From 8274594848fa30f2185d9cbf2437c1a62200b78a Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 16 Aug 2021 17:03:07 +0200 Subject: [PATCH 001/161] [CST-4058] Show EPerson's email address --- .../group-form/members-list/members-list.component.html | 2 ++ .../group-registry/groups-registry.component.ts | 5 +++-- src/assets/i18n/en.json5 | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) 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 51282b49c0..4f8e8090dc 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 @@ -93,6 +93,7 @@ {{messagePrefix + '.table.id' | translate}} {{messagePrefix + '.table.name' | translate}} + {{messagePrefix + '.table.email' | translate}} {{messagePrefix + '.table.edit' | translate}} @@ -101,6 +102,7 @@ {{ePerson.eperson.id}} {{ePerson.eperson.name}} + {{ePerson.eperson.email}}
+
+
+
HEADER (NEW/EDIT)
+

input

+
+ diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts new file mode 100644 index 0000000000..b666f2a0b0 --- /dev/null +++ b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ItemVersionSummaryModalComponent } from './item-version-summary-modal.component'; + +describe('ItemVersionSummaryModalComponent', () => { + let component: ItemVersionSummaryModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ItemVersionSummaryModalComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ItemVersionSummaryModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts new file mode 100644 index 0000000000..b64fd53772 --- /dev/null +++ b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts @@ -0,0 +1,23 @@ +import { Component, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'ds-item-version-summary-modal', + templateUrl: './item-version-summary-modal.component.html', + styleUrls: ['./item-version-summary-modal.component.scss'] +}) +export class ItemVersionSummaryModalComponent implements OnInit { + + constructor(protected activeModal: NgbActiveModal) { + } + + ngOnInit(): void { + } + + /** + * Close the modal + */ + close() { + this.activeModal.close(); + } +} diff --git a/src/app/item-page/edit-item-page/version-history/version-history.module.ts b/src/app/item-page/edit-item-page/version-history/version-history.module.ts index 393edcdf37..0d15aef8c4 100644 --- a/src/app/item-page/edit-item-page/version-history/version-history.module.ts +++ b/src/app/item-page/edit-item-page/version-history/version-history.module.ts @@ -3,12 +3,12 @@ import { CommonModule } from '@angular/common'; import { SharedModule } from '../../../shared/shared.module'; import { VersionHistoryRoutingModule } from './version-history.routing.module'; import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; -import { ItemVersionHistoryEditComponent } from './item-version-history-edit/item-version-history-edit.component'; +import { ItemVersionHistoryFormComponent } from './item-version-history-form/item-version-history-form.component'; @NgModule({ declarations: [ ItemVersionHistoryComponent, - ItemVersionHistoryEditComponent + ItemVersionHistoryFormComponent ], imports: [ CommonModule, diff --git a/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts b/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts index e45d3e5f11..8a5c4a36e1 100644 --- a/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts +++ b/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; -import { ItemVersionHistoryEditComponent } from './item-version-history-edit/item-version-history-edit.component'; +import { ItemVersionHistoryFormComponent } from './item-version-history-form/item-version-history-form.component'; /** @@ -24,11 +24,11 @@ import { ItemVersionHistoryEditComponent } from './item-version-history-edit/ite }, { path: 'create', - component: ItemVersionHistoryEditComponent, + component: ItemVersionHistoryFormComponent, }, { path: ':versionId/edit', - component: ItemVersionHistoryEditComponent, + component: ItemVersionHistoryFormComponent, } ]) ], diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html index e843155d10..74b61fd976 100644 --- a/src/app/item-page/simple/item-page.component.html +++ b/src/app/item-page/simple/item-page.component.html @@ -5,7 +5,7 @@ - + diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 9e61f00e48..82eea0fafd 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -2,7 +2,7 @@

{{'publication.page.titleprefix' | translate}}

-
+
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index b0157dcfee..efe372ccaf 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -3,6 +3,7 @@
+
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts index c1e67561b2..469f04ffd5 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts @@ -119,7 +119,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit { } /** - * Method called on clicking the button "New Submition", It opens a dialog for + * Method called on clicking the button "New Submission", It opens a dialog for * select a collection. */ openDialog() { diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html new file mode 100644 index 0000000000..cf66a15503 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html @@ -0,0 +1,7 @@ + + + diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss new file mode 100644 index 0000000000..e8b7d689a3 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss @@ -0,0 +1,3 @@ +.btn-dark { + background-color: var(--ds-admin-sidebar-bg); +} diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts new file mode 100644 index 0000000000..0a210c3233 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts @@ -0,0 +1,76 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { DsoPageVersionButtonComponent } from './dso-page-version-button.component'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { Item } from '../../../core/shared/item.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { of as observableOf } from 'rxjs'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { By } from '@angular/platform-browser'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; + +describe('DsoPageEditButtonComponent', () => { + let component: DsoPageVersionButtonComponent; + let fixture: ComponentFixture; + + let authorizationService: AuthorizationDataService; + let dso: DSpaceObject; + + beforeEach(waitForAsync(() => { + dso = Object.assign(new Item(), { + id: 'test-item', + _links: { + self: { href: 'test-item-selflink' } + } + }); + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: observableOf(true) + }); + TestBed.configureTestingModule({ + declarations: [DsoPageVersionButtonComponent], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule], + providers: [ + { provide: AuthorizationDataService, useValue: authorizationService } + ] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DsoPageVersionButtonComponent); + component = fixture.componentInstance; + component.dso = dso; + component.pageRoute = 'test'; + fixture.detectChanges(); + }); + + it('should check the authorization of the current user', () => { + expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self); + }); + + describe('when the user is authorized', () => { + beforeEach(() => { + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true)); + component.ngOnInit(); + fixture.detectChanges(); + }); + + it('should render a link', () => { + const link = fixture.debugElement.query(By.css('a')); + expect(link).not.toBeNull(); + }); + }); + + describe('when the user is not authorized', () => { + beforeEach(() => { + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false)); + component.ngOnInit(); + fixture.detectChanges(); + }); + + it('should not render a link', () => { + const link = fixture.debugElement.query(By.css('a')); + expect(link).toBeNull(); + }); + }); +}); diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts new file mode 100644 index 0000000000..72d9872965 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts @@ -0,0 +1,43 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { Observable } from 'rxjs/internal/Observable'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; + +@Component({ + selector: 'ds-dso-page-version-button', + templateUrl: './dso-page-version-button.component.html', + styleUrls: ['./dso-page-version-button.component.scss'] +}) +/** + * Display a button linking to the edit page of a DSpaceObject + */ +export class DsoPageVersionButtonComponent implements OnInit { + /** + * The DSpaceObject to display a button to the edit page for + */ + @Input() dso: DSpaceObject; + + /** + * The prefix of the route to the edit page (before the object's UUID, e.g. "items") + */ + @Input() pageRoute: string; + + /** + * A message for the tooltip on the button + * Supports i18n keys + */ + @Input() tooltipMsg: string; + + /** + * Whether or not the current user is authorized to edit the DSpaceObject + */ + isAuthorized$: Observable; + + constructor(protected authorizationService: AuthorizationDataService) { } + + ngOnInit() { + this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self); + } + +} diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 34764e7925..7d8077d62d 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -11,36 +11,72 @@ [retainScrollPosition]="true"> - - - - - - - + + + + + + + + - - - + + - + - - - + + + + +
{{"item.version.history.table.version" | translate}}{{"item.version.history.table.item" | translate}}{{"item.version.history.table.editor" | translate}}{{"item.version.history.table.date" | translate}}{{"item.version.history.table.summary" | translate}}
{{"item.version.history.table.version" | translate}}{{"item.version.history.table.item" | translate}}{{"item.version.history.table.editor" | translate}}{{"item.version.history.table.date" | translate}}{{"item.version.history.table.summary" | translate}}{{"item.version.history.table.actions" | translate}}
{{version?.version}} +
{{version?.version}} {{item?.handle}} * - + {{eperson?.name}} - {{version?.created}}{{version?.summary}}
{{version?.created}}{{version?.summary}} +
+ + + + + +
+
* {{"item.version.history.selected" | translate}}
- + diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 268c6f00db..aca786b7af 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -19,6 +19,8 @@ import { followLink } from '../../utils/follow-link-config.model'; import { hasValue, hasValueOperator } from '../../empty.util'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ItemVersionSummaryModalComponent } from '../../../item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component'; @Component({ selector: 'ds-item-versions', @@ -45,6 +47,11 @@ export class ItemVersionsComponent implements OnInit { */ @Input() displayTitle = true; + /** + * Whether or not to display the action buttons + */ + @Input() displayActions: boolean; + /** * The AlertType enumeration * @type {AlertType} @@ -102,10 +109,15 @@ export class ItemVersionsComponent implements OnInit { }>; constructor(private versionHistoryService: VersionHistoryDataService, - private paginationService: PaginationService + private paginationService: PaginationService, + private modalService: NgbModal, ) { } + openEditDialog() { + this.modalService.open(ItemVersionSummaryModalComponent); + } + /** * Initialize all observables */ diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 9b993e551f..5aa155faa8 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -211,6 +211,7 @@ import { CollectionSidebarSearchListElementComponent } from './object-list/sideb import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component'; import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component'; +import { DsoPageVersionButtonComponent } from './dso-page/dso-page-version-button/dso-page-version-button.component'; import { HoverClassDirective } from './hover-class.directive'; import { ValidationSuggestionsComponent } from './input-suggestions/validation-suggestions/validation-suggestions.component'; import { ItemAlertsComponent } from './item/item-alerts/item-alerts.component'; @@ -534,6 +535,7 @@ const SHARED_ITEM_PAGE_COMPONENTS = [ MetadataFieldWrapperComponent, MetadataValuesComponent, DsoPageEditButtonComponent, + DsoPageVersionButtonComponent, ItemAlertsComponent, GenericItemPageFieldComponent, MetadataRepresentationListComponent, diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8908ca42f6..349d3b0b33 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1250,7 +1250,7 @@ "file-section.error.header": "Error obtaining files for this item", - + "footer.copyright": "copyright © 2002-{{ year }}", @@ -1910,6 +1910,8 @@ "item.page.return": "Back", + "item.page.version": "Create new version", + "item.preview.dc.identifier.uri": "Identifier:", "item.preview.dc.contributor.author": "Authors:", @@ -1975,6 +1977,14 @@ "item.version.history.table.summary": "Summary", + "item.version.history.table.actions": "Action", + + + "item.version.history.table.action.editSummary": "Edit summary", + + "item.version.history.table.action.newVersion": "Create new version from this one", + + "item.version.history.table.action.deleteVersion": "Delete version", "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", From 6f24b31b393e8e3be91135e74cecf448df695908 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 7 Sep 2021 14:47:36 +0200 Subject: [PATCH 019/161] [CST-4499] Version history (WIP) - Removed summary page (with routing) and modal --- .../edit-item-page/edit-item-page.module.ts | 2 + .../edit-item-page.routing.module.ts | 5 +- .../item-version-history.component.html | 0 .../item-version-history.component.spec.ts | 6 +- .../item-version-history.component.ts | 8 +- .../item-version-history-form.component.html | 5 -- .../item-version-history-form.component.scss | 0 ...tem-version-history-form.component.spec.ts | 25 ------- .../item-version-history-form.component.ts | 74 ------------------- .../item-version-summary-modal.component.html | 11 --- .../item-version-summary-modal.component.scss | 0 ...em-version-summary-modal.component.spec.ts | 25 ------- .../item-version-summary-modal.component.ts | 23 ------ .../version-history/version-history.module.ts | 20 ----- .../version-history.routing.module.ts | 40 ---------- .../item-versions.component.html | 1 + .../item-versions/item-versions.component.ts | 5 +- 17 files changed, 13 insertions(+), 237 deletions(-) rename src/app/item-page/edit-item-page/{version-history => }/item-version-history/item-version-history.component.html (100%) rename src/app/item-page/edit-item-page/{version-history => }/item-version-history/item-version-history.component.spec.ts (87%) rename src/app/item-page/edit-item-page/{version-history => }/item-version-history/item-version-history.component.ts (75%) delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.scss delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/version-history.module.ts delete mode 100644 src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts index 6b12603fc2..11b1d585ba 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.module.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts @@ -28,6 +28,7 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component'; import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component'; import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component'; +import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component'; import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe'; @@ -56,6 +57,7 @@ import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe'; ItemMetadataComponent, ItemRelationshipsComponent, ItemBitstreamsComponent, + ItemVersionHistoryComponent, EditInPlaceFieldComponent, ItemEditBitstreamComponent, ItemEditBitstreamBundleComponent, diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts index 26327f9fcc..2535e42216 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.routing.module.ts @@ -13,6 +13,7 @@ import { ItemCollectionMapperComponent } from './item-collection-mapper/item-col import { ItemMoveComponent } from './item-move/item-move.component'; import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component'; import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component'; import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver'; import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver'; @@ -43,7 +44,6 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua */ @NgModule({ imports: [ - // items//edit/''/public RouterModule.forChild([ { path: '', @@ -99,8 +99,7 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua }, */ { path: 'versionhistory', - loadChildren: () => import('./version-history/version-history.module') - .then((m) => m.VersionHistoryModule), + component: ItemVersionHistoryComponent, data: { title: 'item.edit.tabs.versionhistory.title', showBreadcrumbs: true }, canActivate: [ItemPageVersionHistoryGuard] }, diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html similarity index 100% rename from src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.html rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.spec.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts similarity index 87% rename from src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.spec.ts rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts index 6806decbf6..c68dcfeba3 100644 --- a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts @@ -1,13 +1,13 @@ import { ItemVersionHistoryComponent } from './item-version-history.component'; import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { VarDirective } from '../../../../shared/utils/var.directive'; +import { VarDirective } from '../../../shared/utils/var.directive'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { Item } from '../../../../core/shared/item.model'; +import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { of as observableOf } from 'rxjs'; -import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; describe('ItemVersionHistoryComponent', () => { let component: ItemVersionHistoryComponent; diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts similarity index 75% rename from src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.ts rename to src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts index a982447064..18878109c2 100644 --- a/src/app/item-page/edit-item-page/version-history/item-version-history/item-version-history.component.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts @@ -1,11 +1,11 @@ import { Component } from '@angular/core'; import { Observable } from 'rxjs'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Item } from '../../../../core/shared/item.model'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Item } from '../../../core/shared/item.model'; import { map } from 'rxjs/operators'; -import { getFirstSucceededRemoteData } from '../../../../core/shared/operators'; +import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { ActivatedRoute } from '@angular/router'; -import { AlertType } from '../../../../shared/alert/aletr-type'; +import { AlertType } from '../../../shared/alert/aletr-type'; @Component({ selector: 'ds-item-version-history', diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html deleted file mode 100644 index 74e2c195a6..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.html +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.scss b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts deleted file mode 100644 index d9a2892831..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ItemVersionHistoryFormComponent } from './item-version-history-form.component'; - -describe('ItemVersionHistoryCreateComponent', () => { - let component: ItemVersionHistoryFormComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ ItemVersionHistoryFormComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ItemVersionHistoryFormComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts b/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts deleted file mode 100644 index 892cb9ec01..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-history-form/item-version-history-form.component.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { getFirstSucceededRemoteData } from '../../../../core/shared/operators'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { take } from 'rxjs/operators'; -import { DynamicFormControlModel, DynamicFormLayout, DynamicInputModel } from '@ng-dynamic-forms/core'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'ds-item-version-history-edit', - templateUrl: './item-version-history-form.component.html', - styleUrls: ['./item-version-history-form.component.scss'] -}) -export class ItemVersionHistoryFormComponent implements OnInit { - - versionId; - - itemId; - - itemVersion: DynamicInputModel; - - formId = 'item-version-form'; - formModel: DynamicFormControlModel[]; - formGroup: FormGroup; - formLayout: DynamicFormLayout = { - itemVersion: { - grid: { - host: 'row' - } - }, - }; - - - constructor(private route: ActivatedRoute, private versionDataService: VersionDataService) { - } - - ngOnInit(): void { - - this.versionId = this.route.snapshot.params.versionId; - - console.log(this.route.snapshot.params); - - - - this.itemVersion = new DynamicInputModel({ - id: 'groupName', - label: 'item version label', - name: 'itemVersion', - validators: { - required: null, - }, - required: true, - }); - - - this.formModel = [ - this.itemVersion, - ]; - - /*this.versionDataService.findById(this.versionId).pipe(getFirstSucceededRemoteData()).subscribe( - (res) => { - this.versionDataService.update() - const updatedVersion = - Object.assign({}, res.payload, { - summary: 'New summary', - }); - this.versionDataService.update(updatedVersion).pipe(take(1)).subscribe(); - } - );*/ // TODO check not null - - - } - -} diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html deleted file mode 100644 index fde2b7a55d..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.html +++ /dev/null @@ -1,11 +0,0 @@ -
-
VERSION SUMMARY TMP - -
-
-
HEADER (NEW/EDIT)
-

input

-
-
diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts deleted file mode 100644 index b666f2a0b0..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ItemVersionSummaryModalComponent } from './item-version-summary-modal.component'; - -describe('ItemVersionSummaryModalComponent', () => { - let component: ItemVersionSummaryModalComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ ItemVersionSummaryModalComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ItemVersionSummaryModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts b/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts deleted file mode 100644 index b64fd53772..0000000000 --- a/src/app/item-page/edit-item-page/version-history/item-version-summary-modal/item-version-summary-modal.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; - -@Component({ - selector: 'ds-item-version-summary-modal', - templateUrl: './item-version-summary-modal.component.html', - styleUrls: ['./item-version-summary-modal.component.scss'] -}) -export class ItemVersionSummaryModalComponent implements OnInit { - - constructor(protected activeModal: NgbActiveModal) { - } - - ngOnInit(): void { - } - - /** - * Close the modal - */ - close() { - this.activeModal.close(); - } -} diff --git a/src/app/item-page/edit-item-page/version-history/version-history.module.ts b/src/app/item-page/edit-item-page/version-history/version-history.module.ts deleted file mode 100644 index 0d15aef8c4..0000000000 --- a/src/app/item-page/edit-item-page/version-history/version-history.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SharedModule } from '../../../shared/shared.module'; -import { VersionHistoryRoutingModule } from './version-history.routing.module'; -import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; -import { ItemVersionHistoryFormComponent } from './item-version-history-form/item-version-history-form.component'; - -@NgModule({ - declarations: [ - ItemVersionHistoryComponent, - ItemVersionHistoryFormComponent - ], - imports: [ - CommonModule, - SharedModule, - VersionHistoryRoutingModule - ] -}) -export class VersionHistoryModule { -} diff --git a/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts b/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts deleted file mode 100644 index 8a5c4a36e1..0000000000 --- a/src/app/item-page/edit-item-page/version-history/version-history.routing.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component'; -import { ItemVersionHistoryFormComponent } from './item-version-history-form/item-version-history-form.component'; - - -/** - * Routing module that handles the routing for the Edit Item page administrator functionality - */ -@NgModule({ - imports: [ - // items//edit/''/version-history - RouterModule.forChild([ - { - path: '', - component: ItemVersionHistoryComponent, - // children: [ - // { - // path: '', - // pathMatch: 'full', - // - // } - // ] - }, - { - path: 'create', - component: ItemVersionHistoryFormComponent, - }, - { - path: ':versionId/edit', - component: ItemVersionHistoryFormComponent, - } - ]) - ], - providers: [ - ] -}) -export class VersionHistoryRoutingModule { - -} diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 7d8077d62d..68b64e690f 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -2,6 +2,7 @@

{{"item.version.history.head" | translate}}

+ Date: Tue, 7 Sep 2021 20:33:47 +0200 Subject: [PATCH 020/161] [CST-4499] Version history (WIP) - Added in-row editing in version history (call to REST service TBD) and other fixes --- .../item-metadata.component.html | 119 +++++++++--------- .../item-versions.component.html | 71 +++++++++-- .../item-versions.component.scss | 9 ++ .../item-versions/item-versions.component.ts | 34 ++++- .../pagination/pagination.component.html | 2 +- src/assets/i18n/en.json5 | 6 + 6 files changed, 166 insertions(+), 75 deletions(-) create mode 100644 src/app/shared/item/item-versions/item-versions.component.scss diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html index e154487402..70cd2aaa39 100644 --- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html +++ b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html @@ -1,66 +1,69 @@
-
- - - - -
- - - - - - - - - + + + + + +
{{'item.edit.metadata.headers.field' | translate}}{{'item.edit.metadata.headers.value' | translate}}{{'item.edit.metadata.headers.language' | translate}}{{'item.edit.metadata.headers.edit' | translate}}
+ + + + + + + + + + - - -
{{'item.edit.metadata.headers.field' | translate}}{{'item.edit.metadata.headers.value' | translate}}{{'item.edit.metadata.headers.language' | translate}}{{'item.edit.metadata.headers.edit' | translate}}
-
- + + + +
+ +
+
+
+ + +
-
-
- - - -
-
+
diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 68b64e690f..1b47ad3575 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -2,7 +2,9 @@

{{"item.version.history.head" | translate}}

- + + {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }} + - +
- + @@ -24,33 +26,76 @@ - - - + + - + - + diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index afde91b8ff..cdd4bc79f9 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -2,7 +2,14 @@ import { Component, Input, OnInit } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; import { Version } from '../../../core/shared/version.model'; import { RemoteData } from '../../../core/data/remote-data'; -import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs'; +import { + BehaviorSubject, + combineLatest, + combineLatest as observableCombineLatest, + Observable, + of, + Subscription +} from 'rxjs'; import { VersionHistory } from '../../../core/shared/version-history.model'; import { getAllSucceededRemoteData, @@ -12,7 +19,7 @@ import { getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../../core/shared/operators'; -import { map, startWith, switchMap, take } from 'rxjs/operators'; +import { map, mergeMap, startWith, switchMap, take } from 'rxjs/operators'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; @@ -35,6 +42,8 @@ import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/i import { VersionDataService } from '../../../core/data/version-data.service'; import { ItemDataService } from '../../../core/data/item-data.service'; import { Router } from '@angular/router'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; @Component({ selector: 'ds-item-versions', @@ -101,6 +110,12 @@ export class ItemVersionsComponent implements OnInit { */ hasEpersons$: Observable; + /** + * Verify if there is an inprogress submission in the version history + * Used to disable the "Create version" button + */ + hasDraftVersion$: Observable; + /** * The amount of versions to display per page */ @@ -151,6 +166,9 @@ export class ItemVersionsComponent implements OnInit { */ versionBeingEditedSummary: string; + canCreateVersion$: Observable; + createVersionTitle$: Observable; + constructor(private versionHistoryService: VersionHistoryDataService, private versionService: VersionDataService, private itemService: ItemDataService, @@ -160,6 +178,7 @@ export class ItemVersionsComponent implements OnInit { private notificationsService: NotificationsService, private translateService: TranslateService, private router: Router, + protected authorizationService: AuthorizationDataService, ) { } @@ -250,9 +269,113 @@ export class ItemVersionsComponent implements OnInit { activeModal.componentInstance.versionNumber = version.version; activeModal.componentInstance.firstVersion = false; + + // OLD + const versionHistory$ = this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( + take(1), + switchMap((res) => this.versionHistoryService.findById(res)), + getFirstSucceededRemoteDataPayload(), + ); + // On modal submit/dismiss activeModal.result.then(() => { - console.log('Deleting item...'); + + /*const versionHistory$ = this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( + take(1), + map((versionHistoryId) => { + console.log('Version history ID = ' + versionHistoryId); + return versionHistoryId; + }), + switchMap((res) => this.versionHistoryService.findById(res)), + getFirstSucceededRemoteDataPayload(), + );*/ + + /*const deleteResultWithVersionHistory$ = versionHistory$.pipe( + switchMap((versionHisory) => combineLatest([ + versionItem$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((itemBeingDeleted) => this.itemService.delete(itemBeingDeleted.id)), + getFirstCompletedRemoteData(), + map((deleteItemRes) => deleteItemRes.hasSucceeded), + ), + of(versionHisory) + ]) + ) + );*/ + + /*const deleteResultWithNewLatestVersion = deleteResultWithVersionHistory$.pipe( + switchMap( ([deleteHasSucceeded, versionHisory]) => [ + of(deleteHasSucceeded), + of(versionHisory).pipe( + switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), + switchMap((newLatestVersion) => newLatestVersion.item), + getFirstSucceededRemoteDataPayload(), + ) + ]), + ).subscribe(([deleteHasSucceeded, newLatestVersionItem] ) => { + if (deleteHasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + console.log('LATEST VERSION = ' + newLatestVersionItem.uuid); + if (redirectToLatest) { + const tmpPath = getItemEditVersionhistoryRoute(newLatestVersionItem); + console.log('PATH = ' + tmpPath); + this.router.navigateByUrl(tmpPath); + } + return this.versionHistoryService.getLatestVersion$(version); + });*/ + + /* + * 1. recuperare version history + * 2. successivamente eliminare l'item + * 3. dopo aver eliminato l'item, recuperare la nuova versione + * 4. fare il redirect + */ + + /*versionItem$.pipe( + getFirstSucceededRemoteDataPayload(), + map((item) => item.id), + mergeMap((itemId) => combineLatest([ + of(itemId).pipe( + // BEGIN DELETE + switchMap((id) => this.itemService.delete(id)), + getFirstCompletedRemoteData(), + map((deleteItemRes) => deleteItemRes.hasSucceeded), + // END DELETE + ), + + this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( + take(1), + map((versionHistoryId) => { + console.log('Version history ID = ' + versionHistoryId); + return versionHistoryId; + }), + switchMap((res) => this.versionHistoryService.findById(res)), + getFirstSucceededRemoteDataPayload(), + switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), + switchMap((newLatestVersion) => newLatestVersion.item), + getFirstSucceededRemoteDataPayload(), + mergeMap((deleteHasSucceeded) => combineLatest([])) + ) + + ]) + ), + ).subscribe(([deleteHasSucceeded, newLatestVersionItem]) => { + if (deleteHasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + console.log('LATEST VERSION = ' + newLatestVersionItem.uuid); + if (redirectToLatest) { + const tmpPath = getItemEditVersionhistoryRoute(newLatestVersionItem); + console.log('PATH = ' + tmpPath); + this.router.navigateByUrl(tmpPath); + } + return this.versionHistoryService.getLatestVersion$(version); + });*/ versionItem$.pipe( getFirstSucceededRemoteDataPayload(), @@ -260,82 +383,30 @@ export class ItemVersionsComponent implements OnInit { switchMap((itemId) => this.itemService.delete(itemId)), getFirstCompletedRemoteData(), map((deleteItemRes) => deleteItemRes.hasSucceeded), - switchMap((deleteHasSucceeded) => { - if (deleteHasSucceeded) { - this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); - } else { - this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); - } - return this.versionHistoryService.getLatestVersion$(version); - }), - switchMap((latestVersion) => latestVersion.item), - getFirstSucceededRemoteDataPayload(), - ).subscribe((latestVersionItem) => { - console.log('LATEST VERSION = ' + latestVersionItem.uuid); + mergeMap((deleteHasSucceeded) => combineLatest([ + of(deleteHasSucceeded), + versionHistory$.pipe( + switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), + switchMap((newLatestVersion) => newLatestVersion.item), + getFirstSucceededRemoteDataPayload() + ) + ]) + ), + ).subscribe(([deleteHasSucceeded, newLatestVersionItem]) => { + if (deleteHasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + console.log('LATEST VERSION = ' + newLatestVersionItem.uuid); if (redirectToLatest) { - const tmpPath = getItemEditVersionhistoryRoute(latestVersionItem); + const tmpPath = getItemEditVersionhistoryRoute(newLatestVersionItem); console.log('PATH = ' + tmpPath); this.router.navigateByUrl(tmpPath); } + return this.versionHistoryService.getLatestVersion$(version); }); - - /* - const itemVersion$ = item.version; - const isLatest$ = item.version.pipe( - getFirstSucceededRemoteDataPayload(), - map( (itemVersion) => this.versionHistoryService.isLatest$(itemVersion)) - ); - - */ - - /*map((item) => { - item.version.pipe( - getFirstSucceededRemoteDataPayload(), - switchMap( (itemVersion) => this.versionHistoryService.isLatest$(itemVersion)), - ).subscribe((isLatestVersion) => { - isDeletingLatestVersion = isLatestVersion; - } - ); - return item; - }),*/ - /*mergeMap((versionItem) => combineLatest([ - of(versionItem).pipe( - map((item) => item.id), - switchMap((itemId) => this.itemService.delete(itemId)), - getFirstCompletedRemoteData() - ), - versionHistory$.pipe( - getFirstSucceededRemoteDataPayload(), - ) - ])),*/ - - - // FUNZIONANTE: - - /*version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((getItemRes) => { - const itemId = getItemRes.id; - - const isLatest$ = this.itemService.findById(itemId, true,true, followLink('version')).pipe( - getFirstSucceededRemoteDataPayload(), - switchMap( (item) => item.version ), - getFirstSucceededRemoteDataPayload(), - map( (itemVersion) => this.versionHistoryService.isLatest$(itemVersion)) - ); - - this.itemService.delete(itemId).pipe(getFirstCompletedRemoteData()).subscribe( - (deleteItemRes) => { - console.log(JSON.stringify(deleteItemRes)); - if (deleteItemRes.hasSucceeded) { - this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); - this.refreshSubject.next(null); - } else { - this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); - } - } - ); - });*/ - }); } @@ -372,6 +443,33 @@ export class ItemVersionsComponent implements OnInit { }); } + // TODO eliminare + /*hasDraftVersion$(versionItem: Observable>): Observable { + return versionItem.pipe( + getFirstSucceededRemoteDataPayload(), + map((res) => res._links.version.href ), + switchMap( (res) => this.versionHistoryService.hasDraftVersion$(res)) + ); + }*/ + + canEditVersion$(versionItem: Version) { + return this.authorizationService.isAuthorized(FeatureID.CanEditVersion, versionItem.self); + } + + canDeleteVersion$(versionItem: Version) { + return this.authorizationService.isAuthorized(FeatureID.CanDeleteVersion, versionItem.self); + } + + // TODO eliminare (usa item anziché vrsion) + /*canDeleteVersion$(version: Version) { + return version.item.pipe( + getFirstSucceededRemoteDataPayload(), + map((item) => item.self), + switchMap((url) => this.authorizationService.isAuthorized(FeatureID.CanDeleteVersion, url)), + take(1), + ); + }*/ + /** * Initialize all observables */ @@ -384,6 +482,15 @@ export class ItemVersionsComponent implements OnInit { hasValueOperator(), switchMap((version: Version) => version.versionhistory) ); + this.hasDraftVersion$ = this.versionHistoryRD$.pipe( + getFirstSucceededRemoteDataPayload(), + map((res) => res.draftVersion) + ); + this.canCreateVersion$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.item.self); + this.createVersionTitle$ = this.hasDraftVersion$.pipe( + take(1), + switchMap((res) => of(res ? 'item.version.history.table.action.hasDraft' : 'item.version.history.table.action.newVersion')) + ); const versionHistory$ = this.versionHistoryRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 16dbd7dba7..d640ade531 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1910,7 +1910,9 @@ "item.page.return": "Back", - "item.page.version": "Create new version", + "item.page.version.create": "Create new version", + + "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", "item.preview.dc.identifier.uri": "Identifier:", @@ -1992,6 +1994,8 @@ "item.version.history.table.action.deleteVersion": "Delete version", + "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", From cf1c73bd3234c2a44459886b36c860eaa625bb89 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 16 Sep 2021 15:49:11 +0200 Subject: [PATCH 036/161] [CST-4499] Version history (WIP) - Authorization features - Deleting --- .../version-page/version-page.component.ts | 1 - .../item-versions.component.html | 2 +- .../item-versions/item-versions.component.ts | 163 +++++------------- 3 files changed, 45 insertions(+), 121 deletions(-) diff --git a/src/app/item-page/version-page/version-page/version-page.component.ts b/src/app/item-page/version-page/version-page/version-page.component.ts index d58c98a967..e61b26cd19 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.ts @@ -47,7 +47,6 @@ export class VersionPageComponent implements OnInit { redirectOn4xx(this.router, this.authService), getFirstCompletedRemoteData(), ).subscribe((itemRD) => { - console.log(JSON.stringify(itemRD)); if (itemRD.hasNoContent) { this.router.navigateByUrl(getPageNotFoundRoute(), { skipLocationChange: true }); } else { diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index f39f2b8b70..c3bf6a9beb 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -75,7 +75,7 @@ diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index cdd4bc79f9..b542a2a0a2 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -131,11 +131,6 @@ export class ItemVersionsComponent implements OnInit { pageSize: this.pageSize }); - /** - * The current page being displayed - */ - currentPage$ = new BehaviorSubject(1); - /** * The routes to the versions their item pages * Key: Item ID @@ -253,6 +248,29 @@ export class ItemVersionsComponent implements OnInit { ); } + getVersionHistory$(version: Version): Observable { + return this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( + take(1), + switchMap((res) => this.versionHistoryService.findById(res)), + getFirstSucceededRemoteDataPayload(), + ); + } + + deleteItemAndGetResult$(item: Item): Observable { + return this.itemService.delete(item.id).pipe( + getFirstCompletedRemoteData(), + map((deleteItemRes) => deleteItemRes.hasSucceeded), + take(1), + ); + } + + getLatestVersionItem$(versionHistory: VersionHistory): Observable { + return this.versionHistoryService.getLatestVersionFromHistory$(versionHistory).pipe( + switchMap((newLatestVersion) => newLatestVersion.item), + getFirstSucceededRemoteDataPayload(), + ); + } + /** * Deletes the specified version * @param version the version to be deleted @@ -269,8 +287,6 @@ export class ItemVersionsComponent implements OnInit { activeModal.componentInstance.versionNumber = version.version; activeModal.componentInstance.firstVersion = false; - - // OLD const versionHistory$ = this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( take(1), switchMap((res) => this.versionHistoryService.findById(res)), @@ -280,118 +296,27 @@ export class ItemVersionsComponent implements OnInit { // On modal submit/dismiss activeModal.result.then(() => { - /*const versionHistory$ = this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( - take(1), - map((versionHistoryId) => { - console.log('Version history ID = ' + versionHistoryId); - return versionHistoryId; - }), - switchMap((res) => this.versionHistoryService.findById(res)), - getFirstSucceededRemoteDataPayload(), - );*/ - - /*const deleteResultWithVersionHistory$ = versionHistory$.pipe( - switchMap((versionHisory) => combineLatest([ - versionItem$.pipe( - getFirstSucceededRemoteDataPayload(), - switchMap((itemBeingDeleted) => this.itemService.delete(itemBeingDeleted.id)), - getFirstCompletedRemoteData(), - map((deleteItemRes) => deleteItemRes.hasSucceeded), - ), - of(versionHisory) - ]) - ) - );*/ - - /*const deleteResultWithNewLatestVersion = deleteResultWithVersionHistory$.pipe( - switchMap( ([deleteHasSucceeded, versionHisory]) => [ - of(deleteHasSucceeded), - of(versionHisory).pipe( - switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), - switchMap((newLatestVersion) => newLatestVersion.item), - getFirstSucceededRemoteDataPayload(), - ) - ]), - ).subscribe(([deleteHasSucceeded, newLatestVersionItem] ) => { - if (deleteHasSucceeded) { - this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); - } else { - this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); - } - console.log('LATEST VERSION = ' + newLatestVersionItem.uuid); - if (redirectToLatest) { - const tmpPath = getItemEditVersionhistoryRoute(newLatestVersionItem); - console.log('PATH = ' + tmpPath); - this.router.navigateByUrl(tmpPath); - } - return this.versionHistoryService.getLatestVersion$(version); - });*/ - - /* - * 1. recuperare version history - * 2. successivamente eliminare l'item - * 3. dopo aver eliminato l'item, recuperare la nuova versione - * 4. fare il redirect - */ - - /*versionItem$.pipe( - getFirstSucceededRemoteDataPayload(), - map((item) => item.id), - mergeMap((itemId) => combineLatest([ - of(itemId).pipe( - // BEGIN DELETE - switchMap((id) => this.itemService.delete(id)), - getFirstCompletedRemoteData(), - map((deleteItemRes) => deleteItemRes.hasSucceeded), - // END DELETE - ), - - this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( - take(1), - map((versionHistoryId) => { - console.log('Version history ID = ' + versionHistoryId); - return versionHistoryId; - }), - switchMap((res) => this.versionHistoryService.findById(res)), - getFirstSucceededRemoteDataPayload(), - switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), - switchMap((newLatestVersion) => newLatestVersion.item), - getFirstSucceededRemoteDataPayload(), - mergeMap((deleteHasSucceeded) => combineLatest([])) - ) - - ]) - ), - ).subscribe(([deleteHasSucceeded, newLatestVersionItem]) => { - if (deleteHasSucceeded) { - this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); - } else { - this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); - } - console.log('LATEST VERSION = ' + newLatestVersionItem.uuid); - if (redirectToLatest) { - const tmpPath = getItemEditVersionhistoryRoute(newLatestVersionItem); - console.log('PATH = ' + tmpPath); - this.router.navigateByUrl(tmpPath); - } - return this.versionHistoryService.getLatestVersion$(version); - });*/ - versionItem$.pipe( getFirstSucceededRemoteDataPayload(), - map((item) => item.id), - switchMap((itemId) => this.itemService.delete(itemId)), - getFirstCompletedRemoteData(), - map((deleteItemRes) => deleteItemRes.hasSucceeded), - mergeMap((deleteHasSucceeded) => combineLatest([ - of(deleteHasSucceeded), - versionHistory$.pipe( - switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), - switchMap((newLatestVersion) => newLatestVersion.item), - getFirstSucceededRemoteDataPayload() - ) - ]) - ), + mergeMap((item) => combineLatest([ + // passa item, recupera vh + of(item), + versionHistory$.pipe( + switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), + switchMap((newLatestVersion) => newLatestVersion.item), + getFirstSucceededRemoteDataPayload() + ) + ])), + mergeMap(([item, versionHistory]) => combineLatest([ + // cancella item, passa vh + of(item).pipe( + map((itemBeingDeleted) => itemBeingDeleted.id), + switchMap((itemId) => this.itemService.delete(itemId)), + getFirstCompletedRemoteData(), + map((deleteItemRes) => deleteItemRes.hasSucceeded) + ), + of(versionHistory) + ])), ).subscribe(([deleteHasSucceeded, newLatestVersionItem]) => { if (deleteHasSucceeded) { this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); @@ -452,11 +377,11 @@ export class ItemVersionsComponent implements OnInit { ); }*/ - canEditVersion$(versionItem: Version) { + canEditVersion$(versionItem: Version): Observable { return this.authorizationService.isAuthorized(FeatureID.CanEditVersion, versionItem.self); } - canDeleteVersion$(versionItem: Version) { + canDeleteVersion$(versionItem: Version): Observable { return this.authorizationService.isAuthorized(FeatureID.CanDeleteVersion, versionItem.self); } From b1b2bd456205d6dd688fe6cbbedae368f4386175 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 16 Sep 2021 18:53:45 +0200 Subject: [PATCH 037/161] [CST-4499] Version history (WIP) - Authorization features - Cache issue fixed --- .../core/data/version-history-data.service.ts | 4 + .../item-versions/item-versions.component.ts | 106 +++++++++--------- 2 files changed, 56 insertions(+), 54 deletions(-) diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 0064292114..5f5b765917 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -173,4 +173,8 @@ export class VersionHistoryDataService extends DataService { startWith(false), ); } + + invalidateVersionHistoryCache(versionHistoryID: string) { + this.requestService.setStaleByHrefSubstring('versioning/versionhistories/' + versionHistoryID); + } } diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index b542a2a0a2..92cbe1edd4 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -19,7 +19,7 @@ import { getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../../core/shared/operators'; -import { map, mergeMap, startWith, switchMap, take } from 'rxjs/operators'; +import { map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; @@ -44,6 +44,8 @@ import { ItemDataService } from '../../../core/data/item-data.service'; import { Router } from '@angular/router'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { createPaginatedList } from '../../testing/utils.test'; +import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; @Component({ selector: 'ds-item-versions', @@ -102,7 +104,7 @@ export class ItemVersionsComponent implements OnInit { /** * The version history's list of versions */ - versionsRD$: Observable>>; + versionsRD$: BehaviorSubject>> = new BehaviorSubject>>(createSuccessfulRemoteDataObject(createPaginatedList())); /** * Verify if the list of versions has at least one e-person to display @@ -140,12 +142,6 @@ export class ItemVersionsComponent implements OnInit { [itemId: string]: string }>; - /** - * Emits when the versionsRD$ must be refreshed - * (should be used when a new version has been created) - */ - refreshSubject = new BehaviorSubject(null); - /** * The number of the version whose summary is currently being edited */ @@ -276,7 +272,7 @@ export class ItemVersionsComponent implements OnInit { * @param version the version to be deleted * @param redirectToLatest force the redirect to the latest version in the history */ - deleteVersion(version: Version, redirectToLatest: boolean) { + deleteVersion(version: Version, redirectToLatest: boolean): void { const successMessageKey = 'item.version.delete.notification.success'; const failureMessageKey = 'item.version.delete.notification.failure'; const versionNumber = version.version; @@ -287,36 +283,40 @@ export class ItemVersionsComponent implements OnInit { activeModal.componentInstance.versionNumber = version.version; activeModal.componentInstance.firstVersion = false; - const versionHistory$ = this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( - take(1), - switchMap((res) => this.versionHistoryService.findById(res)), - getFirstSucceededRemoteDataPayload(), - ); - // On modal submit/dismiss activeModal.result.then(() => { + // let versionHistoryOuter: VersionHistory; + versionItem$.pipe( getFirstSucceededRemoteDataPayload(), - mergeMap((item) => combineLatest([ - // passa item, recupera vh + mergeMap((item: Item) => combineLatest([ + // pass item of(item), - versionHistory$.pipe( - switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)), - switchMap((newLatestVersion) => newLatestVersion.item), - getFirstSucceededRemoteDataPayload() + // get and return version history + this.getVersionHistory$(version).pipe( + // invalidate cache + tap((versionHistory) => { + this.versionHistoryService.invalidateVersionHistoryCache(versionHistory.id); + }) ) ])), - mergeMap(([item, versionHistory]) => combineLatest([ - // cancella item, passa vh - of(item).pipe( - map((itemBeingDeleted) => itemBeingDeleted.id), - switchMap((itemId) => this.itemService.delete(itemId)), - getFirstCompletedRemoteData(), - map((deleteItemRes) => deleteItemRes.hasSucceeded) - ), + mergeMap(([item, versionHistory]: [Item, VersionHistory]) => combineLatest([ + // delete item and return result + this.deleteItemAndGetResult$(item), + // pass version history of(versionHistory) ])), + mergeMap(([deleteItemResult, versionHistory]: [boolean, VersionHistory]) => combineLatest([ + // pass result + of(deleteItemResult), + // get and return new latest version + this.getLatestVersionItem$(versionHistory).pipe( + tap(() => { + this.getVersionHistory(of(versionHistory)); + }), + ) + ])), ).subscribe(([deleteHasSucceeded, newLatestVersionItem]) => { if (deleteHasSucceeded) { this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); @@ -325,13 +325,10 @@ export class ItemVersionsComponent implements OnInit { } console.log('LATEST VERSION = ' + newLatestVersionItem.uuid); if (redirectToLatest) { - const tmpPath = getItemEditVersionhistoryRoute(newLatestVersionItem); - console.log('PATH = ' + tmpPath); - this.router.navigateByUrl(tmpPath); + const path = getItemEditVersionhistoryRoute(newLatestVersionItem); + this.router.navigateByUrl(path); } - return this.versionHistoryService.getLatestVersion$(version); }); - }); } @@ -350,6 +347,9 @@ export class ItemVersionsComponent implements OnInit { // On modal submit/dismiss activeModal.result.then((modalResult) => { + // TODO spostare in metodo + // TODO recuperare version history e invalidare cache + // this.versionHistoryService.invalidateVersionHistoryCache(versionHistory.id); const summary = modalResult; version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((item) => { @@ -359,7 +359,7 @@ export class ItemVersionsComponent implements OnInit { if (postResult.hasSucceeded) { const newVersionNumber = postResult.payload.version; this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); - this.refreshSubject.next(null); + this.getVersionHistory$(version); } else { this.notificationsService.error(null, this.translateService.get(failureMessageKey)); } @@ -395,6 +395,22 @@ export class ItemVersionsComponent implements OnInit { ); }*/ + getVersionHistory(versionHistory$: Observable): void { + const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options); + observableCombineLatest([versionHistory$, currentPagination]).pipe( + switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { + return this.versionHistoryService.getVersions(versionHistory.id, + new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), + true, true, followLink('item'), followLink('eperson')); + }), + getFirstCompletedRemoteData(), + ).subscribe((res) => { + this.versionsRD$.next(res); + console.log(res.payload); + }); + } + + /** * Initialize all observables */ @@ -421,25 +437,7 @@ export class ItemVersionsComponent implements OnInit { getRemoteDataPayload(), hasValueOperator(), ); - const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options); - this.versionsRD$ = observableCombineLatest([versionHistory$, currentPagination]).pipe( - switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { - return this.versionHistoryService.getVersions(versionHistory.id, - new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), - true, true, followLink('item'), followLink('eperson')); - }) - ); - // Refresh the table when refreshSubject emits - this.subs.push(this.refreshSubject.pipe(switchMap(() => { - return observableCombineLatest([versionHistory$, currentPagination]).pipe( - take(1), - switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { - return this.versionHistoryService.getVersions(versionHistory.id, - new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), - false, true, followLink('item'), followLink('eperson')); - }) - ); - })).subscribe()); + this.getVersionHistory(versionHistory$); this.hasEpersons$ = this.versionsRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), From 025e7f5c3833a88404f9597299458a9d7c9e1b55 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 17 Sep 2021 12:19:18 +0200 Subject: [PATCH 038/161] [CST-4499] Version history (WIP) - Cache issue fixed --- .../dso-page-version-button.component.spec.ts | 3 +-- .../item-versions/item-versions.component.ts | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts index 0a210c3233..edc7fbd618 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts @@ -15,7 +15,7 @@ describe('DsoPageEditButtonComponent', () => { let fixture: ComponentFixture; let authorizationService: AuthorizationDataService; - let dso: DSpaceObject; + let dso: Item; beforeEach(waitForAsync(() => { dso = Object.assign(new Item(), { @@ -40,7 +40,6 @@ describe('DsoPageEditButtonComponent', () => { fixture = TestBed.createComponent(DsoPageVersionButtonComponent); component = fixture.componentInstance; component.dso = dso; - component.pageRoute = 'test'; fixture.detectChanges(); }); diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 92cbe1edd4..fb95ede32f 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -44,8 +44,6 @@ import { ItemDataService } from '../../../core/data/item-data.service'; import { Router } from '@angular/router'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { createPaginatedList } from '../../testing/utils.test'; -import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; @Component({ selector: 'ds-item-versions', @@ -104,7 +102,7 @@ export class ItemVersionsComponent implements OnInit { /** * The version history's list of versions */ - versionsRD$: BehaviorSubject>> = new BehaviorSubject>>(createSuccessfulRemoteDataObject(createPaginatedList())); + versionsRD$: BehaviorSubject>> = new BehaviorSubject>>(null); /** * Verify if the list of versions has at least one e-person to display @@ -244,7 +242,7 @@ export class ItemVersionsComponent implements OnInit { ); } - getVersionHistory$(version: Version): Observable { + getVersionHistoryFromVersion$(version: Version): Observable { return this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( take(1), switchMap((res) => this.versionHistoryService.findById(res)), @@ -294,7 +292,7 @@ export class ItemVersionsComponent implements OnInit { // pass item of(item), // get and return version history - this.getVersionHistory$(version).pipe( + this.getVersionHistoryFromVersion$(version).pipe( // invalidate cache tap((versionHistory) => { this.versionHistoryService.invalidateVersionHistoryCache(versionHistory.id); @@ -336,7 +334,7 @@ export class ItemVersionsComponent implements OnInit { * Creates a new version starting from the specified one * @param version the version from which a new one will be created */ - createNewVersion(version) { + createNewVersion(version: Version) { const successMessageKey = 'item.version.create.notification.success'; const failureMessageKey = 'item.version.create.notification.failure'; const versionNumber = version.version; @@ -359,7 +357,13 @@ export class ItemVersionsComponent implements OnInit { if (postResult.hasSucceeded) { const newVersionNumber = postResult.payload.version; this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); - this.getVersionHistory$(version); + console.log(version); + const versionHistory$ = this.versionHistoryService.getHistoryFromVersion$(version).pipe( + tap((res) => { + this.versionHistoryService.invalidateVersionHistoryCache(res.id); + }), + ); + this.getVersionHistory(versionHistory$); } else { this.notificationsService.error(null, this.translateService.get(failureMessageKey)); } @@ -401,7 +405,7 @@ export class ItemVersionsComponent implements OnInit { switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { return this.versionHistoryService.getVersions(versionHistory.id, new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), - true, true, followLink('item'), followLink('eperson')); + false, true, followLink('item'), followLink('eperson')); }), getFirstCompletedRemoteData(), ).subscribe((res) => { From 55a1a1c0eb5f8505dca774ab296194ea3102dd87 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 17 Sep 2021 13:37:57 +0200 Subject: [PATCH 039/161] [CST-4499] Version history (WIP) - Refactoring --- .../item-types/shared/item.component.ts | 51 --------------- .../untyped-item/untyped-item.component.html | 2 +- .../untyped-item/untyped-item.component.ts | 63 +++++++++++++++++++ .../item-versions-summary-modal.component.ts | 2 +- 4 files changed, 65 insertions(+), 53 deletions(-) diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts index 2b507aa921..793af180c9 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.ts @@ -2,14 +2,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { environment } from '../../../../../environments/environment'; import { Item } from '../../../../core/shared/item.model'; import { getItemPageRoute } from '../../../item-page-routing-paths'; -import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { take } from 'rxjs/operators'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { VersionDataService } from '../../../../core/data/version-data.service'; @Component({ selector: 'ds-item', @@ -28,49 +20,6 @@ export class ItemComponent implements OnInit { mediaViewer = environment.mediaViewer; - constructor( - private modalService: NgbModal, - private versionHistoryService: VersionHistoryDataService, - private notificationsService: NotificationsService, - private translateService: TranslateService, - // private itemService: ItemDataService, - private versionService: VersionDataService, - ) { - } - - createNewVersion() { - const successMessageKey = 'item.version.create.notification.success'; - const failureMessageKey = 'item.version.create.notification.failure'; - const item = this.object; - - // Open modal - const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); - - this.versionService.findByHref(item._links.version.href).pipe(getFirstCompletedRemoteData()).subscribe( - (res) => { - // TODO check serve async? - activeModal.componentInstance.firstVersion = res.hasNoContent; - activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version); - } - ); - - // On modal submit/dismiss - activeModal.result.then((modalResult) => { - const summary = modalResult; - - const itemHref = item._links.self.href; - - this.versionHistoryService.createVersion(itemHref, summary).pipe(take(1)).subscribe((postResult) => { - if (postResult.hasSucceeded) { - const newVersionNumber = postResult.payload.version; - this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); - } else { - this.notificationsService.error(null, this.translateService.get(failureMessageKey)); - } - }); - }); - } - ngOnInit(): void { this.itemPageRoute = getItemPageRoute(this.object); } diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index a370f2b53b..533d7c6ccf 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -3,7 +3,7 @@
- diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts index 3183c42a28..2a17c9f148 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts @@ -3,6 +3,16 @@ import { Item } from '../../../../core/shared/item.model'; import { ItemComponent } from '../shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionDataService } from '../../../../core/data/version-data.service'; +import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { take } from 'rxjs/operators'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { Version } from '../../../../core/shared/version.model'; /** * Component that represents a publication Item page @@ -16,5 +26,58 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh changeDetection: ChangeDetectionStrategy.OnPush, }) export class UntypedItemComponent extends ItemComponent { + private activeModal: NgbModalRef; + constructor( + private modalService: NgbModal, + private versionHistoryService: VersionHistoryDataService, + private notificationsService: NotificationsService, + private translateService: TranslateService, + // private itemService: ItemDataService, + private versionService: VersionDataService, + ) { + super(); + } + + createNewVersionNotify(success: boolean, newVersionNumber: number) { + const successMessageKey = 'item.version.create.notification.success'; + const failureMessageKey = 'item.version.create.notification.failure'; + if (success) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey)); + } + } + + createNewVersionSubmit(item: Item, summary: string) { + const itemHref = item._links.self.href; + this.versionHistoryService.createVersion(itemHref, summary).pipe( + take(1) + ).subscribe((postResult) => { + this.createNewVersionNotify(postResult.hasSucceeded, postResult?.payload.version); + }); + } + + createNewVersionModal() { + const item = this.object; + + // Open modal + this.activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + + // Show current version in modal + this.versionService.findByHref(item._links.version.href).pipe( + getFirstCompletedRemoteData() + ).subscribe( + (res: RemoteData) => { + // if response is empty then the item is unversioned + this.activeModal.componentInstance.firstVersion = res.hasNoContent; + this.activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version); + } + ); + + // On modal submit create version + this.activeModal.result.then((modalResult) => { + this.createNewVersionSubmit(item, modalResult); + }); + } } diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts index 30dd71ca20..840af4b600 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts @@ -10,7 +10,7 @@ export class ItemVersionsSummaryModalComponent { versionNumber: number; newVersionSummary: string; - firstVersion: boolean; + firstVersion = true; constructor( protected activeModal: NgbActiveModal, From 97ed08e5c82a1c7ad2c520522ba2d32bd74f295d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 17 Sep 2021 17:35:57 +0200 Subject: [PATCH 040/161] [CST-4499] Version history - Test TBD --- src/app/core/data/version-data.service.ts | 27 +++++++ .../core/data/version-history-data.service.ts | 56 ++++++++----- .../item-versions/item-versions.component.ts | 79 ++++++++----------- 3 files changed, 97 insertions(+), 65 deletions(-) diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts index 11a3838eb0..b1e27fde9a 100644 --- a/src/app/core/data/version-data.service.ts +++ b/src/app/core/data/version-data.service.ts @@ -14,6 +14,10 @@ import { FindListOptions } from './request.models'; import { Observable } from 'rxjs'; import { dataService } from '../cache/builders/build-decorators'; import { VERSION } from '../shared/version.resource-type'; +import { VersionHistory } from '../shared/version-history.model'; +import { followLink } from '../../shared/utils/follow-link-config.model'; +import { getFirstSucceededRemoteDataPayload } from '../shared/operators'; +import { map, switchMap } from 'rxjs/operators'; /** * Service responsible for handling requests related to the Version object @@ -41,4 +45,27 @@ export class VersionDataService extends DataService { getBrowseEndpoint(options: FindListOptions = {}, linkPath?: string): Observable { return this.halService.getEndpoint(this.linkPath); } + + /** + * Get the version history for the given version + * @param version + */ + getHistoryFromVersion$(version: Version): Observable { + return this.findById(version.id, false, true, followLink('versionhistory')).pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((res) => res.versionhistory), + getFirstSucceededRemoteDataPayload(), + ); + } + + /** + * Get the ID of the version history for the given version + * @param version + */ + getHistoryIdFromVersion$(version: Version): Observable { + return this.getHistoryFromVersion$(version).pipe( + map((versionHistory) => versionHistory.id), + ); + } + } diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 5f5b765917..a18ef984ff 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -31,6 +31,7 @@ import { } from '../shared/operators'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { hasValueOperator } from '../../shared/empty.util'; +import { Item } from '../shared/item.model'; /** * Service responsible for handling requests related to the VersionHistory object @@ -90,6 +91,11 @@ export class VersionHistoryDataService extends DataService { return this.versionDataService.findAllByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } + /** + * Create a new version for an item + * @param itemHref the item for which create a new version + * @param summary the summary of the new version + */ createVersion(itemHref: string, summary: string): Observable> { const requestOptions: HttpOptions = Object.create({}); let requestHeaders = new HttpHeaders(); @@ -106,6 +112,10 @@ export class VersionHistoryDataService extends DataService { ) as Observable>; } + /** + * Get the latest version in a version history + * @param versionHistory + */ getLatestVersionFromHistory$(versionHistory: VersionHistory): Observable { // Pagination options to fetch a single version on the first page (this is the latest version in the history) @@ -127,23 +137,10 @@ export class VersionHistoryDataService extends DataService { } - // TODO move to versionDataService - getHistoryIdFromVersion$(version: Version): Observable { - return this.getHistoryFromVersion$(version).pipe( - map((versionHistory) => versionHistory.id), - ); - } - - // TODO move to versionDataService - getHistoryFromVersion$(version: Version): Observable { - return this.versionDataService.findById(version.id, false, true, followLink('versionhistory')).pipe( - getFirstSucceededRemoteDataPayload(), - switchMap((res) => res.versionhistory), - getFirstSucceededRemoteDataPayload(), - ); - } - -// TODO move to versionDataService + /** + * Get the latest version + * @param version + */ getLatestVersion$(version: Version): Observable { // retrieve again version, including with versionHistory return this.versionDataService.findById(version.id, false, true, followLink('versionhistory')).pipe( @@ -154,6 +151,10 @@ export class VersionHistoryDataService extends DataService { ); } + /** + * Check if the given version is the latest + * @param version + */ isLatest$(version: Version): Observable { return this.getLatestVersion$(version).pipe( take(1), @@ -168,12 +169,31 @@ export class VersionHistoryDataService extends DataService { hasDraftVersion$(versionHref: string): Observable { return this.versionDataService.findByHref(versionHref, true, true, followLink('versionhistory')).pipe( getFirstSucceededRemoteDataPayload(), - switchMap((version) => this.getHistoryFromVersion$(version)), + switchMap((version) => this.versionDataService.getHistoryFromVersion$(version)), map((versionHistory) => versionHistory.draftVersion), startWith(false), ); } + /** + * Get the item of the latest version in a version history + * @param versionHistory + */ + getLatestVersionItemFromHistory$(versionHistory: VersionHistory): Observable { + return this.getLatestVersionFromHistory$(versionHistory).pipe( + switchMap((newLatestVersion) => newLatestVersion.item), + getFirstSucceededRemoteDataPayload(), + ); + } + + getVersionHistoryFromVersion$(version: Version): Observable { + return this.versionDataService.getHistoryIdFromVersion$(version).pipe( + take(1), + switchMap((res) => this.findById(res)), + getFirstSucceededRemoteDataPayload(), + ); + } + invalidateVersionHistoryCache(versionHistoryID: string) { this.requestService.setStaleByHrefSubstring('versioning/versionhistories/' + versionHistoryID); } diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index fb95ede32f..4a3f28d9e3 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -242,14 +242,10 @@ export class ItemVersionsComponent implements OnInit { ); } - getVersionHistoryFromVersion$(version: Version): Observable { - return this.versionHistoryService.getHistoryIdFromVersion$(version).pipe( - take(1), - switchMap((res) => this.versionHistoryService.findById(res)), - getFirstSucceededRemoteDataPayload(), - ); - } - + /** + * Delete the item and get the result of the operation + * @param item + */ deleteItemAndGetResult$(item: Item): Observable { return this.itemService.delete(item.id).pipe( getFirstCompletedRemoteData(), @@ -258,13 +254,6 @@ export class ItemVersionsComponent implements OnInit { ); } - getLatestVersionItem$(versionHistory: VersionHistory): Observable { - return this.versionHistoryService.getLatestVersionFromHistory$(versionHistory).pipe( - switchMap((newLatestVersion) => newLatestVersion.item), - getFirstSucceededRemoteDataPayload(), - ); - } - /** * Deletes the specified version * @param version the version to be deleted @@ -292,7 +281,7 @@ export class ItemVersionsComponent implements OnInit { // pass item of(item), // get and return version history - this.getVersionHistoryFromVersion$(version).pipe( + this.versionHistoryService.getVersionHistoryFromVersion$(version).pipe( // invalidate cache tap((versionHistory) => { this.versionHistoryService.invalidateVersionHistoryCache(versionHistory.id); @@ -309,9 +298,9 @@ export class ItemVersionsComponent implements OnInit { // pass result of(deleteItemResult), // get and return new latest version - this.getLatestVersionItem$(versionHistory).pipe( + this.versionHistoryService.getLatestVersionItemFromHistory$(versionHistory).pipe( tap(() => { - this.getVersionHistory(of(versionHistory)); + this.getAllVersions(of(versionHistory)); }), ) ])), @@ -358,12 +347,12 @@ export class ItemVersionsComponent implements OnInit { const newVersionNumber = postResult.payload.version; this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); console.log(version); - const versionHistory$ = this.versionHistoryService.getHistoryFromVersion$(version).pipe( + const versionHistory$ = this.versionService.getHistoryFromVersion$(version).pipe( tap((res) => { this.versionHistoryService.invalidateVersionHistoryCache(res.id); }), ); - this.getVersionHistory(versionHistory$); + this.getAllVersions(versionHistory$); } else { this.notificationsService.error(null, this.translateService.get(failureMessageKey)); } @@ -372,34 +361,27 @@ export class ItemVersionsComponent implements OnInit { }); } - // TODO eliminare - /*hasDraftVersion$(versionItem: Observable>): Observable { - return versionItem.pipe( - getFirstSucceededRemoteDataPayload(), - map((res) => res._links.version.href ), - switchMap( (res) => this.versionHistoryService.hasDraftVersion$(res)) - ); - }*/ - - canEditVersion$(versionItem: Version): Observable { - return this.authorizationService.isAuthorized(FeatureID.CanEditVersion, versionItem.self); + /** + * Check is the current user can edit the version summary + * @param version + */ + canEditVersion$(version: Version): Observable { + return this.authorizationService.isAuthorized(FeatureID.CanEditVersion, version.self); } - canDeleteVersion$(versionItem: Version): Observable { - return this.authorizationService.isAuthorized(FeatureID.CanDeleteVersion, versionItem.self); + /** + * Check if the current user can delete the version + * @param version + */ + canDeleteVersion$(version: Version): Observable { + return this.authorizationService.isAuthorized(FeatureID.CanDeleteVersion, version.self); } - // TODO eliminare (usa item anziché vrsion) - /*canDeleteVersion$(version: Version) { - return version.item.pipe( - getFirstSucceededRemoteDataPayload(), - map((item) => item.self), - switchMap((url) => this.authorizationService.isAuthorized(FeatureID.CanDeleteVersion, url)), - take(1), - ); - }*/ - - getVersionHistory(versionHistory$: Observable): void { + /** + * Get all versions for the given version history and store them in versionRD$ + * @param versionHistory$ + */ + getAllVersions(versionHistory$: Observable): void { const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options); observableCombineLatest([versionHistory$, currentPagination]).pipe( switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { @@ -414,7 +396,6 @@ export class ItemVersionsComponent implements OnInit { }); } - /** * Initialize all observables */ @@ -427,21 +408,25 @@ export class ItemVersionsComponent implements OnInit { hasValueOperator(), switchMap((version: Version) => version.versionhistory) ); + + this.canCreateVersion$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.item.self); + + // If there is a draft item in the version history the 'Create version' button is disabled and a different tooltip message is shown this.hasDraftVersion$ = this.versionHistoryRD$.pipe( getFirstSucceededRemoteDataPayload(), map((res) => res.draftVersion) ); - this.canCreateVersion$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.item.self); this.createVersionTitle$ = this.hasDraftVersion$.pipe( take(1), switchMap((res) => of(res ? 'item.version.history.table.action.hasDraft' : 'item.version.history.table.action.newVersion')) ); + const versionHistory$ = this.versionHistoryRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), hasValueOperator(), ); - this.getVersionHistory(versionHistory$); + this.getAllVersions(versionHistory$); this.hasEpersons$ = this.versionsRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), From 8e2ab83d92741e78a8a10984f1cac673ac960af0 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 17 Sep 2021 11:15:36 -0500 Subject: [PATCH 041/161] Fix existing tests. Add new specs for enter key presses --- .../expandable-navbar-section.component.html | 37 ++++++++--------- ...xpandable-navbar-section.component.spec.ts | 41 ++++++++++++++++++- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html index 45edc12b12..04bc6067ac 100644 --- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html +++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html @@ -1,20 +1,19 @@ - -
- +
+ + + +
    + - -
      - - - -
    -
- + *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"> + + +
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts index 8eea76e5c6..6b7c3d4bfc 100644 --- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts +++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts @@ -9,6 +9,7 @@ import { HostWindowService } from '../../shared/host-window.service'; import { MenuService } from '../../shared/menu/menu.service'; import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { VarDirective } from '../../shared/utils/var.directive'; describe('ExpandableNavbarSectionComponent', () => { let component: ExpandableNavbarSectionComponent; @@ -19,7 +20,7 @@ describe('ExpandableNavbarSectionComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [NoopAnimationsModule], - declarations: [ExpandableNavbarSectionComponent, TestComponent], + declarations: [ExpandableNavbarSectionComponent, TestComponent, VarDirective], providers: [ { provide: 'sectionDataProvider', useValue: {} }, { provide: MenuService, useValue: menuService }, @@ -76,6 +77,42 @@ describe('ExpandableNavbarSectionComponent', () => { }); }); + describe('when Enter key is pressed on section header (while inactive)', () => { + beforeEach(() => { + spyOn(menuService, 'activateSection'); + // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property. + spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false)); + component.ngOnInit(); + fixture.detectChanges(); + + const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown')); + // dispatch the (keyup.enter) action used in our component HTML + sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' })); + }); + + it('should call activateSection on the menuService', () => { + expect(menuService.activateSection).toHaveBeenCalled(); + }); + }); + + describe('when Enter key is pressed on section header (while active)', () => { + beforeEach(() => { + spyOn(menuService, 'deactivateSection'); + // Make sure section is 'active'. Requires calling ngOnInit() to update component 'active' property. + spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(true)); + component.ngOnInit(); + fixture.detectChanges(); + + const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown')); + // dispatch the (keyup.enter) action used in our component HTML + sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' })); + }); + + it('should call deactivateSection on the menuService', () => { + expect(menuService.deactivateSection).toHaveBeenCalled(); + }); + }); + describe('when a click occurs on the section header', () => { beforeEach(() => { spyOn(menuService, 'toggleActiveSection'); @@ -96,7 +133,7 @@ describe('ExpandableNavbarSectionComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [NoopAnimationsModule], - declarations: [ExpandableNavbarSectionComponent, TestComponent], + declarations: [ExpandableNavbarSectionComponent, TestComponent, VarDirective], providers: [ { provide: 'sectionDataProvider', useValue: {} }, { provide: MenuService, useValue: menuService }, From 523fca2177f79a42fea3293e7361ee0b183d3a8b Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 17 Sep 2021 11:16:00 -0500 Subject: [PATCH 042/161] Minor updates to README to provide more helpful info on unit tests --- README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0e98bc7cf9..69b6132478 100644 --- a/README.md +++ b/README.md @@ -212,13 +212,17 @@ Once you have tested the Pull Request, please add a comment and/or approval to t ### Unit Tests -Unit tests use Karma. You can find the configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `yarn run coverage`. +Unit tests use the [Jasmine test framework](https://jasmine.github.io/), and are run via [Karma](https://karma-runner.github.io/). + +You can find the Karma configuration file at the same level of this README file:`./karma.conf.js` If you are going to use a remote test environment you need to edit the `./karma.conf.js`. Follow the instructions you will find inside it. To executing tests whenever any file changes you can modify the 'autoWatch' option to 'true' and 'singleRun' option to 'false'. A coverage report is also available at: http://localhost:9876/ after you run: `yarn run coverage`. The default browser is Google Chrome. -Place your tests in the same location of the application source code files that they test. +Place your tests in the same location of the application source code files that they test, e.g. ending with `*.component.spec.ts` -and run: `yarn run test` +and run: `yarn test` + +If you run into odd test errors, see the Angular guide to debugging tests: https://angular.io/guide/test-debugging ### E2E Tests @@ -258,6 +262,10 @@ _Hint: Creating e2e tests is easiest in an IDE (like Visual Studio), as it can h More Information: [docs.cypress.io](https://docs.cypress.io/) has great guides & documentation helping you learn more about writing/debugging e2e tests in Cypress. +### Learning how to build tests + +See our [DSpace Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide) for more hints/tips. + Documentation -------------- From a547030ce081dd8f573a4dd7c311f25dbab717ac Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 17 Sep 2021 18:22:48 +0200 Subject: [PATCH 043/161] [CST-4499] Version history - LGTM fixes - Test TBD --- src/app/core/shared/version-history.model.ts | 1 - .../dso-page-version-button/dso-page-version-button.component.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/app/core/shared/version-history.model.ts b/src/app/core/shared/version-history.model.ts index 6f9423c5fe..1e75b8f321 100644 --- a/src/app/core/shared/version-history.model.ts +++ b/src/app/core/shared/version-history.model.ts @@ -9,7 +9,6 @@ import { link, typedObject } from '../cache/builders/build-decorators'; import { DSpaceObject } from './dspace-object.model'; import { HALLink } from './hal-link.model'; import { VERSION } from './version.resource-type'; -import { ResourceType } from './resource-type'; /** * Class representing a DSpace Version History diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts index 80d39a49a7..94f8afc1eb 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts @@ -5,7 +5,6 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; import { Item } from '../../../core/shared/item.model'; import { switchMap } from 'rxjs/operators'; -import { VersionDataService } from '../../../core/data/version-data.service'; import { of } from 'rxjs'; @Component({ From cbab3484e7594c0512124797fd0f9bab52f40e67 Mon Sep 17 00:00:00 2001 From: Alba Aliu Date: Fri, 17 Sep 2021 23:07:48 +0200 Subject: [PATCH 044/161] [DSC-94] reload tabs box after claim made --- .../edit-in-place-field/edit-in-place-field.component.html | 4 ++-- .../validation-suggestions.component.html | 2 +- .../validation-suggestions.component.ts | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html index 5277fa1a3a..3918cece94 100644 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html +++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html @@ -1,10 +1,10 @@
{{"item.version.history.table.version" | translate}}{{"item.version.history.table.item" | translate}} {{"item.version.history.table.editor" | translate}} {{"item.version.history.table.date" | translate}} {{"item.version.history.table.summary" | translate}}
{{version?.version}} + {{eperson?.name}} {{version?.created}}{{version?.summary}}{{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}} + + + {{version?.summary}} + + + + + + + + + + + +
+ + +
+ + + +
+ - - diff --git a/src/app/shared/item/item-versions/item-versions.component.scss b/src/app/shared/item/item-versions/item-versions.component.scss new file mode 100644 index 0000000000..5594e0cafe --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions.component.scss @@ -0,0 +1,9 @@ +.left-column { + float: left; + text-align: left; +} + +.right-column { + float: right; + text-align: right; +} diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index cd71a4178c..95076a6cf7 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -19,10 +19,12 @@ import { followLink } from '../../utils/follow-link-config.model'; import { hasValue, hasValueOperator } from '../../empty.util'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; +import { FormBuilder } from '@angular/forms'; @Component({ selector: 'ds-item-versions', - templateUrl: './item-versions.component.html' + templateUrl: './item-versions.component.html', + styleUrls: ['./item-versions.component.scss'] }) /** * Component listing all available versions of the history the provided item is a part of @@ -108,11 +110,37 @@ export class ItemVersionsComponent implements OnInit { constructor(private versionHistoryService: VersionHistoryDataService, private paginationService: PaginationService, + private formBuilder: FormBuilder, ) { } - openEditDialog() { - // TODO REMOVE + versionBeingEdited: number; + + summary = 'test'; // TODO delete + + summaryForm = this.formBuilder.group({summary: 's'}); + + onSummarySubmit() { // TODO submit + console.log('SUBMITTING ' + this.summary); + this.versionBeingEdited = undefined; + } + + + isAnyBeingEdited(): boolean { + return this.versionBeingEdited != null; + } + + isThisBeingEdited(version): boolean { + return Number(version?.version) === this.versionBeingEdited; + } + + editVersionSummary(version): void { + this.summary = version?.summary; + this.versionBeingEdited = Number(version?.version); + } + + discardSummaryEdits(): void { + this.versionBeingEdited = undefined; } /** diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html index 5f002e55d3..2a9aa1a062 100644 --- a/src/app/shared/pagination/pagination.component.html +++ b/src/app/shared/pagination/pagination.component.html @@ -16,7 +16,7 @@
- + diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 349d3b0b33..e0b2a9bfaf 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1967,6 +1967,8 @@ "item.version.history.selected": "Selected version", + "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.", + "item.version.history.table.version": "Version", "item.version.history.table.item": "Item", @@ -1982,6 +1984,10 @@ "item.version.history.table.action.editSummary": "Edit summary", + "item.version.history.table.action.saveSummary": "Save summary edits", + + "item.version.history.table.action.discardSummary": "Discard summary edits", + "item.version.history.table.action.newVersion": "Create new version from this one", "item.version.history.table.action.deleteVersion": "Delete version", From 72bfab16df7d39ddeb4eb5dc9f90021dc4b1fb92 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 8 Sep 2021 12:08:54 +0200 Subject: [PATCH 021/161] [CST-4499] Version history (WIP) - Changes to in-row editing, code cleanup, added modal for new versions --- .../item-version-history.component.html | 3 - ...item-versions-summary-modal.component.html | 11 +++ ...item-versions-summary-modal.component.scss | 0 ...m-versions-summary-modal.component.spec.ts | 25 +++++ .../item-versions-summary-modal.component.ts | 20 ++++ .../item-versions.component.html | 96 ++++++------------- .../item-versions/item-versions.component.ts | 9 +- src/app/shared/shared.module.ts | 4 +- src/assets/i18n/en.json5 | 1 + 9 files changed, 97 insertions(+), 72 deletions(-) create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html index d610dffb21..ec0c345d82 100644 --- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html @@ -1,6 +1,3 @@ -
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html new file mode 100644 index 0000000000..259a1e76c3 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html @@ -0,0 +1,11 @@ +
+
{{'item.version.modal.create.header' | translate}} + +
+
+ + NEW VERSION +
+
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts new file mode 100644 index 0000000000..3b88b96f42 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal.component'; + +describe('ItemVersionsSummaryModalComponent', () => { + let component: ItemVersionsSummaryModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ItemVersionsSummaryModalComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ItemVersionsSummaryModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts new file mode 100644 index 0000000000..8fa4f4c826 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts @@ -0,0 +1,20 @@ +import { Component, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'ds-item-versions-summary-modal', + templateUrl: './item-versions-summary-modal.component.html', + styleUrls: ['./item-versions-summary-modal.component.scss'] +}) +export class ItemVersionsSummaryModalComponent implements OnInit { + + constructor( + protected activeModal: NgbActiveModal,) { } + + closeModal() { + this.activeModal.close(); + } + ngOnInit(): void { + } + +} diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 1b47ad3575..ab54d39271 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -12,11 +12,10 @@ [pageInfoState]="versions" [collectionSize]="versions?.totalElements" [retainScrollPosition]="true"> - +
- @@ -26,12 +25,6 @@ - diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 95076a6cf7..cad8caabe4 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -20,6 +20,8 @@ import { hasValue, hasValueOperator } from '../../empty.util'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { FormBuilder } from '@angular/forms'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component'; @Component({ selector: 'ds-item-versions', @@ -111,6 +113,7 @@ export class ItemVersionsComponent implements OnInit { constructor(private versionHistoryService: VersionHistoryDataService, private paginationService: PaginationService, private formBuilder: FormBuilder, + private modalService: NgbModal, ) { } @@ -125,7 +128,6 @@ export class ItemVersionsComponent implements OnInit { this.versionBeingEdited = undefined; } - isAnyBeingEdited(): boolean { return this.versionBeingEdited != null; } @@ -143,6 +145,11 @@ export class ItemVersionsComponent implements OnInit { this.versionBeingEdited = undefined; } + createNewVersion(version) { + this.modalService.open(ItemVersionsSummaryModalComponent); + } + + /** * Initialize all observables */ diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 5aa155faa8..f28c0320d6 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -234,6 +234,7 @@ import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.com import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component'; import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component'; import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'; +import { ItemVersionsSummaryModalComponent } from './item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; /** * Declaration needed to make sure all decorator functions are called in time @@ -586,7 +587,8 @@ const DIRECTIVES = [ ...COMPONENTS, ...DIRECTIVES, ...SHARED_ITEM_PAGE_COMPONENTS, - ...SHARED_SEARCH_PAGE_COMPONENTS + ...SHARED_SEARCH_PAGE_COMPONENTS, + ItemVersionsSummaryModalComponent ], providers: [ ...PROVIDERS diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index e0b2a9bfaf..97f6246141 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1995,6 +1995,7 @@ "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", + "item.version.modal.create.header": "Create new version", "journal.listelement.badge": "Journal", From d402ab7dcf6c944d9a02e204fb1c10e44f0db412 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 9 Sep 2021 00:57:44 +0200 Subject: [PATCH 022/161] [CST-4499] Version history (WIP) - New version modal and other changes --- .../core/data/version-history-data.service.ts | 25 ++++++-- .../item-versions-delete-modal.component.html | 1 + .../item-versions-delete-modal.component.scss | 0 ...em-versions-delete-modal.component.spec.ts | 25 ++++++++ .../item-versions-delete-modal.component.ts | 15 +++++ ...item-versions-summary-modal.component.html | 25 +++++++- .../item-versions-summary-modal.component.ts | 19 ++++-- .../item-versions/item-versions.component.ts | 58 +++++++++++++++---- src/app/shared/shared.module.ts | 4 +- src/assets/i18n/en.json5 | 21 ++++++- 10 files changed, 170 insertions(+), 23 deletions(-) create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 8f148f168d..d680d0a9dd 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -8,19 +8,22 @@ import { CoreState } from '../core.reducers'; import { ObjectCacheService } from '../cache/object-cache.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; -import { FindListOptions } from './request.models'; -import { Observable } from 'rxjs'; +import { FindListOptions, PostRequest } from './request.models'; +import { Observable, of } from 'rxjs'; import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list.model'; import { Version } from '../shared/version.model'; -import { map, switchMap } from 'rxjs/operators'; +import { map, switchMap, take } from 'rxjs/operators'; import { dataService } from '../cache/builders/build-decorators'; import { VERSION_HISTORY } from '../shared/version-history.resource-type'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { VersionDataService } from './version-data.service'; +import { MetadataMap } from '../shared/metadata.models'; +import { Bundle } from '../shared/bundle.model'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; /** * Service responsible for handling requests related to the VersionHistory object @@ -79,4 +82,18 @@ export class VersionHistoryDataService extends DataService { return this.versionDataService.findAllByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } + + public createVersion(itemHref: string, summary: string): Observable> { + const requestId = this.requestService.generateRequestId(); + const requestOptions: HttpOptions = Object.create({}); + let requestHeaders = new HttpHeaders(); + requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list'); + requestOptions.headers = requestHeaders; + const href = 'BASE' + 'api/versioning/versions?summary=' + summary; // TODO + console.error("MISSING BASE URL"); + const body = itemHref; + const request = new PostRequest(this.requestService.generateRequestId(), href, itemHref, requestOptions); + this.requestService.send(request); + return this.rdbService.buildFromRequestUUID(requestId); + } } diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html new file mode 100644 index 0000000000..f517dc105c --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html @@ -0,0 +1 @@ +

item-versions-delete-modal works!

diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts new file mode 100644 index 0000000000..5ef9ae44d2 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal.component'; + +describe('ItemVersionsDeleteModalComponent', () => { + let component: ItemVersionsDeleteModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ItemVersionsDeleteModalComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ItemVersionsDeleteModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts new file mode 100644 index 0000000000..c174d8e595 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'ds-item-versions-delete-modal', + templateUrl: './item-versions-delete-modal.component.html', + styleUrls: ['./item-versions-delete-modal.component.scss'] +}) +export class ItemVersionsDeleteModalComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html index 259a1e76c3..c8919362ed 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html @@ -1,11 +1,30 @@
-
{{'item.version.modal.create.header' | translate}} -
- NEW VERSION +

{{ "item.version.create.modal.text" | translate : {version: versionNumber} }}

+
+ + +
+
+
+ + + +
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts index 8fa4f4c826..c0017d888a 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts @@ -8,13 +8,24 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; }) export class ItemVersionsSummaryModalComponent implements OnInit { - constructor( - protected activeModal: NgbActiveModal,) { } + versionNumber: number; + newVersionSummary: string; - closeModal() { - this.activeModal.close(); + constructor( + protected activeModal: NgbActiveModal, + ) { } + + onModalClose() { + this.activeModal.dismiss('item.version.create.message.failure'); + } + + onModalSubmit() { + this.activeModal.close(this.newVersionSummary); + } + ngOnInit(): void { + // TODO delete if unused } } diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index cad8caabe4..097b42049e 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -2,11 +2,12 @@ import { Component, Input, OnInit } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; import { Version } from '../../../core/shared/version.model'; import { RemoteData } from '../../../core/data/remote-data'; -import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs'; +import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subject } from 'rxjs'; import { VersionHistory } from '../../../core/shared/version-history.model'; import { getAllSucceededRemoteData, - getAllSucceededRemoteDataPayload, + getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../../core/shared/operators'; import { map, startWith, switchMap } from 'rxjs/operators'; @@ -22,6 +23,8 @@ import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { FormBuilder } from '@angular/forms'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'ds-item-versions', @@ -90,7 +93,7 @@ export class ItemVersionsComponent implements OnInit { * The page options to use for fetching the versions * Start at page 1 and always use the set page size */ - options = Object.assign(new PaginationComponentOptions(),{ + options = Object.assign(new PaginationComponentOptions(), { id: 'ivo', currentPage: 1, pageSize: this.pageSize @@ -114,14 +117,13 @@ export class ItemVersionsComponent implements OnInit { private paginationService: PaginationService, private formBuilder: FormBuilder, private modalService: NgbModal, - ) { + private notificationsService: NotificationsService, + private translateService: TranslateService, + ) { } - versionBeingEdited: number; - summary = 'test'; // TODO delete - - summaryForm = this.formBuilder.group({summary: 's'}); + // summaryForm = this.formBuilder.group({summary: 's'}); onSummarySubmit() { // TODO submit console.log('SUBMITTING ' + this.summary); @@ -146,7 +148,38 @@ export class ItemVersionsComponent implements OnInit { } createNewVersion(version) { - this.modalService.open(ItemVersionsSummaryModalComponent); + const successMessageKey = 'item.version.create.message.success'; + const failureMessageKey = 'item.version.create.message.failure'; + const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + activeModal.componentInstance.versionNumber = version.version; + + activeModal.result.then((modalResult) => { + const summary = modalResult; + version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((item) => { + + const itemHref = item._links.self.href; + + // TODO crea versione + + this.versionHistoryService.createVersion(itemHref, summary).pipe(getFirstCompletedRemoteData()).subscribe((postResult) => { + const newVersion = postResult.payload; + const newVersionNumber = newVersion.version; + console.log("SUCCESS " + newVersionNumber); + console.log('RESPONSE = ' + JSON.stringify(postResult)); + this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); + this.refreshSubject.next(); + }); + + // TODO success + + // error + this.notificationsService.error(null, this.translateService.get(failureMessageKey)); + }); + }).catch((msg) => { + this.notificationsService.warning(null, this.translateService.get(failureMessageKey)); + } + ); + } @@ -171,9 +204,14 @@ export class ItemVersionsComponent implements OnInit { this.versionsRD$ = observableCombineLatest(versionHistory$, currentPagination).pipe( switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => this.versionHistoryService.getVersions(versionHistory.id, - new PaginatedSearchOptions({pagination: Object.assign({}, options, { currentPage: options.currentPage })}), + new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), true, true, followLink('item'), followLink('eperson'))) ); + /* TODO fix error and restore refresh + The response for 'http://localhost:8080/server/api/versioning/versionhistories/1/versions?page=0&size=1' + has the self link 'http://localhost:8080/server/api/versioning/versionhistories/1/versions?page=0&embed=item&size=1'. + These don't match. This could mean there's an issue with the REST endpoint + */ this.hasEpersons$ = this.versionsRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index f28c0320d6..3945fe36e3 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -235,6 +235,7 @@ import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component'; import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'; import { ItemVersionsSummaryModalComponent } from './item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { ItemVersionsDeleteModalComponent } from './item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component'; /** * Declaration needed to make sure all decorator functions are called in time @@ -588,7 +589,8 @@ const DIRECTIVES = [ ...DIRECTIVES, ...SHARED_ITEM_PAGE_COMPONENTS, ...SHARED_SEARCH_PAGE_COMPONENTS, - ItemVersionsSummaryModalComponent + ItemVersionsSummaryModalComponent, + ItemVersionsDeleteModalComponent ], providers: [ ...PROVIDERS diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 97f6246141..d87067cf77 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1995,7 +1995,26 @@ "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", - "item.version.modal.create.header": "Create new version", + + "item.version.create.modal.header": "Create new version", + + "item.version.create.modal.text": "Create a new version for this item starting from version {{version}}", + + "item.version.create.modal.button.create": "Create", + + "item.version.create.modal.button.create.tooltip": "Create new version", + + "item.version.create.modal.button.discard": "Discard", + + "item.version.create.modal.button.discard.tooltip": "Do not create new version", + + "item.version.create.modal.form.summary.label": "Summary", + + "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", + + "item.version.create.message.success" : "New version has been created with version number {{version}}", + + "item.version.create.message.failure" : "New version has not been created", "journal.listelement.badge": "Journal", From 05385f3568939d92ba886bd367c06e7190ef6973 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 10 Sep 2021 10:19:33 +0200 Subject: [PATCH 023/161] [CST-4499] Version history (WIP) - Fixes to API calls --- .../core/data/version-history-data.service.ts | 43 +++-- .../item-versions-delete-modal.component.html | 25 ++- .../item-versions-delete-modal.component.ts | 14 +- ...item-versions-summary-modal.component.html | 12 +- .../item-versions-summary-modal.component.ts | 2 +- .../item-versions.component.html | 12 +- .../item-versions/item-versions.component.ts | 166 ++++++++++++++---- src/assets/i18n/en.json5 | 35 +++- 8 files changed, 235 insertions(+), 74 deletions(-) diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index d680d0a9dd..616cfdd48d 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -10,8 +10,8 @@ import { HALEndpointService } from '../shared/hal-endpoint.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; -import { FindListOptions, PostRequest } from './request.models'; -import { Observable, of } from 'rxjs'; +import { FindListOptions, PostRequest, RestRequest } from './request.models'; +import { Observable } from 'rxjs'; import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list.model'; @@ -21,9 +21,8 @@ import { dataService } from '../cache/builders/build-decorators'; import { VERSION_HISTORY } from '../shared/version-history.resource-type'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { VersionDataService } from './version-data.service'; -import { MetadataMap } from '../shared/metadata.models'; -import { Bundle } from '../shared/bundle.model'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; +import { getFirstCompletedRemoteData, sendRequest } from '../shared/operators'; /** * Service responsible for handling requests related to the VersionHistory object @@ -84,16 +83,30 @@ export class VersionHistoryDataService extends DataService { } public createVersion(itemHref: string, summary: string): Observable> { - const requestId = this.requestService.generateRequestId(); - const requestOptions: HttpOptions = Object.create({}); - let requestHeaders = new HttpHeaders(); - requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list'); - requestOptions.headers = requestHeaders; - const href = 'BASE' + 'api/versioning/versions?summary=' + summary; // TODO - console.error("MISSING BASE URL"); - const body = itemHref; - const request = new PostRequest(this.requestService.generateRequestId(), href, itemHref, requestOptions); - this.requestService.send(request); - return this.rdbService.buildFromRequestUUID(requestId); + const requestOptions: HttpOptions = Object.create({}); + let requestHeaders = new HttpHeaders(); + requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list'); + requestOptions.headers = requestHeaders; + + // TODO fix switchmap + + return this.halService.getEndpoint(this.versionsEndpoint).pipe( + take(1), + map((endpointUrl: string) => { + return (summary?.length > 0 ) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`; + }), + map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)), + sendRequest(this.requestService), + /*switchMap((res: string) => { + const requestId = this.requestService.generateRequestId(); + const href = res + ( (summary?.length > 0 ) ? ('?summary=' + summary) : ''); + const body = itemHref; + const request = new PostRequest(requestId, href, body, requestOptions); + this.requestService.send(request); + return this.rdbService.buildFromRequestUUID(requestId); + }),*/ + switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)), + getFirstCompletedRemoteData() + ) as Observable>; } } diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html index f517dc105c..e133c3b61f 100644 --- a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html @@ -1 +1,24 @@ -

item-versions-delete-modal works!

+
+
{{'item.version.delete.modal.header' | translate}} + +
+
+

{{ "item.version.delete.modal.text" | translate : {version: versionNumber} }}

+
+
+ + + + +
+
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts index c174d8e595..6bdfd10939 100644 --- a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'ds-item-versions-delete-modal', @@ -7,7 +8,18 @@ import { Component, OnInit } from '@angular/core'; }) export class ItemVersionsDeleteModalComponent implements OnInit { - constructor() { } + versionNumber: number; + + constructor( + protected activeModal: NgbActiveModal,) { } + + onModalClose() { + this.activeModal.dismiss(); + } + + onModalSubmit() { + this.activeModal.close(); + } ngOnInit(): void { } diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html index c8919362ed..94b4d4dc51 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html @@ -1,12 +1,12 @@
-
{{'item.version.create.modal.header' | translate}}
+
{{'item.version.create.modal.header' | translate}}
-

{{ "item.version.create.modal.text" | translate : {version: versionNumber} }}

+

{{ "item.version.create.modal.text" | translate : {version: versionNumber} }}

-->
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts index c0017d888a..236f058c63 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts @@ -17,7 +17,7 @@ export class ItemVersionsSummaryModalComponent implements OnInit { } onModalClose() { - this.activeModal.dismiss('item.version.create.message.failure'); + this.activeModal.dismiss(); } onModalSubmit() { diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index ab54d39271..6c4724d045 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -2,7 +2,7 @@

{{"item.version.history.head" | translate}}

- + {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }} {{version?.summary}} - - - - +
+ +
{{"item.version.history.table.version" | translate}} {{"item.version.history.table.editor" | translate}} {{"item.version.history.table.date" | translate}} {{"item.version.history.table.summary" | translate}}
{{version?.version}} {{eperson?.name}} @@ -40,80 +33,49 @@ {{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}} - - {{version?.summary}} - - - - + {{version?.summary}} - - - - - -
- - -
- + +
- - + + + - - +
+ - + + diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 097b42049e..10e45001fb 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -2,15 +2,16 @@ import { Component, Input, OnInit } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; import { Version } from '../../../core/shared/version.model'; import { RemoteData } from '../../../core/data/remote-data'; -import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subject } from 'rxjs'; +import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs'; import { VersionHistory } from '../../../core/shared/version-history.model'; import { getAllSucceededRemoteData, - getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, + getAllSucceededRemoteDataPayload, + getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../../core/shared/operators'; -import { map, startWith, switchMap } from 'rxjs/operators'; +import { map, startWith, switchMap, take } from 'rxjs/operators'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; @@ -25,6 +26,10 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component'; import { NotificationsService } from '../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { ObjectCacheService } from '../../../core/cache/object-cache.service'; @Component({ selector: 'ds-item-versions', @@ -114,68 +119,132 @@ export class ItemVersionsComponent implements OnInit { }>; constructor(private versionHistoryService: VersionHistoryDataService, + private versionService: VersionDataService, + private itemService: ItemDataService, private paginationService: PaginationService, private formBuilder: FormBuilder, private modalService: NgbModal, private notificationsService: NotificationsService, private translateService: TranslateService, + private cacheService: ObjectCacheService, ) { } - // summaryForm = this.formBuilder.group({summary: 's'}); - - onSummarySubmit() { // TODO submit - console.log('SUBMITTING ' + this.summary); - this.versionBeingEdited = undefined; - } - isAnyBeingEdited(): boolean { - return this.versionBeingEdited != null; + return this.versionBeingEditedNumber != null; } isThisBeingEdited(version): boolean { - return Number(version?.version) === this.versionBeingEdited; + return version?.version === this.versionBeingEditedNumber; } editVersionSummary(version): void { - this.summary = version?.summary; - this.versionBeingEdited = Number(version?.version); + this.versionBeingEditedSummary = version?.summary; + this.versionBeingEditedNumber = version?.version; + this.versionBeingEditedId = version?.id; } discardSummaryEdits(): void { - this.versionBeingEdited = undefined; + this.versionBeingEditedSummary = undefined; + this.versionBeingEditedNumber = undefined; + this.versionBeingEditedId = undefined; } - createNewVersion(version) { - const successMessageKey = 'item.version.create.message.success'; - const failureMessageKey = 'item.version.create.message.failure'; - const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + onSummarySubmit() { + + const successMessageKey = 'item.version.edit.notification.success'; + const failureMessageKey = 'item.version.edit.notification.failure'; + + const newSummary = this.versionBeingEditedSummary ?? ''; + + // TODO submit + + this.versionService.findById(this.versionBeingEditedId).pipe(getFirstSucceededRemoteData()).subscribe( + (findRes) => { + const updatedVersion = + Object.assign({}, findRes.payload, { + summary: this.versionBeingEditedSummary, + }); + this.versionService.update(updatedVersion).pipe(take(1)).subscribe( + (updateRes) => { + // TODO check + if (updateRes.hasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': this.versionBeingEditedNumber})); + } else { + this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': this.versionBeingEditedNumber})); + } + } + ); + } + ); + + console.log('SUBMITTING ' + this.versionBeingEditedSummary); + this.versionBeingEditedNumber = undefined; + } + + + deleteVersion(version) { + const successMessageKey = 'item.version.delete.notification.success'; + const failureMessageKey = 'item.version.delete.notification.failure'; + const versionNumber = version.version; + + // Open modal + const activeModal = this.modalService.open(ItemVersionsDeleteModalComponent); activeModal.componentInstance.versionNumber = version.version; + // On modal submit/dismiss + activeModal.result.then((modalResult) => { + // TODO delete version + // TODO non usare due subscriptions innestate ma uno switchmap + version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((getItemRes) => { + this.itemService.delete(getItemRes.id).pipe(take(1)).subscribe( // TODO provare con getfirstcompletedremotedata + (deleteItemRes) => { + console.log(JSON.stringify(deleteItemRes)); + if (deleteItemRes.hasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + } else { + this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + } + ); + }); + }).catch(() => { + this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + ); + } + + + // TODO aggiungere anche alla pagina dell'item (spostare in file esterno?) + + createNewVersion(version) { + const successMessageKey = 'item.version.create.notification.success'; + const failureMessageKey = 'item.version.create.notification.failure'; + const versionNumber = version.version; + + // Open modal + const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + activeModal.componentInstance.versionNumber = versionNumber; + + // On modal submit/dismiss activeModal.result.then((modalResult) => { const summary = modalResult; version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((item) => { const itemHref = item._links.self.href; - // TODO crea versione - - this.versionHistoryService.createVersion(itemHref, summary).pipe(getFirstCompletedRemoteData()).subscribe((postResult) => { - const newVersion = postResult.payload; - const newVersionNumber = newVersion.version; - console.log("SUCCESS " + newVersionNumber); - console.log('RESPONSE = ' + JSON.stringify(postResult)); - this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); - this.refreshSubject.next(); + this.versionHistoryService.createVersion(itemHref, summary).pipe(take(1)).subscribe((postResult) => { + if (postResult.hasSucceeded) { + const newVersionNumber = postResult.payload.version; + this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); + this.refreshSubject.next(null); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey)); + } }); - - // TODO success - - // error - this.notificationsService.error(null, this.translateService.get(failureMessageKey)); }); - }).catch((msg) => { + }).catch(() => { this.notificationsService.warning(null, this.translateService.get(failureMessageKey)); } ); @@ -201,12 +270,26 @@ export class ItemVersionsComponent implements OnInit { hasValueOperator(), ); const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options); - this.versionsRD$ = observableCombineLatest(versionHistory$, currentPagination).pipe( - switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => - this.versionHistoryService.getVersions(versionHistory.id, + this.versionsRD$ = observableCombineLatest([versionHistory$, currentPagination]).pipe( + switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { + return this.versionHistoryService.getVersions(versionHistory.id, new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), - true, true, followLink('item'), followLink('eperson'))) + true, true, followLink('item'), followLink('eperson')); + }) ); + // TODO comment refresh + this.subs.push(this.refreshSubject.pipe(switchMap(() => { + return observableCombineLatest([versionHistory$, currentPagination]).pipe( + take(1), + switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { + return this.versionHistoryService.getVersions(versionHistory.id, + new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), + false, true, followLink('item'), followLink('eperson')); + }) + ); + })).subscribe()); + + /* TODO fix error and restore refresh The response for 'http://localhost:8080/server/api/versioning/versionhistories/1/versions?page=0&size=1' has the self link 'http://localhost:8080/server/api/versioning/versionhistories/1/versions?page=0&embed=item&size=1'. @@ -232,8 +315,15 @@ export class ItemVersionsComponent implements OnInit { } ngOnDestroy(): void { + this.cleanupSubscribes(); this.paginationService.clearPagination(this.options.id); } + /** + * Unsub all subscriptions + */ + cleanupSubscribes() { + this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d87067cf77..4496c0dab5 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2000,21 +2000,44 @@ "item.version.create.modal.text": "Create a new version for this item starting from version {{version}}", - "item.version.create.modal.button.create": "Create", + "item.version.create.modal.button.confirm": "Create", - "item.version.create.modal.button.create.tooltip": "Create new version", + "item.version.create.modal.button.confirm.tooltip": "Create new version", - "item.version.create.modal.button.discard": "Discard", + "item.version.create.modal.button.cancel": "Cancel", - "item.version.create.modal.button.discard.tooltip": "Do not create new version", + "item.version.create.modal.button.cancel.tooltip": "Do not create new version", "item.version.create.modal.form.summary.label": "Summary", "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", - "item.version.create.message.success" : "New version has been created with version number {{version}}", + "item.version.create.notification.success" : "New version has been created with version number {{version}}", + + "item.version.create.notification.failure" : "New version has not been created", + + + "item.version.delete.modal.header": "Delete version version", + + "item.version.delete.modal.text": "Do you want to delete version {{version}}?", + + "item.version.delete.modal.button.confirm": "Delete", + + "item.version.delete.modal.button.confirm.tooltip": "Delete this version", + + "item.version.delete.modal.button.cancel": "Cancel", + + "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version", + + "item.version.delete.notification.success" : "Version number {{version}} has been deleted", + + "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted", + + + "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed", + + "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed", - "item.version.create.message.failure" : "New version has not been created", "journal.listelement.badge": "Journal", From dd2df9106cefea58051f9e401c7c132c4b66cd3d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 10 Sep 2021 10:36:33 +0200 Subject: [PATCH 024/161] [CST-4499] Version history (WIP) - Fixes to API calls --- src/app/shared/item/item-versions/item-versions.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 10e45001fb..688ff78bf2 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -216,7 +216,7 @@ export class ItemVersionsComponent implements OnInit { } - // TODO aggiungere anche alla pagina dell'item (spostare in file esterno?) + // TODO aggiungere create anche alla pagina dell'item (spostare in file esterno?) createNewVersion(version) { const successMessageKey = 'item.version.create.notification.success'; From ad5ace79fb5967e593f3d7a2a0cfebd1715afe9d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 10 Sep 2021 10:36:37 +0200 Subject: [PATCH 025/161] Changes by alex --- .../item-versions/item-versions.component.ts | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 688ff78bf2..cfeb84151b 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -40,6 +40,8 @@ import { ObjectCacheService } from '../../../core/cache/object-cache.service'; * Component listing all available versions of the history the provided item is a part of */ export class ItemVersionsComponent implements OnInit { + + /** * The item to display a version history for */ @@ -62,6 +64,8 @@ export class ItemVersionsComponent implements OnInit { */ @Input() displayActions: boolean; + subs: Subscription[] = []; + /** * The AlertType enumeration * @type {AlertType} @@ -118,6 +122,38 @@ export class ItemVersionsComponent implements OnInit { [itemId: string]: string }>; + /** + * Emits when the versionsRD$ must be refreshed. + */ + refreshSubject = new BehaviorSubject(null); + + /** + * The number of the version whose summary is currently being edited + */ + versionBeingEditedNumber: string; + + /** + * The id of the version whose summary is currently being edited + */ + versionBeingEditedId: string; + +// itemLink: string; TODO delete + + /** + * The summary currently being edited + */ + versionBeingEditedSummary: string; + + + /** + * Cancel the current edit when component is destroyed & unsub all subscriptions + */ + // @HostListener('document:keydown:enter') + // onSummarySubmitKeydownEvent(event: KeyboardEvent): void { + // event.preventDefault(); + // } + + constructor(private versionHistoryService: VersionHistoryDataService, private versionService: VersionDataService, private itemService: ItemDataService, From 8df8b1c5747c0e54fd613d623edf28c0c2eeffac Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 10 Sep 2021 10:50:35 +0200 Subject: [PATCH 026/161] [CST-4058] LGTM issues solved --- .../group-registry/group-form/group-form.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1a4d6c92ce..39adc61875 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 @@ -206,7 +206,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { if (linkedObject?.name) { this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity); this.formGroup.patchValue({ - groupName: activeGroup != null ? activeGroup.name : '', + groupName: activeGroup.name, groupCommunity: linkedObject?.name ?? '', groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '', }); @@ -216,7 +216,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { this.groupDescription, ]; this.formGroup.patchValue({ - groupName: activeGroup != null ? activeGroup.name : '', + groupName: activeGroup.name, groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '', }); } From 5526cde8693d51ede6e3ce4e0b24e0583bc95793 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 10 Sep 2021 11:06:25 +0200 Subject: [PATCH 027/161] [CST-4058] LGTM issues solved --- .../group-registry/group-form/group-form.component.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 39adc61875..b2b9fab58d 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 @@ -208,7 +208,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { this.formGroup.patchValue({ groupName: activeGroup.name, groupCommunity: linkedObject?.name ?? '', - groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '', + groupDescription: activeGroup.firstMetadataValue('dc.description'), }); } else { this.formModel = [ @@ -217,7 +217,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { ]; this.formGroup.patchValue({ groupName: activeGroup.name, - groupDescription: activeGroup != null ? activeGroup.firstMetadataValue('dc.description') : '', + groupDescription: activeGroup.firstMetadataValue('dc.description'), }); } setTimeout(() => { @@ -446,11 +446,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { if (hasValue(group) && hasValue(group._links.object.href)) { return this.getLinkedDSO(group).pipe( map((rd: RemoteData) => { - if (hasValue(rd) && hasValue(rd.payload)) { - return true; - } else { - return false; - } + return hasValue(rd) && hasValue(rd.payload); }), catchError(() => observableOf(false)), ); From 44d3558e87583843b2d8e8961d2ad1f2aa500d0e Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 10 Sep 2021 18:16:35 +0200 Subject: [PATCH 028/161] [CST-4499] Version history (WIP) - 'Create version' button in item page and other fixes --- .../core/data/version-history-data.service.ts | 16 +-- .../publication/publication.component.html | 3 +- .../item-types/shared/item.component.ts | 51 ++++++++ .../untyped-item/untyped-item.component.html | 2 +- .../dso-page-version-button.component.html | 12 +- .../dso-page-version-button.component.ts | 25 ++-- .../item-versions-delete-modal.component.html | 6 +- .../item-versions-delete-modal.component.ts | 10 +- ...item-versions-summary-modal.component.html | 10 +- .../item-versions-summary-modal.component.ts | 9 +- .../item-versions.component.html | 4 +- .../item-versions/item-versions.component.ts | 116 +++++++++--------- src/assets/i18n/en.json5 | 8 +- 13 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 616cfdd48d..9bcedd6372 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -82,29 +82,17 @@ export class VersionHistoryDataService extends DataService { return this.versionDataService.findAllByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } - public createVersion(itemHref: string, summary: string): Observable> { + createVersion(itemHref: string, summary: string): Observable> { const requestOptions: HttpOptions = Object.create({}); let requestHeaders = new HttpHeaders(); requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list'); requestOptions.headers = requestHeaders; - // TODO fix switchmap - return this.halService.getEndpoint(this.versionsEndpoint).pipe( take(1), - map((endpointUrl: string) => { - return (summary?.length > 0 ) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`; - }), + map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`), map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)), sendRequest(this.requestService), - /*switchMap((res: string) => { - const requestId = this.requestService.generateRequestId(); - const href = res + ( (summary?.length > 0 ) ? ('?summary=' + summary) : ''); - const body = itemHref; - const request = new PostRequest(requestId, href, body, requestOptions); - this.requestService.send(request); - return this.rdbService.buildFromRequestUUID(requestId); - }),*/ switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)), getFirstCompletedRemoteData() ) as Observable>; diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 82eea0fafd..72824dd3e7 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -2,7 +2,8 @@

{{'publication.page.titleprefix' | translate}}

-
+
+
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts index 793af180c9..2b507aa921 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.ts @@ -2,6 +2,14 @@ import { Component, Input, OnInit } from '@angular/core'; import { environment } from '../../../../../environments/environment'; import { Item } from '../../../../core/shared/item.model'; import { getItemPageRoute } from '../../../item-page-routing-paths'; +import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { take } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionDataService } from '../../../../core/data/version-data.service'; @Component({ selector: 'ds-item', @@ -20,6 +28,49 @@ export class ItemComponent implements OnInit { mediaViewer = environment.mediaViewer; + constructor( + private modalService: NgbModal, + private versionHistoryService: VersionHistoryDataService, + private notificationsService: NotificationsService, + private translateService: TranslateService, + // private itemService: ItemDataService, + private versionService: VersionDataService, + ) { + } + + createNewVersion() { + const successMessageKey = 'item.version.create.notification.success'; + const failureMessageKey = 'item.version.create.notification.failure'; + const item = this.object; + + // Open modal + const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + + this.versionService.findByHref(item._links.version.href).pipe(getFirstCompletedRemoteData()).subscribe( + (res) => { + // TODO check serve async? + activeModal.componentInstance.firstVersion = res.hasNoContent; + activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version); + } + ); + + // On modal submit/dismiss + activeModal.result.then((modalResult) => { + const summary = modalResult; + + const itemHref = item._links.self.href; + + this.versionHistoryService.createVersion(itemHref, summary).pipe(take(1)).subscribe((postResult) => { + if (postResult.hasSucceeded) { + const newVersionNumber = postResult.payload.version; + this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey)); + } + }); + }); + } + ngOnInit(): void { this.itemPageRoute = getItemPageRoute(this.object); } diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index efe372ccaf..3ba7ddafd2 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -3,7 +3,7 @@
- +
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html index cf66a15503..1538d3bd89 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html @@ -1,7 +1,7 @@ - + diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts index 72d9872965..7e12f4e1ff 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { Observable } from 'rxjs/internal/Observable'; @@ -18,11 +18,6 @@ export class DsoPageVersionButtonComponent implements OnInit { */ @Input() dso: DSpaceObject; - /** - * The prefix of the route to the edit page (before the object's UUID, e.g. "items") - */ - @Input() pageRoute: string; - /** * A message for the tooltip on the button * Supports i18n keys @@ -30,13 +25,27 @@ export class DsoPageVersionButtonComponent implements OnInit { @Input() tooltipMsg: string; /** - * Whether or not the current user is authorized to edit the DSpaceObject + * Emits an event that triggers the creation of the new version + */ + @Output() newVersionEvent = new EventEmitter(); + + /** + * Whether or not the current user is authorized to create a new version of the DSpaceObject */ isAuthorized$: Observable; - constructor(protected authorizationService: AuthorizationDataService) { } + constructor(protected authorizationService: AuthorizationDataService) { + } + + /** + * Creates a new version for the current item + */ + createNewVersion() { + this.newVersionEvent.emit(); + } ngOnInit() { + // TODO show if user can view history this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self); } diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html index e133c3b61f..0c0b72272f 100644 --- a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html @@ -8,17 +8,15 @@

{{ "item.version.delete.modal.text" | translate : {version: versionNumber} }}

- - - -
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts index 6bdfd10939..35618390d9 100644 --- a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ @@ -6,12 +6,13 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; templateUrl: './item-versions-delete-modal.component.html', styleUrls: ['./item-versions-delete-modal.component.scss'] }) -export class ItemVersionsDeleteModalComponent implements OnInit { +export class ItemVersionsDeleteModalComponent { versionNumber: number; constructor( - protected activeModal: NgbActiveModal,) { } + protected activeModal: NgbActiveModal,) { + } onModalClose() { this.activeModal.dismiss(); @@ -21,7 +22,4 @@ export class ItemVersionsDeleteModalComponent implements OnInit { this.activeModal.close(); } - ngOnInit(): void { - } - } diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html index 94b4d4dc51..6065cb289e 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html @@ -5,8 +5,10 @@
- -

{{ "item.version.create.modal.text" | translate : {version: versionNumber} }}

+

+ {{ "item.version.create.modal.text" | translate }} + {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }} +

- - -
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts index 236f058c63..30dd71ca20 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ @@ -6,10 +6,11 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; templateUrl: './item-versions-summary-modal.component.html', styleUrls: ['./item-versions-summary-modal.component.scss'] }) -export class ItemVersionsSummaryModalComponent implements OnInit { +export class ItemVersionsSummaryModalComponent { versionNumber: number; newVersionSummary: string; + firstVersion: boolean; constructor( protected activeModal: NgbActiveModal, @@ -24,8 +25,4 @@ export class ItemVersionsSummaryModalComponent implements OnInit { this.activeModal.close(this.newVersionSummary); } - ngOnInit(): void { - // TODO delete if unused - } - } diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 6c4724d045..4e488a3e23 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -44,7 +44,7 @@ @@ -72,7 +72,7 @@ diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index cfeb84151b..d68c201359 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -7,6 +7,7 @@ import { VersionHistory } from '../../../core/shared/version-history.model'; import { getAllSucceededRemoteData, getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload @@ -29,19 +30,18 @@ import { TranslateService } from '@ngx-translate/core'; import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component'; import { VersionDataService } from '../../../core/data/version-data.service'; import { ItemDataService } from '../../../core/data/item-data.service'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; @Component({ selector: 'ds-item-versions', templateUrl: './item-versions.component.html', styleUrls: ['./item-versions.component.scss'] }) + /** * Component listing all available versions of the history the provided item is a part of */ export class ItemVersionsComponent implements OnInit { - /** * The item to display a version history for */ @@ -60,10 +60,13 @@ export class ItemVersionsComponent implements OnInit { @Input() displayTitle = true; /** - * Whether or not to display the action buttons + * Whether or not to display the action buttons (delete/create/edit version) */ @Input() displayActions: boolean; + /** + * Array of active subscriptions + */ subs: Subscription[] = []; /** @@ -123,7 +126,8 @@ export class ItemVersionsComponent implements OnInit { }>; /** - * Emits when the versionsRD$ must be refreshed. + * Emits when the versionsRD$ must be refreshed + * (should be used when a new version has been created) */ refreshSubject = new BehaviorSubject(null); @@ -137,23 +141,11 @@ export class ItemVersionsComponent implements OnInit { */ versionBeingEditedId: string; -// itemLink: string; TODO delete - /** * The summary currently being edited */ versionBeingEditedSummary: string; - - /** - * Cancel the current edit when component is destroyed & unsub all subscriptions - */ - // @HostListener('document:keydown:enter') - // onSummarySubmitKeydownEvent(event: KeyboardEvent): void { - // event.preventDefault(); - // } - - constructor(private versionHistoryService: VersionHistoryDataService, private versionService: VersionDataService, private itemService: ItemDataService, @@ -162,40 +154,52 @@ export class ItemVersionsComponent implements OnInit { private modalService: NgbModal, private notificationsService: NotificationsService, private translateService: TranslateService, - private cacheService: ObjectCacheService, + // private cacheService: ObjectCacheService, ) { } - + /** + * True when a version is being edited + * (used to disable buttons for other versions) + */ isAnyBeingEdited(): boolean { return this.versionBeingEditedNumber != null; } + /** + * True if the specified version is being edited + * (used to show input field and to change buttons for specified version) + */ isThisBeingEdited(version): boolean { return version?.version === this.versionBeingEditedNumber; } - editVersionSummary(version): void { + /** + * Enables editing for the specified version + */ + enableVersionEditing(version): void { this.versionBeingEditedSummary = version?.summary; this.versionBeingEditedNumber = version?.version; this.versionBeingEditedId = version?.id; } - discardSummaryEdits(): void { + /** + * Disables editing for the specified version and discards all pending changes + */ + disableSummaryEditing(): void { this.versionBeingEditedSummary = undefined; this.versionBeingEditedNumber = undefined; this.versionBeingEditedId = undefined; } + /** + * Applies changes to version currently being edited + */ onSummarySubmit() { const successMessageKey = 'item.version.edit.notification.success'; const failureMessageKey = 'item.version.edit.notification.failure'; - const newSummary = this.versionBeingEditedSummary ?? ''; - - // TODO submit - this.versionService.findById(this.versionBeingEditedId).pipe(getFirstSucceededRemoteData()).subscribe( (findRes) => { const updatedVersion = @@ -210,16 +214,17 @@ export class ItemVersionsComponent implements OnInit { } else { this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': this.versionBeingEditedNumber})); } + this.disableSummaryEditing(); } ); } ); - - console.log('SUBMITTING ' + this.versionBeingEditedSummary); - this.versionBeingEditedNumber = undefined; } - + /** + * Deletes the specified version + * @param version the version to be deleted + */ deleteVersion(version) { const successMessageKey = 'item.version.delete.notification.success'; const failureMessageKey = 'item.version.delete.notification.failure'; @@ -228,14 +233,29 @@ export class ItemVersionsComponent implements OnInit { // Open modal const activeModal = this.modalService.open(ItemVersionsDeleteModalComponent); activeModal.componentInstance.versionNumber = version.version; + activeModal.componentInstance.firstVersion = false; // On modal submit/dismiss - activeModal.result.then((modalResult) => { - // TODO delete version - // TODO non usare due subscriptions innestate ma uno switchmap + activeModal.result.then(() => { version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((getItemRes) => { - this.itemService.delete(getItemRes.id).pipe(take(1)).subscribe( // TODO provare con getfirstcompletedremotedata + this.itemService.delete(getItemRes.id).pipe(getFirstCompletedRemoteData()).subscribe( (deleteItemRes) => { + console.log(JSON.stringify(deleteItemRes)); + if (deleteItemRes.hasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + this.refreshSubject.next(null); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + } + ); + }); + /*version.item.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((getItemRes) => this.itemService.delete(getItemRes.id)) + ).subscribe( + getFirstCompletedRemoteData(), + map((deleteItemRes) => { console.log(JSON.stringify(deleteItemRes)); if (deleteItemRes.hasSucceeded) { this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); @@ -243,17 +263,15 @@ export class ItemVersionsComponent implements OnInit { this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); } } - ); - }); - }).catch(() => { - this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); - } - ); + ) + );*/ + }); } - - // TODO aggiungere create anche alla pagina dell'item (spostare in file esterno?) - + /** + * Creates a new version starting from the specified one + * @param version the version from which a new one will be created + */ createNewVersion(version) { const successMessageKey = 'item.version.create.notification.success'; const failureMessageKey = 'item.version.create.notification.failure'; @@ -280,14 +298,9 @@ export class ItemVersionsComponent implements OnInit { } }); }); - }).catch(() => { - this.notificationsService.warning(null, this.translateService.get(failureMessageKey)); - } - ); - + }); } - /** * Initialize all observables */ @@ -313,7 +326,7 @@ export class ItemVersionsComponent implements OnInit { true, true, followLink('item'), followLink('eperson')); }) ); - // TODO comment refresh + // Refresh the table when refreshSubject emits this.subs.push(this.refreshSubject.pipe(switchMap(() => { return observableCombineLatest([versionHistory$, currentPagination]).pipe( take(1), @@ -324,13 +337,6 @@ export class ItemVersionsComponent implements OnInit { }) ); })).subscribe()); - - - /* TODO fix error and restore refresh - The response for 'http://localhost:8080/server/api/versioning/versionhistories/1/versions?page=0&size=1' - has the self link 'http://localhost:8080/server/api/versioning/versionhistories/1/versions?page=0&embed=item&size=1'. - These don't match. This could mean there's an issue with the REST endpoint - */ this.hasEpersons$ = this.versionsRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 4496c0dab5..16dbd7dba7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1996,9 +1996,11 @@ "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", - "item.version.create.modal.header": "Create new version", + "item.version.create.modal.header": "New version", - "item.version.create.modal.text": "Create a new version for this item starting from version {{version}}", + "item.version.create.modal.text": "Create a new version for this item", + + "item.version.create.modal.text.startingFrom": "starting from version {{version}}", "item.version.create.modal.button.confirm": "Create", @@ -2017,7 +2019,7 @@ "item.version.create.notification.failure" : "New version has not been created", - "item.version.delete.modal.header": "Delete version version", + "item.version.delete.modal.header": "Delete version", "item.version.delete.modal.text": "Do you want to delete version {{version}}?", From ce399cb764a6663f586ec5999b8acac1c36040af Mon Sep 17 00:00:00 2001 From: Alessandro Martelli Date: Thu, 2 Sep 2021 13:30:13 +0200 Subject: [PATCH 029/161] [CST-4499] Version history (WIP) - Missing tests and auth features --- .../core/data/version-history-data.service.ts | 24 +- src/app/core/shared/version-history.model.ts | 12 + .../item-metadata.component.html | 119 ++++----- .../item-version-history.component.html | 6 +- .../item-version-history.component.ts | 2 +- .../item-page/simple/item-page.component.html | 2 +- .../publication/publication.component.html | 1 + .../item-types/shared/item.component.ts | 51 ++++ .../untyped-item/untyped-item.component.html | 1 + .../my-dspace-new-submission.component.ts | 2 +- .../dso-page-version-button.component.html | 7 + .../dso-page-version-button.component.scss | 3 + .../dso-page-version-button.component.spec.ts | 76 ++++++ .../dso-page-version-button.component.ts | 52 ++++ .../item-versions-delete-modal.component.html | 22 ++ .../item-versions-delete-modal.component.scss | 0 ...em-versions-delete-modal.component.spec.ts | 25 ++ .../item-versions-delete-modal.component.ts | 25 ++ ...item-versions-summary-modal.component.html | 30 +++ ...item-versions-summary-modal.component.scss | 0 ...m-versions-summary-modal.component.spec.ts | 25 ++ .../item-versions-summary-modal.component.ts | 28 +++ .../item-versions.component.html | 88 +++++-- .../item-versions.component.scss | 9 + .../item-versions/item-versions.component.ts | 236 +++++++++++++++++- .../pagination/pagination.component.html | 2 +- src/app/shared/shared.module.ts | 8 +- src/assets/i18n/en.json5 | 63 ++++- 28 files changed, 815 insertions(+), 104 deletions(-) create mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html create mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss create mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts create mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts create mode 100644 src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts create mode 100644 src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts create mode 100644 src/app/shared/item/item-versions/item-versions.component.scss diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 8f148f168d..9bcedd6372 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -8,19 +8,21 @@ import { CoreState } from '../core.reducers'; import { ObjectCacheService } from '../cache/object-cache.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; -import { FindListOptions } from './request.models'; +import { FindListOptions, PostRequest, RestRequest } from './request.models'; import { Observable } from 'rxjs'; import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list.model'; import { Version } from '../shared/version.model'; -import { map, switchMap } from 'rxjs/operators'; +import { map, switchMap, take } from 'rxjs/operators'; import { dataService } from '../cache/builders/build-decorators'; import { VERSION_HISTORY } from '../shared/version-history.resource-type'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { VersionDataService } from './version-data.service'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; +import { getFirstCompletedRemoteData, sendRequest } from '../shared/operators'; /** * Service responsible for handling requests related to the VersionHistory object @@ -79,4 +81,20 @@ export class VersionHistoryDataService extends DataService { return this.versionDataService.findAllByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } + + createVersion(itemHref: string, summary: string): Observable> { + const requestOptions: HttpOptions = Object.create({}); + let requestHeaders = new HttpHeaders(); + requestHeaders = requestHeaders.append('Content-Type', 'text/uri-list'); + requestOptions.headers = requestHeaders; + + return this.halService.getEndpoint(this.versionsEndpoint).pipe( + take(1), + map((endpointUrl: string) => (summary?.length > 0) ? `${endpointUrl}?summary=${summary}` : `${endpointUrl}`), + map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)), + sendRequest(this.requestService), + switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)), + getFirstCompletedRemoteData() + ) as Observable>; + } } diff --git a/src/app/core/shared/version-history.model.ts b/src/app/core/shared/version-history.model.ts index 85578f20fc..1448317427 100644 --- a/src/app/core/shared/version-history.model.ts +++ b/src/app/core/shared/version-history.model.ts @@ -30,6 +30,18 @@ export class VersionHistory extends DSpaceObject { @autoserialize id: string; + /** + * The summary of this Version History + */ + @autoserialize + summary: string; + + /** + * The name of the submitter of this Version History + */ + @autoserialize + submitterName: string; + /** * The list of versions within this history */ diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html index e154487402..70cd2aaa39 100644 --- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html +++ b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html @@ -1,66 +1,69 @@
-
- - - - -
- - - - - - - - - + + + + + +
{{'item.edit.metadata.headers.field' | translate}}{{'item.edit.metadata.headers.value' | translate}}{{'item.edit.metadata.headers.language' | translate}}{{'item.edit.metadata.headers.edit' | translate}}
+ + + + + + + + + + - - -
{{'item.edit.metadata.headers.field' | translate}}{{'item.edit.metadata.headers.value' | translate}}{{'item.edit.metadata.headers.language' | translate}}{{'item.edit.metadata.headers.edit' | translate}}
-
- +
+
+ +
+
+
+ + +
-
-
- - - -
-
+
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html index acabbd1010..ec0c345d82 100644 --- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html @@ -1,6 +1,4 @@ -
- -
- +
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts index 99ef6b3933..18878109c2 100644 --- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts @@ -30,6 +30,6 @@ export class ItemVersionHistoryComponent { } ngOnInit(): void { - this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso)).pipe(getFirstSucceededRemoteData()) as Observable>; + this.itemRD$ = this.route.parent.parent.data.pipe(map((data) => data.dso)).pipe(getFirstSucceededRemoteData()) as Observable>; } } diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html index e843155d10..74b61fd976 100644 --- a/src/app/item-page/simple/item-page.component.html +++ b/src/app/item-page/simple/item-page.component.html @@ -5,7 +5,7 @@ - + diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 9e61f00e48..72824dd3e7 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -3,6 +3,7 @@ {{'publication.page.titleprefix' | translate}}
+
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts index 793af180c9..2b507aa921 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.ts @@ -2,6 +2,14 @@ import { Component, Input, OnInit } from '@angular/core'; import { environment } from '../../../../../environments/environment'; import { Item } from '../../../../core/shared/item.model'; import { getItemPageRoute } from '../../../item-page-routing-paths'; +import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { take } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionDataService } from '../../../../core/data/version-data.service'; @Component({ selector: 'ds-item', @@ -20,6 +28,49 @@ export class ItemComponent implements OnInit { mediaViewer = environment.mediaViewer; + constructor( + private modalService: NgbModal, + private versionHistoryService: VersionHistoryDataService, + private notificationsService: NotificationsService, + private translateService: TranslateService, + // private itemService: ItemDataService, + private versionService: VersionDataService, + ) { + } + + createNewVersion() { + const successMessageKey = 'item.version.create.notification.success'; + const failureMessageKey = 'item.version.create.notification.failure'; + const item = this.object; + + // Open modal + const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + + this.versionService.findByHref(item._links.version.href).pipe(getFirstCompletedRemoteData()).subscribe( + (res) => { + // TODO check serve async? + activeModal.componentInstance.firstVersion = res.hasNoContent; + activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version); + } + ); + + // On modal submit/dismiss + activeModal.result.then((modalResult) => { + const summary = modalResult; + + const itemHref = item._links.self.href; + + this.versionHistoryService.createVersion(itemHref, summary).pipe(take(1)).subscribe((postResult) => { + if (postResult.hasSucceeded) { + const newVersionNumber = postResult.payload.version; + this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey)); + } + }); + }); + } + ngOnInit(): void { this.itemPageRoute = getItemPageRoute(this.object); } diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index b0157dcfee..3ba7ddafd2 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -3,6 +3,7 @@
+
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts index c1e67561b2..469f04ffd5 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts @@ -119,7 +119,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit { } /** - * Method called on clicking the button "New Submition", It opens a dialog for + * Method called on clicking the button "New Submission", It opens a dialog for * select a collection. */ openDialog() { diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html new file mode 100644 index 0000000000..1538d3bd89 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html @@ -0,0 +1,7 @@ + diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss new file mode 100644 index 0000000000..e8b7d689a3 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss @@ -0,0 +1,3 @@ +.btn-dark { + background-color: var(--ds-admin-sidebar-bg); +} diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts new file mode 100644 index 0000000000..0a210c3233 --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts @@ -0,0 +1,76 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { DsoPageVersionButtonComponent } from './dso-page-version-button.component'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { Item } from '../../../core/shared/item.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { of as observableOf } from 'rxjs'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { By } from '@angular/platform-browser'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; + +describe('DsoPageEditButtonComponent', () => { + let component: DsoPageVersionButtonComponent; + let fixture: ComponentFixture; + + let authorizationService: AuthorizationDataService; + let dso: DSpaceObject; + + beforeEach(waitForAsync(() => { + dso = Object.assign(new Item(), { + id: 'test-item', + _links: { + self: { href: 'test-item-selflink' } + } + }); + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: observableOf(true) + }); + TestBed.configureTestingModule({ + declarations: [DsoPageVersionButtonComponent], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule], + providers: [ + { provide: AuthorizationDataService, useValue: authorizationService } + ] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DsoPageVersionButtonComponent); + component = fixture.componentInstance; + component.dso = dso; + component.pageRoute = 'test'; + fixture.detectChanges(); + }); + + it('should check the authorization of the current user', () => { + expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self); + }); + + describe('when the user is authorized', () => { + beforeEach(() => { + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true)); + component.ngOnInit(); + fixture.detectChanges(); + }); + + it('should render a link', () => { + const link = fixture.debugElement.query(By.css('a')); + expect(link).not.toBeNull(); + }); + }); + + describe('when the user is not authorized', () => { + beforeEach(() => { + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false)); + component.ngOnInit(); + fixture.detectChanges(); + }); + + it('should not render a link', () => { + const link = fixture.debugElement.query(By.css('a')); + expect(link).toBeNull(); + }); + }); +}); diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts new file mode 100644 index 0000000000..7e12f4e1ff --- /dev/null +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts @@ -0,0 +1,52 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { Observable } from 'rxjs/internal/Observable'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; + +@Component({ + selector: 'ds-dso-page-version-button', + templateUrl: './dso-page-version-button.component.html', + styleUrls: ['./dso-page-version-button.component.scss'] +}) +/** + * Display a button linking to the edit page of a DSpaceObject + */ +export class DsoPageVersionButtonComponent implements OnInit { + /** + * The DSpaceObject to display a button to the edit page for + */ + @Input() dso: DSpaceObject; + + /** + * A message for the tooltip on the button + * Supports i18n keys + */ + @Input() tooltipMsg: string; + + /** + * Emits an event that triggers the creation of the new version + */ + @Output() newVersionEvent = new EventEmitter(); + + /** + * Whether or not the current user is authorized to create a new version of the DSpaceObject + */ + isAuthorized$: Observable; + + constructor(protected authorizationService: AuthorizationDataService) { + } + + /** + * Creates a new version for the current item + */ + createNewVersion() { + this.newVersionEvent.emit(); + } + + ngOnInit() { + // TODO show if user can view history + this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self); + } + +} diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html new file mode 100644 index 0000000000..0c0b72272f --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html @@ -0,0 +1,22 @@ +
+
{{'item.version.delete.modal.header' | translate}} + +
+
+

{{ "item.version.delete.modal.text" | translate : {version: versionNumber} }}

+
+
+ + +
+
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts new file mode 100644 index 0000000000..5ef9ae44d2 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal.component'; + +describe('ItemVersionsDeleteModalComponent', () => { + let component: ItemVersionsDeleteModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ItemVersionsDeleteModalComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ItemVersionsDeleteModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts new file mode 100644 index 0000000000..35618390d9 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'ds-item-versions-delete-modal', + templateUrl: './item-versions-delete-modal.component.html', + styleUrls: ['./item-versions-delete-modal.component.scss'] +}) +export class ItemVersionsDeleteModalComponent { + + versionNumber: number; + + constructor( + protected activeModal: NgbActiveModal,) { + } + + onModalClose() { + this.activeModal.dismiss(); + } + + onModalSubmit() { + this.activeModal.close(); + } + +} diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html new file mode 100644 index 0000000000..6065cb289e --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html @@ -0,0 +1,30 @@ +
+
{{'item.version.create.modal.header' | translate}} + +
+
+

+ {{ "item.version.create.modal.text" | translate }} + {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }} +

+
+ + +
+
+
+ + +
+
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts new file mode 100644 index 0000000000..3b88b96f42 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal.component'; + +describe('ItemVersionsSummaryModalComponent', () => { + let component: ItemVersionsSummaryModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ItemVersionsSummaryModalComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ItemVersionsSummaryModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts new file mode 100644 index 0000000000..30dd71ca20 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts @@ -0,0 +1,28 @@ +import { Component } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'ds-item-versions-summary-modal', + templateUrl: './item-versions-summary-modal.component.html', + styleUrls: ['./item-versions-summary-modal.component.scss'] +}) +export class ItemVersionsSummaryModalComponent { + + versionNumber: number; + newVersionSummary: string; + firstVersion: boolean; + + constructor( + protected activeModal: NgbActiveModal, + ) { + } + + onModalClose() { + this.activeModal.dismiss(); + } + + onModalSubmit() { + this.activeModal.close(this.newVersionSummary); + } + +} diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 34764e7925..4e488a3e23 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -2,6 +2,9 @@

{{"item.version.history.head" | translate}}

+ + {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }} + - +
- - - - - - - + + + + + + + - - - - + + - - - + + + + +
{{"item.version.history.table.version" | translate}}{{"item.version.history.table.item" | translate}}{{"item.version.history.table.editor" | translate}}{{"item.version.history.table.date" | translate}}{{"item.version.history.table.summary" | translate}}
{{"item.version.history.table.version" | translate}}{{"item.version.history.table.editor" | translate}}{{"item.version.history.table.date" | translate}}{{"item.version.history.table.summary" | translate}}{{"item.version.history.table.actions" | translate}}
{{version?.version}} - - {{item?.handle}} - * - - +
{{version?.version}} {{eperson?.name}} - {{version?.created}}{{version?.summary}}
{{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}} + + {{version?.summary}} + + + + +
+ + + + + + + + +
+
* {{"item.version.history.selected" | translate}}
 - +
diff --git a/src/app/shared/item/item-versions/item-versions.component.scss b/src/app/shared/item/item-versions/item-versions.component.scss new file mode 100644 index 0000000000..5594e0cafe --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions.component.scss @@ -0,0 +1,9 @@ +.left-column { + float: left; + text-align: left; +} + +.right-column { + float: right; + text-align: right; +} diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 268c6f00db..d68c201359 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -2,14 +2,17 @@ import { Component, Input, OnInit } from '@angular/core'; import { Item } from '../../../core/shared/item.model'; import { Version } from '../../../core/shared/version.model'; import { RemoteData } from '../../../core/data/remote-data'; -import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs'; +import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs'; import { VersionHistory } from '../../../core/shared/version-history.model'; import { getAllSucceededRemoteData, getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../../core/shared/operators'; -import { map, startWith, switchMap } from 'rxjs/operators'; +import { map, startWith, switchMap, take } from 'rxjs/operators'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; @@ -19,15 +22,26 @@ import { followLink } from '../../utils/follow-link-config.model'; import { hasValue, hasValueOperator } from '../../empty.util'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; +import { FormBuilder } from '@angular/forms'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { ItemDataService } from '../../../core/data/item-data.service'; @Component({ selector: 'ds-item-versions', - templateUrl: './item-versions.component.html' + templateUrl: './item-versions.component.html', + styleUrls: ['./item-versions.component.scss'] }) + /** * Component listing all available versions of the history the provided item is a part of */ export class ItemVersionsComponent implements OnInit { + /** * The item to display a version history for */ @@ -45,6 +59,16 @@ export class ItemVersionsComponent implements OnInit { */ @Input() displayTitle = true; + /** + * Whether or not to display the action buttons (delete/create/edit version) + */ + @Input() displayActions: boolean; + + /** + * Array of active subscriptions + */ + subs: Subscription[] = []; + /** * The AlertType enumeration * @type {AlertType} @@ -81,7 +105,7 @@ export class ItemVersionsComponent implements OnInit { * The page options to use for fetching the versions * Start at page 1 and always use the set page size */ - options = Object.assign(new PaginationComponentOptions(),{ + options = Object.assign(new PaginationComponentOptions(), { id: 'ivo', currentPage: 1, pageSize: this.pageSize @@ -101,9 +125,180 @@ export class ItemVersionsComponent implements OnInit { [itemId: string]: string }>; + /** + * Emits when the versionsRD$ must be refreshed + * (should be used when a new version has been created) + */ + refreshSubject = new BehaviorSubject(null); + + /** + * The number of the version whose summary is currently being edited + */ + versionBeingEditedNumber: string; + + /** + * The id of the version whose summary is currently being edited + */ + versionBeingEditedId: string; + + /** + * The summary currently being edited + */ + versionBeingEditedSummary: string; + constructor(private versionHistoryService: VersionHistoryDataService, - private paginationService: PaginationService - ) { + private versionService: VersionDataService, + private itemService: ItemDataService, + private paginationService: PaginationService, + private formBuilder: FormBuilder, + private modalService: NgbModal, + private notificationsService: NotificationsService, + private translateService: TranslateService, + // private cacheService: ObjectCacheService, + ) { + } + + /** + * True when a version is being edited + * (used to disable buttons for other versions) + */ + isAnyBeingEdited(): boolean { + return this.versionBeingEditedNumber != null; + } + + /** + * True if the specified version is being edited + * (used to show input field and to change buttons for specified version) + */ + isThisBeingEdited(version): boolean { + return version?.version === this.versionBeingEditedNumber; + } + + /** + * Enables editing for the specified version + */ + enableVersionEditing(version): void { + this.versionBeingEditedSummary = version?.summary; + this.versionBeingEditedNumber = version?.version; + this.versionBeingEditedId = version?.id; + } + + /** + * Disables editing for the specified version and discards all pending changes + */ + disableSummaryEditing(): void { + this.versionBeingEditedSummary = undefined; + this.versionBeingEditedNumber = undefined; + this.versionBeingEditedId = undefined; + } + + /** + * Applies changes to version currently being edited + */ + onSummarySubmit() { + + const successMessageKey = 'item.version.edit.notification.success'; + const failureMessageKey = 'item.version.edit.notification.failure'; + + this.versionService.findById(this.versionBeingEditedId).pipe(getFirstSucceededRemoteData()).subscribe( + (findRes) => { + const updatedVersion = + Object.assign({}, findRes.payload, { + summary: this.versionBeingEditedSummary, + }); + this.versionService.update(updatedVersion).pipe(take(1)).subscribe( + (updateRes) => { + // TODO check + if (updateRes.hasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': this.versionBeingEditedNumber})); + } else { + this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': this.versionBeingEditedNumber})); + } + this.disableSummaryEditing(); + } + ); + } + ); + } + + /** + * Deletes the specified version + * @param version the version to be deleted + */ + deleteVersion(version) { + const successMessageKey = 'item.version.delete.notification.success'; + const failureMessageKey = 'item.version.delete.notification.failure'; + const versionNumber = version.version; + + // Open modal + const activeModal = this.modalService.open(ItemVersionsDeleteModalComponent); + activeModal.componentInstance.versionNumber = version.version; + activeModal.componentInstance.firstVersion = false; + + // On modal submit/dismiss + activeModal.result.then(() => { + version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((getItemRes) => { + this.itemService.delete(getItemRes.id).pipe(getFirstCompletedRemoteData()).subscribe( + (deleteItemRes) => { + console.log(JSON.stringify(deleteItemRes)); + if (deleteItemRes.hasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + this.refreshSubject.next(null); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + } + ); + }); + /*version.item.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((getItemRes) => this.itemService.delete(getItemRes.id)) + ).subscribe( + getFirstCompletedRemoteData(), + map((deleteItemRes) => { + console.log(JSON.stringify(deleteItemRes)); + if (deleteItemRes.hasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + } else { + this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + } + ) + );*/ + }); + } + + /** + * Creates a new version starting from the specified one + * @param version the version from which a new one will be created + */ + createNewVersion(version) { + const successMessageKey = 'item.version.create.notification.success'; + const failureMessageKey = 'item.version.create.notification.failure'; + const versionNumber = version.version; + + // Open modal + const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + activeModal.componentInstance.versionNumber = versionNumber; + + // On modal submit/dismiss + activeModal.result.then((modalResult) => { + const summary = modalResult; + version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((item) => { + + const itemHref = item._links.self.href; + + this.versionHistoryService.createVersion(itemHref, summary).pipe(take(1)).subscribe((postResult) => { + if (postResult.hasSucceeded) { + const newVersionNumber = postResult.payload.version; + this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); + this.refreshSubject.next(null); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey)); + } + }); + }); + }); } /** @@ -124,12 +319,24 @@ export class ItemVersionsComponent implements OnInit { hasValueOperator(), ); const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options); - this.versionsRD$ = observableCombineLatest(versionHistory$, currentPagination).pipe( - switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => - this.versionHistoryService.getVersions(versionHistory.id, - new PaginatedSearchOptions({pagination: Object.assign({}, options, { currentPage: options.currentPage })}), - true, true, followLink('item'), followLink('eperson'))) + this.versionsRD$ = observableCombineLatest([versionHistory$, currentPagination]).pipe( + switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { + return this.versionHistoryService.getVersions(versionHistory.id, + new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), + true, true, followLink('item'), followLink('eperson')); + }) ); + // Refresh the table when refreshSubject emits + this.subs.push(this.refreshSubject.pipe(switchMap(() => { + return observableCombineLatest([versionHistory$, currentPagination]).pipe( + take(1), + switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => { + return this.versionHistoryService.getVersions(versionHistory.id, + new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}), + false, true, followLink('item'), followLink('eperson')); + }) + ); + })).subscribe()); this.hasEpersons$ = this.versionsRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), @@ -150,8 +357,15 @@ export class ItemVersionsComponent implements OnInit { } ngOnDestroy(): void { + this.cleanupSubscribes(); this.paginationService.clearPagination(this.options.id); } + /** + * Unsub all subscriptions + */ + cleanupSubscribes() { + this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + } } diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html index 5f002e55d3..2a9aa1a062 100644 --- a/src/app/shared/pagination/pagination.component.html +++ b/src/app/shared/pagination/pagination.component.html @@ -16,7 +16,7 @@ - + diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 9b993e551f..3945fe36e3 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -211,6 +211,7 @@ import { CollectionSidebarSearchListElementComponent } from './object-list/sideb import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component'; import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component'; +import { DsoPageVersionButtonComponent } from './dso-page/dso-page-version-button/dso-page-version-button.component'; import { HoverClassDirective } from './hover-class.directive'; import { ValidationSuggestionsComponent } from './input-suggestions/validation-suggestions/validation-suggestions.component'; import { ItemAlertsComponent } from './item/item-alerts/item-alerts.component'; @@ -233,6 +234,8 @@ import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.com import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component'; import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component'; import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'; +import { ItemVersionsSummaryModalComponent } from './item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { ItemVersionsDeleteModalComponent } from './item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component'; /** * Declaration needed to make sure all decorator functions are called in time @@ -534,6 +537,7 @@ const SHARED_ITEM_PAGE_COMPONENTS = [ MetadataFieldWrapperComponent, MetadataValuesComponent, DsoPageEditButtonComponent, + DsoPageVersionButtonComponent, ItemAlertsComponent, GenericItemPageFieldComponent, MetadataRepresentationListComponent, @@ -584,7 +588,9 @@ const DIRECTIVES = [ ...COMPONENTS, ...DIRECTIVES, ...SHARED_ITEM_PAGE_COMPONENTS, - ...SHARED_SEARCH_PAGE_COMPONENTS + ...SHARED_SEARCH_PAGE_COMPONENTS, + ItemVersionsSummaryModalComponent, + ItemVersionsDeleteModalComponent ], providers: [ ...PROVIDERS diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8908ca42f6..16dbd7dba7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1250,7 +1250,7 @@ "file-section.error.header": "Error obtaining files for this item", - + "footer.copyright": "copyright © 2002-{{ year }}", @@ -1910,6 +1910,8 @@ "item.page.return": "Back", + "item.page.version": "Create new version", + "item.preview.dc.identifier.uri": "Identifier:", "item.preview.dc.contributor.author": "Authors:", @@ -1965,6 +1967,8 @@ "item.version.history.selected": "Selected version", + "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.", + "item.version.history.table.version": "Version", "item.version.history.table.item": "Item", @@ -1975,11 +1979,68 @@ "item.version.history.table.summary": "Summary", + "item.version.history.table.actions": "Action", + + + "item.version.history.table.action.editSummary": "Edit summary", + + "item.version.history.table.action.saveSummary": "Save summary edits", + + "item.version.history.table.action.discardSummary": "Discard summary edits", + + "item.version.history.table.action.newVersion": "Create new version from this one", + + "item.version.history.table.action.deleteVersion": "Delete version", "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", + "item.version.create.modal.header": "New version", + + "item.version.create.modal.text": "Create a new version for this item", + + "item.version.create.modal.text.startingFrom": "starting from version {{version}}", + + "item.version.create.modal.button.confirm": "Create", + + "item.version.create.modal.button.confirm.tooltip": "Create new version", + + "item.version.create.modal.button.cancel": "Cancel", + + "item.version.create.modal.button.cancel.tooltip": "Do not create new version", + + "item.version.create.modal.form.summary.label": "Summary", + + "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", + + "item.version.create.notification.success" : "New version has been created with version number {{version}}", + + "item.version.create.notification.failure" : "New version has not been created", + + + "item.version.delete.modal.header": "Delete version", + + "item.version.delete.modal.text": "Do you want to delete version {{version}}?", + + "item.version.delete.modal.button.confirm": "Delete", + + "item.version.delete.modal.button.confirm.tooltip": "Delete this version", + + "item.version.delete.modal.button.cancel": "Cancel", + + "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version", + + "item.version.delete.notification.success" : "Version number {{version}} has been deleted", + + "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted", + + + "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed", + + "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed", + + "journal.listelement.badge": "Journal", From b4111fe4b16fa194a04971cd8d7b0acf11a66f9e Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 13 Sep 2021 17:56:55 +0200 Subject: [PATCH 030/161] [CST-4499] Version history (WIP) - Version page added (redirecting to item's page) --- src/app/item-page/item-page-routing-paths.ts | 9 +++ src/app/item-page/item-page-routing.module.ts | 15 +++++ src/app/item-page/item-page.module.ts | 6 +- .../version-page/version-page.component.html | 0 .../version-page/version-page.component.scss | 0 .../version-page.component.spec.ts | 25 ++++++++ .../version-page/version-page.component.ts | 61 +++++++++++++++++++ .../version-page/version.resolver.ts | 54 ++++++++++++++++ .../item-versions.component.html | 9 ++- .../item-versions/item-versions.component.ts | 11 +++- 10 files changed, 185 insertions(+), 5 deletions(-) create mode 100644 src/app/item-page/version-page/version-page/version-page.component.html create mode 100644 src/app/item-page/version-page/version-page/version-page.component.scss create mode 100644 src/app/item-page/version-page/version-page/version-page.component.spec.ts create mode 100644 src/app/item-page/version-page/version-page/version-page.component.ts create mode 100644 src/app/item-page/version-page/version.resolver.ts diff --git a/src/app/item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts index 43b37f954a..3e0a356efb 100644 --- a/src/app/item-page/item-page-routing-paths.ts +++ b/src/app/item-page/item-page-routing-paths.ts @@ -34,5 +34,14 @@ export function getEntityEditRoute(entityType: string, itemId: string) { return new URLCombiner(getEntityPageRoute(entityType, itemId), ITEM_EDIT_PATH).toString(); } +/** + * Get the route to an item's version + * @param versionId the ID of the version for which the route will be retrieved + */ +export function getItemVersionRoute(versionId: string) { + return new URLCombiner(getItemModuleRoute(), ITEM_VERSION_PATH, versionId).toString(); +} + export const ITEM_EDIT_PATH = 'edit'; +export const ITEM_VERSION_PATH = 'version'; export const UPLOAD_BITSTREAM_PATH = 'bitstreams/new'; diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index f2d0a23935..52de34e8ed 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -3,6 +3,7 @@ import { RouterModule } from '@angular/router'; import { ItemPageResolver } from './item-page.resolver'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; import { ItemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver'; +import { VersionResolver } from './version-page/version.resolver'; import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service'; import { LinkService } from '../core/cache/builders/link.service'; import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component'; @@ -12,6 +13,7 @@ import { MenuItemType } from '../shared/menu/initial-menus-state'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { ThemedItemPageComponent } from './simple/themed-item-page.component'; import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component'; +import { VersionPageComponent } from './version-page/version-page/version-page.component'; @NgModule({ imports: [ @@ -58,6 +60,18 @@ import { ThemedFullItemPageComponent } from './full/themed-full-item-page.compon }], }, }, + }, + { + path: 'version', + children: [ + { + path: ':id', + component: VersionPageComponent, + resolve: { + dso: VersionResolver, + }, + } + ], } ]) ], @@ -67,6 +81,7 @@ import { ThemedFullItemPageComponent } from './full/themed-full-item-page.compon DSOBreadcrumbsService, LinkService, ItemPageAdministratorGuard, + VersionResolver, ] }) diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts index 1c6cd83e9c..6556617e4a 100644 --- a/src/app/item-page/item-page.module.ts +++ b/src/app/item-page/item-page.module.ts @@ -31,6 +31,7 @@ import { MediaViewerComponent } from './media-viewer/media-viewer.component'; import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component'; import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/media-viewer-image.component'; import { NgxGalleryModule } from '@kolkov/ngx-gallery'; +import { VersionPageComponent } from './version-page/version-page/version-page.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator @@ -60,7 +61,8 @@ const DECLARATIONS = [ AbstractIncrementalListComponent, MediaViewerComponent, MediaViewerVideoComponent, - MediaViewerImageComponent + MediaViewerImageComponent, + VersionPageComponent, ]; @NgModule({ @@ -72,7 +74,7 @@ const DECLARATIONS = [ StatisticsModule.forRoot(), JournalEntitiesModule.withEntryComponents(), ResearchEntitiesModule.withEntryComponents(), - NgxGalleryModule, + NgxGalleryModule, ], declarations: [ ...DECLARATIONS diff --git a/src/app/item-page/version-page/version-page/version-page.component.html b/src/app/item-page/version-page/version-page/version-page.component.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/item-page/version-page/version-page/version-page.component.scss b/src/app/item-page/version-page/version-page/version-page.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts new file mode 100644 index 0000000000..7e3061f397 --- /dev/null +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VersionPageComponent } from './version-page.component'; + +describe('VersionPageComponent', () => { + let component: VersionPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ VersionPageComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(VersionPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/item-page/version-page/version-page/version-page.component.ts b/src/app/item-page/version-page/version-page/version-page.component.ts new file mode 100644 index 0000000000..d58c98a967 --- /dev/null +++ b/src/app/item-page/version-page/version-page/version-page.component.ts @@ -0,0 +1,61 @@ +import { Component, OnInit } from '@angular/core'; +import { Observable } from 'rxjs'; +import { RemoteData } from '../../../core/data/remote-data'; +import { ActivatedRoute, Router } from '@angular/router'; +import { AuthService } from '../../../core/auth/auth.service'; +import { map, switchMap } from 'rxjs/operators'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, + redirectOn4xx +} from '../../../core/shared/operators'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { Version } from '../../../core/shared/version.model'; +import { Item } from '../../../core/shared/item.model'; +import { getItemPageRoute } from '../../item-page-routing-paths'; +import { getPageNotFoundRoute } from '../../../app-routing-paths'; + +@Component({ + selector: 'ds-version-page', + templateUrl: './version-page.component.html', + styleUrls: ['./version-page.component.scss'] +}) +export class VersionPageComponent implements OnInit { + + versionRD$: Observable>; + itemRD$: Observable>; + + constructor( + protected route: ActivatedRoute, + private router: Router, + private versionService: VersionDataService, + private authService: AuthService, + ) { + } + + ngOnInit(): void { + /* Retrieve version from resolver or redirect on 4xx */ + this.versionRD$ = this.route.data.pipe( + map((data) => data.dso as RemoteData), + redirectOn4xx(this.router, this.authService), + ); + + /* Retrieve item from version and reroute to item's page or handle missing item */ + this.versionRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((version) => version.item), + redirectOn4xx(this.router, this.authService), + getFirstCompletedRemoteData(), + ).subscribe((itemRD) => { + console.log(JSON.stringify(itemRD)); + if (itemRD.hasNoContent) { + this.router.navigateByUrl(getPageNotFoundRoute(), { skipLocationChange: true }); + } else { + const itemUrl = getItemPageRoute(itemRD.payload); + this.router.navigateByUrl(itemUrl); + } + }); + + } + +} diff --git a/src/app/item-page/version-page/version.resolver.ts b/src/app/item-page/version-page/version.resolver.ts new file mode 100644 index 0000000000..8341052468 --- /dev/null +++ b/src/app/item-page/version-page/version.resolver.ts @@ -0,0 +1,54 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; +import { Observable } from 'rxjs'; +import { RemoteData } from '../../core/data/remote-data'; +import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { Store } from '@ngrx/store'; +import { ResolvedAction } from '../../core/resolving/resolver.actions'; +import { Version } from '../../core/shared/version.model'; +import { VersionDataService } from '../../core/data/version-data.service'; + +/** + * The self links defined in this list are expected to be requested somewhere in the near future + * Requesting them as embeds will limit the number of requests + */ +export const VERSION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig[] = [ + followLink('item'), +]; + +/** + * This class represents a resolver that requests a specific version before the route is activated + */ +@Injectable() +export class VersionResolver implements Resolve> { + constructor( + protected versionService: VersionDataService, + protected store: Store, + protected router: Router + ) { + } + + /** + * Method for resolving a version based on the parameters in the current route + * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot + * @param {RouterStateSnapshot} state The current RouterStateSnapshot + * @returns Observable<> Emits the found item based on the parameters in the current route, + * or an error if something went wrong + */ + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> { + const versionRD$ = this.versionService.findById(route.params.id, + true, + false, + ...VERSION_PAGE_LINKS_TO_FOLLOW + ).pipe( + getFirstCompletedRemoteData(), + ); + + versionRD$.subscribe((versionRD: RemoteData) => { + this.store.dispatch(new ResolvedAction(state.url, versionRD.payload)); + }); + + return versionRD$; + } +} diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 4e488a3e23..4e05e035c9 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -24,13 +24,18 @@
{{version?.version}} + {{version.version}} + * + {{eperson?.name}} {{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}} + {{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}} + {{version?.summary}} diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index d68c201359..2e26695d82 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -21,7 +21,7 @@ import { AlertType } from '../../alert/aletr-type'; import { followLink } from '../../utils/follow-link-config.model'; import { hasValue, hasValueOperator } from '../../empty.util'; import { PaginationService } from '../../../core/pagination/pagination.service'; -import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; +import { getItemPageRoute, getItemVersionRoute } from '../../../item-page/item-page-routing-paths'; import { FormBuilder } from '@angular/forms'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component'; @@ -192,6 +192,14 @@ export class ItemVersionsComponent implements OnInit { this.versionBeingEditedId = undefined; } + /** + * Get the route to the specified version + * @param versionId the ID of the version for which the route will be retrieved + */ + getVersionRoute(versionId: string) { + return getItemVersionRoute(versionId); + } + /** * Applies changes to version currently being edited */ @@ -250,6 +258,7 @@ export class ItemVersionsComponent implements OnInit { } ); }); + // TODO non usare subscribe annidate /*version.item.pipe( getFirstSucceededRemoteDataPayload(), switchMap((getItemRes) => this.itemService.delete(getItemRes.id)) From 5d8f625d0107949ffc0714f58127486b01524d66 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 14 Sep 2021 01:39:00 +0200 Subject: [PATCH 031/161] [CST-4499] Version history (WIP) - Refactoring --- .../core/data/version-history-data.service.ts | 54 +++++++++++++-- .../item-versions/item-versions.component.ts | 66 +++++++++++++------ .../notice/item-versions-notice.component.ts | 40 +++++++---- 3 files changed, 125 insertions(+), 35 deletions(-) diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 9bcedd6372..65bef94c6c 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -11,18 +11,26 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { HttpClient, HttpHeaders } from '@angular/common/http'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; import { FindListOptions, PostRequest, RestRequest } from './request.models'; -import { Observable } from 'rxjs'; +import { Observable, of } from 'rxjs'; import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model'; import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list.model'; import { Version } from '../shared/version.model'; -import { map, switchMap, take } from 'rxjs/operators'; +import { filter, map, switchMap, take } from 'rxjs/operators'; import { dataService } from '../cache/builders/build-decorators'; import { VERSION_HISTORY } from '../shared/version-history.resource-type'; -import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { VersionDataService } from './version-data.service'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; -import { getFirstCompletedRemoteData, sendRequest } from '../shared/operators'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload, + sendRequest +} from '../shared/operators'; +import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; +import { hasValueOperator } from '../../shared/empty.util'; /** * Service responsible for handling requests related to the VersionHistory object @@ -97,4 +105,42 @@ export class VersionHistoryDataService extends DataService { getFirstCompletedRemoteData() ) as Observable>; } + + getLatestVersionFromHistory$(versionHistory: VersionHistory): Observable { + + // Pagination options to fetch a single version on the first page (this is the latest version in the history) + const latestVersionOptions = Object.assign(new PaginationComponentOptions(), { + id: 'item-newest-version-options', + currentPage: 1, + pageSize: 1 + }); + + const latestVersionSearch = new PaginatedSearchOptions({pagination: latestVersionOptions}); + + return this.getVersions(versionHistory.id, latestVersionSearch, true, true, followLink('item')).pipe( + getAllSucceededRemoteData(), + getRemoteDataPayload(), + hasValueOperator(), + filter((versions) => versions.page.length > 0), + map((versions) => versions.page[0]) + ); + + } + + getLatestVersion$(version: Version): Observable { + return version.versionhistory.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((versionHistoryRD) => + this.getLatestVersionFromHistory$(versionHistoryRD) + ), + ); + } + + isLatest$(version: Version): Observable { + return this.getLatestVersion$(version).pipe( + take(1), + switchMap((latestVersion) => of(version.version === latestVersion.version)) + ); + } + } diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 2e26695d82..4fe56622d6 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -233,7 +233,7 @@ export class ItemVersionsComponent implements OnInit { * Deletes the specified version * @param version the version to be deleted */ - deleteVersion(version) { + deleteVersion(version: Version) { const successMessageKey = 'item.version.delete.notification.success'; const failureMessageKey = 'item.version.delete.notification.failure'; const versionNumber = version.version; @@ -245,8 +245,49 @@ export class ItemVersionsComponent implements OnInit { // On modal submit/dismiss activeModal.result.then(() => { - version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((getItemRes) => { - this.itemService.delete(getItemRes.id).pipe(getFirstCompletedRemoteData()).subscribe( + console.log('Deleting item...'); + + version.item.pipe( + getFirstSucceededRemoteDataPayload(), + map((item) => item.id), + switchMap((itemId) => this.itemService.delete(itemId)), + getFirstCompletedRemoteData() + ).subscribe( + (deleteItemRes) => { + console.log('DELETE: ' + JSON.stringify(deleteItemRes)); + if (deleteItemRes.hasSucceeded) { + this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); + this.refreshSubject.next(null); + } else { + this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); + } + } + ); + + + /* + const itemVersion$ = item.version; + const isLatest$ = item.version.pipe( + getFirstSucceededRemoteDataPayload(), + map( (itemVersion) => this.versionHistoryService.isLatest$(itemVersion)) + ); + + */ + + + // FUNZIONANTE: + + /*version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((getItemRes) => { + const itemId = getItemRes.id; + + const isLatest$ = this.itemService.findById(itemId, true,true, followLink('version')).pipe( + getFirstSucceededRemoteDataPayload(), + switchMap( (item) => item.version ), + getFirstSucceededRemoteDataPayload(), + map( (itemVersion) => this.versionHistoryService.isLatest$(itemVersion)) + ); + + this.itemService.delete(itemId).pipe(getFirstCompletedRemoteData()).subscribe( (deleteItemRes) => { console.log(JSON.stringify(deleteItemRes)); if (deleteItemRes.hasSucceeded) { @@ -257,23 +298,8 @@ export class ItemVersionsComponent implements OnInit { } } ); - }); - // TODO non usare subscribe annidate - /*version.item.pipe( - getFirstSucceededRemoteDataPayload(), - switchMap((getItemRes) => this.itemService.delete(getItemRes.id)) - ).subscribe( - getFirstCompletedRemoteData(), - map((deleteItemRes) => { - console.log(JSON.stringify(deleteItemRes)); - if (deleteItemRes.hasSucceeded) { - this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); - } else { - this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); - } - } - ) - );*/ + });*/ + }); } diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts index 2fd39b661c..001d5ad97d 100644 --- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts +++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts @@ -2,13 +2,17 @@ import { Component, Input, OnInit } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; import { PaginatedSearchOptions } from '../../../search/paginated-search-options.model'; -import { combineLatest as observableCombineLatest, Observable } from 'rxjs'; +import { Observable } from 'rxjs'; import { RemoteData } from '../../../../core/data/remote-data'; import { VersionHistory } from '../../../../core/shared/version-history.model'; import { Version } from '../../../../core/shared/version.model'; import { hasValue, hasValueOperator } from '../../../empty.util'; -import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators'; -import { filter, map, startWith, switchMap } from 'rxjs/operators'; +import { + getAllSucceededRemoteData, getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload +} from '../../../../core/shared/operators'; +import { filter, map, switchMap, take } from 'rxjs/operators'; import { followLink } from '../../../utils/follow-link-config.model'; import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; import { AlertType } from '../../../alert/aletr-type'; @@ -52,11 +56,11 @@ export class ItemVersionsNoticeComponent implements OnInit { /** * Pagination options to fetch a single version on the first page (this is the latest version in the history) */ - latestVersionOptions = Object.assign(new PaginationComponentOptions(),{ - id: 'item-newest-version-options', - currentPage: 1, - pageSize: 1 - }); + // latestVersionOptions = Object.assign(new PaginationComponentOptions(),{ + // id: 'item-newest-version-options', + // currentPage: 1, + // pageSize: 1 + // }); /** * The AlertType enumeration @@ -71,7 +75,7 @@ export class ItemVersionsNoticeComponent implements OnInit { * Initialize the component's observables */ ngOnInit(): void { - const latestVersionSearch = new PaginatedSearchOptions({pagination: this.latestVersionOptions}); + // const latestVersionSearch = new PaginatedSearchOptions({pagination: this.latestVersionOptions}); if (hasValue(this.item.version)) { this.versionRD$ = this.item.version; this.versionHistoryRD$ = this.versionRD$.pipe( @@ -80,10 +84,12 @@ export class ItemVersionsNoticeComponent implements OnInit { hasValueOperator(), switchMap((version: Version) => version.versionhistory) ); - const versionHistory$ = this.versionHistoryRD$.pipe( + + /*const versionHistory$ = this.versionHistoryRD$.pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), ); + this.latestVersion$ = versionHistory$.pipe( switchMap((versionHistory: VersionHistory) => this.versionHistoryService.getVersions(versionHistory.id, latestVersionSearch, true, true, followLink('item'))), @@ -92,13 +98,23 @@ export class ItemVersionsNoticeComponent implements OnInit { hasValueOperator(), filter((versions) => versions.page.length > 0), map((versions) => versions.page[0]) + );*/ + + this.latestVersion$ = this.versionHistoryRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)) ); - this.isLatestVersion$ = observableCombineLatest( + /*this.isLatestVersion$ = observableCombineLatest( this.versionRD$.pipe(getAllSucceededRemoteData(), getRemoteDataPayload()), this.latestVersion$ ).pipe( map(([itemVersion, latestVersion]: [Version, Version]) => itemVersion.id === latestVersion.id), startWith(true) + );*/ + + this.isLatestVersion$ = this.versionRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((version) => this.versionHistoryService.isLatest$(version)) ); } } @@ -113,3 +129,5 @@ export class ItemVersionsNoticeComponent implements OnInit { } } } + +// TODO code cleanup From 60bbb9ace41f670066627c205fcc1cecf73085b9 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 14 Sep 2021 18:20:58 +0200 Subject: [PATCH 032/161] [CST-4499] Version history (WIP) - Redirect after deleting a version --- .../core/data/version-history-data.service.ts | 12 ++-- src/app/item-page/item-page-routing-paths.ts | 5 ++ .../item-versions.component.html | 2 +- .../item-versions/item-versions.component.ts | 58 +++++++++++++++---- 4 files changed, 61 insertions(+), 16 deletions(-) diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 65bef94c6c..783b2bae94 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -117,7 +117,7 @@ export class VersionHistoryDataService extends DataService { const latestVersionSearch = new PaginatedSearchOptions({pagination: latestVersionOptions}); - return this.getVersions(versionHistory.id, latestVersionSearch, true, true, followLink('item')).pipe( + return this.getVersions(versionHistory.id, latestVersionSearch, false, true, followLink('item')).pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), hasValueOperator(), @@ -128,10 +128,14 @@ export class VersionHistoryDataService extends DataService { } getLatestVersion$(version: Version): Observable { - return version.versionhistory.pipe( + // retrieve again version, including with versionHistory + return this.versionDataService.findById(version.id, false, true, followLink('versionhistory')).pipe( getFirstSucceededRemoteDataPayload(), - switchMap((versionHistoryRD) => - this.getLatestVersionFromHistory$(versionHistoryRD) + switchMap((res) => res.versionhistory), + getFirstSucceededRemoteDataPayload(), + switchMap((versionHistoryRD) => { + return this.getLatestVersionFromHistory$(versionHistoryRD); + } ), ); } diff --git a/src/app/item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts index 3e0a356efb..74ad0aae07 100644 --- a/src/app/item-page/item-page-routing-paths.ts +++ b/src/app/item-page/item-page-routing-paths.ts @@ -22,6 +22,10 @@ export function getItemEditRoute(item: Item) { return new URLCombiner(getItemPageRoute(item), ITEM_EDIT_PATH).toString(); } +export function getItemEditVersionhistoryRoute(item: Item) { + return new URLCombiner(getItemPageRoute(item), ITEM_EDIT_PATH, ITEM_EDIT_VERSIONHISTORY_PATH).toString(); +} + export function getEntityPageRoute(entityType: string, itemId: string) { if (isNotEmpty(entityType)) { return new URLCombiner('/entities', encodeURIComponent(entityType.toLowerCase()), itemId).toString(); @@ -43,5 +47,6 @@ export function getItemVersionRoute(versionId: string) { } export const ITEM_EDIT_PATH = 'edit'; +export const ITEM_EDIT_VERSIONHISTORY_PATH = 'versionhistory'; export const ITEM_VERSION_PATH = 'version'; export const UPLOAD_BITSTREAM_PATH = 'bitstreams/new'; diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 4e05e035c9..500ef602b9 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -70,7 +70,7 @@ diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 4fe56622d6..afde91b8ff 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -21,7 +21,11 @@ import { AlertType } from '../../alert/aletr-type'; import { followLink } from '../../utils/follow-link-config.model'; import { hasValue, hasValueOperator } from '../../empty.util'; import { PaginationService } from '../../../core/pagination/pagination.service'; -import { getItemPageRoute, getItemVersionRoute } from '../../../item-page/item-page-routing-paths'; +import { + getItemEditVersionhistoryRoute, + getItemPageRoute, + getItemVersionRoute +} from '../../../item-page/item-page-routing-paths'; import { FormBuilder } from '@angular/forms'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component'; @@ -30,6 +34,7 @@ import { TranslateService } from '@ngx-translate/core'; import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component'; import { VersionDataService } from '../../../core/data/version-data.service'; import { ItemDataService } from '../../../core/data/item-data.service'; +import { Router } from '@angular/router'; @Component({ selector: 'ds-item-versions', @@ -154,7 +159,7 @@ export class ItemVersionsComponent implements OnInit { private modalService: NgbModal, private notificationsService: NotificationsService, private translateService: TranslateService, - // private cacheService: ObjectCacheService, + private router: Router, ) { } @@ -232,11 +237,13 @@ export class ItemVersionsComponent implements OnInit { /** * Deletes the specified version * @param version the version to be deleted + * @param redirectToLatest force the redirect to the latest version in the history */ - deleteVersion(version: Version) { + deleteVersion(version: Version, redirectToLatest: boolean) { const successMessageKey = 'item.version.delete.notification.success'; const failureMessageKey = 'item.version.delete.notification.failure'; const versionNumber = version.version; + const versionItem$ = version.item; // Open modal const activeModal = this.modalService.open(ItemVersionsDeleteModalComponent); @@ -247,22 +254,30 @@ export class ItemVersionsComponent implements OnInit { activeModal.result.then(() => { console.log('Deleting item...'); - version.item.pipe( + versionItem$.pipe( getFirstSucceededRemoteDataPayload(), map((item) => item.id), switchMap((itemId) => this.itemService.delete(itemId)), - getFirstCompletedRemoteData() - ).subscribe( - (deleteItemRes) => { - console.log('DELETE: ' + JSON.stringify(deleteItemRes)); - if (deleteItemRes.hasSucceeded) { + getFirstCompletedRemoteData(), + map((deleteItemRes) => deleteItemRes.hasSucceeded), + switchMap((deleteHasSucceeded) => { + if (deleteHasSucceeded) { this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); - this.refreshSubject.next(null); } else { this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber})); } + return this.versionHistoryService.getLatestVersion$(version); + }), + switchMap((latestVersion) => latestVersion.item), + getFirstSucceededRemoteDataPayload(), + ).subscribe((latestVersionItem) => { + console.log('LATEST VERSION = ' + latestVersionItem.uuid); + if (redirectToLatest) { + const tmpPath = getItemEditVersionhistoryRoute(latestVersionItem); + console.log('PATH = ' + tmpPath); + this.router.navigateByUrl(tmpPath); } - ); + }); /* @@ -274,6 +289,27 @@ export class ItemVersionsComponent implements OnInit { */ + /*map((item) => { + item.version.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap( (itemVersion) => this.versionHistoryService.isLatest$(itemVersion)), + ).subscribe((isLatestVersion) => { + isDeletingLatestVersion = isLatestVersion; + } + ); + return item; + }),*/ + /*mergeMap((versionItem) => combineLatest([ + of(versionItem).pipe( + map((item) => item.id), + switchMap((itemId) => this.itemService.delete(itemId)), + getFirstCompletedRemoteData() + ), + versionHistory$.pipe( + getFirstSucceededRemoteDataPayload(), + ) + ])),*/ + // FUNZIONANTE: From 77ff774c97cff709432439894a05282c41ae895f Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 14 Sep 2021 18:48:13 +0200 Subject: [PATCH 033/161] [CST-4499] Version history (WIP) - Minor fixes and code cleanup --- .../notice/item-versions-notice.component.ts | 40 ++----------------- 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts index 001d5ad97d..efa545d052 100644 --- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts +++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts @@ -1,19 +1,16 @@ import { Component, Input, OnInit } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; -import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; -import { PaginatedSearchOptions } from '../../../search/paginated-search-options.model'; import { Observable } from 'rxjs'; import { RemoteData } from '../../../../core/data/remote-data'; import { VersionHistory } from '../../../../core/shared/version-history.model'; import { Version } from '../../../../core/shared/version.model'; import { hasValue, hasValueOperator } from '../../../empty.util'; import { - getAllSucceededRemoteData, getFirstSucceededRemoteData, + getAllSucceededRemoteData, getFirstSucceededRemoteDataPayload, getRemoteDataPayload } from '../../../../core/shared/operators'; -import { filter, map, switchMap, take } from 'rxjs/operators'; -import { followLink } from '../../../utils/follow-link-config.model'; +import { startWith, switchMap } from 'rxjs/operators'; import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; import { AlertType } from '../../../alert/aletr-type'; import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths'; @@ -56,11 +53,6 @@ export class ItemVersionsNoticeComponent implements OnInit { /** * Pagination options to fetch a single version on the first page (this is the latest version in the history) */ - // latestVersionOptions = Object.assign(new PaginationComponentOptions(),{ - // id: 'item-newest-version-options', - // currentPage: 1, - // pageSize: 1 - // }); /** * The AlertType enumeration @@ -75,7 +67,6 @@ export class ItemVersionsNoticeComponent implements OnInit { * Initialize the component's observables */ ngOnInit(): void { - // const latestVersionSearch = new PaginatedSearchOptions({pagination: this.latestVersionOptions}); if (hasValue(this.item.version)) { this.versionRD$ = this.item.version; this.versionHistoryRD$ = this.versionRD$.pipe( @@ -85,36 +76,15 @@ export class ItemVersionsNoticeComponent implements OnInit { switchMap((version: Version) => version.versionhistory) ); - /*const versionHistory$ = this.versionHistoryRD$.pipe( - getAllSucceededRemoteData(), - getRemoteDataPayload(), - ); - - this.latestVersion$ = versionHistory$.pipe( - switchMap((versionHistory: VersionHistory) => - this.versionHistoryService.getVersions(versionHistory.id, latestVersionSearch, true, true, followLink('item'))), - getAllSucceededRemoteData(), - getRemoteDataPayload(), - hasValueOperator(), - filter((versions) => versions.page.length > 0), - map((versions) => versions.page[0]) - );*/ - this.latestVersion$ = this.versionHistoryRD$.pipe( getFirstSucceededRemoteDataPayload(), switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)) ); - /*this.isLatestVersion$ = observableCombineLatest( - this.versionRD$.pipe(getAllSucceededRemoteData(), getRemoteDataPayload()), this.latestVersion$ - ).pipe( - map(([itemVersion, latestVersion]: [Version, Version]) => itemVersion.id === latestVersion.id), - startWith(true) - );*/ - this.isLatestVersion$ = this.versionRD$.pipe( getFirstSucceededRemoteDataPayload(), - switchMap((version) => this.versionHistoryService.isLatest$(version)) + switchMap((version) => this.versionHistoryService.isLatest$(version)), + startWith(true), ); } } @@ -129,5 +99,3 @@ export class ItemVersionsNoticeComponent implements OnInit { } } } - -// TODO code cleanup From b86ae8dd143d9970e126c2a6f5154a9c9c5ec74e Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 14 Sep 2021 14:16:04 -0500 Subject: [PATCH 034/161] Allow enter key to expand or contract menu based on current active status --- .../expandable-navbar-section.component.html | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html index cb96435b77..45edc12b12 100644 --- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html +++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html @@ -1,18 +1,20 @@ -
- - - - -
+ *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"> + +
    + + + +
+ + From f858eeef46fb6c7d0b43cc304f3e431ff8ca2304 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 16 Sep 2021 00:28:45 +0200 Subject: [PATCH 035/161] [CST-4499] Version history (WIP) - Authorization features - Deleting not working --- .../data/feature-authorization/feature-id.ts | 3 + .../core/data/version-history-data.service.ts | 36 ++- src/app/core/shared/version-history.model.ts | 8 + .../publication/publication.component.html | 1 - .../untyped-item/untyped-item.component.html | 4 +- .../dso-page-version-button.component.html | 5 +- .../dso-page-version-button.component.ts | 34 ++- .../item-versions.component.html | 75 +++--- .../item-versions/item-versions.component.ts | 253 +++++++++++++----- src/assets/i18n/en.json5 | 6 +- 10 files changed, 302 insertions(+), 123 deletions(-) diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts index ac045b93b0..4716fbf413 100644 --- a/src/app/core/data/feature-authorization/feature-id.ts +++ b/src/app/core/data/feature-authorization/feature-id.ts @@ -21,4 +21,7 @@ export enum FeatureID { CanManagePolicies = 'canManagePolicies', CanMakePrivate = 'canMakePrivate', CanMove = 'canMove', + CanEditVersion = 'canEditVersion', + CanDeleteVersion = 'canDeleteVersion', + CanCreateVersion = 'canCreateVersion', } diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 783b2bae94..0064292114 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -16,7 +16,7 @@ import { PaginatedSearchOptions } from '../../shared/search/paginated-search-opt import { RemoteData } from './remote-data'; import { PaginatedList } from './paginated-list.model'; import { Version } from '../shared/version.model'; -import { filter, map, switchMap, take } from 'rxjs/operators'; +import { filter, map, startWith, switchMap, take } from 'rxjs/operators'; import { dataService } from '../cache/builders/build-decorators'; import { VERSION_HISTORY } from '../shared/version-history.resource-type'; import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; @@ -127,16 +127,30 @@ export class VersionHistoryDataService extends DataService { } + // TODO move to versionDataService + getHistoryIdFromVersion$(version: Version): Observable { + return this.getHistoryFromVersion$(version).pipe( + map((versionHistory) => versionHistory.id), + ); + } + + // TODO move to versionDataService + getHistoryFromVersion$(version: Version): Observable { + return this.versionDataService.findById(version.id, false, true, followLink('versionhistory')).pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((res) => res.versionhistory), + getFirstSucceededRemoteDataPayload(), + ); + } + +// TODO move to versionDataService getLatestVersion$(version: Version): Observable { // retrieve again version, including with versionHistory return this.versionDataService.findById(version.id, false, true, followLink('versionhistory')).pipe( getFirstSucceededRemoteDataPayload(), switchMap((res) => res.versionhistory), getFirstSucceededRemoteDataPayload(), - switchMap((versionHistoryRD) => { - return this.getLatestVersionFromHistory$(versionHistoryRD); - } - ), + switchMap((versionHistoryRD) => this.getLatestVersionFromHistory$(versionHistoryRD)), ); } @@ -147,4 +161,16 @@ export class VersionHistoryDataService extends DataService { ); } + /** + * Check if a worskpace item exists in the version history + * @param versionHref the href of the version + */ + hasDraftVersion$(versionHref: string): Observable { + return this.versionDataService.findByHref(versionHref, true, true, followLink('versionhistory')).pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((version) => this.getHistoryFromVersion$(version)), + map((versionHistory) => versionHistory.draftVersion), + startWith(false), + ); + } } diff --git a/src/app/core/shared/version-history.model.ts b/src/app/core/shared/version-history.model.ts index 1448317427..6f9423c5fe 100644 --- a/src/app/core/shared/version-history.model.ts +++ b/src/app/core/shared/version-history.model.ts @@ -9,6 +9,7 @@ import { link, typedObject } from '../cache/builders/build-decorators'; import { DSpaceObject } from './dspace-object.model'; import { HALLink } from './hal-link.model'; import { VERSION } from './version.resource-type'; +import { ResourceType } from './resource-type'; /** * Class representing a DSpace Version History @@ -22,6 +23,7 @@ export class VersionHistory extends DSpaceObject { _links: { self: HALLink; versions: HALLink; + draftVersion: HALLink; }; /** @@ -42,6 +44,12 @@ export class VersionHistory extends DSpaceObject { @autoserialize submitterName: string; + /** + * Whether exist a workspace item + */ + @autoserialize + draftVersion: boolean; + /** * The list of versions within this history */ diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 72824dd3e7..9e61f00e48 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -3,7 +3,6 @@ {{'publication.page.titleprefix' | translate}}
-
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index 3ba7ddafd2..a370f2b53b 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -3,7 +3,9 @@
- +
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html index 1538d3bd89..a46b48244a 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html @@ -1,7 +1,8 @@ diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts index 7e12f4e1ff..80d39a49a7 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts @@ -1,8 +1,12 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { Observable } from 'rxjs/internal/Observable'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; +import { Item } from '../../../core/shared/item.model'; +import { switchMap } from 'rxjs/operators'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { of } from 'rxjs'; @Component({ selector: 'ds-dso-page-version-button', @@ -14,15 +18,21 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; */ export class DsoPageVersionButtonComponent implements OnInit { /** - * The DSpaceObject to display a button to the edit page for + * The item for which display a button to create a new version */ - @Input() dso: DSpaceObject; + @Input() dso: Item; /** * A message for the tooltip on the button * Supports i18n keys */ - @Input() tooltipMsg: string; + @Input() tooltipMsgCreate: string; + + /** + * A message for the tooltip on the button (when is disabled) + * Supports i18n keys + */ + @Input() tooltipMsgHasDraft: string; /** * Emits an event that triggers the creation of the new version @@ -34,7 +44,14 @@ export class DsoPageVersionButtonComponent implements OnInit { */ isAuthorized$: Observable; - constructor(protected authorizationService: AuthorizationDataService) { + hasDraftVersion$: Observable; + + tooltipMsg$: Observable; + + constructor( + protected authorizationService: AuthorizationDataService, + protected versionHistoryService: VersionHistoryDataService, + ) { } /** @@ -45,8 +62,11 @@ export class DsoPageVersionButtonComponent implements OnInit { } ngOnInit() { - // TODO show if user can view history - this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self); + this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.dso.self); + this.hasDraftVersion$ = this.versionHistoryService.hasDraftVersion$(this.dso._links.version.href); + this.tooltipMsg$ = this.hasDraftVersion$.pipe( + switchMap((hasDraftVersion) => of(hasDraftVersion ? this.tooltipMsgHasDraft : this.tooltipMsgCreate)), + ); } } diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 500ef602b9..f39f2b8b70 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -46,41 +46,50 @@
- - + + + + - + + + - - + + + + + + +
- {{metadata?.key?.split('.').join('.​')}} + {{metadata?.key?.split('.').join('.​')}}
- - Date: Mon, 20 Sep 2021 11:12:45 +0200 Subject: [PATCH 045/161] [DSC-192] fix --- .../edit-in-place-field/edit-in-place-field.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html index 3918cece94..fe46906f47 100644 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html +++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html @@ -1,7 +1,7 @@
- {{metadata?.key?.split('.').join('.​')}} + {{metadata?.key?.split('.').join('.​')}}
Date: Fri, 17 Sep 2021 15:11:49 +0200 Subject: [PATCH 046/161] 83631: Add the ability to extend a theme --- .../metadata-representation.decorator.spec.ts | 60 +++++++ .../metadata-representation.decorator.ts | 6 +- src/app/shared/mocks/theme-service.mock.ts | 15 +- .../listable-object.decorator.spec.ts | 60 +++++++ .../listable-object.decorator.ts | 50 +++++- src/app/shared/theme-support/theme.service.ts | 15 +- .../theme-support/themed.component.spec.ts | 153 +++++++++++++++--- .../shared/theme-support/themed.component.ts | 76 ++++++--- src/config/theme.model.ts | 6 + 9 files changed, 381 insertions(+), 60 deletions(-) diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts index 25c5be0129..a9988aad6f 100644 --- a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts +++ b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts @@ -7,12 +7,17 @@ import { import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model'; import { Context } from '../../core/shared/context.model'; import * as uuidv4 from 'uuid/v4'; +import { environment } from '../../../environments/environment'; + +let ogEnvironmentThemes; describe('MetadataRepresentation decorator function', () => { const type1 = 'TestType'; const type2 = 'TestType2'; const type3 = 'TestType3'; const type4 = 'RandomType'; + const typeHier1 = 'TestTypeHier1'; + const typeHier2 = 'TestTypeHier2'; let prefix; /* tslint:disable:max-classes-per-file */ @@ -31,6 +36,12 @@ describe('MetadataRepresentation decorator function', () => { class Test3ItemSubmission { } + class TestHier1Ancestor { + } + + class TestHier2Unthemed { + } + /* tslint:enable:max-classes-per-file */ beforeEach(() => { @@ -46,8 +57,17 @@ describe('MetadataRepresentation decorator function', () => { metadataRepresentationComponent(key + type2, MetadataRepresentationType.Item, Context.Workspace)(Test2ItemSubmission); metadataRepresentationComponent(key + type3, MetadataRepresentationType.Item, Context.Workspace)(Test3ItemSubmission); + + metadataRepresentationComponent(key + typeHier1, MetadataRepresentationType.Item, Context.Any, 'ancestor')(TestHier1Ancestor); + metadataRepresentationComponent(key + typeHier2, MetadataRepresentationType.Item, Context.Any)(TestHier2Unthemed); + + ogEnvironmentThemes = environment.themes; } + afterEach(() => { + environment.themes = ogEnvironmentThemes; + }); + describe('If there\'s an exact match', () => { it('should return the matching class', () => { const component = getMetadataRepresentationComponent(prefix + type3, MetadataRepresentationType.Item, Context.Workspace); @@ -76,4 +96,44 @@ describe('MetadataRepresentation decorator function', () => { }); }); }); + + describe('With theme extensions', () => { + describe('If requested theme has no match', () => { + beforeEach(() => { + environment.themes = [ + { name: 'requested', extends: 'intermediate' }, + { name: 'intermediate', extends: 'ancestor' }, + ]; + }); + + it('should return component from ancestor theme if it has a match', () => { + const component = getMetadataRepresentationComponent(prefix + typeHier1, MetadataRepresentationType.Item, Context.Any, 'requested'); + expect(component).toEqual(TestHier1Ancestor); + }); + + it('should return default component if ancestor theme has no match', () => { + const component = getMetadataRepresentationComponent(prefix + typeHier2, MetadataRepresentationType.Item, Context.Any, 'requested'); + expect(component).toEqual(TestHier2Unthemed); + }); + }); + + describe('If there is a theme extension cycle', () => { + beforeEach(() => { + environment.themes = [ + { name: 'extension-cycle', extends: 'broken1' }, + { name: 'broken1', extends: 'broken2' }, + { name: 'broken2', extends: 'broken3' }, + { name: 'broken3', extends: 'broken1' }, + ]; + }); + + it('should throw an error', () => { + expect(() => { + getMetadataRepresentationComponent(prefix + typeHier1, MetadataRepresentationType.Item, Context.Any, 'extension-cycle'); + }).toThrowError( + 'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1' + ); + }); + }); + }); }); diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.ts index 0b5bea33d9..eca08c5c62 100644 --- a/src/app/shared/metadata-representation/metadata-representation.decorator.ts +++ b/src/app/shared/metadata-representation/metadata-representation.decorator.ts @@ -3,6 +3,7 @@ import { hasNoValue, hasValue } from '../empty.util'; import { Context } from '../../core/shared/context.model'; import { InjectionToken } from '@angular/core'; import { GenericConstructor } from '../../core/shared/generic-constructor'; +import { resolveTheme } from '../object-collection/shared/listable-object/listable-object.decorator'; export const METADATA_REPRESENTATION_COMPONENT_FACTORY = new InjectionToken<(entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context, theme: string) => GenericConstructor>('getMetadataRepresentationComponent', { providedIn: 'root', @@ -57,8 +58,9 @@ export function getMetadataRepresentationComponent(entityType: string, mdReprese if (hasValue(entityAndMDRepMap)) { const contextMap = entityAndMDRepMap.get(context); if (hasValue(contextMap)) { - if (hasValue(contextMap.get(theme))) { - return contextMap.get(theme); + const match = resolveTheme(contextMap, theme); + if (hasValue(match)) { + return match; } if (hasValue(contextMap.get(DEFAULT_THEME))) { return contextMap.get(DEFAULT_THEME); diff --git a/src/app/shared/mocks/theme-service.mock.ts b/src/app/shared/mocks/theme-service.mock.ts index 3594270807..058ba993bc 100644 --- a/src/app/shared/mocks/theme-service.mock.ts +++ b/src/app/shared/mocks/theme-service.mock.ts @@ -1,9 +1,18 @@ import { ThemeService } from '../theme-support/theme.service'; import { of as observableOf } from 'rxjs'; +import { ThemeConfig } from '../../../config/theme.model'; +import { isNotEmpty } from '../empty.util'; -export function getMockThemeService(themeName = 'base'): ThemeService { - return jasmine.createSpyObj('themeService', { +export function getMockThemeService(themeName = 'base', themes?: ThemeConfig[]): ThemeService { + const spy = jasmine.createSpyObj('themeService', { getThemeName: themeName, - getThemeName$: observableOf(themeName) + getThemeName$: observableOf(themeName), + getThemeConfigFor: undefined, }); + + if (isNotEmpty(themes)) { + spy.getThemeConfigFor.and.callFake((name: string) => themes.find(theme => theme.name === name)); + } + + return spy; } diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts index 19765f86b0..d3c7a5a1e1 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts @@ -2,11 +2,16 @@ import { Item } from '../../../../core/shared/item.model'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { getListableObjectComponent, listableObjectComponent } from './listable-object.decorator'; import { Context } from '../../../../core/shared/context.model'; +import { environment } from '../../../../../environments/environment'; + +let ogEnvironmentThemes; describe('ListableObject decorator function', () => { const type1 = 'TestType'; const type2 = 'TestType2'; const type3 = 'TestType3'; + const typeHier1 = 'TestTypeHier1'; + const typeHier2 = 'TestTypeHier2'; /* tslint:disable:max-classes-per-file */ class Test1List { @@ -27,6 +32,12 @@ describe('ListableObject decorator function', () => { class Test3DetailedSubmission { } + class TestHier1Ancestor { + } + + class TestHier2Unthemed { + } + /* tslint:enable:max-classes-per-file */ beforeEach(() => { @@ -38,6 +49,15 @@ describe('ListableObject decorator function', () => { listableObjectComponent(type3, ViewMode.ListElement)(Test3List); listableObjectComponent(type3, ViewMode.DetailedListElement, Context.Workspace)(Test3DetailedSubmission); + + listableObjectComponent(typeHier1, ViewMode.ListElement, Context.Any, 'ancestor')(TestHier1Ancestor); + listableObjectComponent(typeHier2, ViewMode.ListElement, Context.Any)(TestHier2Unthemed); + + ogEnvironmentThemes = environment.themes; + }); + + afterEach(() => { + environment.themes = ogEnvironmentThemes; }); const gridDecorator = listableObjectComponent('Item', ViewMode.GridElement); @@ -80,4 +100,44 @@ describe('ListableObject decorator function', () => { }); }); }); + + describe('With theme extensions', () => { + describe('If requested theme has no match', () => { + beforeEach(() => { + environment.themes = [ + { name: 'requested', extends: 'intermediate' }, + { name: 'intermediate', extends: 'ancestor' }, + ]; + }); + + it('should return component from ancestor theme if it has a match', () => { + const component = getListableObjectComponent([typeHier1], ViewMode.ListElement, Context.Any, 'requested'); + expect(component).toEqual(TestHier1Ancestor); + }); + + it('should return default component if ancestor theme has no match', () => { + const component = getListableObjectComponent([typeHier2], ViewMode.ListElement, Context.Any, 'requested'); + expect(component).toEqual(TestHier2Unthemed); + }); + }); + + describe('If there is a theme extension cycle', () => { + beforeEach(() => { + environment.themes = [ + { name: 'extension-cycle', extends: 'broken1' }, + { name: 'broken1', extends: 'broken2' }, + { name: 'broken2', extends: 'broken3' }, + { name: 'broken3', extends: 'broken1' }, + ]; + }); + + it('should throw an error', () => { + expect(() => { + getListableObjectComponent([typeHier1], ViewMode.ListElement, Context.Any, 'extension-cycle'); + }).toThrowError( + 'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1' + ); + }); + }); + }); }); diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts index 91140f0ea1..5df2683bb9 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts @@ -1,15 +1,26 @@ import { ViewMode } from '../../../../core/shared/view-mode.model'; import { Context } from '../../../../core/shared/context.model'; -import { hasNoValue, hasValue } from '../../../empty.util'; +import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util'; import { DEFAULT_CONTEXT, DEFAULT_THEME } from '../../../metadata-representation/metadata-representation.decorator'; import { GenericConstructor } from '../../../../core/shared/generic-constructor'; import { ListableObject } from '../listable-object.model'; +import { environment } from '../../../../../environments/environment'; +import { ThemeConfig } from '../../../../../config/theme.model'; +import { InjectionToken } from '@angular/core'; export const DEFAULT_VIEW_MODE = ViewMode.ListElement; +/** + * Factory to allow us to inject getThemeConfigFor so we can mock it in tests + */ +export const GET_THEME_CONFIG_FOR_FACTORY = new InjectionToken<(str) => ThemeConfig>('getThemeConfigFor', { + providedIn: 'root', + factory: () => getThemeConfigFor +}); + const map = new Map(); /** @@ -54,8 +65,9 @@ export function getListableObjectComponent(types: (string | GenericConstructor { + return environment.themes.find(theme => theme.name === themeName); +}; + +/** + * Find a match in the given map for the given theme name, taking theme extension into account + * + * @param contextMap A map of theme names to components + * @param themeName The name of the theme to check + * @param checkedThemeNames The list of theme names that are already checked + */ +export const resolveTheme = (contextMap: Map, themeName: string, checkedThemeNames: string[] = []): any => { + const match = contextMap.get(themeName); + if (hasValue(match)) { + return match; + } else { + const cfg = getThemeConfigFor(themeName); + if (hasValue(cfg) && isNotEmpty(cfg.extends)) { + const nextTheme = cfg.extends; + const nextCheckedThemeNames = [...checkedThemeNames, themeName]; + if (checkedThemeNames.includes(nextTheme)) { + throw new Error('Theme extension cycle detected: ' + [...nextCheckedThemeNames, nextTheme].join(' -> ')); + } else { + return resolveTheme(contextMap, nextTheme, nextCheckedThemeNames); + } + } + } +}; diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts index 7b0af93e04..7f000447e4 100644 --- a/src/app/shared/theme-support/theme.service.ts +++ b/src/app/shared/theme-support/theme.service.ts @@ -1,10 +1,16 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Inject } from '@angular/core'; import { Store, createFeatureSelector, createSelector, select } from '@ngrx/store'; import { Observable } from 'rxjs/internal/Observable'; import { ThemeState } from './theme.reducer'; import { SetThemeAction } from './theme.actions'; import { take } from 'rxjs/operators'; import { hasValue } from '../empty.util'; +import { ThemeConfig } from '../../../config/theme.model'; +import { environment } from '../../../environments/environment'; +import { + GET_THEME_CONFIG_FOR_FACTORY, + getThemeConfigFor +} from '../object-collection/shared/listable-object/listable-object.decorator'; export const themeStateSelector = createFeatureSelector('theme'); @@ -19,6 +25,7 @@ export const currentThemeSelector = createSelector( export class ThemeService { constructor( private store: Store, + @Inject(GET_THEME_CONFIG_FOR_FACTORY) private gtcf: (str) => ThemeConfig ) { } @@ -43,4 +50,10 @@ export class ThemeService { ); } + /** + * Searches for a ThemeConfig by its name; + */ + getThemeConfigFor(themeName: string): ThemeConfig { + return this.gtcf(themeName); + } } diff --git a/src/app/shared/theme-support/themed.component.spec.ts b/src/app/shared/theme-support/themed.component.spec.ts index abaee28a29..1db6de072d 100644 --- a/src/app/shared/theme-support/themed.component.spec.ts +++ b/src/app/shared/theme-support/themed.component.spec.ts @@ -5,6 +5,7 @@ import { VarDirective } from '../utils/var.directive'; import { ThemeService } from './theme.service'; import { getMockThemeService } from '../mocks/theme-service.mock'; import { TestComponent } from './test/test.component.spec'; +import { ThemeConfig } from '../../../config/theme.model'; /* tslint:disable:max-classes-per-file */ @Component({ @@ -32,8 +33,8 @@ describe('ThemedComponent', () => { let fixture: ComponentFixture; let themeService: ThemeService; - function setupTestingModuleForTheme(theme: string) { - themeService = getMockThemeService(theme); + function setupTestingModuleForTheme(theme: string, themes?: ThemeConfig[]) { + themeService = getMockThemeService(theme, themes); TestBed.configureTestingModule({ imports: [], declarations: [TestThemedComponent, VarDirective], @@ -44,17 +45,20 @@ describe('ThemedComponent', () => { }).compileComponents(); } + function initComponent() { + fixture = TestBed.createComponent(TestThemedComponent); + component = fixture.componentInstance; + spyOn(component as any, 'importThemedComponent').and.callThrough(); + component.testInput = 'changed'; + fixture.detectChanges(); + } + describe('when the current theme matches a themed component', () => { beforeEach(waitForAsync(() => { setupTestingModuleForTheme('custom'); })); - beforeEach(() => { - fixture = TestBed.createComponent(TestThemedComponent); - component = fixture.componentInstance; - component.testInput = 'changed'; - fixture.detectChanges(); - }); + beforeEach(initComponent); it('should set compRef to the themed component', waitForAsync(() => { fixture.whenStable().then(() => { @@ -70,28 +74,127 @@ describe('ThemedComponent', () => { }); describe('when the current theme doesn\'t match a themed component', () => { - beforeEach(waitForAsync(() => { - setupTestingModuleForTheme('non-existing-theme'); - })); + describe('and it doesn\'t extend another theme', () => { + beforeEach(waitForAsync(() => { + setupTestingModuleForTheme('non-existing-theme'); + })); - beforeEach(() => { - fixture = TestBed.createComponent(TestThemedComponent); - component = fixture.componentInstance; - component.testInput = 'changed'; - fixture.detectChanges(); + beforeEach(initComponent); + + it('should set compRef to the default component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).compRef.instance.type).toEqual('default'); + }); + })); + + it('should sync up this component\'s input with the default component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).compRef.instance.testInput).toEqual('changed'); + }); + })); }); - it('should set compRef to the default component', waitForAsync(() => { - fixture.whenStable().then(() => { - expect((component as any).compRef.instance.type).toEqual('default'); - }); - })); + describe('and it extends another theme', () => { + describe('that doesn\'t match it either', () => { + beforeEach(waitForAsync(() => { + setupTestingModuleForTheme('current-theme', [ + { name: 'current-theme', extends: 'non-existing-theme' }, + ]); + })); - it('should sync up this component\'s input with the default component', waitForAsync(() => { - fixture.whenStable().then(() => { - expect((component as any).compRef.instance.testInput).toEqual('changed'); + beforeEach(initComponent); + + it('should set compRef to the default component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).importThemedComponent).toHaveBeenCalledWith('current-theme'); + expect((component as any).importThemedComponent).toHaveBeenCalledWith('non-existing-theme'); + expect((component as any).compRef.instance.type).toEqual('default'); + }); + })); + + it('should sync up this component\'s input with the default component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).compRef.instance.testInput).toEqual('changed'); + }); + })); }); - })); + + describe('that does match it', () => { + beforeEach(waitForAsync(() => { + setupTestingModuleForTheme('current-theme', [ + { name: 'current-theme', extends: 'custom' }, + ]); + })); + + beforeEach(initComponent); + + it('should set compRef to the themed component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).importThemedComponent).toHaveBeenCalledWith('current-theme'); + expect((component as any).importThemedComponent).toHaveBeenCalledWith('custom'); + expect((component as any).compRef.instance.type).toEqual('themed'); + }); + })); + + it('should sync up this component\'s input with the themed component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).compRef.instance.testInput).toEqual('changed'); + }); + })); + }); + + describe('that extends another theme that doesn\'t match it either', () => { + beforeEach(waitForAsync(() => { + setupTestingModuleForTheme('current-theme', [ + { name: 'current-theme', extends: 'parent-theme' }, + { name: 'parent-theme', extends: 'non-existing-theme' }, + ]); + })); + + beforeEach(initComponent); + + it('should set compRef to the default component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).importThemedComponent).toHaveBeenCalledWith('current-theme'); + expect((component as any).importThemedComponent).toHaveBeenCalledWith('parent-theme'); + expect((component as any).importThemedComponent).toHaveBeenCalledWith('non-existing-theme'); + expect((component as any).compRef.instance.type).toEqual('default'); + }); + })); + + it('should sync up this component\'s input with the default component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).compRef.instance.testInput).toEqual('changed'); + }); + })); + }); + + describe('that extends another theme that does match it', () => { + beforeEach(waitForAsync(() => { + setupTestingModuleForTheme('current-theme', [ + { name: 'current-theme', extends: 'parent-theme' }, + { name: 'parent-theme', extends: 'custom' }, + ]); + })); + + beforeEach(initComponent); + + it('should set compRef to the themed component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).importThemedComponent).toHaveBeenCalledWith('current-theme'); + expect((component as any).importThemedComponent).toHaveBeenCalledWith('parent-theme'); + expect((component as any).importThemedComponent).toHaveBeenCalledWith('custom'); + expect((component as any).compRef.instance.type).toEqual('themed'); + }); + })); + + it('should sync up this component\'s input with the themed component', waitForAsync(() => { + fixture.whenStable().then(() => { + expect((component as any).compRef.instance.testInput).toEqual('changed'); + }); + })); + }); + }); }); }); /* tslint:enable:max-classes-per-file */ diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts index 1a41327209..6646c0aa30 100644 --- a/src/app/shared/theme-support/themed.component.ts +++ b/src/app/shared/theme-support/themed.component.ts @@ -11,7 +11,7 @@ import { OnChanges } from '@angular/core'; import { hasValue, isNotEmpty } from '../empty.util'; -import { Subscription } from 'rxjs'; +import { Observable, of as observableOf, Subscription } from 'rxjs'; import { ThemeService } from './theme.service'; import { fromPromise } from 'rxjs/internal-compatibility'; import { catchError, switchMap, map } from 'rxjs/operators'; @@ -69,31 +69,27 @@ export abstract class ThemedComponent implements OnInit, OnDestroy, OnChanges this.lazyLoadSub.unsubscribe(); } - this.lazyLoadSub = - fromPromise(this.importThemedComponent(this.themeService.getThemeName())).pipe( - // if there is no themed version of the component an exception is thrown, - // catch it and return null instead - catchError(() => [null]), - switchMap((themedFile: any) => { - if (hasValue(themedFile) && hasValue(themedFile[this.getComponentName()])) { - // if the file is not null, and exports a component with the specified name, - // return that component - return [themedFile[this.getComponentName()]]; - } else { - // otherwise import and return the default component - return fromPromise(this.importUnthemedComponent()).pipe( - map((unthemedFile: any) => { - return unthemedFile[this.getComponentName()]; - }) - ); - } - }), - ).subscribe((constructor: GenericConstructor) => { - const factory = this.resolver.resolveComponentFactory(constructor); - this.compRef = this.vcr.createComponent(factory); - this.connectInputsAndOutputs(); - this.cdr.markForCheck(); - }); + this.lazyLoadSub = this.resolveThemedComponent(this.themeService.getThemeName()).pipe( + switchMap((themedFile: any) => { + if (hasValue(themedFile) && hasValue(themedFile[this.getComponentName()])) { + // if the file is not null, and exports a component with the specified name, + // return that component + return [themedFile[this.getComponentName()]]; + } else { + // otherwise import and return the default component + return fromPromise(this.importUnthemedComponent()).pipe( + map((unthemedFile: any) => { + return unthemedFile[this.getComponentName()]; + }) + ); + } + }), + ).subscribe((constructor: GenericConstructor) => { + const factory = this.resolver.resolveComponentFactory(constructor); + this.compRef = this.vcr.createComponent(factory); + this.connectInputsAndOutputs(); + this.cdr.markForCheck(); + }); } protected destroyComponentInstance(): void { @@ -113,4 +109,32 @@ export abstract class ThemedComponent implements OnInit, OnDestroy, OnChanges }); } } + + /** + * Attempt to import this component from the current theme or a theme it {@link NamedThemeConfig.extends}. + * Recurse until we succeed or when until we run out of themes to fall back to. + * + * @param themeName The name of the theme to check + * @param checkedThemeNames The list of theme names that are already checked + * @private + */ + private resolveThemedComponent(themeName?: string, checkedThemeNames: string[] = []): Observable { + if (isNotEmpty(themeName)) { + return fromPromise(this.importThemedComponent(themeName)).pipe( + catchError(() => { + // Try the next ancestor theme instead + const nextTheme = this.themeService.getThemeConfigFor(themeName)?.extends; + const nextCheckedThemeNames = [...checkedThemeNames, themeName]; + if (checkedThemeNames.includes(nextTheme)) { + throw new Error('Theme extension cycle detected: ' + [...nextCheckedThemeNames, nextTheme].join(' -> ')); + } else { + return this.resolveThemedComponent(nextTheme, nextCheckedThemeNames); + } + }), + ); + } else { + // If we got here, we've failed to import this component from any ancestor theme → fall back to unthemed + return observableOf(null); + } + } } diff --git a/src/config/theme.model.ts b/src/config/theme.model.ts index 908589c71c..0130b5ffd8 100644 --- a/src/config/theme.model.ts +++ b/src/config/theme.model.ts @@ -6,6 +6,12 @@ import { getDSORoute } from '../app/app-routing-paths'; // tslint:disable:max-classes-per-file export interface NamedThemeConfig extends Config { name: string; + + /** + * Specify another theme to build upon: whenever a themed component is not found in the current theme, + * its ancestor theme(s) will be checked recursively before falling back to the default theme. + */ + extends?: string; } export interface RegExThemeConfig extends NamedThemeConfig { From fbc69832d80245410b74cff86af80317a2dc0746 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 20 Sep 2021 17:38:03 +0200 Subject: [PATCH 047/161] [CST-4499] Version history - Tests WIP --- .../version-page.component.spec.ts | 41 ++++++++-- .../dso-page-version-button.component.spec.ts | 3 +- .../item-versions.component.spec.ts | 74 ++++++++++++++----- .../item-versions/item-versions.component.ts | 1 - 4 files changed, 92 insertions(+), 27 deletions(-) diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts index 7e3061f397..146d0e98c4 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -1,16 +1,45 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { VersionPageComponent } from './version-page.component'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; +import { of as observableOf } from 'rxjs'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { Item } from '../../../core/shared/item.model'; +import { createPaginatedList } from '../../../shared/testing/utils.test'; +import { createRelationshipsObservable } from '../../simple/item-types/shared/item.component.spec'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { AuthService } from '../../../core/auth/auth.service'; + +const mockItem: Item = Object.assign(new Item(), { + bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])), + metadata: [], + relationships: createRelationshipsObservable() +}); describe('VersionPageComponent', () => { let component: VersionPageComponent; let fixture: ComponentFixture; + let authService: AuthService; - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ VersionPageComponent ] + beforeEach(waitForAsync(() => { + authService = jasmine.createSpyObj('authService', { + isAuthenticated: observableOf(true), + setRedirectUrl: {} + }); + TestBed.configureTestingModule({ + declarations: [VersionPageComponent], + providers: [ + {provide: ActivatedRoute, useValue: mockRoute}, + {provide: Router, useValue: {}}, + {provide: VersionDataService, useValue: {}}, + {provide: AuthService, useValue: authService}, + ], }) - .compileComponents(); + .compileComponents(); + })); + + const mockRoute = Object.assign(new ActivatedRouteStub(), { + data: observableOf({dso: createSuccessfulRemoteDataObject(mockItem)}) }); beforeEach(() => { diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts index edc7fbd618..b05d8a1c3a 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { DsoPageVersionButtonComponent } from './dso-page-version-button.component'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { Item } from '../../../core/shared/item.model'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { of as observableOf } from 'rxjs'; @@ -10,7 +9,7 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { By } from '@angular/platform-browser'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -describe('DsoPageEditButtonComponent', () => { +describe('DsoPageVersionButtonComponent', () => { let component: DsoPageVersionButtonComponent; let fixture: ComponentFixture; diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts index cc28779537..81b5489439 100644 --- a/src/app/shared/item/item-versions/item-versions.component.spec.ts +++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts @@ -11,19 +11,27 @@ import { VersionHistoryDataService } from '../../../core/data/version-history-da import { By } from '@angular/platform-browser'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { createPaginatedList } from '../../testing/utils.test'; -import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model'; import { of as observableOf } from 'rxjs'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../testing/pagination-service.stub'; +import { AuthService } from '../../../core/auth/auth.service'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { FormBuilder } from '@angular/forms'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; describe('ItemVersionsComponent', () => { let component: ItemVersionsComponent; let fixture: ComponentFixture; + let authenticationService: AuthService; + let authorizationService: AuthorizationDataService; const versionHistory = Object.assign(new VersionHistory(), { id: '1' }); + const version1 = Object.assign(new Version(), { id: '1', version: 1, @@ -38,34 +46,61 @@ describe('ItemVersionsComponent', () => { created: new Date(2020, 1, 2), versionhistory: createSuccessfulRemoteDataObject$(versionHistory) }); + const versions = [version1, version2]; versionHistory.versions = createSuccessfulRemoteDataObject$(createPaginatedList(versions)); + const item1 = Object.assign(new Item(), { uuid: 'item-identifier-1', handle: '123456789/1', - version: createSuccessfulRemoteDataObject$(version1) + version: createSuccessfulRemoteDataObject$(version1), + _links: { + self: { + href: '/items/item-identifier-1' + } + } }); const item2 = Object.assign(new Item(), { uuid: 'item-identifier-2', handle: '123456789/2', - version: createSuccessfulRemoteDataObject$(version2) + version: createSuccessfulRemoteDataObject$(version2), + _links: { + self: { + href: '/items/item-identifier-2' + } + } }); const items = [item1, item2]; version1.item = createSuccessfulRemoteDataObject$(item1); version2.item = createSuccessfulRemoteDataObject$(item2); + const versionHistoryService = jasmine.createSpyObj('versionHistoryService', { getVersions: createSuccessfulRemoteDataObject$(createPaginatedList(versions)) }); - const paginationService = new PaginationServiceStub(); - beforeEach(waitForAsync(() => { + authenticationService = jasmine.createSpyObj('authenticationService', { + isAuthenticated: observableOf(true), + setRedirectUrl: {} + } + ); + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: observableOf(true), + } + ); + TestBed.configureTestingModule({ declarations: [ItemVersionsComponent, VarDirective], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ + { provide: PaginationService, useValue: new PaginationServiceStub() }, + { provide: FormBuilder, useValue: new FormBuilder() }, + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: AuthService, useValue: authenticationService }, + { provide: AuthorizationDataService, useValue: authorizationService }, { provide: VersionHistoryDataService, useValue: versionHistoryService }, - { provide: PaginationService, useValue: paginationService } + { provide: ItemDataService, useValue: {} }, + { provide: VersionDataService, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); @@ -88,26 +123,29 @@ describe('ItemVersionsComponent', () => { it(`should display version ${version.version} in the correct column for version ${version.id}`, () => { const id = fixture.debugElement.query(By.css(`#version-row-${version.id} .version-row-element-version`)); - expect(id.nativeElement.textContent).toEqual('' + version.version); + expect(id.nativeElement.textContent).toContain(version.version.toString()); }); - it(`should display item handle ${versionItem.handle} in the correct column for version ${version.id}`, () => { - const item = fixture.debugElement.query(By.css(`#version-row-${version.id} .version-row-element-item`)); - expect(item.nativeElement.textContent).toContain(versionItem.handle); - }); - - // This version's item is equal to the component's item (the selected item) - // Check if the handle contains an asterisk + // Check if the current version contains an asterisk if (item1.uuid === versionItem.uuid) { - it('should add an asterisk to the handle of the selected item', () => { - const item = fixture.debugElement.query(By.css(`#version-row-${version.id} .version-row-element-item`)); + it('should add an asterisk to the version of the selected item', () => { + const item = fixture.debugElement.query(By.css(`#version-row-${version.id} .version-row-element-version`)); expect(item.nativeElement.textContent).toContain('*'); }); } it(`should display date ${version.created} in the correct column for version ${version.id}`, () => { const date = fixture.debugElement.query(By.css(`#version-row-${version.id} .version-row-element-date`)); - expect(date.nativeElement.textContent).toEqual('' + version.created); + switch (versionItem.uuid) { + case item1.uuid: + expect(date.nativeElement.textContent.trim()).toEqual('2020-02-01 00:00:00'); + break; + case item2.uuid: + expect(date.nativeElement.textContent.trim()).toEqual('2020-02-02 00:00:00'); + break; + default: + throw new Error('Unexpected versionItem'); + } }); it(`should display summary ${version.summary} in the correct column for version ${version.id}`, () => { diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index 4a3f28d9e3..e941da4e4d 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -392,7 +392,6 @@ export class ItemVersionsComponent implements OnInit { getFirstCompletedRemoteData(), ).subscribe((res) => { this.versionsRD$.next(res); - console.log(res.payload); }); } From 3255a29b309c61b357b3dee9d689c46a9f3492a6 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 20 Sep 2021 20:34:34 +0200 Subject: [PATCH 048/161] [CST-4499] Version history - Tests WIP --- .../item-versions-notice.component.spec.ts | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts index f2184b136a..77e6b6b775 100644 --- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts +++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts @@ -10,10 +10,13 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history import { By } from '@angular/platform-browser'; import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; import { createPaginatedList } from '../../../testing/utils.test'; +import { of } from 'rxjs'; +import { take } from 'rxjs/operators'; describe('ItemVersionsNoticeComponent', () => { let component: ItemVersionsNoticeComponent; let fixture: ComponentFixture; + let versionHistoryService: VersionHistoryDataService; const versionHistory = Object.assign(new VersionHistory(), { id: '1' @@ -48,19 +51,37 @@ describe('ItemVersionsNoticeComponent', () => { }); firstVersion.item = createSuccessfulRemoteDataObject$(firstItem); latestVersion.item = createSuccessfulRemoteDataObject$(latestItem); - const versionHistoryService = jasmine.createSpyObj('versionHistoryService', { - getVersions: createSuccessfulRemoteDataObject$(createPaginatedList(versions)) - }); + + // versionHistoryService.getLatestVersionFromHistory$.createSpy('getLatestVersionFromHistory$').and.callFake((id) => { + // return of(latestVersion); + // }); + // versionHistoryService.isLatest$.createSpy('isLatest$').and.callFake((id) => { + // return of(true); + // }); + beforeEach(waitForAsync(() => { + + const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', + ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', ] + ); + TestBed.configureTestingModule({ declarations: [ItemVersionsNoticeComponent], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ - { provide: VersionHistoryDataService, useValue: versionHistoryService } + { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); + + versionHistoryService = TestBed.inject(VersionHistoryDataService); + + const isLatestFcn = (version: Version) => of((version.version === latestVersion.version)); + + versionHistoryServiceSpy.getVersions.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(versions))); + versionHistoryServiceSpy.getLatestVersionFromHistory$.and.returnValue(of(latestVersion)); + versionHistoryServiceSpy.isLatest$.and.callFake(isLatestFcn); })); describe('when the item is the latest version', () => { @@ -85,6 +106,19 @@ describe('ItemVersionsNoticeComponent', () => { }); }); + describe('isLatest', () => { + it('firstVersion should not be the latest', () => { + versionHistoryService.isLatest$(firstVersion).pipe(take(1)).subscribe((res) => { + expect(res).toBeFalse(); + }); + }); + it('latestVersion should be the latest', () => { + versionHistoryService.isLatest$(latestVersion).pipe(take(1)).subscribe((res) => { + expect(res).toBeTrue(); + }); + }); + }); + function initComponentWithItem(item: Item) { fixture = TestBed.createComponent(ItemVersionsNoticeComponent); component = fixture.componentInstance; From 62fea1fa7894fc5278af55262eeb6a360e1835eb Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 21 Sep 2021 12:07:27 +0200 Subject: [PATCH 049/161] [CST-4499] Version history - Tests WIP --- .../dso-page-version-button.component.spec.ts | 54 +++++++++++++------ .../item-versions-notice.component.spec.ts | 14 ++--- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts index b05d8a1c3a..9839507d57 100644 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts +++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts @@ -2,73 +2,95 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { DsoPageVersionButtonComponent } from './dso-page-version-button.component'; import { Item } from '../../../core/shared/item.model'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { of as observableOf } from 'rxjs'; +import { Observable, of, of as observableOf } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { By } from '@angular/platform-browser'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; describe('DsoPageVersionButtonComponent', () => { let component: DsoPageVersionButtonComponent; let fixture: ComponentFixture; let authorizationService: AuthorizationDataService; + let versionHistoryService: VersionHistoryDataService; + let dso: Item; + let tooltipMsg: Observable; + + const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']); + + const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', + ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', 'hasDraftVersion$'] + ); beforeEach(waitForAsync(() => { dso = Object.assign(new Item(), { id: 'test-item', _links: { - self: { href: 'test-item-selflink' } - } - }); - authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) + self: { href: 'test-item-selflink' }, + version: { href: 'test-item-version-selflink' }, + }, }); + tooltipMsg = of('tooltip-msg'); + TestBed.configureTestingModule({ declarations: [DsoPageVersionButtonComponent], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule], providers: [ - { provide: AuthorizationDataService, useValue: authorizationService } + { provide: AuthorizationDataService, useValue: authorizationServiceSpy }, + { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy }, ] }).compileComponents(); + + authorizationService = TestBed.inject(AuthorizationDataService); + versionHistoryService = TestBed.inject(VersionHistoryDataService); + + versionHistoryServiceSpy.hasDraftVersion$.and.returnValue(observableOf(true)); })); beforeEach(() => { fixture = TestBed.createComponent(DsoPageVersionButtonComponent); component = fixture.componentInstance; component.dso = dso; + component.tooltipMsg$ = tooltipMsg; fixture.detectChanges(); }); it('should check the authorization of the current user', () => { - expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self); + expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanCreateVersion, dso.self); + }); + + it('should check if the item has a draft version', () => { + expect(versionHistoryServiceSpy.hasDraftVersion$).toHaveBeenCalledWith(dso._links.version.href); }); describe('when the user is authorized', () => { beforeEach(() => { - (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true)); + authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(true)); component.ngOnInit(); fixture.detectChanges(); }); - it('should render a link', () => { - const link = fixture.debugElement.query(By.css('a')); - expect(link).not.toBeNull(); + it('should render a button', () => { + const button = fixture.debugElement.query(By.css('button')); + expect(button).not.toBeNull(); }); }); describe('when the user is not authorized', () => { beforeEach(() => { - (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false)); + authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(false)); component.ngOnInit(); fixture.detectChanges(); }); - it('should not render a link', () => { - const link = fixture.debugElement.query(By.css('a')); - expect(link).toBeNull(); + it('should render a button', () => { + const button = fixture.debugElement.query(By.css('button')); + expect(button).toBeNull(); }); }); + }); diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts index 77e6b6b775..2849ba4909 100644 --- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts +++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts @@ -52,20 +52,12 @@ describe('ItemVersionsNoticeComponent', () => { firstVersion.item = createSuccessfulRemoteDataObject$(firstItem); latestVersion.item = createSuccessfulRemoteDataObject$(latestItem); - // versionHistoryService.getLatestVersionFromHistory$.createSpy('getLatestVersionFromHistory$').and.callFake((id) => { - // return of(latestVersion); - // }); - // versionHistoryService.isLatest$.createSpy('isLatest$').and.callFake((id) => { - // return of(true); - // }); - + const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', + ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', ] + ); beforeEach(waitForAsync(() => { - const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', - ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', ] - ); - TestBed.configureTestingModule({ declarations: [ItemVersionsNoticeComponent], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], From a97f55c32dc026eb703db9ecb13cb9745e75756b Mon Sep 17 00:00:00 2001 From: Alba Aliu Date: Fri, 17 Sep 2021 23:07:48 +0200 Subject: [PATCH 050/161] [DSC-192] disable edit metadata field name in edit mode --- .../edit-in-place-field/edit-in-place-field.component.html | 4 ++-- .../validation-suggestions.component.html | 2 +- .../validation-suggestions.component.ts | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html index 5277fa1a3a..3918cece94 100644 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html +++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html @@ -1,10 +1,10 @@
- {{metadata?.key?.split('.').join('.​')}} + {{metadata?.key?.split('.').join('.​')}}
- - Date: Mon, 20 Sep 2021 11:12:45 +0200 Subject: [PATCH 051/161] [DSC-192] fix --- .../edit-in-place-field/edit-in-place-field.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html index 3918cece94..fe46906f47 100644 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html +++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html @@ -1,7 +1,7 @@
- {{metadata?.key?.split('.').join('.​')}} + {{metadata?.key?.split('.').join('.​')}}
Date: Tue, 21 Sep 2021 16:47:42 +0200 Subject: [PATCH 052/161] [CST-4499] Version history - Old tests fixed --- .../item-version-history.component.spec.ts | 12 +++++++-- .../untyped-item.component.spec.ts | 5 +++- .../version-page.component.spec.ts | 26 +++++++++++++------ .../version-page/version-page.component.ts | 9 +++---- ...em-versions-delete-modal.component.spec.ts | 12 ++++++--- ...m-versions-summary-modal.component.spec.ts | 12 ++++++--- 6 files changed, 53 insertions(+), 23 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts index c68dcfeba3..f4ed04c2c8 100644 --- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts @@ -1,5 +1,5 @@ import { ItemVersionHistoryComponent } from './item-version-history.component'; -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { VarDirective } from '../../../shared/utils/var.directive'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -18,12 +18,20 @@ describe('ItemVersionHistoryComponent', () => { handle: '123456789/1', }); + const activatedRoute = { + parent: { + parent: { + data: observableOf({dso: createSuccessfulRemoteDataObject(item)}) + } + } + }; + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ItemVersionHistoryComponent, VarDirective], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ - { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }) } } } + { provide: ActivatedRoute, useValue: activatedRoute } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts index e70a05a8c8..3c888071ea 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts @@ -29,6 +29,8 @@ import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component'; import { createRelationshipsObservable } from '../shared/item.component.spec'; import { UntypedItemComponent } from './untyped-item.component'; +import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; +import { VersionDataService } from '../../../../core/data/version-data.service'; const mockItem: Item = Object.assign(new Item(), { bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), @@ -68,9 +70,10 @@ describe('UntypedItemComponent', () => { { provide: HttpClient, useValue: {} }, { provide: DSOChangeAnalyzer, useValue: {} }, { provide: DefaultChangeAnalyzer, useValue: {} }, + { provide: VersionHistoryDataService, useValue: {} }, + { provide: VersionDataService, useValue: {} }, { provide: BitstreamDataService, useValue: mockBitstreamDataService }, ], - schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(UntypedItemComponent, { set: { changeDetection: ChangeDetectionStrategy.Default } diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts index 146d0e98c4..8793315968 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { VersionPageComponent } from './version-page.component'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; import { of as observableOf } from 'rxjs'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; @@ -9,6 +9,8 @@ import { createPaginatedList } from '../../../shared/testing/utils.test'; import { createRelationshipsObservable } from '../../simple/item-types/shared/item.component.spec'; import { VersionDataService } from '../../../core/data/version-data.service'; import { AuthService } from '../../../core/auth/auth.service'; +import { Version } from '../../../core/shared/version.model'; +import { RouterTestingModule } from '@angular/router/testing'; const mockItem: Item = Object.assign(new Item(), { bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])), @@ -16,11 +18,21 @@ const mockItem: Item = Object.assign(new Item(), { relationships: createRelationshipsObservable() }); +const mockVersion: Version = Object.assign(new Version(), { + item: createSuccessfulRemoteDataObject$(mockItem), + version: 1, +}); + + describe('VersionPageComponent', () => { let component: VersionPageComponent; let fixture: ComponentFixture; let authService: AuthService; + const mockRoute = Object.assign(new ActivatedRouteStub(), { + data: observableOf({dso: createSuccessfulRemoteDataObject(mockVersion)}) + }); + beforeEach(waitForAsync(() => { authService = jasmine.createSpyObj('authService', { isAuthenticated: observableOf(true), @@ -28,19 +40,17 @@ describe('VersionPageComponent', () => { }); TestBed.configureTestingModule({ declarations: [VersionPageComponent], + imports: [RouterTestingModule], providers: [ - {provide: ActivatedRoute, useValue: mockRoute}, - {provide: Router, useValue: {}}, - {provide: VersionDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, + { provide: ActivatedRoute, useValue: mockRoute }, + { provide: VersionDataService, useValue: {} }, + { provide: AuthService, useValue: authService }, ], }) .compileComponents(); })); - const mockRoute = Object.assign(new ActivatedRouteStub(), { - data: observableOf({dso: createSuccessfulRemoteDataObject(mockItem)}) - }); + beforeEach(() => { fixture = TestBed.createComponent(VersionPageComponent); diff --git a/src/app/item-page/version-page/version-page/version-page.component.ts b/src/app/item-page/version-page/version-page/version-page.component.ts index e61b26cd19..99d11af1d5 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.ts @@ -3,12 +3,8 @@ import { Observable } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { ActivatedRoute, Router } from '@angular/router'; import { AuthService } from '../../../core/auth/auth.service'; -import { map, switchMap } from 'rxjs/operators'; -import { - getFirstCompletedRemoteData, - getFirstSucceededRemoteDataPayload, - redirectOn4xx -} from '../../../core/shared/operators'; +import { map, switchMap, tap } from 'rxjs/operators'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, redirectOn4xx } from '../../../core/shared/operators'; import { VersionDataService } from '../../../core/data/version-data.service'; import { Version } from '../../../core/shared/version.model'; import { Item } from '../../../core/shared/item.model'; @@ -36,6 +32,7 @@ export class VersionPageComponent implements OnInit { ngOnInit(): void { /* Retrieve version from resolver or redirect on 4xx */ this.versionRD$ = this.route.data.pipe( + tap( (data) => { console.log(JSON.stringify(data)); } ), map((data) => data.dso as RemoteData), redirectOn4xx(this.router, this.authService), ); diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts index 5ef9ae44d2..8a0d4a58d9 100644 --- a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts +++ b/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts @@ -1,6 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; describe('ItemVersionsDeleteModalComponent', () => { let component: ItemVersionsDeleteModalComponent; @@ -8,9 +11,12 @@ describe('ItemVersionsDeleteModalComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ItemVersionsDeleteModalComponent ] - }) - .compileComponents(); + declarations: [ItemVersionsDeleteModalComponent], + imports: [ TranslateModule.forRoot(), RouterTestingModule.withRoutes([]) ], + providers: [ + { provide: NgbActiveModal }, + ] + }).compileComponents(); }); beforeEach(() => { diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts index 3b88b96f42..657e8c0e75 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts @@ -1,6 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal.component'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; describe('ItemVersionsSummaryModalComponent', () => { let component: ItemVersionsSummaryModalComponent; @@ -8,9 +11,12 @@ describe('ItemVersionsSummaryModalComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ItemVersionsSummaryModalComponent ] - }) - .compileComponents(); + declarations: [ ItemVersionsSummaryModalComponent ], + imports: [ TranslateModule.forRoot(), RouterTestingModule.withRoutes([]) ], + providers: [ + { provide: NgbActiveModal }, + ] + }).compileComponents(); }); beforeEach(() => { From 468ad70751b233da61698b49faec1cc241c75f60 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 21 Sep 2021 18:21:38 +0200 Subject: [PATCH 053/161] [CST-4499] Version history - Old tests fixed --- .../version-page/version-page/version-page.component.spec.ts | 5 +++-- .../version-page/version-page/version-page.component.ts | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts index 8793315968..f30bfe4ba7 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -15,7 +15,8 @@ import { RouterTestingModule } from '@angular/router/testing'; const mockItem: Item = Object.assign(new Item(), { bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])), metadata: [], - relationships: createRelationshipsObservable() + relationships: createRelationshipsObservable(), + uuid: 'item-uuid', }); const mockVersion: Version = Object.assign(new Version(), { @@ -40,7 +41,7 @@ describe('VersionPageComponent', () => { }); TestBed.configureTestingModule({ declarations: [VersionPageComponent], - imports: [RouterTestingModule], + imports: [RouterTestingModule.withRoutes([])], providers: [ { provide: ActivatedRoute, useValue: mockRoute }, { provide: VersionDataService, useValue: {} }, diff --git a/src/app/item-page/version-page/version-page/version-page.component.ts b/src/app/item-page/version-page/version-page/version-page.component.ts index 99d11af1d5..0a2021e06d 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.ts @@ -3,7 +3,7 @@ import { Observable } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { ActivatedRoute, Router } from '@angular/router'; import { AuthService } from '../../../core/auth/auth.service'; -import { map, switchMap, tap } from 'rxjs/operators'; +import { map, switchMap } from 'rxjs/operators'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, redirectOn4xx } from '../../../core/shared/operators'; import { VersionDataService } from '../../../core/data/version-data.service'; import { Version } from '../../../core/shared/version.model'; @@ -32,7 +32,6 @@ export class VersionPageComponent implements OnInit { ngOnInit(): void { /* Retrieve version from resolver or redirect on 4xx */ this.versionRD$ = this.route.data.pipe( - tap( (data) => { console.log(JSON.stringify(data)); } ), map((data) => data.dso as RemoteData), redirectOn4xx(this.router, this.authService), ); From c816b97525b24e7ec51e90e363c50c45127bd4a9 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 21 Sep 2021 19:42:43 +0200 Subject: [PATCH 054/161] [CST-4499] Version history - Old tests fixed --- .../version-page/version-page.component.spec.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts index f30bfe4ba7..aedf0aa549 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -11,6 +11,7 @@ import { VersionDataService } from '../../../core/data/version-data.service'; import { AuthService } from '../../../core/auth/auth.service'; import { Version } from '../../../core/shared/version.model'; import { RouterTestingModule } from '@angular/router/testing'; +import { Component } from '@angular/core'; const mockItem: Item = Object.assign(new Item(), { bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])), @@ -24,6 +25,9 @@ const mockVersion: Version = Object.assign(new Version(), { version: 1, }); +@Component({ template: '' }) +class DummyComponent { +} describe('VersionPageComponent', () => { let component: VersionPageComponent; @@ -40,8 +44,8 @@ describe('VersionPageComponent', () => { setRedirectUrl: {} }); TestBed.configureTestingModule({ - declarations: [VersionPageComponent], - imports: [RouterTestingModule.withRoutes([])], + declarations: [VersionPageComponent, DummyComponent], + imports: [RouterTestingModule.withRoutes([{ path: 'items/item-uuid', component: DummyComponent, pathMatch: 'full' }])], providers: [ { provide: ActivatedRoute, useValue: mockRoute }, { provide: VersionDataService, useValue: {} }, From 5a136f8865a99b9a5341f8a3c8bc237cae08afd5 Mon Sep 17 00:00:00 2001 From: Alessandro Martelli Date: Wed, 22 Sep 2021 11:35:59 +0200 Subject: [PATCH 055/161] [DSC-227] Reload of My Dspace results is broken --- ...stable-object-component-loader.component.spec.ts | 13 +++++++++---- .../listable-object-component-loader.component.ts | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts index 458272c606..f99ec550f1 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts @@ -48,6 +48,7 @@ describe('ListableObjectComponentLoaderComponent', () => { comp.viewMode = testViewMode; comp.context = testContext; spyOn(comp, 'getComponent').and.returnValue(ItemListElementComponent as any); + spyOn(comp as any, 'connectInputsAndOutputs').and.callThrough(); fixture.detectChanges(); })); @@ -56,6 +57,10 @@ describe('ListableObjectComponentLoaderComponent', () => { it('should call the getListableObjectComponent function with the right types, view mode and context', () => { expect(comp.getComponent).toHaveBeenCalledWith([testType], testViewMode, testContext); }); + + it('should connectInputsAndOutputs of loaded component', () => { + expect((comp as any).connectInputsAndOutputs).toHaveBeenCalled(); + }); }); describe('when the object is an item and viewMode is a list', () => { @@ -121,20 +126,20 @@ describe('ListableObjectComponentLoaderComponent', () => { let reloadedObject: any; beforeEach(() => { - spyOn((comp as any), 'connectInputsAndOutputs').and.returnValue(null); + spyOn((comp as any), 'instantiateComponent').and.returnValue(null); spyOn((comp as any).contentChange, 'emit').and.returnValue(null); listableComponent = fixture.debugElement.query(By.css('ds-item-list-element')).componentInstance; reloadedObject = 'object'; }); - it('should pass it on connectInputsAndOutputs', fakeAsync(() => { - expect((comp as any).connectInputsAndOutputs).not.toHaveBeenCalled(); + it('should re-instantiate the listable component', fakeAsync(() => { + expect((comp as any).instantiateComponent).not.toHaveBeenCalled(); (listableComponent as any).reloadedObject.emit(reloadedObject); tick(); - expect((comp as any).connectInputsAndOutputs).toHaveBeenCalled(); + expect((comp as any).instantiateComponent).toHaveBeenCalledWith(reloadedObject); })); it('should re-emit it as a contentChange', fakeAsync(() => { diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts index 4c6206cb43..67778b0aa6 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts @@ -184,7 +184,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges if (reloadedObject) { this.compRef.destroy(); this.object = reloadedObject; - this.connectInputsAndOutputs(); + this.instantiateComponent(reloadedObject); this.contentChange.emit(reloadedObject); } }); From 2d638a738e9951ade099e54d537a2e99e5989b79 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 22 Sep 2021 11:51:05 +0200 Subject: [PATCH 056/161] 83628: Dynamic theme fixes --- src/app/app.component.ts | 28 +- .../theme-support/theme.effects.spec.ts | 260 ------------------ src/app/shared/theme-support/theme.effects.ts | 152 +--------- src/app/shared/theme-support/theme.service.ts | 177 +++++++++++- 4 files changed, 200 insertions(+), 417 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 356025da9e..d3668fad5a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,4 @@ -import { delay, distinctUntilChanged, filter, take, withLatestFrom } from 'rxjs/operators'; +import { delay, distinctUntilChanged, filter, switchMap, take, withLatestFrom } from 'rxjs/operators'; import { AfterViewInit, ChangeDetectionStrategy, @@ -9,7 +9,14 @@ import { Optional, PLATFORM_ID, } from '@angular/core'; -import { NavigationCancel, NavigationEnd, NavigationStart, Router } from '@angular/router'; +import { + ActivatedRouteSnapshot, + NavigationCancel, + NavigationEnd, + NavigationStart, + Router, + RoutesRecognized +} from '@angular/router'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { select, Store } from '@ngrx/store'; @@ -71,6 +78,7 @@ export class AppComponent implements OnInit, AfterViewInit { */ isThemeLoading$: BehaviorSubject = new BehaviorSubject(false); + isThemeCSSLoading$: BehaviorSubject = new BehaviorSubject(false); /** * Whether or not the idle modal is is currently open @@ -106,6 +114,7 @@ export class AppComponent implements OnInit, AfterViewInit { if (isPlatformBrowser(this.platformId)) { // the theme css will never download server side, so this should only happen on the browser this.isThemeLoading$.next(true); + this.isThemeCSSLoading$.next(true); } if (hasValue(themeName)) { this.setThemeCss(themeName); @@ -184,6 +193,19 @@ export class AppComponent implements OnInit, AfterViewInit { ).subscribe((event) => { if (event instanceof NavigationStart) { this.isRouteLoading$.next(true); + } else if (event instanceof RoutesRecognized) { + const activatedRouteSnapShot: ActivatedRouteSnapshot = event.state.root; + this.themeService.updateThemeOnRouteChange$(event.urlAfterRedirects, activatedRouteSnapShot).pipe( + switchMap((changed) => { + if (changed) { + return this.isThemeCSSLoading$; + } else { + return [false]; + } + }) + ).subscribe((changed) => { + this.isThemeLoading$.next(changed); + }); } else if ( event instanceof NavigationEnd || event instanceof NavigationCancel @@ -237,7 +259,7 @@ export class AppComponent implements OnInit, AfterViewInit { }); } // the fact that this callback is used, proves we're on the browser. - this.isThemeLoading$.next(false); + this.isThemeCSSLoading$.next(false); }; head.appendChild(link); } diff --git a/src/app/shared/theme-support/theme.effects.spec.ts b/src/app/shared/theme-support/theme.effects.spec.ts index 7a0e9c8f19..43727df8d6 100644 --- a/src/app/shared/theme-support/theme.effects.spec.ts +++ b/src/app/shared/theme-support/theme.effects.spec.ts @@ -1,75 +1,17 @@ import { ThemeEffects } from './theme.effects'; -import { of as observableOf } from 'rxjs'; import { TestBed } from '@angular/core/testing'; import { provideMockActions } from '@ngrx/effects/testing'; -import { LinkService } from '../../core/cache/builders/link.service'; import { cold, hot } from 'jasmine-marbles'; import { ROOT_EFFECTS_INIT } from '@ngrx/effects'; import { SetThemeAction } from './theme.actions'; -import { Theme } from '../../../config/theme.model'; import { provideMockStore } from '@ngrx/store/testing'; -import { ROUTER_NAVIGATED } from '@ngrx/router-store'; -import { ResolverActionTypes } from '../../core/resolving/resolver.actions'; -import { Community } from '../../core/shared/community.model'; -import { COMMUNITY } from '../../core/shared/community.resource-type'; -import { NoOpAction } from '../ngrx/no-op.action'; -import { ITEM } from '../../core/shared/item.resource-type'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { Item } from '../../core/shared/item.model'; -import { Collection } from '../../core/shared/collection.model'; -import { COLLECTION } from '../../core/shared/collection.resource-type'; -import { - createNoContentRemoteDataObject$, - createSuccessfulRemoteDataObject$ -} from '../remote-data.utils'; import { BASE_THEME_NAME } from './theme.constants'; -/** - * LinkService able to mock recursively resolving DSO parent links - * Every time resolveLinkWithoutAttaching is called, it returns the next object in the array of ancestorDSOs until - * none are left, after which it returns a no-content remote-date - */ -class MockLinkService { - index = -1; - - constructor(private ancestorDSOs: DSpaceObject[]) { - } - - resolveLinkWithoutAttaching() { - if (this.index >= this.ancestorDSOs.length - 1) { - return createNoContentRemoteDataObject$(); - } else { - this.index++; - return createSuccessfulRemoteDataObject$(this.ancestorDSOs[this.index]); - } - } -} - describe('ThemeEffects', () => { let themeEffects: ThemeEffects; - let linkService: LinkService; let initialState; - let ancestorDSOs: DSpaceObject[]; - function init() { - ancestorDSOs = [ - Object.assign(new Collection(), { - type: COLLECTION.value, - uuid: 'collection-uuid', - _links: { owningCommunity: { href: 'owning-community-link' } } - }), - Object.assign(new Community(), { - type: COMMUNITY.value, - uuid: 'sub-community-uuid', - _links: { parentCommunity: { href: 'parent-community-link' } } - }), - Object.assign(new Community(), { - type: COMMUNITY.value, - uuid: 'top-community-uuid', - }), - ]; - linkService = new MockLinkService(ancestorDSOs) as any; initialState = { theme: { currentTheme: 'custom', @@ -82,7 +24,6 @@ describe('ThemeEffects', () => { TestBed.configureTestingModule({ providers: [ ThemeEffects, - { provide: LinkService, useValue: linkService }, provideMockStore({ initialState }), provideMockActions(() => mockActions) ] @@ -110,205 +51,4 @@ describe('ThemeEffects', () => { expect(themeEffects.initTheme$).toBeObservable(expected); }); }); - - describe('updateThemeOnRouteChange$', () => { - const url = '/test/route'; - const dso = Object.assign(new Community(), { - type: COMMUNITY.value, - uuid: '0958c910-2037-42a9-81c7-dca80e3892b4', - }); - - function spyOnPrivateMethods() { - spyOn((themeEffects as any), 'getAncestorDSOs').and.returnValue(() => observableOf([dso])); - spyOn((themeEffects as any), 'matchThemeToDSOs').and.returnValue(new Theme({ name: 'custom' })); - spyOn((themeEffects as any), 'getActionForMatch').and.returnValue(new SetThemeAction('custom')); - } - - describe('when a resolved action is present', () => { - beforeEach(() => { - setupEffectsWithActions( - hot('--ab-', { - a: { - type: ROUTER_NAVIGATED, - payload: { routerState: { url } }, - }, - b: { - type: ResolverActionTypes.RESOLVED, - payload: { url, dso }, - } - }) - ); - spyOnPrivateMethods(); - }); - - it('should set the theme it receives from the DSO', () => { - const expected = cold('--b-', { - b: new SetThemeAction('custom') - }); - - expect(themeEffects.updateThemeOnRouteChange$).toBeObservable(expected); - }); - }); - - describe('when no resolved action is present', () => { - beforeEach(() => { - setupEffectsWithActions( - hot('--a-', { - a: { - type: ROUTER_NAVIGATED, - payload: { routerState: { url } }, - }, - }) - ); - spyOnPrivateMethods(); - }); - - it('should set the theme it receives from the route url', () => { - const expected = cold('--b-', { - b: new SetThemeAction('custom') - }); - - expect(themeEffects.updateThemeOnRouteChange$).toBeObservable(expected); - }); - }); - - describe('when no themes are present', () => { - beforeEach(() => { - setupEffectsWithActions( - hot('--a-', { - a: { - type: ROUTER_NAVIGATED, - payload: { routerState: { url } }, - }, - }) - ); - (themeEffects as any).themes = []; - }); - - it('should return an empty action', () => { - const expected = cold('--b-', { - b: new NoOpAction() - }); - - expect(themeEffects.updateThemeOnRouteChange$).toBeObservable(expected); - }); - }); - }); - - describe('private functions', () => { - beforeEach(() => { - setupEffectsWithActions(hot('-', {})); - }); - - describe('getActionForMatch', () => { - it('should return a SET action if the new theme differs from the current theme', () => { - const theme = new Theme({ name: 'new-theme' }); - expect((themeEffects as any).getActionForMatch(theme, 'old-theme')).toEqual(new SetThemeAction('new-theme')); - }); - - it('should return an empty action if the new theme equals the current theme', () => { - const theme = new Theme({ name: 'old-theme' }); - expect((themeEffects as any).getActionForMatch(theme, 'old-theme')).toEqual(new NoOpAction()); - }); - }); - - describe('matchThemeToDSOs', () => { - let themes: Theme[]; - let nonMatchingTheme: Theme; - let itemMatchingTheme: Theme; - let communityMatchingTheme: Theme; - let dsos: DSpaceObject[]; - - beforeEach(() => { - nonMatchingTheme = Object.assign(new Theme({ name: 'non-matching-theme' }), { - matches: () => false - }); - itemMatchingTheme = Object.assign(new Theme({ name: 'item-matching-theme' }), { - matches: (url, dso) => (dso as any).type === ITEM.value - }); - communityMatchingTheme = Object.assign(new Theme({ name: 'community-matching-theme' }), { - matches: (url, dso) => (dso as any).type === COMMUNITY.value - }); - dsos = [ - Object.assign(new Item(), { - type: ITEM.value, - uuid: 'item-uuid', - }), - Object.assign(new Collection(), { - type: COLLECTION.value, - uuid: 'collection-uuid', - }), - Object.assign(new Community(), { - type: COMMUNITY.value, - uuid: 'community-uuid', - }), - ]; - }); - - describe('when no themes match any of the DSOs', () => { - beforeEach(() => { - themes = [ nonMatchingTheme ]; - themeEffects.themes = themes; - }); - - it('should return undefined', () => { - expect((themeEffects as any).matchThemeToDSOs(dsos, '')).toBeUndefined(); - }); - }); - - describe('when one of the themes match a DSOs', () => { - beforeEach(() => { - themes = [ nonMatchingTheme, itemMatchingTheme ]; - themeEffects.themes = themes; - }); - - it('should return the matching theme', () => { - expect((themeEffects as any).matchThemeToDSOs(dsos, '')).toEqual(itemMatchingTheme); - }); - }); - - describe('when multiple themes match some of the DSOs', () => { - it('should return the first matching theme', () => { - themes = [ nonMatchingTheme, itemMatchingTheme, communityMatchingTheme ]; - themeEffects.themes = themes; - expect((themeEffects as any).matchThemeToDSOs(dsos, '')).toEqual(itemMatchingTheme); - - themes = [ nonMatchingTheme, communityMatchingTheme, itemMatchingTheme ]; - themeEffects.themes = themes; - expect((themeEffects as any).matchThemeToDSOs(dsos, '')).toEqual(communityMatchingTheme); - }); - }); - }); - - describe('getAncestorDSOs', () => { - it('should return an array of the provided DSO and its ancestors', (done) => { - const dso = Object.assign(new Item(), { - type: ITEM.value, - uuid: 'item-uuid', - _links: { owningCollection: { href: 'owning-collection-link' } }, - }); - - observableOf(dso).pipe( - (themeEffects as any).getAncestorDSOs() - ).subscribe((result) => { - expect(result).toEqual([dso, ...ancestorDSOs]); - done(); - }); - }); - - it('should return an array of just the provided DSO if it doesn\'t have any parents', (done) => { - const dso = { - type: ITEM.value, - uuid: 'item-uuid', - }; - - observableOf(dso).pipe( - (themeEffects as any).getAncestorDSOs() - ).subscribe((result) => { - expect(result).toEqual([dso]); - done(); - }); - }); - }); - }); }); diff --git a/src/app/shared/theme-support/theme.effects.ts b/src/app/shared/theme-support/theme.effects.ts index 894cfeca75..e120257728 100644 --- a/src/app/shared/theme-support/theme.effects.ts +++ b/src/app/shared/theme-support/theme.effects.ts @@ -1,22 +1,9 @@ import { Injectable } from '@angular/core'; import { createEffect, Actions, ofType, ROOT_EFFECTS_INIT } from '@ngrx/effects'; -import { ROUTER_NAVIGATED, RouterNavigatedAction } from '@ngrx/router-store'; -import { map, withLatestFrom, expand, switchMap, toArray, startWith, filter } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { SetThemeAction } from './theme.actions'; import { environment } from '../../../environments/environment'; -import { ThemeConfig, themeFactory, Theme, } from '../../../config/theme.model'; -import { hasValue, isNotEmpty, hasNoValue } from '../empty.util'; -import { NoOpAction } from '../ngrx/no-op.action'; -import { Store, select } from '@ngrx/store'; -import { ThemeState } from './theme.reducer'; -import { currentThemeSelector } from './theme.service'; -import { of as observableOf, EMPTY, Observable } from 'rxjs'; -import { ResolverActionTypes, ResolvedAction } from '../../core/resolving/resolver.actions'; -import { followLink } from '../utils/follow-link-config.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { LinkService } from '../../core/cache/builders/link.service'; +import { hasValue, hasNoValue } from '../empty.util'; import { BASE_THEME_NAME } from './theme.constants'; export const DEFAULT_THEME_CONFIG = environment.themes.find((themeConfig: any) => @@ -27,16 +14,6 @@ export const DEFAULT_THEME_CONFIG = environment.themes.find((themeConfig: any) = @Injectable() export class ThemeEffects { - /** - * The list of configured themes - */ - themes: Theme[]; - - /** - * True if at least one theme depends on the route - */ - hasDynamicTheme: boolean; - /** * Initialize with a theme that doesn't depend on the route. */ @@ -53,133 +30,8 @@ export class ThemeEffects { ) ); - /** - * An effect that fires when a route change completes, - * and determines whether or not the theme should change - */ - updateThemeOnRouteChange$ = createEffect(() => this.actions$.pipe( - // Listen for when a route change ends - ofType(ROUTER_NAVIGATED), - withLatestFrom( - // Pull in the latest resolved action, or undefined if none was dispatched yet - this.actions$.pipe(ofType(ResolverActionTypes.RESOLVED), startWith(undefined)), - // and the current theme from the store - this.store.pipe(select(currentThemeSelector)) - ), - switchMap(([navigatedAction, resolvedAction, currentTheme]: [RouterNavigatedAction, ResolvedAction, string]) => { - if (this.hasDynamicTheme === true && isNotEmpty(this.themes)) { - const currentRouteUrl = navigatedAction.payload.routerState.url; - // If resolvedAction exists, and deals with the current url - if (hasValue(resolvedAction) && resolvedAction.payload.url === currentRouteUrl) { - // Start with the resolved dso and go recursively through its parents until you reach the top-level community - return observableOf(resolvedAction.payload.dso).pipe( - this.getAncestorDSOs(), - map((dsos: DSpaceObject[]) => { - const dsoMatch = this.matchThemeToDSOs(dsos, currentRouteUrl); - return this.getActionForMatch(dsoMatch, currentTheme); - }) - ); - } - - // check whether the route itself matches - const routeMatch = this.themes.find((theme: Theme) => theme.matches(currentRouteUrl, undefined)); - - return [this.getActionForMatch(routeMatch, currentTheme)]; - } - - // If there are no themes configured, do nothing - return [new NoOpAction()]; - }) - ) - ); - - /** - * return the action to dispatch based on the given matching theme - * - * @param newTheme The theme to create an action for - * @param currentThemeName The name of the currently active theme - * @private - */ - private getActionForMatch(newTheme: Theme, currentThemeName: string): SetThemeAction | NoOpAction { - if (hasValue(newTheme) && newTheme.config.name !== currentThemeName) { - // If we have a match, and it isn't already the active theme, set it as the new theme - return new SetThemeAction(newTheme.config.name); - } else { - // Otherwise, do nothing - return new NoOpAction(); - } - } - - /** - * Check the given DSpaceObjects in order to see if they match the configured themes in order. - * If a match is found, the matching theme is returned - * - * @param dsos The DSpaceObjects to check - * @param currentRouteUrl The url for the current route - * @private - */ - private matchThemeToDSOs(dsos: DSpaceObject[], currentRouteUrl: string): Theme { - // iterate over the themes in order, and return the first one that matches - return this.themes.find((theme: Theme) => { - // iterate over the dsos's in order (most specific one first, so Item, Collection, - // Community), and return the first one that matches the current theme - const match = dsos.find((dso: DSpaceObject) => theme.matches(currentRouteUrl, dso)); - return hasValue(match); - }); - - } - - /** - * An rxjs operator that will return an array of all the ancestors of the DSpaceObject used as - * input. The initial DSpaceObject will be the first element of the output array, followed by - * its parent, its grandparent etc - * - * @private - */ - private getAncestorDSOs() { - return (source: Observable): Observable => - source.pipe( - expand((dso: DSpaceObject) => { - // Check if the dso exists and has a parent link - if (hasValue(dso) && typeof (dso as any).getParentLinkKey === 'function') { - const linkName = (dso as any).getParentLinkKey(); - // If it does, retrieve it. - return this.linkService.resolveLinkWithoutAttaching(dso, followLink(linkName)).pipe( - getFirstCompletedRemoteData(), - map((rd: RemoteData) => { - if (hasValue(rd.payload)) { - // If there's a parent, use it for the next iteration - return rd.payload; - } else { - // If there's no parent, or an error, return null, which will stop recursion - // in the next iteration - return null; - } - }), - ); - } - - // The current dso has no value, or no parent. Return EMPTY to stop recursion - return EMPTY; - }), - // only allow through DSOs that have a value - filter((dso: DSpaceObject) => hasValue(dso)), - // Wait for recursion to complete, and emit all results at once, in an array - toArray() - ); - } - constructor( private actions$: Actions, - private store: Store, - private linkService: LinkService, ) { - // Create objects from the theme configs in the environment file - this.themes = environment.themes.map((themeConfig: ThemeConfig) => themeFactory(themeConfig)); - this.hasDynamicTheme = environment.themes.some((themeConfig: any) => - hasValue(themeConfig.regex) || - hasValue(themeConfig.handle) || - hasValue(themeConfig.uuid) - ); } } diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts index 7b0af93e04..f351f320d7 100644 --- a/src/app/shared/theme-support/theme.service.ts +++ b/src/app/shared/theme-support/theme.service.ts @@ -1,10 +1,27 @@ import { Injectable } from '@angular/core'; -import { Store, createFeatureSelector, createSelector, select } from '@ngrx/store'; +import { Store, createFeatureSelector, createSelector, select, Action } from '@ngrx/store'; import { Observable } from 'rxjs/internal/Observable'; import { ThemeState } from './theme.reducer'; -import { SetThemeAction } from './theme.actions'; -import { take } from 'rxjs/operators'; -import { hasValue } from '../empty.util'; +import { SetThemeAction, ThemeActionTypes } from './theme.actions'; +import { expand, filter, map, startWith, switchMap, take, toArray } from 'rxjs/operators'; +import { hasValue, isNotEmpty } from '../empty.util'; +import { Actions, ofType } from '@ngrx/effects'; +import { ResolvedAction, ResolverActionTypes } from '../../core/resolving/resolver.actions'; +import { RemoteData } from '../../core/data/remote-data'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload +} from '../../core/shared/operators'; +import { combineLatest as observableCombineLatest, EMPTY, of as observableOf } from 'rxjs'; +import { Theme, ThemeConfig, themeFactory } from '../../../config/theme.model'; +import { NO_OP_ACTION_TYPE, NoOpAction } from '../ngrx/no-op.action'; +import { followLink } from '../utils/follow-link-config.model'; +import { LinkService } from '../../core/cache/builders/link.service'; +import { environment } from '../../../environments/environment'; +import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; +import { ActivatedRouteSnapshot } from '@angular/router'; export const themeStateSelector = createFeatureSelector('theme'); @@ -17,9 +34,29 @@ export const currentThemeSelector = createSelector( providedIn: 'root' }) export class ThemeService { + /** + * The list of configured themes + */ + themes: Theme[]; + + /** + * True if at least one theme depends on the route + */ + hasDynamicTheme: boolean; + constructor( private store: Store, + private actions$: Actions, + private linkService: LinkService, + private dSpaceObjectDataService: DSpaceObjectDataService, ) { + // Create objects from the theme configs in the environment file + this.themes = environment.themes.map((themeConfig: ThemeConfig) => themeFactory(themeConfig)); + this.hasDynamicTheme = environment.themes.some((themeConfig: any) => + hasValue(themeConfig.regex) || + hasValue(themeConfig.handle) || + hasValue(themeConfig.uuid) + ); } setTheme(newName: string) { @@ -43,4 +80,136 @@ export class ThemeService { ); } + updateThemeOnRouteChange$(currentRouteUrl: string, activatedRouteSnapshot: ActivatedRouteSnapshot): Observable { + // and the current theme from the store + const currentTheme$: Observable = this.store.pipe(select(currentThemeSelector)); + + const action$ = currentTheme$.pipe( + switchMap((currentTheme: string) => { + if (this.hasDynamicTheme === true && isNotEmpty(this.themes)) { + if (hasValue(activatedRouteSnapshot) && hasValue(activatedRouteSnapshot.data) && hasValue(activatedRouteSnapshot.data.dso)) { + const dsoRD: RemoteData = activatedRouteSnapshot.data.dso; + if (dsoRD.hasSucceeded) { + // Start with the resolved dso and go recursively through its parents until you reach the top-level community + return observableOf(dsoRD.payload).pipe( + this.getAncestorDSOs(), + map((dsos: DSpaceObject[]) => { + const dsoMatch = this.matchThemeToDSOs(dsos, currentRouteUrl); + return this.getActionForMatch(dsoMatch, currentTheme); + }) + ); + } + } + if (hasValue(activatedRouteSnapshot.queryParams) && hasValue(activatedRouteSnapshot.queryParams.scope)) { + const dsoFromScope$: Observable> = this.dSpaceObjectDataService.findById(activatedRouteSnapshot.queryParams.scope); + // Start with the resolved dso and go recursively through its parents until you reach the top-level community + return dsoFromScope$.pipe( + getFirstSucceededRemoteData(), + getRemoteDataPayload(), + this.getAncestorDSOs(), + map((dsos: DSpaceObject[]) => { + const dsoMatch = this.matchThemeToDSOs(dsos, currentRouteUrl); + return this.getActionForMatch(dsoMatch, currentTheme); + }) + ); + } + + // check whether the route itself matches + const routeMatch = this.themes.find((theme: Theme) => theme.matches(currentRouteUrl, undefined)); + + return [this.getActionForMatch(routeMatch, currentTheme)]; + } + + // If there are no themes configured, do nothing + return [new NoOpAction()]; + }), + ); + + action$.pipe( + take(1), + filter((action) => action.type !== NO_OP_ACTION_TYPE), + ).subscribe((action) => { + this.store.dispatch(action); + }); + + return action$.pipe( + map((action) => action.type === ThemeActionTypes.SET), + ); + } + + /** + * An rxjs operator that will return an array of all the ancestors of the DSpaceObject used as + * input. The initial DSpaceObject will be the first element of the output array, followed by + * its parent, its grandparent etc + * + * @private + */ + private getAncestorDSOs() { + return (source: Observable): Observable => + source.pipe( + expand((dso: DSpaceObject) => { + // Check if the dso exists and has a parent link + if (hasValue(dso) && typeof (dso as any).getParentLinkKey === 'function') { + const linkName = (dso as any).getParentLinkKey(); + // If it does, retrieve it. + return this.linkService.resolveLinkWithoutAttaching(dso, followLink(linkName)).pipe( + getFirstCompletedRemoteData(), + map((rd: RemoteData) => { + if (hasValue(rd.payload)) { + // If there's a parent, use it for the next iteration + return rd.payload; + } else { + // If there's no parent, or an error, return null, which will stop recursion + // in the next iteration + return null; + } + }), + ); + } + + // The current dso has no value, or no parent. Return EMPTY to stop recursion + return EMPTY; + }), + // only allow through DSOs that have a value + filter((dso: DSpaceObject) => hasValue(dso)), + // Wait for recursion to complete, and emit all results at once, in an array + toArray() + ); + } + + /** + * return the action to dispatch based on the given matching theme + * + * @param newTheme The theme to create an action for + * @param currentThemeName The name of the currently active theme + * @private + */ + private getActionForMatch(newTheme: Theme, currentThemeName: string): SetThemeAction | NoOpAction { + if (hasValue(newTheme) && newTheme.config.name !== currentThemeName) { + // If we have a match, and it isn't already the active theme, set it as the new theme + return new SetThemeAction(newTheme.config.name); + } else { + // Otherwise, do nothing + return new NoOpAction(); + } + } + + /** + * Check the given DSpaceObjects in order to see if they match the configured themes in order. + * If a match is found, the matching theme is returned + * + * @param dsos The DSpaceObjects to check + * @param currentRouteUrl The url for the current route + * @private + */ + private matchThemeToDSOs(dsos: DSpaceObject[], currentRouteUrl: string): Theme { + // iterate over the themes in order, and return the first one that matches + return this.themes.find((theme: Theme) => { + // iterate over the dsos's in order (most specific one first, so Item, Collection, + // Community), and return the first one that matches the current theme + const match = dsos.find((dso: DSpaceObject) => theme.matches(currentRouteUrl, dso)); + return hasValue(match); + }); + } + } From 225a5640e55d5bb8475188635e4fae26ea3c1371 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 22 Sep 2021 17:20:04 +0200 Subject: [PATCH 057/161] [CST-4591] Add methods to retrieve collections by entity type --- .../core/data/collection-data.service.spec.ts | 2 +- src/app/core/data/collection-data.service.ts | 75 +++++++++++++++++-- 2 files changed, 68 insertions(+), 9 deletions(-) diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts index 00aede27a6..031e5ecf47 100644 --- a/src/app/core/data/collection-data.service.spec.ts +++ b/src/app/core/data/collection-data.service.spec.ts @@ -17,7 +17,7 @@ import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ -} from 'src/app/shared/remote-data.utils'; +} from '../../shared/remote-data.utils'; import { cold, getTestScheduler, hot } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; import { Observable } from 'rxjs'; diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts index f58f36450f..2014394000 100644 --- a/src/app/core/data/collection-data.service.ts +++ b/src/app/core/data/collection-data.service.ts @@ -27,12 +27,7 @@ import { CommunityDataService } from './community-data.service'; import { DSOChangeAnalyzer } from './dso-change-analyzer.service'; import { PaginatedList } from './paginated-list.model'; import { RemoteData } from './remote-data'; -import { - ContentSourceRequest, - FindListOptions, - UpdateContentSourceRequest, - RestRequest -} from './request.models'; +import { ContentSourceRequest, FindListOptions, RestRequest, UpdateContentSourceRequest } from './request.models'; import { RequestService } from './request.service'; import { BitstreamDataService } from './bitstream-data.service'; @@ -84,16 +79,48 @@ export class CollectionDataService extends ComColDataService { filter((collections: RemoteData>) => !collections.isResponsePending)); } + /** + * Get all collections the user is authorized to submit to + * + * @param query limit the returned collection to those with metadata values matching the query terms. + * @param entityType The entity type used to limit the returned collection + * @param options The [[FindListOptions]] object + * @param reRequestOnStale Whether or not the request should automatically be re-requested after + * the response becomes stale + * @param linksToFollow The array of [[FollowLinkConfig]] + * @return Observable>> + * collection list + */ + getAuthorizedCollectionByEntityType( + query: string, + entityType: string, + options: FindListOptions = {}, + reRequestOnStale = true, + ...linksToFollow: FollowLinkConfig[]): Observable>> { + const searchHref = 'findSubmitAuthorizedByEntityType'; + options = Object.assign({}, options, { + searchParams: [ + new RequestParam('query', query), + new RequestParam('entityType', entityType) + ] + }); + + return this.searchBy(searchHref, options, true, reRequestOnStale, ...linksToFollow).pipe( + filter((collections: RemoteData>) => !collections.isResponsePending)); + } + /** * Get all collections the user is authorized to submit to, by community * * @param communityId The community id * @param query limit the returned collection to those with metadata values matching the query terms. * @param options The [[FindListOptions]] object + * @param reRequestOnStale Whether or not the request should automatically be re- + * requested after the response becomes stale * @return Observable>> * collection list */ - getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}): Observable>> { + getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}, reRequestOnStale = true,): Observable>> { const searchHref = 'findSubmitAuthorizedByCommunity'; options = Object.assign({}, options, { searchParams: [ @@ -102,7 +129,38 @@ export class CollectionDataService extends ComColDataService { ] }); - return this.searchBy(searchHref, options).pipe( + return this.searchBy(searchHref, options, reRequestOnStale).pipe( + filter((collections: RemoteData>) => !collections.isResponsePending)); + } + /** + * Get all collections the user is authorized to submit to, by community and has the metadata + * + * @param communityId The community id + * @param entityType The entity type used to limit the returned collection + * @param options The [[FindListOptions]] object + * @param reRequestOnStale Whether or not the request should automatically be re-requested after + * the response becomes stale + * @param linksToFollow The array of [[FollowLinkConfig]] + * @return Observable>> + * collection list + */ + getAuthorizedCollectionByCommunityAndEntityType( + communityId: string, + entityType: string, + options: FindListOptions = {}, + reRequestOnStale = true, + ...linksToFollow: FollowLinkConfig[]): Observable>> { + const searchHref = 'findSubmitAuthorizedByCommunityAndEntityType'; + const searchParams = [ + new RequestParam('uuid', communityId), + new RequestParam('entityType', entityType) + ]; + + options = Object.assign({}, options, { + searchParams: searchParams + }); + + return this.searchBy(searchHref, options, true, reRequestOnStale, ...linksToFollow).pipe( filter((collections: RemoteData>) => !collections.isResponsePending)); } @@ -214,4 +272,5 @@ export class CollectionDataService extends ComColDataService { findOwningCollectionFor(item: Item): Observable> { return this.findByHref(item._links.owningCollection.href); } + } From eaca1ac2286e5ea9ab630053e2e0f21811d07236 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 22 Sep 2021 17:24:28 +0200 Subject: [PATCH 058/161] [CST-4058] Improvements applied in all places --- .../eperson-form/eperson-form.component.html | 10 +++--- .../eperson-form/eperson-form.component.ts | 3 +- .../members-list/members-list.component.html | 33 +++++++++++-------- .../subgroups-list.component.html | 26 ++++++++------- .../subgroup-list/subgroups-list.component.ts | 9 +++-- src/assets/i18n/en.json5 | 8 +++-- 6 files changed, 55 insertions(+), 34 deletions(-) diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html index c613cfdcad..45326c1abc 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html @@ -52,15 +52,17 @@ - - + + + - - + +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.collectionOrCommunity' | translate}}
{{group.id}}{{group.id}}{{group.name}}{{(group.object | async)?.payload?.name}}
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 11c117ef55..b1d0c5bed3 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 @@ -32,6 +32,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { RequestService } from '../../../core/data/request.service'; import { NoContent } from '../../../core/shared/NoContent.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; +import { followLink } from '../../../shared/utils/follow-link-config.model'; @Component({ selector: 'ds-eperson-form', @@ -272,7 +273,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { }), switchMap(([eperson, findListOptions]) => { if (eperson != null) { - return this.groupsDataService.findAllByHref(eperson._links.groups.href, findListOptions); + return this.groupsDataService.findAllByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object')); } return observableOf(undefined); }) 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 e73d1a5e71..e5932edf05 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 @@ -38,17 +38,22 @@ - - - + + + + - - + - + - - - - + + + + - - + - - - - - + + + + - - + - + - - + + + - - + - + - - diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts index d6e3a96d19..35b16fad7c 100644 --- a/src/app/shared/item/item-versions/item-versions.component.spec.ts +++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts @@ -22,6 +22,8 @@ import { NotificationsService } from '../../notifications/notifications.service' import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; +import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; describe('ItemVersionsComponent', () => { let component: ItemVersionsComponent; @@ -29,9 +31,12 @@ describe('ItemVersionsComponent', () => { let authenticationService: AuthService; let authorizationService: AuthorizationDataService; let versionHistoryService: VersionHistoryDataService; + let workspaceItemDataService: WorkspaceitemDataService; + let workflowItemDataService: WorkflowItemDataService; const versionHistory = Object.assign(new VersionHistory(), { - id: '1' + id: '1', + draftVersion: false, }); const version1 = Object.assign(new Version(), { @@ -86,7 +91,7 @@ describe('ItemVersionsComponent', () => { version2.item = createSuccessfulRemoteDataObject$(item2); const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', { - getVersions: createSuccessfulRemoteDataObject$(createPaginatedList(versions)) + getVersions: createSuccessfulRemoteDataObject$(createPaginatedList(versions)), }); const authenticationServiceSpy = jasmine.createSpyObj('authenticationService', { isAuthenticated: observableOf(true), @@ -94,6 +99,12 @@ describe('ItemVersionsComponent', () => { } ); const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']); + const workspaceItemDataServiceSpy = jasmine.createSpyObj('workspaceItemDataService', { + findByItem: of(undefined), + }); + const workflowItemDataServiceSpy = jasmine.createSpyObj('workflowItemDataService', { + findByItem: of(undefined), + }); beforeEach(waitForAsync(() => { @@ -110,6 +121,8 @@ describe('ItemVersionsComponent', () => { {provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy}, {provide: ItemDataService, useValue: {}}, {provide: VersionDataService, useValue: {}}, + {provide: WorkspaceitemDataService, useValue: workspaceItemDataServiceSpy}, + {provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy}, ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); @@ -117,6 +130,8 @@ describe('ItemVersionsComponent', () => { versionHistoryService = TestBed.inject(VersionHistoryDataService); authenticationService = TestBed.inject(AuthService); authorizationService = TestBed.inject(AuthorizationDataService); + workspaceItemDataService = TestBed.inject(WorkspaceitemDataService); + workflowItemDataService = TestBed.inject(WorkflowItemDataService); })); diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index a1367c180a..8ecfc76ae8 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -8,7 +8,7 @@ import { combineLatest as observableCombineLatest, Observable, of, - Subscription + Subscription, } from 'rxjs'; import { VersionHistory } from '../../../core/shared/version-history.model'; import { @@ -47,6 +47,7 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { ItemVersionsSharedService } from './item-versions-shared.service'; import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; +import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; @Component({ selector: 'ds-item-versions', @@ -173,6 +174,7 @@ export class ItemVersionsComponent implements OnInit { private itemVersionShared: ItemVersionsSharedService, private authorizationService: AuthorizationDataService, private workspaceItemDataService: WorkspaceitemDataService, + private workflowItemDataService: WorkflowItemDataService, ) { } @@ -333,19 +335,31 @@ export class ItemVersionsComponent implements OnInit { of(summary), version.item.pipe(getFirstSucceededRemoteDataPayload()) ])), - mergeMap(([summary, item]: [string, Item]) => this.itemVersionShared.createNewVersionAndNotify(item, summary)), - map((newVersionRD: RemoteData) => { + mergeMap(([summary, item]: [string, Item]) => this.versionHistoryService.createVersion(item._links.self.href, summary)), + // show success/failure notification + tap((newVersionRD: RemoteData) => { + this.itemVersionShared.notifyCreateNewVersion(newVersionRD); if (newVersionRD.hasSucceeded) { const versionHistory$ = this.versionService.getHistoryFromVersion$(version).pipe( - tap((res: VersionHistory) => { - this.versionHistoryService.invalidateVersionHistoryCache(res.id); + tap((versionHistory: VersionHistory) => { + this.itemService.invalidateItemCache(this.item.uuid); + this.versionHistoryService.invalidateVersionHistoryCache(versionHistory.id); }), ); this.getAllVersions(versionHistory$); } }), - take(1), - ).subscribe(); + // get workspace item + getFirstSucceededRemoteDataPayload(), + switchMap((newVersion: Version) => this.itemService.findByHref(newVersion._links.item.href)), + getFirstSucceededRemoteDataPayload(), + switchMap((newVersionItem: Item) => this.workspaceItemDataService.findByItem(newVersionItem.uuid, true, false)), + getFirstSucceededRemoteDataPayload(), + ).subscribe((wsItem) => { + const wsiId = wsItem.id; + const route = 'workspaceitems/' + wsiId + '/edit'; + this.router.navigateByUrl(route); + }); } /** @@ -386,7 +400,7 @@ export class ItemVersionsComponent implements OnInit { * Get the ID of the workspace item, if present, otherwise return undefined * @param versionItem the item for which retrieve the workspace item id */ - getDraftId(versionItem): Observable { + getWorkspaceId(versionItem): Observable { return versionItem.pipe( getFirstSucceededRemoteDataPayload(), map((item: Item) => item.uuid), @@ -396,6 +410,20 @@ export class ItemVersionsComponent implements OnInit { ); } + /** + * Get the ID of the workflow item, if present, otherwise return undefined + * @param versionItem the item for which retrieve the workspace item id + */ + getWorkflowId(versionItem): Observable { + return versionItem.pipe( + getFirstSucceededRemoteDataPayload(), + map((item: Item) => item.uuid), + switchMap((itemUuid: string) => this.workflowItemDataService.findByItem(itemUuid, true)), + getFirstCompletedRemoteData(), + map((res: RemoteData) => res?.payload?.id ), + ); + } + /** * redirect to the edit page of the workspace item * @param id$ the id of the workspace item diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index bbaa570e8b..69d115bd2a 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1983,8 +1983,11 @@ "item.version.history.table.workspaceItem": "Workspace item", + "item.version.history.table.workflowItem": "Workflow item", + "item.version.history.table.actions": "Action", + "item.version.history.table.action.editWorkspaceItem": "Edit workspace item", "item.version.history.table.action.editSummary": "Edit summary", From c3dbe00f0bf426ebcb4bd05008d7083dca57ec23 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 15 Oct 2021 15:31:56 -0500 Subject: [PATCH 139/161] Add 'es' to languages. Order alphabetically by label --- src/environments/environment.common.ts | 38 ++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts index f6fd7f1e68..b1cbd699a3 100644 --- a/src/environments/environment.common.ts +++ b/src/environments/environment.common.ts @@ -158,25 +158,17 @@ export const environment: GlobalConfig = { code: 'en', label: 'English', active: true, - }, { - code: 'de', - label: 'Deutsch', - active: true, }, { code: 'cs', label: 'Čeština', active: true, }, { - code: 'nl', - label: 'Nederlands', + code: 'de', + label: 'Deutsch', active: true, - },{ - code: 'pt-BR', - label: 'Português do Brasil', - active: true, - },{ - code: 'pt-PT', - label: 'Português', + }, { + code: 'es', + label: 'Español', active: true, }, { code: 'fr', @@ -186,14 +178,26 @@ export const environment: GlobalConfig = { code: 'lv', label: 'Latviešu', active: true, + }, { + code: 'hu', + label: 'Magyar', + active: true, + }, { + code: 'nl', + label: 'Nederlands', + active: true, + }, { + code: 'pt-PT', + label: 'Português', + active: true, + },{ + code: 'pt-BR', + label: 'Português do Brasil', + active: true, },{ code: 'fi', label: 'Suomi', active: true, - },{ - code: 'hu', - label: 'magyar', - active: true, }], // Browse-By Pages browseBy: { From 3c35c6c8aebe9c0da7de32d8c3b12e8214b19e58 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 27 Aug 2021 17:27:41 -0500 Subject: [PATCH 140/161] Add basic accessibility scan for most public pages. Disable any a11y tests with known issues --- cypress/integration/breadcrumbs.spec.ts | 23 +++++++++++++ cypress/integration/collection-page.spec.ts | 23 +++++++++++++ .../integration/collection-statistics.spec.ts | 32 +++++++++++++++++++ cypress/integration/community-list.spec.ts | 25 +++++++++++++++ cypress/integration/community-page.spec.ts | 23 +++++++++++++ .../integration/community-statistics.spec.ts | 32 +++++++++++++++++++ cypress/integration/footer.spec.ts | 12 +++++++ cypress/integration/header.spec.ts | 18 +++++++++++ .../integration/homepage-statistics.spec.ts | 18 +++++++++++ cypress/integration/homepage.spec.ts | 21 +++++------- cypress/integration/item-page.spec.ts | 30 +++++++++++++---- cypress/integration/item-statistics.spec.ts | 31 ++++++++++++------ cypress/support/index.ts | 5 +++ 13 files changed, 264 insertions(+), 29 deletions(-) create mode 100644 cypress/integration/breadcrumbs.spec.ts create mode 100644 cypress/integration/collection-page.spec.ts create mode 100644 cypress/integration/collection-statistics.spec.ts create mode 100644 cypress/integration/community-list.spec.ts create mode 100644 cypress/integration/community-page.spec.ts create mode 100644 cypress/integration/community-statistics.spec.ts create mode 100644 cypress/integration/footer.spec.ts create mode 100644 cypress/integration/header.spec.ts create mode 100644 cypress/integration/homepage-statistics.spec.ts diff --git a/cypress/integration/breadcrumbs.spec.ts b/cypress/integration/breadcrumbs.spec.ts new file mode 100644 index 0000000000..8fed83bacb --- /dev/null +++ b/cypress/integration/breadcrumbs.spec.ts @@ -0,0 +1,23 @@ +import { Options } from "cypress-axe"; +import { TEST_ENTITY_PUBLICATION } from "cypress/support"; + +describe('Breadcrumbs', () => { + it('should pass accessibility tests', () => { + // Visit an Item, as those have more breadcrumbs + cy.visit('/entities/publication/' + TEST_ENTITY_PUBLICATION); + cy.injectAxe(); + + // Wait for breadcrumbs to be visible + cy.get('ds-breadcrumbs').should('be.visible'); + + // Analyze for accessibility + // Disable color-contrast checks until #1149 is fixed + cy.checkA11y('ds-breadcrumbs', + { + rules: { + 'color-contrast': { enabled: false } + } + } as Options + ); + }); +}); diff --git a/cypress/integration/collection-page.spec.ts b/cypress/integration/collection-page.spec.ts new file mode 100644 index 0000000000..11babe76d2 --- /dev/null +++ b/cypress/integration/collection-page.spec.ts @@ -0,0 +1,23 @@ +import { Options } from "cypress-axe"; +import { TEST_COLLECTION } from "cypress/support"; + +describe('Collection Page', () => { + + it('should pass accessibility tests', () => { + cy.visit('/collections/' + TEST_COLLECTION); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-collection-page').should('exist'); + + // Analyze for accessibility issues + // Disable color-contrast checks until it is fixed (see #1202 and #1178) + cy.checkA11y('ds-collection-page', + { + rules: { + 'color-contrast': { enabled: false } + } + } as Options + ); + }); +}); diff --git a/cypress/integration/collection-statistics.spec.ts b/cypress/integration/collection-statistics.spec.ts new file mode 100644 index 0000000000..c6f6082101 --- /dev/null +++ b/cypress/integration/collection-statistics.spec.ts @@ -0,0 +1,32 @@ +import { TEST_COLLECTION } from "cypress/support"; + +describe('Collection Statistics Page', () => { + const COLLECTIONSTATISTICSPAGE = '/statistics/collections/' + TEST_COLLECTION; + + it('should load if you click on "Statistics" from a Collection page', () => { + cy.visit('/collections/' + TEST_COLLECTION); + cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); + cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE); + }); + + it('should contain a "Total visits" section', () => { + cy.visit(COLLECTIONSTATISTICSPAGE); + cy.get('.' + TEST_COLLECTION + '_TotalVisits').should('exist'); + }); + + it('should contain a "Total visits per month" section', () => { + cy.visit(COLLECTIONSTATISTICSPAGE); + cy.get('.' + TEST_COLLECTION + '_TotalVisitsPerMonth').should('exist'); + }); + + it('should pass accessibility tests', () => { + cy.visit(COLLECTIONSTATISTICSPAGE); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-collection-statistics-page').should('exist'); + + // Analyze for accessibility issues + cy.checkA11y('ds-collection-statistics-page'); + }); +}); diff --git a/cypress/integration/community-list.spec.ts b/cypress/integration/community-list.spec.ts new file mode 100644 index 0000000000..1d6f9ff849 --- /dev/null +++ b/cypress/integration/community-list.spec.ts @@ -0,0 +1,25 @@ +import { Options } from "cypress-axe"; + +describe('Community List Page', () => { + + it('should pass accessibility tests', () => { + cy.visit('/community-list'); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-community-list-page').should('exist'); + + // Open first Community (to show Collections)...that way we scan sub-elements as well + cy.get('ds-community-list :nth-child(1) > .btn-group > .btn').click(); + + // Analyze for accessibility issues + // Disable heading-order checks until it is fixed + cy.checkA11y('ds-community-list-page', + { + rules: { + 'heading-order': { enabled: false } + } + } as Options + ); + }); +}); diff --git a/cypress/integration/community-page.spec.ts b/cypress/integration/community-page.spec.ts new file mode 100644 index 0000000000..60641120a0 --- /dev/null +++ b/cypress/integration/community-page.spec.ts @@ -0,0 +1,23 @@ +import { Options } from "cypress-axe"; +import { TEST_COMMUNITY } from "cypress/support"; + +describe('Community Page', () => { + + it('should pass accessibility tests', () => { + cy.visit('/communities/' + TEST_COMMUNITY); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-community-page').should('exist'); + + // Analyze for accessibility issues + // Disable color-contrast checks until it is fixed (see #1202 and #1178) + cy.checkA11y('ds-community-page', + { + rules: { + 'color-contrast': { enabled: false } + } + } as Options + ); + }); +}); diff --git a/cypress/integration/community-statistics.spec.ts b/cypress/integration/community-statistics.spec.ts new file mode 100644 index 0000000000..555667a96e --- /dev/null +++ b/cypress/integration/community-statistics.spec.ts @@ -0,0 +1,32 @@ +import { TEST_COMMUNITY } from "cypress/support"; + +describe('Community Statistics Page', () => { + const COMMUNITYSTATISTICSPAGE = '/statistics/communities/' + TEST_COMMUNITY; + + it('should load if you click on "Statistics" from a Community page', () => { + cy.visit('/communities/' + TEST_COMMUNITY); + cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); + cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE); + }); + + it('should contain a "Total visits" section', () => { + cy.visit(COMMUNITYSTATISTICSPAGE); + cy.get('.' + TEST_COMMUNITY + '_TotalVisits').should('exist'); + }); + + it('should contain a "Total visits per month" section', () => { + cy.visit(COMMUNITYSTATISTICSPAGE); + cy.get('.' + TEST_COMMUNITY + '_TotalVisitsPerMonth').should('exist'); + }); + + it('should pass accessibility tests', () => { + cy.visit(COMMUNITYSTATISTICSPAGE); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-community-statistics-page').should('exist'); + + // Analyze for accessibility issues + cy.checkA11y('ds-community-statistics-page'); + }); +}); diff --git a/cypress/integration/footer.spec.ts b/cypress/integration/footer.spec.ts new file mode 100644 index 0000000000..25d1ec8c94 --- /dev/null +++ b/cypress/integration/footer.spec.ts @@ -0,0 +1,12 @@ +describe('Footer', () => { + it('should pass accessibility tests', () => { + cy.visit('/'); + cy.injectAxe(); + + // Footer must first be visible + cy.get('ds-footer').should('be.visible'); + + // Analyze for accessibility + cy.checkA11y('ds-footer'); + }); +}); \ No newline at end of file diff --git a/cypress/integration/header.spec.ts b/cypress/integration/header.spec.ts new file mode 100644 index 0000000000..75e1837c36 --- /dev/null +++ b/cypress/integration/header.spec.ts @@ -0,0 +1,18 @@ +describe('Header', () => { + it('should pass accessibility tests', () => { + cy.visit('/'); + cy.injectAxe(); + + // Header must first be visible + cy.get('ds-header').should('be.visible'); + + // Analyze for accessibility + cy.checkA11y({ + include: ['ds-header'], + exclude: [ + ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174 + ['.dropdownLogin'] // "Log in" link has color contrast issues. Will be fixed in #1149 + ], + }); + }); +}); \ No newline at end of file diff --git a/cypress/integration/homepage-statistics.spec.ts b/cypress/integration/homepage-statistics.spec.ts new file mode 100644 index 0000000000..b479d7b300 --- /dev/null +++ b/cypress/integration/homepage-statistics.spec.ts @@ -0,0 +1,18 @@ +describe('Site Statistics Page', () => { + it('should load if you click on "Statistics" from homepage', () => { + cy.visit('/'); + cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); + cy.location('pathname').should('eq', '/statistics'); + }); + + it('should pass accessibility tests', () => { + cy.visit('/statistics'); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-site-statistics-page').should('exist'); + + // Analyze for accessibility issues + cy.checkA11y('ds-site-statistics-page'); + }); +}); diff --git a/cypress/integration/homepage.spec.ts b/cypress/integration/homepage.spec.ts index e6c28156bb..25494d4164 100644 --- a/cypress/integration/homepage.spec.ts +++ b/cypress/integration/homepage.spec.ts @@ -20,18 +20,13 @@ describe('Homepage', () => { cy.url().should('include', 'query=' + encodeURI(queryString)); }); - // it('should pass accessibility tests', () => { - // // first must inject Axe into current page - // cy.injectAxe(); + it('should pass accessibility tests', () => { + cy.injectAxe(); - // // Analyze entire page for accessibility issues - // // NOTE: this test checks accessibility of header/footer as well - // cy.checkA11y({ - // exclude: [ - // ['#klaro'], // Klaro plugin (privacy policy popup) has color contrast issues - // ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174 - // ['.dropdownLogin'] // "Log in" link in header has color contrast issues - // ], - // }); - // }); + // Wait for homepage tag to appear + cy.get('ds-home-page').should('be.visible'); + + // Analyze for accessibility issues + cy.checkA11y('ds-home-page'); + }); }); diff --git a/cypress/integration/item-page.spec.ts b/cypress/integration/item-page.spec.ts index bd91b6506c..2009623dce 100644 --- a/cypress/integration/item-page.spec.ts +++ b/cypress/integration/item-page.spec.ts @@ -1,15 +1,31 @@ -describe('Item Page', () => { - const ITEMPAGE = '/items/e98b0f27-5c19-49a0-960d-eb6ad5287067'; - const ENTITYPAGE = '/entities/publication/e98b0f27-5c19-49a0-960d-eb6ad5287067'; +import { Options } from "cypress-axe"; +import { TEST_ENTITY_PUBLICATION } from "cypress/support"; - it('should contain element ds-item-page when navigating to an item page', () => { - cy.visit(ENTITYPAGE); - cy.get('ds-item-page').should('exist'); - }); +describe('Item Page', () => { + const ITEMPAGE = '/items/' + TEST_ENTITY_PUBLICATION; + const ENTITYPAGE = '/entities/publication/' + TEST_ENTITY_PUBLICATION; // Test that entities will redirect to /entities/[type]/[uuid] when accessed via /items/[uuid] it('should redirect to the entity page when navigating to an item page', () => { cy.visit(ITEMPAGE); cy.location('pathname').should('eq', ENTITYPAGE); }); + + it('should pass accessibility tests', () => { + cy.visit(ENTITYPAGE); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-item-page').should('exist'); + + // Analyze for accessibility issues + // Disable heading-order checks until it is fixed + cy.checkA11y('ds-item-page', + { + rules: { + 'heading-order': { enabled: false } + } + } as Options + ); + }); }); diff --git a/cypress/integration/item-statistics.spec.ts b/cypress/integration/item-statistics.spec.ts index f90195c9fa..1d60a015dc 100644 --- a/cypress/integration/item-statistics.spec.ts +++ b/cypress/integration/item-statistics.spec.ts @@ -1,6 +1,13 @@ +import { TEST_ENTITY_PUBLICATION } from "cypress/support"; + describe('Item Statistics Page', () => { - const ITEMUUID = 'e98b0f27-5c19-49a0-960d-eb6ad5287067'; - const ITEMSTATISTICSPAGE = '/statistics/items/' + ITEMUUID; + const ITEMSTATISTICSPAGE = '/statistics/items/' + TEST_ENTITY_PUBLICATION; + + it('should load if you click on "Statistics" from an Item/Entity page', () => { + cy.visit('/entities/publication/' + TEST_ENTITY_PUBLICATION); + cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click(); + cy.location('pathname').should('eq', ITEMSTATISTICSPAGE); + }); it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => { cy.visit(ITEMSTATISTICSPAGE); @@ -8,18 +15,24 @@ describe('Item Statistics Page', () => { cy.get('ds-item-page').should('not.exist'); }); - it('should contain the item statistics page url when navigating to an item statistics page', () => { - cy.visit(ITEMSTATISTICSPAGE); - cy.location('pathname').should('eq', ITEMSTATISTICSPAGE); - }); - it('should contain a "Total visits" section', () => { cy.visit(ITEMSTATISTICSPAGE); - cy.get('.' + ITEMUUID + '_TotalVisits').should('exist'); + cy.get('.' + TEST_ENTITY_PUBLICATION + '_TotalVisits').should('exist'); }); it('should contain a "Total visits per month" section', () => { cy.visit(ITEMSTATISTICSPAGE); - cy.get('.' + ITEMUUID + '_TotalVisitsPerMonth').should('exist'); + cy.get('.' + TEST_ENTITY_PUBLICATION + '_TotalVisitsPerMonth').should('exist'); + }); + + it('should pass accessibility tests', () => { + cy.visit(ITEMSTATISTICSPAGE); + cy.injectAxe(); + + // tag must be loaded + cy.get('ds-item-statistics-page').should('exist'); + + // Analyze for accessibility issues + cy.checkA11y('ds-item-statistics-page'); }); }); diff --git a/cypress/support/index.ts b/cypress/support/index.ts index a1456bfcd4..479212333a 100644 --- a/cypress/support/index.ts +++ b/cypress/support/index.ts @@ -19,3 +19,8 @@ // Import Cypress Axe tools for all tests // https://github.com/component-driven/cypress-axe import 'cypress-axe'; + +// Global constants used in tests +export const TEST_COLLECTION = '282164f5-d325-4740-8dd1-fa4d6d3e7200'; +export const TEST_COMMUNITY = '0958c910-2037-42a9-81c7-dca80e3892b4'; +export const TEST_ENTITY_PUBLICATION = 'e98b0f27-5c19-49a0-960d-eb6ad5287067'; \ No newline at end of file From fad74a4ca28fe5ff5ce1b6ca507f6ad386ca068e Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Mon, 13 Sep 2021 17:11:31 -0500 Subject: [PATCH 141/161] Upgrade Cypress --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 66ef13f471..87fdcb51f0 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "copy-webpack-plugin": "^6.4.1", "css-loader": "3.4.0", "cssnano": "^4.1.10", - "cypress": "8.3.1", + "cypress": "8.4.0", "cypress-axe": "^0.13.0", "deep-freeze": "0.0.1", "dotenv": "^8.2.0", diff --git a/yarn.lock b/yarn.lock index 40658e305f..5d6ba9f67f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4153,10 +4153,10 @@ cypress-axe@^0.13.0: resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.13.0.tgz#3234e1a79a27701f2451fcf2f333eb74204c7966" integrity sha512-fCIy7RiDCm7t30U3C99gGwQrUO307EYE1QqXNaf9ToK4DVqW8y5on+0a/kUHMrHdlls2rENF6TN9ZPpPpwLrnw== -cypress@8.3.1: - version "8.3.1" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.1.tgz#c6760dbb907df2570b0e1ac235fa31c30f9260a6" - integrity sha512-1v6pfx+/5cXhaT5T6QKOvnkawmEHWHLiVzm3MYMoQN1fkX2Ma1C32STd3jBStE9qT5qPSTILjGzypVRxCBi40g== +cypress@8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.4.0.tgz#09ec06a73f1cb10121c103cba15076e659e24876" + integrity sha512-RtVgGFR06ikyMaq/VqapeqOjGaIA42PpK7F0qe1MCiFArfUuJECsLmeYaOA+1TlmNUgJNMSF5fWKkZIJr5Uc7w== dependencies: "@cypress/request" "^2.88.6" "@cypress/xvfb" "^1.2.4" From 4faa850fbaced4405793f376c7970bbbca0d1246 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Mon, 13 Sep 2021 17:11:53 -0500 Subject: [PATCH 142/161] Add logging for violations & testA11y() in utils.ts. Use that method everywhere else --- cypress/integration/breadcrumbs.spec.ts | 14 ++---- cypress/integration/collection-page.spec.ts | 14 ++---- .../integration/collection-statistics.spec.ts | 6 +-- cypress/integration/community-list.spec.ts | 6 +-- cypress/integration/community-page.spec.ts | 14 ++---- .../integration/community-statistics.spec.ts | 6 +-- cypress/integration/footer.spec.ts | 7 +-- cypress/integration/header.spec.ts | 7 +-- .../integration/homepage-statistics.spec.ts | 5 ++- cypress/integration/homepage.spec.ts | 6 +-- cypress/integration/item-page.spec.ts | 8 ++-- cypress/integration/item-statistics.spec.ts | 6 +-- cypress/plugins/index.ts | 17 +++++-- cypress/support/index.ts | 2 +- cypress/support/utils.ts | 44 +++++++++++++++++++ cypress/tsconfig.json | 3 +- 16 files changed, 100 insertions(+), 65 deletions(-) create mode 100644 cypress/support/utils.ts diff --git a/cypress/integration/breadcrumbs.spec.ts b/cypress/integration/breadcrumbs.spec.ts index 8fed83bacb..62b9a8ad1d 100644 --- a/cypress/integration/breadcrumbs.spec.ts +++ b/cypress/integration/breadcrumbs.spec.ts @@ -1,23 +1,15 @@ -import { Options } from "cypress-axe"; -import { TEST_ENTITY_PUBLICATION } from "cypress/support"; +import { TEST_ENTITY_PUBLICATION } from 'cypress/support'; +import { testA11y } from 'cypress/support/utils'; describe('Breadcrumbs', () => { it('should pass accessibility tests', () => { // Visit an Item, as those have more breadcrumbs cy.visit('/entities/publication/' + TEST_ENTITY_PUBLICATION); - cy.injectAxe(); // Wait for breadcrumbs to be visible cy.get('ds-breadcrumbs').should('be.visible'); // Analyze for accessibility - // Disable color-contrast checks until #1149 is fixed - cy.checkA11y('ds-breadcrumbs', - { - rules: { - 'color-contrast': { enabled: false } - } - } as Options - ); + testA11y('ds-breadcrumbs'); }); }); diff --git a/cypress/integration/collection-page.spec.ts b/cypress/integration/collection-page.spec.ts index 11babe76d2..a0140d8faf 100644 --- a/cypress/integration/collection-page.spec.ts +++ b/cypress/integration/collection-page.spec.ts @@ -1,23 +1,15 @@ -import { Options } from "cypress-axe"; -import { TEST_COLLECTION } from "cypress/support"; +import { TEST_COLLECTION } from 'cypress/support'; +import { testA11y } from 'cypress/support/utils'; describe('Collection Page', () => { it('should pass accessibility tests', () => { cy.visit('/collections/' + TEST_COLLECTION); - cy.injectAxe(); // tag must be loaded cy.get('ds-collection-page').should('exist'); // Analyze for accessibility issues - // Disable color-contrast checks until it is fixed (see #1202 and #1178) - cy.checkA11y('ds-collection-page', - { - rules: { - 'color-contrast': { enabled: false } - } - } as Options - ); + testA11y('ds-collection-page'); }); }); diff --git a/cypress/integration/collection-statistics.spec.ts b/cypress/integration/collection-statistics.spec.ts index c6f6082101..90b569c824 100644 --- a/cypress/integration/collection-statistics.spec.ts +++ b/cypress/integration/collection-statistics.spec.ts @@ -1,4 +1,5 @@ -import { TEST_COLLECTION } from "cypress/support"; +import { TEST_COLLECTION } from 'cypress/support'; +import { testA11y } from 'cypress/support/utils'; describe('Collection Statistics Page', () => { const COLLECTIONSTATISTICSPAGE = '/statistics/collections/' + TEST_COLLECTION; @@ -21,12 +22,11 @@ describe('Collection Statistics Page', () => { it('should pass accessibility tests', () => { cy.visit(COLLECTIONSTATISTICSPAGE); - cy.injectAxe(); // tag must be loaded cy.get('ds-collection-statistics-page').should('exist'); // Analyze for accessibility issues - cy.checkA11y('ds-collection-statistics-page'); + testA11y('ds-collection-statistics-page'); }); }); diff --git a/cypress/integration/community-list.spec.ts b/cypress/integration/community-list.spec.ts index 1d6f9ff849..a7ba72b74a 100644 --- a/cypress/integration/community-list.spec.ts +++ b/cypress/integration/community-list.spec.ts @@ -1,10 +1,10 @@ -import { Options } from "cypress-axe"; +import { Options } from 'cypress-axe'; +import { testA11y } from 'cypress/support/utils'; describe('Community List Page', () => { it('should pass accessibility tests', () => { cy.visit('/community-list'); - cy.injectAxe(); // tag must be loaded cy.get('ds-community-list-page').should('exist'); @@ -14,7 +14,7 @@ describe('Community List Page', () => { // Analyze for accessibility issues // Disable heading-order checks until it is fixed - cy.checkA11y('ds-community-list-page', + testA11y('ds-community-list-page', { rules: { 'heading-order': { enabled: false } diff --git a/cypress/integration/community-page.spec.ts b/cypress/integration/community-page.spec.ts index 60641120a0..79e21431ad 100644 --- a/cypress/integration/community-page.spec.ts +++ b/cypress/integration/community-page.spec.ts @@ -1,23 +1,15 @@ -import { Options } from "cypress-axe"; -import { TEST_COMMUNITY } from "cypress/support"; +import { TEST_COMMUNITY } from 'cypress/support'; +import { testA11y } from 'cypress/support/utils'; describe('Community Page', () => { it('should pass accessibility tests', () => { cy.visit('/communities/' + TEST_COMMUNITY); - cy.injectAxe(); // tag must be loaded cy.get('ds-community-page').should('exist'); // Analyze for accessibility issues - // Disable color-contrast checks until it is fixed (see #1202 and #1178) - cy.checkA11y('ds-community-page', - { - rules: { - 'color-contrast': { enabled: false } - } - } as Options - ); + testA11y('ds-community-page',); }); }); diff --git a/cypress/integration/community-statistics.spec.ts b/cypress/integration/community-statistics.spec.ts index 555667a96e..cbf1783c0b 100644 --- a/cypress/integration/community-statistics.spec.ts +++ b/cypress/integration/community-statistics.spec.ts @@ -1,4 +1,5 @@ -import { TEST_COMMUNITY } from "cypress/support"; +import { TEST_COMMUNITY } from 'cypress/support'; +import { testA11y } from 'cypress/support/utils'; describe('Community Statistics Page', () => { const COMMUNITYSTATISTICSPAGE = '/statistics/communities/' + TEST_COMMUNITY; @@ -21,12 +22,11 @@ describe('Community Statistics Page', () => { it('should pass accessibility tests', () => { cy.visit(COMMUNITYSTATISTICSPAGE); - cy.injectAxe(); // tag must be loaded cy.get('ds-community-statistics-page').should('exist'); // Analyze for accessibility issues - cy.checkA11y('ds-community-statistics-page'); + testA11y('ds-community-statistics-page'); }); }); diff --git a/cypress/integration/footer.spec.ts b/cypress/integration/footer.spec.ts index 25d1ec8c94..656e9d4701 100644 --- a/cypress/integration/footer.spec.ts +++ b/cypress/integration/footer.spec.ts @@ -1,12 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + describe('Footer', () => { it('should pass accessibility tests', () => { cy.visit('/'); - cy.injectAxe(); // Footer must first be visible cy.get('ds-footer').should('be.visible'); // Analyze for accessibility - cy.checkA11y('ds-footer'); + testA11y('ds-footer'); }); -}); \ No newline at end of file +}); diff --git a/cypress/integration/header.spec.ts b/cypress/integration/header.spec.ts index 75e1837c36..236208db68 100644 --- a/cypress/integration/header.spec.ts +++ b/cypress/integration/header.spec.ts @@ -1,13 +1,14 @@ +import { testA11y } from 'cypress/support/utils'; + describe('Header', () => { it('should pass accessibility tests', () => { cy.visit('/'); - cy.injectAxe(); // Header must first be visible cy.get('ds-header').should('be.visible'); // Analyze for accessibility - cy.checkA11y({ + testA11y({ include: ['ds-header'], exclude: [ ['#search-navbar-container'], // search in navbar has duplicative ID. Will be fixed in #1174 @@ -15,4 +16,4 @@ describe('Header', () => { ], }); }); -}); \ No newline at end of file +}); diff --git a/cypress/integration/homepage-statistics.spec.ts b/cypress/integration/homepage-statistics.spec.ts index b479d7b300..fe0311f87e 100644 --- a/cypress/integration/homepage-statistics.spec.ts +++ b/cypress/integration/homepage-statistics.spec.ts @@ -1,3 +1,5 @@ +import { testA11y } from 'cypress/support/utils'; + describe('Site Statistics Page', () => { it('should load if you click on "Statistics" from homepage', () => { cy.visit('/'); @@ -7,12 +9,11 @@ describe('Site Statistics Page', () => { it('should pass accessibility tests', () => { cy.visit('/statistics'); - cy.injectAxe(); // tag must be loaded cy.get('ds-site-statistics-page').should('exist'); // Analyze for accessibility issues - cy.checkA11y('ds-site-statistics-page'); + testA11y('ds-site-statistics-page'); }); }); diff --git a/cypress/integration/homepage.spec.ts b/cypress/integration/homepage.spec.ts index 25494d4164..ddde260bc7 100644 --- a/cypress/integration/homepage.spec.ts +++ b/cypress/integration/homepage.spec.ts @@ -1,3 +1,5 @@ +import { testA11y } from 'cypress/support/utils'; + describe('Homepage', () => { beforeEach(() => { // All tests start with visiting homepage @@ -21,12 +23,10 @@ describe('Homepage', () => { }); it('should pass accessibility tests', () => { - cy.injectAxe(); - // Wait for homepage tag to appear cy.get('ds-home-page').should('be.visible'); // Analyze for accessibility issues - cy.checkA11y('ds-home-page'); + testA11y('ds-home-page'); }); }); diff --git a/cypress/integration/item-page.spec.ts b/cypress/integration/item-page.spec.ts index 2009623dce..6a454b678d 100644 --- a/cypress/integration/item-page.spec.ts +++ b/cypress/integration/item-page.spec.ts @@ -1,5 +1,6 @@ -import { Options } from "cypress-axe"; -import { TEST_ENTITY_PUBLICATION } from "cypress/support"; +import { Options } from 'cypress-axe'; +import { TEST_ENTITY_PUBLICATION } from 'cypress/support'; +import { testA11y } from 'cypress/support/utils'; describe('Item Page', () => { const ITEMPAGE = '/items/' + TEST_ENTITY_PUBLICATION; @@ -13,14 +14,13 @@ describe('Item Page', () => { it('should pass accessibility tests', () => { cy.visit(ENTITYPAGE); - cy.injectAxe(); // tag must be loaded cy.get('ds-item-page').should('exist'); // Analyze for accessibility issues // Disable heading-order checks until it is fixed - cy.checkA11y('ds-item-page', + testA11y('ds-item-page', { rules: { 'heading-order': { enabled: false } diff --git a/cypress/integration/item-statistics.spec.ts b/cypress/integration/item-statistics.spec.ts index 1d60a015dc..66ebc228db 100644 --- a/cypress/integration/item-statistics.spec.ts +++ b/cypress/integration/item-statistics.spec.ts @@ -1,4 +1,5 @@ -import { TEST_ENTITY_PUBLICATION } from "cypress/support"; +import { TEST_ENTITY_PUBLICATION } from 'cypress/support'; +import { testA11y } from 'cypress/support/utils'; describe('Item Statistics Page', () => { const ITEMSTATISTICSPAGE = '/statistics/items/' + TEST_ENTITY_PUBLICATION; @@ -27,12 +28,11 @@ describe('Item Statistics Page', () => { it('should pass accessibility tests', () => { cy.visit(ITEMSTATISTICSPAGE); - cy.injectAxe(); // tag must be loaded cy.get('ds-item-statistics-page').should('exist'); // Analyze for accessibility issues - cy.checkA11y('ds-item-statistics-page'); + testA11y('ds-item-statistics-page'); }); }); diff --git a/cypress/plugins/index.ts b/cypress/plugins/index.ts index c106e08011..c6eb874232 100644 --- a/cypress/plugins/index.ts +++ b/cypress/plugins/index.ts @@ -1,5 +1,16 @@ // Plugins enable you to tap into, modify, or extend the internal behavior of Cypress // For more info, visit https://on.cypress.io/plugins-api -/* tslint:disable:no-empty */ -module.exports = (on, config) => { }; -/* tslint:enable:no-empty */ +module.exports = (on, config) => { + // Define "log" and "table" tasks, used for logging accessibility errors during CI + // Borrowed from https://github.com/component-driven/cypress-axe#in-cypress-plugins-file + on('task', { + log(message: string) { + console.log(message); + return null; + }, + table(message: string) { + console.table(message); + return null; + } + }); +}; diff --git a/cypress/support/index.ts b/cypress/support/index.ts index 479212333a..e8b10b9cfb 100644 --- a/cypress/support/index.ts +++ b/cypress/support/index.ts @@ -23,4 +23,4 @@ import 'cypress-axe'; // Global constants used in tests export const TEST_COLLECTION = '282164f5-d325-4740-8dd1-fa4d6d3e7200'; export const TEST_COMMUNITY = '0958c910-2037-42a9-81c7-dca80e3892b4'; -export const TEST_ENTITY_PUBLICATION = 'e98b0f27-5c19-49a0-960d-eb6ad5287067'; \ No newline at end of file +export const TEST_ENTITY_PUBLICATION = 'e98b0f27-5c19-49a0-960d-eb6ad5287067'; diff --git a/cypress/support/utils.ts b/cypress/support/utils.ts new file mode 100644 index 0000000000..96575969e8 --- /dev/null +++ b/cypress/support/utils.ts @@ -0,0 +1,44 @@ +import { Result } from 'axe-core'; +import { Options } from 'cypress-axe'; + +// Log violations to terminal/commandline in a table format. +// Uses 'log' and 'table' tasks defined in ../plugins/index.ts +// Borrowed from https://github.com/component-driven/cypress-axe#in-your-spec-file +function terminalLog(violations: Result[]) { + cy.task( + 'log', + `${violations.length} accessibility violation${violations.length === 1 ? '' : 's'} ${violations.length === 1 ? 'was' : 'were'} detected` + ); + // pluck specific keys to keep the table readable + const violationData = violations.map( + ({ id, impact, description, helpUrl, nodes }) => ({ + id, + impact, + description, + helpUrl, + nodes: nodes.length, + html: nodes.map(node => node.html) + }) + ); + + // Print violations as an array, since 'node.html' above often breaks table alignment + cy.task('log', violationData); + // Optionally, uncomment to print as a table + // cy.task('table', violationData); + +} + +// Custom "testA11y()" method which checks accessibility using cypress-axe +// while also ensuring any violations are logged to the terminal (see terminalLog above) +// This method MUST be called after cy.visit(), as cy.injectAxe() must be called after page load +export const testA11y = (context?: any, options?: Options) => { + cy.injectAxe(); + cy.configureAxe({ + rules: [ + // Disable color contrast checks as they are inaccurate / result in a lot of false positives + // See also open issues in axe-core: https://github.com/dequelabs/axe-core/labels/color%20contrast + { id: 'color-contrast', enabled: false }, + ] + }); + cy.checkA11y(context, options, terminalLog); +}; diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json index 39f88f8210..58083003cd 100644 --- a/cypress/tsconfig.json +++ b/cypress/tsconfig.json @@ -6,7 +6,8 @@ "compilerOptions": { "types": [ "cypress", - "cypress-axe" + "cypress-axe", + "node" ] } } \ No newline at end of file From 305571bc25de109355965a7046fb50e9cd70a678 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 14 Sep 2021 09:53:10 -0500 Subject: [PATCH 143/161] Add accessibility tests for search/browse --- cypress/integration/browse-by-author.spec.ts | 13 +++++ .../integration/browse-by-dateissued.spec.ts | 13 +++++ cypress/integration/browse-by-subject.spec.ts | 13 +++++ cypress/integration/browse-by-title.spec.ts | 13 +++++ cypress/integration/search-page.spec.ts | 53 +++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 cypress/integration/browse-by-author.spec.ts create mode 100644 cypress/integration/browse-by-dateissued.spec.ts create mode 100644 cypress/integration/browse-by-subject.spec.ts create mode 100644 cypress/integration/browse-by-title.spec.ts diff --git a/cypress/integration/browse-by-author.spec.ts b/cypress/integration/browse-by-author.spec.ts new file mode 100644 index 0000000000..07c20ad7c9 --- /dev/null +++ b/cypress/integration/browse-by-author.spec.ts @@ -0,0 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Browse By Author', () => { + it('should pass accessibility tests', () => { + cy.visit('/browse/author'); + + // Wait for to be visible + cy.get('ds-browse-by-metadata-page').should('be.visible'); + + // Analyze for accessibility + testA11y('ds-browse-by-metadata-page'); + }); +}); diff --git a/cypress/integration/browse-by-dateissued.spec.ts b/cypress/integration/browse-by-dateissued.spec.ts new file mode 100644 index 0000000000..4d22420227 --- /dev/null +++ b/cypress/integration/browse-by-dateissued.spec.ts @@ -0,0 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Browse By Date Issued', () => { + it('should pass accessibility tests', () => { + cy.visit('/browse/dateissued'); + + // Wait for to be visible + cy.get('ds-browse-by-date-page').should('be.visible'); + + // Analyze for accessibility + testA11y('ds-browse-by-date-page'); + }); +}); diff --git a/cypress/integration/browse-by-subject.spec.ts b/cypress/integration/browse-by-subject.spec.ts new file mode 100644 index 0000000000..89b791f03c --- /dev/null +++ b/cypress/integration/browse-by-subject.spec.ts @@ -0,0 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Browse By Subject', () => { + it('should pass accessibility tests', () => { + cy.visit('/browse/subject'); + + // Wait for to be visible + cy.get('ds-browse-by-metadata-page').should('be.visible'); + + // Analyze for accessibility + testA11y('ds-browse-by-metadata-page'); + }); +}); diff --git a/cypress/integration/browse-by-title.spec.ts b/cypress/integration/browse-by-title.spec.ts new file mode 100644 index 0000000000..e4e027586a --- /dev/null +++ b/cypress/integration/browse-by-title.spec.ts @@ -0,0 +1,13 @@ +import { testA11y } from 'cypress/support/utils'; + +describe('Browse By Title', () => { + it('should pass accessibility tests', () => { + cy.visit('/browse/title'); + + // Wait for to be visible + cy.get('ds-browse-by-title-page').should('be.visible'); + + // Analyze for accessibility + testA11y('ds-browse-by-title-page'); + }); +}); diff --git a/cypress/integration/search-page.spec.ts b/cypress/integration/search-page.spec.ts index d124f16982..a2bfbe6a5b 100644 --- a/cypress/integration/search-page.spec.ts +++ b/cypress/integration/search-page.spec.ts @@ -1,3 +1,6 @@ +import { Options } from 'cypress-axe'; +import { testA11y } from 'cypress/support/utils'; + describe('Search Page', () => { // unique ID of the search form (for selecting specific elements below) const SEARCHFORM_ID = '#search-form'; @@ -16,4 +19,54 @@ describe('Search Page', () => { cy.get(SEARCHFORM_ID + ' button.search-button').click(); cy.url().should('include', 'query=' + encodeURI(queryString)); }); + + it('should pass accessibility tests', () => { + cy.visit('/search'); + + // tag must be loaded + cy.get('ds-search-page').should('exist'); + + // Click each filter toggle to open *every* filter + // (As we want to scan filter section for accessibility issues as well) + cy.get('.filter-toggle').click({ multiple: true }); + + // Analyze for accessibility issues + testA11y( + { + include: ['ds-search-page'], + exclude: [ + ['nouislider'] // Date filter slider is missing ARIA labels. Will be fixed by #1175 + ], + }, + { + rules: { + // Search filters fail these two "moderate" impact rules + 'heading-order': { enabled: false }, + 'landmark-unique': { enabled: false } + } + } as Options + ); + }); + + it('should pass accessibility tests in Grid view', () => { + cy.visit('/search'); + + // Click to display grid view + // TODO: These buttons should likely have an easier way to uniquely select + cy.get('#search-sidebar-content > ds-view-mode-switch > .btn-group > [href="/search?spc.sf=score&spc.sd=DESC&view=grid"] > .fas').click(); + + // tag must be loaded + cy.get('ds-search-page').should('exist'); + + // Analyze for accessibility issues + testA11y('ds-search-page', + { + rules: { + // Search filters fail these two "moderate" impact rules + 'heading-order': { enabled: false }, + 'landmark-unique': { enabled: false } + } + } as Options + ); + }); }); From 8a1ff1ef70eaced1da16269a3f481f5f828948c9 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 15 Oct 2021 16:03:43 -0500 Subject: [PATCH 144/161] Update to latest Cypress --- package.json | 2 +- yarn.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 87fdcb51f0..f6d7314243 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "copy-webpack-plugin": "^6.4.1", "css-loader": "3.4.0", "cssnano": "^4.1.10", - "cypress": "8.4.0", + "cypress": "8.6.0", "cypress-axe": "^0.13.0", "deep-freeze": "0.0.1", "dotenv": "^8.2.0", diff --git a/yarn.lock b/yarn.lock index 5d6ba9f67f..7f5bd9b2f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4153,10 +4153,10 @@ cypress-axe@^0.13.0: resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.13.0.tgz#3234e1a79a27701f2451fcf2f333eb74204c7966" integrity sha512-fCIy7RiDCm7t30U3C99gGwQrUO307EYE1QqXNaf9ToK4DVqW8y5on+0a/kUHMrHdlls2rENF6TN9ZPpPpwLrnw== -cypress@8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.4.0.tgz#09ec06a73f1cb10121c103cba15076e659e24876" - integrity sha512-RtVgGFR06ikyMaq/VqapeqOjGaIA42PpK7F0qe1MCiFArfUuJECsLmeYaOA+1TlmNUgJNMSF5fWKkZIJr5Uc7w== +cypress@8.6.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.6.0.tgz#8d02fa58878b37cfc45bbfce393aa974fa8a8e22" + integrity sha512-F7qEK/6Go5FsqTueR+0wEw2vOVKNgk5847Mys8vsWkzPoEKdxs+7N9Y1dit+zhaZCLtMPyrMwjfA53ZFy+lSww== dependencies: "@cypress/request" "^2.88.6" "@cypress/xvfb" "^1.2.4" @@ -4192,6 +4192,7 @@ cypress@8.4.0: minimist "^1.2.5" ospath "^1.2.2" pretty-bytes "^5.6.0" + proxy-from-env "1.0.0" ramda "~0.27.1" request-progress "^3.0.0" supports-color "^8.1.1" @@ -9839,6 +9840,11 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.1" +proxy-from-env@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" + integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" From d264576a0793cdb17fcca222273fb1da22140069 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 18 Oct 2021 10:40:02 +0200 Subject: [PATCH 145/161] [CST-4659] Deque accessibility issues - fix 470001 --- .../sections/upload/file/section-upload-file.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html index ce10e0ea59..bac71df1a7 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.html +++ b/src/app/submission/sections/upload/file/section-upload-file.component.html @@ -29,17 +29,17 @@ - - - diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts index 427a833946..47d333397f 100644 --- a/src/app/shared/item/item-versions/item-versions.component.spec.ts +++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts @@ -11,7 +11,7 @@ import { VersionHistoryDataService } from '../../../core/data/version-history-da import { By } from '@angular/platform-browser'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { createPaginatedList } from '../../testing/utils.test'; -import { of, of as observableOf } from 'rxjs'; +import { EMPTY, of, of as observableOf } from 'rxjs'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../testing/pagination-service.stub'; import { AuthService } from '../../../core/auth/auth.service'; @@ -25,7 +25,7 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -describe('ItemVersionsComponent', () => { +fdescribe('ItemVersionsComponent', () => { let component: ItemVersionsComponent; let fixture: ComponentFixture; let authenticationService: AuthService; @@ -33,6 +33,7 @@ describe('ItemVersionsComponent', () => { let versionHistoryService: VersionHistoryDataService; let workspaceItemDataService: WorkspaceitemDataService; let workflowItemDataService: WorkflowItemDataService; + let versionService: VersionDataService; const versionHistory = Object.assign(new VersionHistory(), { id: '1', @@ -94,16 +95,18 @@ describe('ItemVersionsComponent', () => { getVersions: createSuccessfulRemoteDataObject$(createPaginatedList(versions)), }); const authenticationServiceSpy = jasmine.createSpyObj('authenticationService', { - isAuthenticated: observableOf(true), - setRedirectUrl: {} - } - ); + isAuthenticated: observableOf(true), + setRedirectUrl: {} + }); const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']); const workspaceItemDataServiceSpy = jasmine.createSpyObj('workspaceItemDataService', { - findByItem: of(undefined), + findByItem: EMPTY, }); const workflowItemDataServiceSpy = jasmine.createSpyObj('workflowItemDataService', { - findByItem: of(undefined), + findByItem: EMPTY, + }); + const versionServiceSpy = jasmine.createSpyObj('versionService', { + findById: EMPTY, }); beforeEach(waitForAsync(() => { @@ -119,7 +122,7 @@ describe('ItemVersionsComponent', () => { {provide: AuthorizationDataService, useValue: authorizationServiceSpy}, {provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy}, {provide: ItemDataService, useValue: {}}, - {provide: VersionDataService, useValue: {}}, + {provide: VersionDataService, useValue: versionServiceSpy}, {provide: WorkspaceitemDataService, useValue: workspaceItemDataServiceSpy}, {provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy}, ], @@ -131,6 +134,7 @@ describe('ItemVersionsComponent', () => { authorizationService = TestBed.inject(AuthorizationDataService); workspaceItemDataService = TestBed.inject(WorkspaceitemDataService); workflowItemDataService = TestBed.inject(WorkflowItemDataService); + versionService = TestBed.inject(VersionDataService); })); @@ -214,4 +218,53 @@ describe('ItemVersionsComponent', () => { }); }); + describe('when onSummarySubmit() is called', () => { + const id = 'version-being-edited-id'; + beforeEach(() => { + component.versionBeingEditedId = id; + }); + it('should call versionService.findById', () => { + component.onSummarySubmit(); + expect(versionService.findById).toHaveBeenCalledWith(id); + }); + }); + + describe('when editing is enabled for an item', () => { + beforeEach(() => { + component.enableVersionEditing(version1); + }); + it('should set all variables', () => { + expect(component.versionBeingEditedSummary).toEqual('first version'); + expect(component.versionBeingEditedNumber).toEqual(1); + expect(component.versionBeingEditedId).toEqual('1'); + }); + it('isAnyBeingEdited should be true', () => { + expect(component.isAnyBeingEdited()).toBeTrue(); + }); + it('isThisBeingEdited should be true for version1', () => { + expect(component.isThisBeingEdited(version1)).toBeTrue(); + }); + it('isThisBeingEdited should be false for version2', () => { + expect(component.isThisBeingEdited(version2)).toBeFalse(); + }); + }); + + describe('when editing is disabled', () => { + beforeEach(() => { + component.disableVersionEditing(); + }); + it('should unset all variables', () => { + expect(component.versionBeingEditedSummary).toBeUndefined(); + expect(component.versionBeingEditedNumber).toBeUndefined(); + expect(component.versionBeingEditedId).toBeUndefined(); + }); + it('isAnyBeingEdited should be false', () => { + expect(component.isAnyBeingEdited()).toBeFalse(); + }); + it('isThisBeingEdited should be false for all versions', () => { + expect(component.isThisBeingEdited(version1)).toBeFalse(); + expect(component.isThisBeingEdited(version2)).toBeFalse(); + }); + }); + }); diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index aa00ab1d9e..e7d65919d6 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -152,7 +152,7 @@ export class ItemVersionsComponent implements OnInit { /** * The number of the version whose summary is currently being edited */ - versionBeingEditedNumber: string; + versionBeingEditedNumber: number; /** * The id of the version whose summary is currently being edited @@ -195,14 +195,14 @@ export class ItemVersionsComponent implements OnInit { * True if the specified version is being edited * (used to show input field and to change buttons for specified version) */ - isThisBeingEdited(version): boolean { + isThisBeingEdited(version: Version): boolean { return version?.version === this.versionBeingEditedNumber; } /** * Enables editing for the specified version */ - enableVersionEditing(version): void { + enableVersionEditing(version: Version): void { this.versionBeingEditedSummary = version?.summary; this.versionBeingEditedNumber = version?.version; this.versionBeingEditedId = version?.id; @@ -211,7 +211,7 @@ export class ItemVersionsComponent implements OnInit { /** * Disables editing for the specified version and discards all pending changes */ - disableSummaryEditing(): void { + disableVersionEditing(): void { this.versionBeingEditedSummary = undefined; this.versionBeingEditedNumber = undefined; this.versionBeingEditedId = undefined; @@ -248,7 +248,7 @@ export class ItemVersionsComponent implements OnInit { } else { this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': this.versionBeingEditedNumber})); } - this.disableSummaryEditing(); + this.disableVersionEditing(); } ); } From fd61ac0c416a3f0bccdd03197370b0312dcbb52c Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 20 Oct 2021 02:29:00 +0200 Subject: [PATCH 160/161] [CST-4499] Version history - Test item-versions.component --- .../shared/item/item-versions/item-versions.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts index 47d333397f..fff0744aba 100644 --- a/src/app/shared/item/item-versions/item-versions.component.spec.ts +++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts @@ -25,7 +25,7 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; -fdescribe('ItemVersionsComponent', () => { +describe('ItemVersionsComponent', () => { let component: ItemVersionsComponent; let fixture: ComponentFixture; let authenticationService: AuthService; From cf0a5261879d5c64ee65167c7e82cdb0678d3e5e Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Wed, 20 Oct 2021 16:35:51 +0200 Subject: [PATCH 161/161] 84385: Tabbed search view breaks if switch away/back between tabs --- .../configuration-search-page.component.spec.ts | 6 ------ .../configuration-search-page.component.ts | 16 +--------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/app/search-page/configuration-search-page.component.spec.ts b/src/app/search-page/configuration-search-page.component.spec.ts index 8ce4154c66..5ca593981f 100644 --- a/src/app/search-page/configuration-search-page.component.spec.ts +++ b/src/app/search-page/configuration-search-page.component.spec.ts @@ -55,10 +55,4 @@ describe('ConfigurationSearchPageComponent', () => { expect(routeService.setParameter).toHaveBeenCalledWith('fixedFilterQuery', QUERY); }); - it('should reset route parameters on destroy', () => { - fixture.destroy(); - - expect(routeService.setParameter).toHaveBeenCalledWith('configuration', undefined); - expect(routeService.setParameter).toHaveBeenCalledWith('fixedFilterQuery', undefined); - }); }); diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts index 1eefeeb569..df25febde7 100644 --- a/src/app/search-page/configuration-search-page.component.ts +++ b/src/app/search-page/configuration-search-page.component.ts @@ -6,7 +6,6 @@ import { Component, Inject, Input, - OnDestroy, OnInit } from '@angular/core'; import { pushInOut } from '../shared/animations/push'; @@ -34,7 +33,7 @@ import { Router } from '@angular/router'; ] }) -export class ConfigurationSearchPageComponent extends SearchComponent implements OnInit, OnDestroy { +export class ConfigurationSearchPageComponent extends SearchComponent implements OnInit { /** * The configuration to use for the search options * If empty, the configuration will be determined by the route parameter called 'configuration' @@ -72,17 +71,4 @@ export class ConfigurationSearchPageComponent extends SearchComponent implements this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery); } } - - /** - * Reset the updated query/configuration set in ngOnInit() - */ - ngOnDestroy(): void { - super.ngOnDestroy(); - if (hasValue(this.configuration)) { - this.routeService.setParameter('configuration', undefined); - } - if (hasValue(this.fixedFilterQuery)) { - this.routeService.setParameter('fixedFilterQuery', undefined); - } - } }
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.edit' | translate}}{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{ePerson.eperson.id}}{{ePerson.eperson.id}}{{ePerson.eperson.name}} + + {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}
+ {{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }} +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{ePerson.eperson.id}}{{ePerson.eperson.id}}{{ePerson.eperson.name}} + {{messagePrefix + '.table.email' | translate}}: {{ ePerson.eperson.email ? ePerson.eperson.email : '-' }}
{{messagePrefix + '.table.netid' | translate}}: {{ ePerson.eperson.netid ? ePerson.eperson.netid : '-' }} 		+
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.edit' | translate}}{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.collectionOrCommunity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{group.id}}{{group.id}}{{group.name}} + {{(group.object | async)?.payload?.name}}
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.collectionOrCommunity' | translate}} {{messagePrefix + '.table.edit' | translate}}
{{group.id}}{{group.id}}{{group.name}} + {{(group.object | async)?.payload?.name}}
-
- \ No newline at end of file + + diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts index f08df65ca4..612f5a1733 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts @@ -5,21 +5,16 @@ import { By } from '@angular/platform-browser'; import { getTestScheduler } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { of as observableOf } from 'rxjs'; import { CollectionDropdownComponent } from './collection-dropdown.component'; -import { RemoteData } from '../../core/data/remote-data'; -import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; +import { buildPaginatedList } from '../../core/data/paginated-list.model'; +import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { PageInfo } from '../../core/shared/page-info.model'; import { Collection } from '../../core/shared/collection.model'; import { CollectionDataService } from '../../core/data/collection-data.service'; import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; import { Community } from '../../core/shared/community.model'; import { MockElementRef } from '../testing/element-ref.mock'; -import { FollowLinkConfig } from '../utils/follow-link-config.model'; -import { FindListOptions } from '../../core/data/request.models'; -import { Observable } from 'rxjs/internal/Observable'; const community: Community = Object.assign(new Community(), { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', @@ -99,17 +94,6 @@ const listElementMock = { } }; -// tslint:disable-next-line: max-classes-per-file -class CollectionDataServiceMock { - getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig[]): Observable>> { - return observableOf( - createSuccessfulRemoteDataObject( - buildPaginatedList(new PageInfo(), collections) - ) - ); - } -} - describe('CollectionDropdownComponent', () => { let component: CollectionDropdownComponent; let componentAsAny: any; @@ -117,12 +101,19 @@ describe('CollectionDropdownComponent', () => { let scheduler: TestScheduler; const collectionDataServiceMock: any = jasmine.createSpyObj('CollectionDataService', { - getAuthorizedCollection: jasmine.createSpy('getAuthorizedCollection') + getAuthorizedCollection: jasmine.createSpy('getAuthorizedCollection'), + getAuthorizedCollectionByEntityType: jasmine.createSpy('getAuthorizedCollectionByEntityType') }); const paginatedCollection = buildPaginatedList(new PageInfo(), collections); const paginatedCollectionRD$ = createSuccessfulRemoteDataObject$(paginatedCollection); + const paginatedEmptyCollection = buildPaginatedList(new PageInfo(), []); + const paginatedEmptyCollectionRD$ = createSuccessfulRemoteDataObject$(paginatedEmptyCollection); + + const paginatedOneElementCollection = buildPaginatedList(new PageInfo(), [collections[0]]); + const paginatedOneElementCollectionRD$ = createSuccessfulRemoteDataObject$(paginatedOneElementCollection); + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ @@ -150,6 +141,7 @@ describe('CollectionDropdownComponent', () => { component = fixture.componentInstance; componentAsAny = component; componentAsAny.collectionDataService.getAuthorizedCollection.and.returnValue(paginatedCollectionRD$); + componentAsAny.collectionDataService.getAuthorizedCollectionByEntityType.and.returnValue(paginatedCollectionRD$); }); it('should init component with collection list', () => { @@ -225,4 +217,48 @@ describe('CollectionDropdownComponent', () => { expect(component.hasNextPage).toEqual(true); expect(component.searchListCollection).toEqual([]); }); + + it('should invoke the method getAuthorizedCollectionByEntityType of CollectionDataService when entityType is set',() => { + component.entityType = 'rel'; + scheduler.schedule(() => fixture.detectChanges()); + scheduler.flush(); + expect((component as any).collectionDataService.getAuthorizedCollectionByEntityType).toHaveBeenCalled(); + }); + + it('should emit hasChoice true when totalElements is greater then one', () => { + spyOn(component.hasChoice, 'emit').and.callThrough(); + component.ngOnInit(); + fixture.detectChanges(); + + expect(component.hasChoice.emit).toHaveBeenCalledWith(true); + }); + + it('should emit hasChoice false when totalElements is not greater then one', () => { + + componentAsAny.collectionDataService.getAuthorizedCollection.and.returnValue(paginatedEmptyCollectionRD$); + componentAsAny.collectionDataService.getAuthorizedCollectionByEntityType.and.returnValue(paginatedEmptyCollectionRD$); + + spyOn(component.hasChoice, 'emit').and.callThrough(); + component.ngOnInit(); + fixture.detectChanges(); + + expect(component.hasChoice.emit).toHaveBeenCalledWith(false); + }); + + it('should emit theOnlySelectable when totalElements is equal to one', () => { + + componentAsAny.collectionDataService.getAuthorizedCollection.and.returnValue(paginatedOneElementCollectionRD$); + componentAsAny.collectionDataService.getAuthorizedCollectionByEntityType.and.returnValue(paginatedOneElementCollectionRD$); + + spyOn(component.theOnlySelectable, 'emit').and.callThrough(); + component.ngOnInit(); + fixture.detectChanges(); + + const expectedTheOnlySelectable = { + communities: [ { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Community 1', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88' } ], + collection: { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Collection 1' } + }; + + expect(component.theOnlySelectable.emit).toHaveBeenCalledWith(expectedTheOnlySelectable); + }); }); diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts index c91ddbdb0a..6c11613512 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts @@ -4,6 +4,7 @@ import { ElementRef, EventEmitter, HostListener, + Input, OnDestroy, OnInit, Output @@ -11,7 +12,7 @@ import { import { FormControl } from '@angular/forms'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { debounceTime, distinctUntilChanged, map, mergeMap, reduce, startWith, switchMap } from 'rxjs/operators'; +import { debounceTime, distinctUntilChanged, map, mergeMap, reduce, startWith, switchMap, take } from 'rxjs/operators'; import { hasValue } from '../empty.util'; import { RemoteData } from '../../core/data/remote-data'; @@ -106,6 +107,21 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { */ currentQuery: string; + /** + * If present this value is used to filter collection list by entity type + */ + @Input() entityType: string; + + /** + * Emit to notify whether collections to choice from are more than one + */ + @Output() hasChoice = new EventEmitter(); + + /** + * Emit to notify the only selectable collection. + */ + @Output() theOnlySelectable = new EventEmitter(); + constructor( private changeDetectorRef: ChangeDetectorRef, private collectionDataService: CollectionDataService, @@ -190,14 +206,26 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { elementsPerPage: 10, currentPage: page }; - this.searchListCollection$ = this.collectionDataService - .getAuthorizedCollection(query, findOptions, true, false, followLink('parentCommunity')) - .pipe( + let searchListService$: Observable>> = null; + if (this.entityType) { + searchListService$ = this.collectionDataService + .getAuthorizedCollectionByEntityType( + query, + this.entityType, + findOptions, + false, + followLink('parentCommunity')); + } else { + searchListService$ = this.collectionDataService + .getAuthorizedCollection(query, findOptions, true, false, followLink('parentCommunity')); + } + this.searchListCollection$ = searchListService$.pipe( getFirstSucceededRemoteWithNotEmptyData(), switchMap((collections: RemoteData>) => { if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collections.payload.totalElements ) { this.hasNextPage = false; } + this.emitSelectionEvents(collections); return collections.payload.page; }), mergeMap((collection: Collection) => collection.parentCommunity.pipe( @@ -247,4 +275,28 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { hideShowLoader(hideShow: boolean) { this.isLoadingList.next(hideShow); } + + /** + * Emit events related to the number of selectable collections. + * hasChoice containing whether there are more then one selectable collections. + * theOnlySelectable containing the only collection available. + * @param collections + * @private + */ + private emitSelectionEvents(collections: RemoteData>) { + this.hasChoice.emit(collections.payload.totalElements > 1); + if (collections.payload.totalElements === 1) { + const collection = collections.payload.page[0]; + collections.payload.page[0].parentCommunity.pipe( + getFirstSucceededRemoteDataPayload(), + take(1) + ).subscribe((community: Community) => { + this.theOnlySelectable.emit({ + communities: [{ id: community.id, name: community.name, uuid: community.id }], + collection: { id: collection.id, uuid: collection.id, name: collection.name } + }); + }); + } + } + } diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts index 55634dbf7f..b46df8ff36 100644 --- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts @@ -26,7 +26,8 @@ describe('AuthorizedCollectionSelectorComponent', () => { id: 'authorized-collection' }); collectionService = jasmine.createSpyObj('collectionService', { - getAuthorizedCollection: createSuccessfulRemoteDataObject$(createPaginatedList([collection])) + getAuthorizedCollection: createSuccessfulRemoteDataObject$(createPaginatedList([collection])), + getAuthorizedCollectionByEntityType: createSuccessfulRemoteDataObject$(createPaginatedList([collection])) }); notificationsService = jasmine.createSpyObj('notificationsService', ['error']); TestBed.configureTestingModule({ @@ -49,12 +50,27 @@ describe('AuthorizedCollectionSelectorComponent', () => { }); describe('search', () => { - it('should call getAuthorizedCollection and return the authorized collection in a SearchResult', (done) => { + describe('when has no entity type', () => { + it('should call getAuthorizedCollection and return the authorized collection in a SearchResult', (done) => { component.search('', 1).subscribe((resultRD) => { - expect(collectionService.getAuthorizedCollection).toHaveBeenCalled(); + expect(collectionService.getAuthorizedCollection).toHaveBeenCalled(); expect(resultRD.payload.page.length).toEqual(1); expect(resultRD.payload.page[0].indexableObject).toEqual(collection); - done(); + done(); + }); + }); + }); + + describe('when has entity type', () => { + it('should call getAuthorizedCollectionByEntityType and return the authorized collection in a SearchResult', (done) => { + component.entityType = 'test'; + fixture.detectChanges(); + component.search('', 1).subscribe((resultRD) => { + expect(collectionService.getAuthorizedCollectionByEntityType).toHaveBeenCalled(); + expect(resultRD.payload.page.length).toEqual(1); + expect(resultRD.payload.page[0].indexableObject).toEqual(collection); + done(); + }); }); }); }); diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts index bca1727542..b6aa0b3413 100644 --- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts @@ -1,8 +1,8 @@ -import { Component } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { DSOSelectorComponent } from '../dso-selector.component'; import { SearchService } from '../../../../core/shared/search/search.service'; import { CollectionDataService } from '../../../../core/data/collection-data.service'; -import { Observable } from 'rxjs/internal/Observable'; +import { Observable } from 'rxjs'; import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { map } from 'rxjs/operators'; import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model'; @@ -14,6 +14,8 @@ import { RemoteData } from '../../../../core/data/remote-data'; import { hasValue } from '../../../empty.util'; import { NotificationsService } from '../../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import { Collection } from '../../../../core/shared/collection.model'; +import { FindListOptions } from '../../../../core/data/request.models'; @Component({ selector: 'ds-authorized-collection-selector', @@ -24,6 +26,11 @@ import { TranslateService } from '@ngx-translate/core'; * Component rendering a list of collections to select from */ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent { + /** + * If present this value is used to filter collection list by entity type + */ + @Input() entityType: string; + constructor(protected searchService: SearchService, protected collectionDataService: CollectionDataService, protected notifcationsService: NotificationsService, @@ -44,10 +51,23 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent * @param page Page to retrieve */ search(query: string, page: number): Observable>>> { - return this.collectionDataService.getAuthorizedCollection(query, Object.assign({ + let searchListService$: Observable>> = null; + const findOptions: FindListOptions = { currentPage: page, elementsPerPage: this.defaultPagination.pageSize - }),true, false, followLink('parentCommunity')).pipe( + }; + + if (this.entityType) { + searchListService$ = this.collectionDataService + .getAuthorizedCollectionByEntityType( + query, + this.entityType, + findOptions); + } else { + searchListService$ = this.collectionDataService + .getAuthorizedCollection(query, findOptions, true, false, followLink('parentCommunity')); + } + return searchListService$.pipe( getFirstCompletedRemoteData(), map((rd) => Object.assign(new RemoteData(null, null, null, null), rd, { payload: hasValue(rd.payload) ? buildPaginatedList(rd.payload.pageInfo, rd.payload.page.map((col) => Object.assign(new CollectionSearchResult(), { indexableObject: col }))) : null, diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html index 8761e4eb9e..5fccd58f48 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html @@ -6,6 +6,9 @@
{{header | translate}}
- +
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts index 3afb3c5e9a..90bd07c52b 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts @@ -69,4 +69,10 @@ describe('CreateItemParentSelectorComponent', () => { expect(router.navigate).toHaveBeenCalledWith(['/submit'], { queryParams: { collection: collection.uuid } }); }); + it('should call navigate on the router with entityType parameter', () => { + const entityType = 'Person'; + component.entityType = entityType; + component.navigate(collection); + expect(router.navigate).toHaveBeenCalledWith(['/submit'], { queryParams: { collection: collection.uuid, entityType: entityType } }); + }); }); diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts index 03d7732fb0..b109be0af2 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; @@ -22,6 +22,11 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo action = SelectorActionType.CREATE; header = 'dso-selector.create.item.sub-level'; + /** + * If present this value is used to filter collection list by entity type + */ + @Input() entityType: string; + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) { super(activeModal, route); } @@ -35,6 +40,9 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo ['collection']: dso.uuid, } }; + if (this.entityType) { + navigationExtras.queryParams.entityType = this.entityType; + } this.router.navigate(['/submit'], navigationExtras); } } From 2e0095a587378f30ab707bab48b02c731f8e44cf Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 22 Sep 2021 17:36:18 +0200 Subject: [PATCH 062/161] [CST-4591] Create entity scrollable dropdown --- .../entity-dropdown.component.html | 28 +++ .../entity-dropdown.component.scss | 19 ++ .../entity-dropdown.component.spec.ts | 167 ++++++++++++++ .../entity-dropdown.component.ts | 207 ++++++++++++++++++ src/app/shared/shared.module.ts | 5 +- 5 files changed, 425 insertions(+), 1 deletion(-) create mode 100644 src/app/shared/entity-dropdown/entity-dropdown.component.html create mode 100644 src/app/shared/entity-dropdown/entity-dropdown.component.scss create mode 100644 src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts create mode 100644 src/app/shared/entity-dropdown/entity-dropdown.component.ts diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html new file mode 100644 index 0000000000..59c242ef97 --- /dev/null +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html @@ -0,0 +1,28 @@ +
+ + + + +
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.scss b/src/app/shared/entity-dropdown/entity-dropdown.component.scss new file mode 100644 index 0000000000..a5f43f359b --- /dev/null +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.scss @@ -0,0 +1,19 @@ +.list-item:active { + color: white !important; +} + +.scrollable-menu { + height: auto; + max-height: var(--ds-dropdown-menu-max-height); + overflow-x: hidden; +} + +.entity-item { + border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color); +} + +#entityControlsDropdownMenu { + outline: 0; + left: 0 !important; + box-shadow: var(--bs-btn-focus-box-shadow); +} diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts new file mode 100644 index 0000000000..0cc14cae22 --- /dev/null +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts @@ -0,0 +1,167 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { EntityDropdownComponent } from './entity-dropdown.component'; +import { getTestScheduler } from 'jasmine-marbles'; +import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; +import { ItemType } from '../../core/shared/item-relationships/item-type.model'; +import { ChangeDetectorRef, NO_ERRORS_SCHEMA, Pipe, PipeTransform } from '@angular/core'; +import { EntityTypeService } from '../../core/data/entity-type.service'; +import { TestScheduler } from 'rxjs/testing'; +import { By } from '@angular/platform-browser'; +import { createPaginatedList } from '../testing/utils.test'; + +// tslint:disable-next-line:pipe-prefix +@Pipe({ name: 'translate' }) +class MockTranslatePipe implements PipeTransform { + transform(value: string): string { + return value; + } +} + +const entities: ItemType[] = [ + Object.assign(new ItemType(), { + id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', + label: 'Entity_1', + uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88' + }), + Object.assign(new ItemType(), { + id: '59ee713b-ee53-4220-8c3f-9860dc84fe33', + label: 'Entity_2', + uuid: 'UUID-59ee713b-ee53-4220-8c3f-9860dc84fe33' + }), + Object.assign(new ItemType(), { + id: 'e9dbf393-7127-415f-8919-55be34a6e9ed', + label: 'Entity_3', + uuid: 'UUID-7127-415f-8919-55be34a6e9ed' + }), + Object.assign(new ItemType(), { + id: '59da2ff0-9bf4-45bf-88be-e35abd33f304', + label: 'Entity_4', + uuid: 'UUID-59da2ff0-9bf4-45bf-88be-e35abd33f304' + }), + Object.assign(new ItemType(), { + id: 'a5159760-f362-4659-9e81-e3253ad91ede', + label: 'Entity_5', + uuid: 'UUID-a5159760-f362-4659-9e81-e3253ad91ede' + }), +]; + +const listElementMock: ItemType = Object.assign( + new ItemType(), { + id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', + label: 'Entity_1', + uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88' +} +); + +describe('EntityDropdownComponent', () => { + let component: EntityDropdownComponent; + let componentAsAny: any; + let fixture: ComponentFixture; + let scheduler: TestScheduler; + + const entityTypeServiceMock: any = jasmine.createSpyObj('EntityTypeService', { + getAllAuthorizedRelationshipType: jasmine.createSpy('getAllAuthorizedRelationshipType'), + getAllAuthorizedRelationshipTypeImport: jasmine.createSpy('getAllAuthorizedRelationshipTypeImport') + }); + + + let translatePipeSpy: jasmine.Spy; + + const paginatedEntities = createPaginatedList(entities); + const paginatedEntitiesRD$ = createSuccessfulRemoteDataObject$(paginatedEntities); + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [], + declarations: [EntityDropdownComponent, MockTranslatePipe], + providers: [ + { provide: EntityTypeService, useValue: entityTypeServiceMock }, + ChangeDetectorRef + ], + schemas: [NO_ERRORS_SCHEMA] + }) + .compileComponents(); + })); + + beforeEach(() => { + scheduler = getTestScheduler(); + fixture = TestBed.createComponent(EntityDropdownComponent); + component = fixture.componentInstance; + componentAsAny = fixture.componentInstance; + componentAsAny.entityTypeService.getAllAuthorizedRelationshipType.and.returnValue(paginatedEntitiesRD$); + componentAsAny.entityTypeService.getAllAuthorizedRelationshipTypeImport.and.returnValue(paginatedEntitiesRD$); + component.isSubmission = true; + + translatePipeSpy = spyOn(MockTranslatePipe.prototype, 'transform'); + }); + + it('should translate entries', () => { + scheduler.schedule(() => fixture.detectChanges()); + scheduler.flush(); + + expect(translatePipeSpy).toHaveBeenCalledWith('entity_1.listelement.badge'); + }); + + it('should init component with entities list', () => { + spyOn(component.subs, 'push'); + spyOn(component, 'resetPagination'); + spyOn(component, 'populateEntityList').and.callThrough(); + + scheduler.schedule(() => fixture.detectChanges()); + scheduler.flush(); + const elements = fixture.debugElement.queryAll(By.css('.entity-item')); + + expect(elements.length).toEqual(5); + expect(component.subs.push).toHaveBeenCalled(); + expect(component.resetPagination).toHaveBeenCalled(); + expect(component.populateEntityList).toHaveBeenCalled(); + expect((component as any).entityTypeService.getAllAuthorizedRelationshipType).toHaveBeenCalled(); + }); + + it('should trigger onSelect method when select a new entity from list', () => { + scheduler.schedule(() => fixture.detectChanges()); + scheduler.flush(); + + spyOn(component, 'onSelect'); + const entityItem = fixture.debugElement.query(By.css('.entity-item:nth-child(2)')); + entityItem.triggerEventHandler('click', null); + + scheduler.schedule(() => fixture.detectChanges()); + scheduler.flush(); + + expect(component.onSelect).toHaveBeenCalled(); + }); + + it('should emit selectionChange event when selecting a new entity', () => { + spyOn(component.selectionChange, 'emit').and.callThrough(); + component.ngOnInit(); + component.onSelect(listElementMock as any); + fixture.detectChanges(); + + expect(component.selectionChange.emit).toHaveBeenCalledWith(listElementMock as any); + }); + + it('should change loader status', () => { + spyOn(component.isLoadingList, 'next').and.callThrough(); + component.hideShowLoader(true); + + expect(component.isLoadingList.next).toHaveBeenCalledWith(true); + }); + + it('reset pagination fields', () => { + component.resetPagination(); + + expect(component.currentPage).toEqual(1); + expect(component.hasNextPage).toEqual(true); + expect(component.searchListEntity).toEqual([]); + }); + + it('should invoke the method getAllAuthorizedRelationshipTypeImport of EntityTypeService when isSubmission is false', () => { + component.isSubmission = false; + + scheduler.schedule(() => fixture.detectChanges()); + scheduler.flush(); + + expect((component as any).entityTypeService.getAllAuthorizedRelationshipTypeImport).toHaveBeenCalled(); + }); +}); diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts new file mode 100644 index 0000000000..13d50a8b79 --- /dev/null +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts @@ -0,0 +1,207 @@ +import { + ChangeDetectorRef, + Component, + ElementRef, + EventEmitter, + HostListener, + Input, + OnDestroy, + OnInit, + Output +} from '@angular/core'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { hasValue } from '../empty.util'; +import { reduce, startWith, switchMap } from 'rxjs/operators'; +import { RemoteData } from '../../core/data/remote-data'; +import { FindListOptions } from '../../core/data/request.models'; +import { PaginatedList } from '../../core/data/paginated-list.model'; +import { EntityTypeService } from '../../core/data/entity-type.service'; +import { ItemType } from '../../core/shared/item-relationships/item-type.model'; +import { getFirstSucceededRemoteWithNotEmptyData } from '../../core/shared/operators'; + +@Component({ + selector: 'ds-entity-dropdown', + templateUrl: './entity-dropdown.component.html', + styleUrls: ['./entity-dropdown.component.scss'] +}) +export class EntityDropdownComponent implements OnInit, OnDestroy { + /** + * The entity list obtained from a search + * @type {Observable} + */ + public searchListEntity$: Observable; + + /** + * A boolean representing if dropdown list is scrollable to the bottom + * @type {boolean} + */ + private scrollableBottom = false; + + /** + * A boolean representing if dropdown list is scrollable to the top + * @type {boolean} + */ + private scrollableTop = false; + + /** + * The list of entity to render + */ + public searchListEntity: ItemType[] = []; + + /** + * TRUE if the parent operation is a 'new submission' operation, FALSE otherwise (eg.: is an 'Import metadata from an external source' operation). + */ + @Input() isSubmission: boolean; + + /** + * The entity to output to the parent component + */ + @Output() selectionChange = new EventEmitter(); + + /** + * A boolean representing if the loader is visible or not + */ + public isLoadingList: BehaviorSubject = new BehaviorSubject(false); + + /** + * A numeric representig current page + */ + public currentPage: number; + + /** + * A boolean representing if exist another page to render + */ + public hasNextPage: boolean; + + /** + * Array to track all subscriptions and unsubscribe them onDestroy + * @type {Array} + */ + public subs: Subscription[] = []; + + /** + * Initialize instance variables + * + * @param {ChangeDetectorRef} changeDetectorRef + * @param {EntityTypeService} entityTypeService + * @param {ElementRef} el + */ + constructor( + private changeDetectorRef: ChangeDetectorRef, + private entityTypeService: EntityTypeService, + private el: ElementRef + ) { } + + /** + * Method called on mousewheel event, it prevent the page scroll + * when arriving at the top/bottom of dropdown menu + * + * @param event + * mousewheel event + */ + @HostListener('mousewheel', ['$event']) onMousewheel(event) { + if (event.wheelDelta > 0 && this.scrollableTop) { + event.preventDefault(); + } + if (event.wheelDelta < 0 && this.scrollableBottom) { + event.preventDefault(); + } + } + + /** + * Initialize entity list + */ + ngOnInit() { + this.resetPagination(); + this.populateEntityList(this.currentPage); + } + + /** + * Check if dropdown scrollbar is at the top or bottom of the dropdown list + * + * @param event + */ + public onScroll(event) { + this.scrollableBottom = (event.target.scrollTop + event.target.clientHeight === event.target.scrollHeight); + this.scrollableTop = (event.target.scrollTop === 0); + } + + /** + * Method used from infitity scroll for retrive more data on scroll down + */ + public onScrollDown() { + if ( this.hasNextPage ) { + this.populateEntityList(++this.currentPage); + } + } + + /** + * Emit a [selectionChange] event when a new entity is selected from list + * + * @param event + * the selected [ItemType] + */ + public onSelect(event: ItemType) { + this.selectionChange.emit(event); + } + + /** + * Method called for populate the entity list + * @param page page number + */ + public populateEntityList(page: number) { + this.isLoadingList.next(true); + // Set the pagination info + const findOptions: FindListOptions = { + elementsPerPage: 10, + currentPage: page + }; + let searchListEntity$; + if (this.isSubmission) { + searchListEntity$ = this.entityTypeService.getAllAuthorizedRelationshipType(findOptions); + } else { + searchListEntity$ = this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findOptions); + } + this.searchListEntity$ = searchListEntity$.pipe( + getFirstSucceededRemoteWithNotEmptyData(), + switchMap((entityType: RemoteData>) => { + if ( (this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements ) { + this.hasNextPage = false; + } + return entityType.payload.page; + }), + reduce((acc: any, value: any) => [...acc, value], []), + startWith([]) + ); + this.subs.push( + this.searchListEntity$.subscribe( + (next) => { this.searchListEntity.push(...next); }, undefined, + () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); } + ) + ); + } + + /** + * Reset pagination values + */ + public resetPagination() { + this.currentPage = 1; + this.hasNextPage = true; + this.searchListEntity = []; + } + + /** + * Hide/Show the entity list loader + * @param hideShow true for show, false otherwise + */ + public hideShowLoader(hideShow: boolean) { + this.isLoadingList.next(hideShow); + } + + /** + * Unsubscribe from all subscriptions + */ + ngOnDestroy(): void { + this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 9b993e551f..b3120006a5 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -53,7 +53,8 @@ import { FormComponent } from './form/form.component'; import { DsDynamicOneboxComponent } from './form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component'; import { DsDynamicScrollableDropdownComponent } from './form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component'; import { - DsDynamicFormControlContainerComponent, dsDynamicFormControlMapFn, + DsDynamicFormControlContainerComponent, + dsDynamicFormControlMapFn, } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component'; import { DsDynamicFormComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form.component'; import { DragClickDirective } from './utils/drag-click.directive'; @@ -202,6 +203,7 @@ import { EpersonSearchBoxComponent } from './resource-policies/form/eperson-grou import { GroupSearchBoxComponent } from './resource-policies/form/eperson-group-list/group-search-box/group-search-box.component'; import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component'; import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component'; +import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.component'; import { DsSelectComponent } from './ds-select/ds-select.component'; import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component'; import { CurationFormComponent } from '../curation-form/curation-form.component'; @@ -432,6 +434,7 @@ const COMPONENTS = [ FileDownloadLinkComponent, BitstreamDownloadPageComponent, CollectionDropdownComponent, + EntityDropdownComponent, ExportMetadataSelectorComponent, ConfirmationModalComponent, VocabularyTreeviewComponent, From afdbf3541bdc2711c91ec2b6bc13ae9032bd685b Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 22 Sep 2021 17:43:47 +0200 Subject: [PATCH 063/161] [CST-4591] Add dropdown for selecting entity type when creating a new submission or importing from external source --- ...space-new-external-dropdown.component.html | 24 +++ ...space-new-external-dropdown.component.scss | 16 ++ ...ce-new-external-dropdown.component.spec.ts | 189 +++++++++++++++++ ...-dspace-new-external-dropdown.component.ts | 106 ++++++++++ ...ace-new-submission-dropdown.component.html | 20 ++ ...ace-new-submission-dropdown.component.scss | 16 ++ ...-new-submission-dropdown.component.spec.ts | 194 ++++++++++++++++++ ...space-new-submission-dropdown.component.ts | 109 ++++++++++ .../my-dspace-new-submission.component.html | 8 +- ...my-dspace-new-submission.component.spec.ts | 18 +- .../my-dspace-new-submission.component.ts | 9 - .../my-dspace-page/my-dspace-page.module.ts | 6 +- 12 files changed, 684 insertions(+), 31 deletions(-) create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.scss create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.scss create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts create mode 100644 src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html new file mode 100644 index 0000000000..141e628ac0 --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html @@ -0,0 +1,24 @@ +
+ +
+
+ + +
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.scss b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.scss new file mode 100644 index 0000000000..a156132e3f --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.scss @@ -0,0 +1,16 @@ +.parent { + display: flex; +} + +.upload { + flex: auto; +} + +.add { + flex: initial; +} + +#entityControlsDropdownMenu { + min-width: 18rem; + box-shadow: $btn-focus-box-shadow; +} diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts new file mode 100644 index 0000000000..aa223fc10e --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts @@ -0,0 +1,189 @@ +import { Component, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { Router } from '@angular/router'; +import { By } from '@angular/platform-browser'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { of as observableOf } from 'rxjs'; +import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test'; +import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component'; +import { EntityTypeService } from '../../../core/data/entity-type.service'; +import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; +import { ResourceType } from '../../../core/shared/resource-type'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { PageInfo } from '../../../core/shared/page-info.model'; +import { RouterStub } from '../../../shared/testing/router.stub'; + +export function getMockEntityTypeService(): EntityTypeService { + const pageInfo = { elementsPerPage: 20, totalElements: 4, totalPages: 1, currentPage: 0 } as PageInfo; + const type1: ItemType = { + id: '1', + label: 'Publication', + uuid: '1', + type: new ResourceType('entitytype'), + _links: undefined + }; + const type2: ItemType = { + id: '2', + label: 'Journal', + uuid: '2', + type: new ResourceType('entitytype'), + _links: undefined + }; + const type3: ItemType = { + id: '2', + label: 'DataPackage', + uuid: '2', + type: new ResourceType('entitytype'), + _links: undefined + }; + const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1, type2, type3])); + return jasmine.createSpyObj('entityTypeService', { + getAllAuthorizedRelationshipTypeImport: rd$, + hasMoreThanOneAuthorizedImport: observableOf(true) + }); +} + +export function getMockEmptyEntityTypeService(): EntityTypeService { + const pageInfo = { elementsPerPage: 20, totalElements: 1, totalPages: 1, currentPage: 0 } as PageInfo; + const type1: ItemType = { + id: '1', + label: 'Publication', + uuid: '1', + type: new ResourceType('entitytype'), + _links: undefined + }; + const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1])); + return jasmine.createSpyObj('entityTypeService', { + getAllAuthorizedRelationshipTypeImport: rd$, + hasMoreThanOneAuthorizedImport: observableOf(false) + }); +} + +describe('MyDSpaceNewExternalDropdownComponent test', () => { + let testComp: TestComponent; + let testFixture: ComponentFixture; + let submissionComponent: MyDSpaceNewExternalDropdownComponent; + let submissionComponentFixture: ComponentFixture; + + const entityType1: ItemType = { + id: '1', + label: 'Publication', + uuid: '1', + type: new ResourceType('entitytype'), + _links: undefined + }; + + describe('With only one Entity', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + TranslateModule.forRoot(), + ], + declarations: [ + MyDSpaceNewExternalDropdownComponent, + TestComponent + ], + providers: [ + { provide: EntityTypeService, useValue: getMockEmptyEntityTypeService() }, + { provide: Router, useValue: new RouterStub() }, + MyDSpaceNewExternalDropdownComponent + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + const html = ``; + + testFixture = createTestComponent(html, TestComponent) as ComponentFixture; + testComp = testFixture.componentInstance; + + submissionComponentFixture = TestBed.createComponent(MyDSpaceNewExternalDropdownComponent); + submissionComponent = submissionComponentFixture.componentInstance; + submissionComponentFixture.detectChanges(); + })); + + afterEach(() => { + testFixture.destroy(); + submissionComponentFixture.destroy(); + }); + + it('should create MyDSpaceNewExternalDropdownComponent', inject([MyDSpaceNewExternalDropdownComponent], (app: MyDSpaceNewExternalDropdownComponent) => { + expect(app).toBeDefined(); + })); + + it('should be a single button', inject([MyDSpaceNewExternalDropdownComponent], (app: MyDSpaceNewExternalDropdownComponent) => { + submissionComponentFixture.detectChanges(); + const addDivElement: DebugElement = submissionComponentFixture.debugElement.query(By.css('.add')); + const addDiv = addDivElement.nativeElement; + expect(addDiv.innerHTML).toBeDefined(); + const buttonElement: DebugElement = addDivElement.query(By.css('.btn')); + const button = buttonElement.nativeElement; + expect(button.innerHTML).toBeDefined(); + const dropdownElement: DebugElement = submissionComponentFixture.debugElement.query(By.css('.dropdown-menu')); + expect(dropdownElement).toBeNull(); + })); + }); + + describe('With more than one Entity', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + TranslateModule.forRoot(), + ], + declarations: [ + MyDSpaceNewExternalDropdownComponent, + TestComponent + ], + providers: [ + { provide: EntityTypeService, useValue: getMockEntityTypeService() }, + { provide: Router, useValue: new RouterStub() }, + MyDSpaceNewExternalDropdownComponent + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + const html = ``; + + testFixture = createTestComponent(html, TestComponent) as ComponentFixture; + testComp = testFixture.componentInstance; + + submissionComponentFixture = TestBed.createComponent(MyDSpaceNewExternalDropdownComponent); + submissionComponent = submissionComponentFixture.componentInstance; + submissionComponentFixture.detectChanges(); + })); + + afterEach(() => { + testFixture.destroy(); + submissionComponentFixture.destroy(); + }); + + it('should create MyDSpaceNewExternalDropdownComponent', inject([MyDSpaceNewExternalDropdownComponent], (app: MyDSpaceNewExternalDropdownComponent) => { + expect(app).toBeDefined(); + })); + + it('should be a dropdown button', inject([MyDSpaceNewExternalDropdownComponent], (app: MyDSpaceNewExternalDropdownComponent) => { + const dropdownElement: DebugElement = submissionComponentFixture.debugElement.query(By.css('.dropdown-menu')); + const dropdown = dropdownElement.nativeElement; + expect(dropdown.innerHTML).toBeDefined(); + })); + + it('should invoke modalService.open', () => { + submissionComponent.openPage(entityType1); + + expect((submissionComponent as any).router.navigate).toHaveBeenCalled(); + }); + }); +}); + +// declare a test component +@Component({ + selector: 'ds-test-cmp', + template: `` +}) +class TestComponent { + reload = (event) => { + return; + } +} diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts new file mode 100644 index 0000000000..e806f162f4 --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts @@ -0,0 +1,106 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; + +import { Observable, of as observableOf, Subscription } from 'rxjs'; +import { map, mergeMap, take } from 'rxjs/operators'; + +import { EntityTypeService } from '../../../core/data/entity-type.service'; +import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; +import { FindListOptions } from '../../../core/data/request.models'; +import { hasValue } from '../../../shared/empty.util'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list.model'; + +/** + * This component represents the 'Import metadata from external source' dropdown menu + */ +@Component({ + selector: 'ds-my-dspace-new-external-dropdown', + styleUrls: ['./my-dspace-new-external-dropdown.component.scss'], + templateUrl: './my-dspace-new-external-dropdown.component.html' +}) +export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy { + + /** + * Used to verify if there are one or more entities available + */ + public moreThanOne$: Observable; + + /** + * The entity observble (only if there is only one entity available) + */ + public singleEntity$: Observable; + + /** + * The entity object (only if there is only one entity available) + */ + public singleEntity: ItemType; + + /** + * TRUE if the page is initialized + */ + public initialized$: Observable; + + /** + * Array to track all subscriptions and unsubscribe them onDestroy + * @type {Array} + */ + public subs: Subscription[] = []; + + /** + * Initialize instance variables + * + * @param {EntityTypeService} entityTypeService + * @param {Router} router + */ + constructor(private entityTypeService: EntityTypeService, + private router: Router) { } + + /** + * Initialize entity type list + */ + ngOnInit() { + this.initialized$ = observableOf(false); + this.moreThanOne$ = this.entityTypeService.hasMoreThanOneAuthorizedImport(); + this.singleEntity$ = this.moreThanOne$.pipe( + mergeMap((response: boolean) => { + if (!response) { + const findListOptions: FindListOptions = { + elementsPerPage: 1, + currentPage: 1 + }; + return this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findListOptions).pipe( + map((entities: RemoteData>) => { + this.initialized$ = observableOf(true); + return entities.payload.page[0]; + }), + take(1) + ); + } else { + this.initialized$ = observableOf(true); + return observableOf(null); + } + }), + take(1) + ); + this.subs.push( + this.singleEntity$.subscribe((result) => this.singleEntity = result ) + ); + } + + /** + * Method called on clicking the button 'Import metadata from external source'. It opens the page of the external import. + */ + openPage(entity: ItemType) { + this.router.navigate(['/import-external'], { queryParams: { entity: entity.label } }); + } + + /** + * Unsubscribe from the subscription + */ + ngOnDestroy(): void { + this.subs + .filter((subscription) => hasValue(subscription)) + .forEach((subscription) => subscription.unsubscribe()); + } +} diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html new file mode 100644 index 0000000000..ac40bbb005 --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html @@ -0,0 +1,20 @@ +
+ +
+
+ + +
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.scss b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.scss new file mode 100644 index 0000000000..a156132e3f --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.scss @@ -0,0 +1,16 @@ +.parent { + display: flex; +} + +.upload { + flex: auto; +} + +.add { + flex: initial; +} + +#entityControlsDropdownMenu { + min-width: 18rem; + box-shadow: $btn-focus-box-shadow; +} diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts new file mode 100644 index 0000000000..2e7361c560 --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts @@ -0,0 +1,194 @@ +import { Component, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { of as observableOf } from 'rxjs'; +import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test'; +import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component'; +import { EntityTypeService } from '../../../core/data/entity-type.service'; +import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; +import { ResourceType } from '../../../core/shared/resource-type'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { PageInfo } from '../../../core/shared/page-info.model'; + +export function getMockEntityTypeService(): EntityTypeService { + const type1: ItemType = { + id: '1', + label: 'Publication', + uuid: '1', + type: new ResourceType('entitytype'), + _links: undefined + }; + const type2: ItemType = { + id: '2', + label: 'Journal', + uuid: '2', + type: new ResourceType('entitytype'), + _links: undefined + }; + const type3: ItemType = { + id: '2', + label: 'DataPackage', + uuid: '2', + type: new ResourceType('entitytype'), + _links: undefined + }; + const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1, type2, type3])); + return jasmine.createSpyObj('entityTypeService', { + getAllAuthorizedRelationshipType: rd$, + hasMoreThanOneAuthorized: observableOf(true) + }); +} + +export function getMockEmptyEntityTypeService(): EntityTypeService { + const pageInfo = { elementsPerPage: 20, totalElements: 1, totalPages: 1, currentPage: 0 } as PageInfo; + const type1: ItemType = { + id: '1', + label: 'Publication', + uuid: '1', + type: new ResourceType('entitytype'), + _links: undefined + }; + const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1])); + return jasmine.createSpyObj('entityTypeService', { + getAllAuthorizedRelationshipType: rd$, + hasMoreThanOneAuthorized: observableOf(false) + }); +} + +describe('MyDSpaceNewSubmissionDropdownComponent test', () => { + let testComp: TestComponent; + let testFixture: ComponentFixture; + let submissionComponent: MyDSpaceNewSubmissionDropdownComponent; + let submissionComponentFixture: ComponentFixture; + + const entityType1: ItemType = { + id: '1', + label: 'Publication', + uuid: '1', + type: new ResourceType('entitytype'), + _links: undefined + }; + + const modalStub = { + open: () => null, + close: () => null, + dismiss: () => null + }; + + describe('With only one Entity', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + TranslateModule.forRoot(), + ], + declarations: [ + MyDSpaceNewSubmissionDropdownComponent, + TestComponent + ], + providers: [ + { provide: EntityTypeService, useValue: getMockEmptyEntityTypeService() }, + { provide: NgbModal, useValue: modalStub }, + MyDSpaceNewSubmissionDropdownComponent + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + const html = ``; + + testFixture = createTestComponent(html, TestComponent) as ComponentFixture; + testComp = testFixture.componentInstance; + + submissionComponentFixture = TestBed.createComponent(MyDSpaceNewSubmissionDropdownComponent); + submissionComponent = submissionComponentFixture.componentInstance; + submissionComponentFixture.detectChanges(); + })); + + afterEach(() => { + testFixture.destroy(); + submissionComponentFixture.destroy(); + }); + + it('should create MyDSpaceNewSubmissionDropdownComponent', inject([MyDSpaceNewSubmissionDropdownComponent], (app: MyDSpaceNewSubmissionDropdownComponent) => { + expect(app).toBeDefined(); + })); + + it('should be a single button', inject([MyDSpaceNewSubmissionDropdownComponent], (app: MyDSpaceNewSubmissionDropdownComponent) => { + submissionComponentFixture.detectChanges(); + const addDivElement: DebugElement = submissionComponentFixture.debugElement.query(By.css('.add')); + const addDiv = addDivElement.nativeElement; + expect(addDiv.innerHTML).toBeDefined(); + const buttonElement: DebugElement = addDivElement.query(By.css('.btn')); + const button = buttonElement.nativeElement; + expect(button.innerHTML).toBeDefined(); + const dropdownElement: DebugElement = submissionComponentFixture.debugElement.query(By.css('.dropdown-menu')); + expect(dropdownElement).toBeNull(); + })); + }); + + describe('With more than one Entity', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + TranslateModule.forRoot(), + ], + declarations: [ + MyDSpaceNewSubmissionDropdownComponent, + TestComponent + ], + providers: [ + { provide: EntityTypeService, useValue: getMockEntityTypeService() }, + { provide: NgbModal, useValue: modalStub }, + MyDSpaceNewSubmissionDropdownComponent + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + const html = ``; + + testFixture = createTestComponent(html, TestComponent) as ComponentFixture; + testComp = testFixture.componentInstance; + + submissionComponentFixture = TestBed.createComponent(MyDSpaceNewSubmissionDropdownComponent); + submissionComponent = submissionComponentFixture.componentInstance; + submissionComponentFixture.detectChanges(); + })); + + afterEach(() => { + testFixture.destroy(); + submissionComponentFixture.destroy(); + }); + + it('should create MyDSpaceNewSubmissionDropdownComponent', inject([MyDSpaceNewSubmissionDropdownComponent], (app: MyDSpaceNewSubmissionDropdownComponent) => { + expect(app).toBeDefined(); + })); + + it('should be a dropdown button', inject([MyDSpaceNewSubmissionDropdownComponent], (app: MyDSpaceNewSubmissionDropdownComponent) => { + const dropdownElement: DebugElement = submissionComponentFixture.debugElement.query(By.css('.dropdown-menu')); + const dropdown = dropdownElement.nativeElement; + expect(dropdown.innerHTML).toBeDefined(); + })); + + it('should invoke modalService.open', () => { + spyOn((submissionComponent as any).modalService, 'open').and.returnValue({ componentInstance: { } }); + submissionComponent.openDialog(entityType1); + + expect((submissionComponent as any).modalService.open).toHaveBeenCalled(); + }); + }); +}); + +// declare a test component +@Component({ + selector: 'ds-test-cmp', + template: `` +}) +class TestComponent { + reload = (event) => { + return; + } +} diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts new file mode 100644 index 0000000000..0ff363b164 --- /dev/null +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts @@ -0,0 +1,109 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; + +import { Observable, of as observableOf, Subscription } from 'rxjs'; +import { map, mergeMap, take } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; + +import { EntityTypeService } from '../../../core/data/entity-type.service'; +import { ItemType } from '../../../core/shared/item-relationships/item-type.model'; +import { FindListOptions } from '../../../core/data/request.models'; +import { hasValue } from '../../../shared/empty.util'; +import { CreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list.model'; + +/** + * This component represents the new submission dropdown + */ +@Component({ + selector: 'ds-my-dspace-new-submission-dropdown', + styleUrls: ['./my-dspace-new-submission-dropdown.component.scss'], + templateUrl: './my-dspace-new-submission-dropdown.component.html' +}) +export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy { + + /** + * Used to verify if there are one or more entities available + */ + public moreThanOne$: Observable; + + /** + * The entity observble (only if there is only one entity available) + */ + public singleEntity$: Observable; + + /** + * The entity object (only if there is only one entity available) + */ + public singleEntity: ItemType; + + /** + * TRUE if the page is initialized + */ + public initialized$: Observable; + + /** + * Array to track all subscriptions and unsubscribe them onDestroy + * @type {Array} + */ + public subs: Subscription[] = []; + + /** + * Initialize instance variables + * + * @param {EntityTypeService} entityTypeService + * @param {NgbModal} modalService + */ + constructor(private entityTypeService: EntityTypeService, + private modalService: NgbModal) { } + + /** + * Initialize entity type list + */ + ngOnInit() { + this.initialized$ = observableOf(false); + this.moreThanOne$ = this.entityTypeService.hasMoreThanOneAuthorized(); + this.singleEntity$ = this.moreThanOne$.pipe( + mergeMap((response: boolean) => { + if (!response) { + const findListOptions: FindListOptions = { + elementsPerPage: 1, + currentPage: 1 + }; + return this.entityTypeService.getAllAuthorizedRelationshipType(findListOptions).pipe( + map((entities: RemoteData>) => { + this.initialized$ = observableOf(true); + return entities.payload.page[0]; + }), + take(1) + ); + } else { + this.initialized$ = observableOf(true); + return observableOf(null); + } + }), + take(1) + ); + this.subs.push( + this.singleEntity$.subscribe((result) => this.singleEntity = result ) + ); + } + + /** + * Method called on clicking the button "New Submition", It opens a dialog for + * select a collection. + */ + openDialog(entity: ItemType) { + const modalRef = this.modalService.open(CreateItemParentSelectorComponent); + modalRef.componentInstance.entityType = entity.label; + } + + /** + * Unsubscribe from the subscription + */ + ngOnDestroy(): void { + this.subs + .filter((subscription) => hasValue(subscription)) + .forEach((subscription) => subscription.unsubscribe()); + } +} diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html index 028b7df5a5..d0052b9355 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html @@ -8,14 +8,10 @@
- +
- - - +
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts index 7c6d8918cb..fb8ecbf65c 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts @@ -1,7 +1,6 @@ import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { By } from '@angular/platform-browser'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to'; @@ -25,6 +24,8 @@ import { HttpXsrfTokenExtractor } from '@angular/common/http'; import { CookieService } from '../../core/services/cookie.service'; import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock'; import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock'; +import { getMockEntityTypeService } from './my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec'; +import { EntityTypeService } from '../../core/data/entity-type.service'; describe('MyDSpaceNewSubmissionComponent test', () => { @@ -62,6 +63,7 @@ describe('MyDSpaceNewSubmissionComponent test', () => { { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock('mock-token') }, { provide: CookieService, useValue: new CookieServiceMock() }, { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }, + { provide: EntityTypeService, useValue: getMockEntityTypeService() }, ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); @@ -104,20 +106,6 @@ describe('MyDSpaceNewSubmissionComponent test', () => { comp.uploaderComponent.uploader = uploader; }); - it('should call app.openDialog', (done) => { - spyOn(comp, 'openDialog'); - const submissionButton = fixture.debugElement.query(By.css('button.btn-primary')); - submissionButton.triggerEventHandler('click', null); - - fixture.detectChanges(); - - fixture.whenStable().then(() => { - expect(comp.openDialog).toHaveBeenCalled(); - done(); - }); - - }); - it('should show a collection selector if only one file are uploaded', (done) => { spyOn((comp as any).modalService, 'open').and.returnValue({ result: new Promise((res, rej) => {/****/}) }); comp.afterFileLoaded(['']); diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts index c1e67561b2..580afd8ad4 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts @@ -14,7 +14,6 @@ import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; import { NotificationType } from '../../shared/notifications/models/notification-type'; import { hasValue } from '../../shared/empty.util'; import { SearchResult } from '../../shared/search/search-result.model'; -import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; import { CollectionSelectorComponent } from '../collection-selector/collection-selector.component'; import { UploaderComponent } from '../../shared/uploader/uploader.component'; import { UploaderError } from '../../shared/uploader/uploader-error.model'; @@ -118,14 +117,6 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit { this.notificationsService.error(null, this.translate.get(errorMessageKey)); } - /** - * Method called on clicking the button "New Submition", It opens a dialog for - * select a collection. - */ - openDialog() { - this.modalService.open(CreateItemParentSelectorComponent); - } - /** * Method invoked after all file are loaded from upload plugin */ diff --git a/src/app/my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts index 52c80c90b0..a5a18effbc 100644 --- a/src/app/my-dspace-page/my-dspace-page.module.ts +++ b/src/app/my-dspace-page/my-dspace-page.module.ts @@ -11,6 +11,8 @@ import { MyDSpaceGuard } from './my-dspace.guard'; import { MyDSpaceConfigurationService } from './my-dspace-configuration.service'; import { CollectionSelectorComponent } from './collection-selector/collection-selector.component'; import { MyDspaceSearchModule } from './my-dspace-search.module'; +import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component'; +import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component'; import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; const DECLARATIONS = [ @@ -18,7 +20,9 @@ const DECLARATIONS = [ ThemedMyDSpacePageComponent, MyDSpaceResultsComponent, MyDSpaceNewSubmissionComponent, - CollectionSelectorComponent + CollectionSelectorComponent, + MyDSpaceNewSubmissionDropdownComponent, + MyDSpaceNewExternalDropdownComponent ]; @NgModule({ From d9db65685b4df4b14e0330d758f9761f4624a7b9 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 22 Sep 2021 17:46:55 +0200 Subject: [PATCH 064/161] 83628: Dynamic theme fixes --- src/app/app.component.ts | 21 ++++++++------- src/app/shared/theme-support/theme.service.ts | 27 +++++++++++++++---- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d3668fad5a..6f06a84144 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,4 @@ -import { delay, distinctUntilChanged, filter, switchMap, take, withLatestFrom } from 'rxjs/operators'; +import { distinctUntilChanged, filter, switchMap, take, withLatestFrom } from 'rxjs/operators'; import { AfterViewInit, ChangeDetectionStrategy, @@ -13,9 +13,8 @@ import { ActivatedRouteSnapshot, NavigationCancel, NavigationEnd, - NavigationStart, + NavigationStart, ResolveEnd, Router, - RoutesRecognized } from '@angular/router'; import { BehaviorSubject, Observable, of } from 'rxjs'; @@ -113,7 +112,6 @@ export class AppComponent implements OnInit, AfterViewInit { this.themeService.getThemeName$().subscribe((themeName: string) => { if (isPlatformBrowser(this.platformId)) { // the theme css will never download server side, so this should only happen on the browser - this.isThemeLoading$.next(true); this.isThemeCSSLoading$.next(true); } if (hasValue(themeName)) { @@ -186,14 +184,14 @@ export class AppComponent implements OnInit, AfterViewInit { } ngAfterViewInit() { - this.router.events.pipe( - // This fixes an ExpressionChangedAfterItHasBeenCheckedError from being thrown while loading the component - // More information on this bug-fix: https://blog.angular-university.io/angular-debugging/ - delay(0) - ).subscribe((event) => { + let resolveEndFound = false; + this.router.events.subscribe((event) => { if (event instanceof NavigationStart) { + resolveEndFound = false; this.isRouteLoading$.next(true); - } else if (event instanceof RoutesRecognized) { + this.isThemeLoading$.next(true); + } else if (event instanceof ResolveEnd) { + resolveEndFound = true; const activatedRouteSnapShot: ActivatedRouteSnapshot = event.state.root; this.themeService.updateThemeOnRouteChange$(event.urlAfterRedirects, activatedRouteSnapShot).pipe( switchMap((changed) => { @@ -210,6 +208,9 @@ export class AppComponent implements OnInit, AfterViewInit { event instanceof NavigationEnd || event instanceof NavigationCancel ) { + if (!resolveEndFound) { + this.isThemeLoading$.next(false); + } this.isRouteLoading$.next(false); } }); diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts index f351f320d7..77be1691bf 100644 --- a/src/app/shared/theme-support/theme.service.ts +++ b/src/app/shared/theme-support/theme.service.ts @@ -3,9 +3,9 @@ import { Store, createFeatureSelector, createSelector, select, Action } from '@n import { Observable } from 'rxjs/internal/Observable'; import { ThemeState } from './theme.reducer'; import { SetThemeAction, ThemeActionTypes } from './theme.actions'; -import { expand, filter, map, startWith, switchMap, take, toArray } from 'rxjs/operators'; +import { expand, filter, map, startWith, switchMap, take, tap, toArray } from 'rxjs/operators'; import { hasValue, isNotEmpty } from '../empty.util'; -import { Actions, ofType } from '@ngrx/effects'; +import { act, Actions, ofType } from '@ngrx/effects'; import { ResolvedAction, ResolverActionTypes } from '../../core/resolving/resolver.actions'; import { RemoteData } from '../../core/data/remote-data'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; @@ -86,9 +86,10 @@ export class ThemeService { const action$ = currentTheme$.pipe( switchMap((currentTheme: string) => { + const snapshotWithData = this.findRouteData(activatedRouteSnapshot); if (this.hasDynamicTheme === true && isNotEmpty(this.themes)) { - if (hasValue(activatedRouteSnapshot) && hasValue(activatedRouteSnapshot.data) && hasValue(activatedRouteSnapshot.data.dso)) { - const dsoRD: RemoteData = activatedRouteSnapshot.data.dso; + if (hasValue(snapshotWithData) && hasValue(snapshotWithData.data) && hasValue(snapshotWithData.data.dso)) { + const dsoRD: RemoteData = snapshotWithData.data.dso; if (dsoRD.hasSucceeded) { // Start with the resolved dso and go recursively through its parents until you reach the top-level community return observableOf(dsoRD.payload).pipe( @@ -123,10 +124,10 @@ export class ThemeService { // If there are no themes configured, do nothing return [new NoOpAction()]; }), + take(1), ); action$.pipe( - take(1), filter((action) => action.type !== NO_OP_ACTION_TYPE), ).subscribe((action) => { this.store.dispatch(action); @@ -137,6 +138,22 @@ export class ThemeService { ); } + findRouteData(...routes: ActivatedRouteSnapshot[]) { + const result = routes.find((route) => hasValue(route.data.dso)); + if (hasValue(result)) { + return result; + } else { + const nextLevelRoutes = routes + .map((route: ActivatedRouteSnapshot) => route.children) + .reduce((combined: ActivatedRouteSnapshot[], current: ActivatedRouteSnapshot[]) => [...combined, ...current]); + if (isNotEmpty(nextLevelRoutes)) { + return this.findRouteData(...nextLevelRoutes); + } else { + return undefined; + } + } + } + /** * An rxjs operator that will return an array of all the ancestors of the DSpaceObject used as * input. The initial DSpaceObject will be the first element of the output array, followed by From 6bf3b8e7cdaa347144148ca6f695b80b39f95910 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 22 Sep 2021 18:02:52 +0200 Subject: [PATCH 065/161] [CST-4591] Change import from external source page in order to work with entity type --- .../mocks/external-source.service.mock.ts | 1 + ...-import-external-collection.component.html | 7 ++- ...port-external-collection.component.spec.ts | 47 ++++++++++++++++- ...on-import-external-collection.component.ts | 35 ++++++++++++- ...ion-import-external-preview.component.html | 2 +- ...ssion-import-external-preview.component.ts | 7 ++- ...mport-external-searchbar.component.spec.ts | 22 +++++--- ...ion-import-external-searchbar.component.ts | 33 +++++++----- .../submission-import-external.component.html | 20 +++++--- ...bmission-import-external.component.spec.ts | 23 ++++++--- .../submission-import-external.component.ts | 50 +++++++++++-------- src/assets/i18n/en.json5 | 18 ++++++- 12 files changed, 204 insertions(+), 61 deletions(-) diff --git a/src/app/shared/mocks/external-source.service.mock.ts b/src/app/shared/mocks/external-source.service.mock.ts index fd6d7cdc46..89b2927939 100644 --- a/src/app/shared/mocks/external-source.service.mock.ts +++ b/src/app/shared/mocks/external-source.service.mock.ts @@ -53,6 +53,7 @@ export const externalSourceMyStaffDb: ExternalSource = { export function getMockExternalSourceService(): ExternalSourceService { return jasmine.createSpyObj('ExternalSourceService', { findAll: jasmine.createSpy('findAll'), + searchBy: jasmine.createSpy('searchBy'), getExternalSourceEntries: jasmine.createSpy('getExternalSourceEntries'), }); } 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 73b41378c8..e1f03c40d5 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 @@ -5,7 +5,12 @@
- + +
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts index 1247eda0dc..3fb2d971b5 100644 --- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts +++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts @@ -1,10 +1,11 @@ -import { Component, NO_ERRORS_SCHEMA, EventEmitter } from '@angular/core'; -import { waitForAsync, TestBed, ComponentFixture, inject } from '@angular/core/testing'; +import { Component, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, fakeAsync, inject, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { createTestComponent } from '../../../shared/testing/utils.test'; import { SubmissionImportExternalCollectionComponent } from './submission-import-external-collection.component'; import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { By } from '@angular/platform-browser'; describe('SubmissionImportExternalCollectionComponent test suite', () => { let comp: SubmissionImportExternalCollectionComponent; @@ -76,6 +77,48 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => { expect(compAsAny.activeModal.dismiss).toHaveBeenCalled(); }); + + it('should be in loading state when hasChoice variable is different to true', () => { + comp.hasChoice = null; + expect(comp.isLoading()).toBeTrue(); + + comp.hasChoice = false; + expect(comp.isLoading()).toBeTrue(); + + comp.hasChoice = true; + expect(comp.isLoading()).toBeFalse(); + }); + + it('should set hasChoice variable on hasChoice event', () => { + comp.hasChoice = null; + + comp.onHasChoice(true); + expect(comp.hasChoice).toBe(true); + + comp.onHasChoice(false); + expect(comp.hasChoice).toBe(false); + }); + + it('should emit theOnlySelectable', () => { + spyOn(comp.selectedEvent, 'emit').and.callThrough(); + + const selected: any = {}; + comp.theOnlySelectable(selected); + + expect(comp.selectedEvent.emit).toHaveBeenCalledWith(selected); + }); + + it('dropdown should be invisible when the component is loading', fakeAsync(() => { + + spyOn(comp, 'isLoading').and.returnValue(true); + fixture.detectChanges(); + + fixture.whenStable().then(() => { + const dropdownMenu = fixture.debugElement.query(By.css('ds-collection-dropdown')).nativeElement; + expect(dropdownMenu.classList).toContain('d-none'); + }); + })); + }); }); 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 cbac0cb710..588bce89f9 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,4 +1,4 @@ -import { Component, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -16,6 +16,16 @@ export class SubmissionImportExternalCollectionComponent { */ @Output() public selectedEvent = new EventEmitter(); + /** + * If present this value is used to filter collection list by entity type + */ + public entityType: string; + + /** + * If a collection choice is available + */ + public hasChoice: boolean = null; + /** * Initialize the component variables. * @param {NgbActiveModal} activeModal @@ -37,4 +47,27 @@ export class SubmissionImportExternalCollectionComponent { public closeCollectionModal(): void { this.activeModal.dismiss(false); } + + /** + * Propagate the onlySelectable collection + * @param theOnlySelectable + */ + public theOnlySelectable(theOnlySelectable: CollectionListEntry) { + this.selectedEvent.emit(theOnlySelectable); + } + + /** + * Set the hasChoice state + * @param hasChoice + */ + public onHasChoice(hasChoice: boolean) { + this.hasChoice = hasChoice; + } + + /** + * If the component is in loading state. + */ + public isLoading(): boolean { + return this.hasChoice !== true; + } } diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html index 83c1ed82b6..bbb0dbcc94 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html @@ -1,5 +1,5 @@
-

{{'submission.import-external.preview.title' | translate}}

+

{{'submission.import-external.preview.title.' + labelPrefix | translate}}

+ + + + +
+ \ No newline at end of file diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts new file mode 100644 index 0000000000..417627cf46 --- /dev/null +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts @@ -0,0 +1,150 @@ +import { Component, Input, OnDestroy } from '@angular/core'; +import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; +import { ContentSource } from '../../../../core/shared/content-source.model'; +import { ProcessDataService } from '../../../../core/data/processes/process-data.service'; +import { + getAllCompletedRemoteData, + getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload +} from '../../../../core/shared/operators'; +import { filter, map, switchMap, tap } from 'rxjs/operators'; +import { hasValue, hasValueOperator } from '../../../../shared/empty.util'; +import { ProcessStatus } from '../../../../process-page/processes/process-status.model'; +import { Subscription } from 'rxjs/internal/Subscription'; +import { RequestService } from '../../../../core/data/request.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { Collection } from '../../../../core/shared/collection.model'; +import { CollectionDataService } from '../../../../core/data/collection-data.service'; +import { Observable } from 'rxjs/internal/Observable'; +import { Process } from '../../../../process-page/processes/process.model'; +import { TranslateService } from '@ngx-translate/core'; +import { HttpClient } from '@angular/common/http'; +import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; + +@Component({ + selector: 'ds-collection-source-controls', + templateUrl: './collection-source-controls.component.html', +}) +export class CollectionSourceControlsComponent implements OnDestroy { + + @Input() isEnabled: boolean; + @Input() collection: Collection; + @Input() shouldShow: boolean; + + contentSource$: Observable; + private subs: Subscription[] = []; + + constructor(private scriptDataService: ScriptDataService, + private processDataService: ProcessDataService, + private requestService: RequestService, + private notificationsService: NotificationsService, + private collectionService: CollectionDataService, + private translateService: TranslateService, + private httpClient: HttpClient, + private bitstreamService: BitstreamDataService + ) { + } + + ngOnInit() { + this.contentSource$ = this.collectionService.findByHref(this.collection._links.self.href, false).pipe( + getAllSucceededRemoteDataPayload(), + switchMap((collection) => this.collectionService.getContentSource(collection.uuid, false)), + getAllSucceededRemoteDataPayload() + ); + } + + testConfiguration(contentSource) { + this.subs.push(this.scriptDataService.invoke('harvest', [ + {name: '-g', value: null}, + {name: '-a', value: contentSource.oaiSource}, + {name: '-i', value: contentSource.oaiSetId}, + ], []).pipe( + getFirstCompletedRemoteData(), + tap((rd) => { + if (rd.hasFailed) { + this.notificationsService.error(this.translateService.get('collection.source.controls.test.submit.error')); + } + }), + filter((rd) => rd.hasSucceeded && hasValue(rd.payload)), + switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)), + getAllCompletedRemoteData(), + filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)), + map((rd) => rd.payload), + hasValueOperator(), + ).subscribe((process: Process) => { + if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() && + process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) { + setTimeout(() => { + this.requestService.setStaleByHrefSubstring(process._links.self.href); + }, 5000); + } + if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) { + this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed')); + } + if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { + this.bitstreamService.findByHref(process._links.output.href, false).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => { + this.httpClient.get(bitstream._links.content.href, {responseType: 'text'}).subscribe((data: any) => { + const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1') + .replaceAll('The script has started', '') + .replaceAll('The script has completed', ''); + this.notificationsService.success(this.translateService.get('collection.source.controls.test.completed'), output); + }); + }); + } + } + )); + } + + importNow() { + this.subs.push(this.scriptDataService.invoke('harvest', [ + {name: '-r', value: null}, + {name: '-e', value: 'dspacedemo+admin@gmail.com'}, + {name: '-c', value: this.collection.uuid}, + ], []) + .pipe( + getFirstCompletedRemoteData(), + tap((rd) => { + if (rd.hasFailed) { + this.notificationsService.error(this.translateService.get('collection.source.controls.test.submit.error')); + } + }), + filter((rd) => rd.hasSucceeded && hasValue(rd.payload)), + switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)), + getAllCompletedRemoteData(), + filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)), + map((rd) => rd.payload), + hasValueOperator(), + ).subscribe((process) => { + if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() && + process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) { + setTimeout(() => { + this.requestService.setStaleByHrefSubstring(process._links.self.href); + this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); + }, 5000); + } + if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) { + this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed')); + } + if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { + this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed')); + setTimeout(() => { + this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); + }, 5000); + } + } + )); + } + + resetAndReimport() { + // TODO implement when a single option is present + } + + ngOnDestroy(): void { + this.subs.forEach((sub) => { + if (hasValue(sub)) { + sub.unsubscribe(); + } + }); + } +} diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html index de7f0b4708..b67ee9a1bd 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html @@ -1,57 +1,74 @@
-
- - - -
-

{{ 'collection.edit.tabs.source.head' | translate }}

-
- - -
- -

{{ 'collection.edit.tabs.source.form.head' | translate }}

+
+ + + +
+

{{ 'collection.edit.tabs.source.head' | translate }}

+
+ + +
+ +

{{ 'collection.edit.tabs.source.form.head' | translate }}

- -
-
- - - -
+
+
+
+
+
+
+ + + +
+
+
+
+ + + diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts index c4b42d028d..ae48b9309e 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts @@ -380,7 +380,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem switchMap((uuid) => this.collectionService.getHarvesterEndpoint(uuid)), take(1) ).subscribe((endpoint) => this.requestService.removeByHrefSubstring(endpoint)); - + this.requestService.setStaleByHrefSubstring(this.contentSource._links.self.href); // Update harvester this.collectionRD$.pipe( getFirstSucceededRemoteData(), diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts index b743032c8c..0b09542fa0 100644 --- a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts +++ b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts @@ -9,6 +9,7 @@ import { CollectionCurateComponent } from './collection-curate/collection-curate import { CollectionSourceComponent } from './collection-source/collection-source.component'; import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component'; import { CollectionFormModule } from '../collection-form/collection-form.module'; +import { CollectionSourceControlsComponent } from './collection-source/collection-source-controls/collection-source-controls.component'; /** * Module that contains all components related to the Edit Collection page administrator functionality @@ -26,6 +27,8 @@ import { CollectionFormModule } from '../collection-form/collection-form.module' CollectionRolesComponent, CollectionCurateComponent, CollectionSourceComponent, + + CollectionSourceControlsComponent, CollectionAuthorizationsComponent ] }) diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts index f58f36450f..334e56e371 100644 --- a/src/app/core/data/collection-data.service.ts +++ b/src/app/core/data/collection-data.service.ts @@ -138,7 +138,7 @@ export class CollectionDataService extends ComColDataService { * Get the collection's content harvester * @param collectionId */ - getContentSource(collectionId: string): Observable> { + getContentSource(collectionId: string, useCachedVersionIfAvailable = true): Observable> { const href$ = this.getHarvesterEndpoint(collectionId).pipe( isNotEmptyOperator(), take(1) @@ -146,7 +146,7 @@ export class CollectionDataService extends ComColDataService { href$.subscribe((href: string) => { const request = new ContentSourceRequest(this.requestService.generateRequestId(), href); - this.requestService.send(request, true); + this.requestService.send(request, useCachedVersionIfAvailable); }); return this.rdbService.buildSingle(href$); diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index 326407822f..c98901219d 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -70,6 +70,15 @@ export class ContentSource extends CacheableObject { */ metadataConfigs: MetadataConfig[]; + @autoserializeAs('harvest_status') + harvestStatus: string; + + @autoserializeAs('harvest_start_time') + harvestStartTime: string; + + @autoserializeAs('last_harvested') + lastHarvested: string; + /** * The {@link HALLink}s for this ContentSource */ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8908ca42f6..8d89561d68 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -881,6 +881,22 @@ "collection.select.table.title": "Title", + "collection.source.controls.head": "Harvest Controls", + "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings", + "collection.source.controls.test.failed": "The script to test the settings has failed", + "collection.source.controls.test.completed": "The script to test the settings has successfully finished", + "collection.source.controls.test.submit": "Test configuration", + "collection.source.controls.import.submit.success": "The import has been successfully initiated", + "collection.source.controls.import.submit.error": "Something went wrong with initiating the import", + "collection.source.controls.import.submit": "Import now", + "collection.source.controls.import.failed": "An error occurred during the import", + "collection.source.controls.import.completed": "The import completed", + "collection.source.controls.reset.submit": "Reset and reimport", + "collection.source.controls.harvest.status": "Harvest status:", + "collection.source.controls.harvest.start": "Harvest start time:", + "collection.source.controls.harvest.last": "Last time harvested:", + "collection.source.controls.harvest.no-information": "N/A", + "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.", From 50c2d918b09d332a99549acfbc360c05e138c307 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 23 Sep 2021 15:48:58 +0200 Subject: [PATCH 070/161] fixed lgtm issue --- .../item-page/bitstreams/upload/upload-bitstream.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts index 61821a81b9..f68aca2252 100644 --- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts +++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { Item } from '../../../core/shared/item.model'; -import { map, switchMap, take } from 'rxjs/operators'; +import { map, take } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { UploaderOptions } from '../../../shared/uploader/uploader-options.model'; import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util'; From a170f1f8a97bfa1c98e64f8d34a9f630e207cacf Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 24 Sep 2021 13:17:35 +0200 Subject: [PATCH 071/161] [CST-4591] Fix issue with navigate when entity type is empty --- .../my-dspace-new-external-dropdown.component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts index e806f162f4..651178e7a1 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts @@ -92,7 +92,11 @@ export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy { * Method called on clicking the button 'Import metadata from external source'. It opens the page of the external import. */ openPage(entity: ItemType) { - this.router.navigate(['/import-external'], { queryParams: { entity: entity.label } }); + const params = Object.create({}); + if (entity) { + params.entity = entity.label; + } + this.router.navigate(['/import-external'], { queryParams: params }); } /** From c6a73f2dcb0e3e7ec332d83620819ba0f54b56f6 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 24 Sep 2021 13:18:50 +0200 Subject: [PATCH 072/161] [CST-4591] Fix issue with showing empty collection results --- .../collection-dropdown.component.html | 68 +++++++++---------- .../collection-dropdown.component.spec.ts | 16 +---- .../collection-dropdown.component.ts | 63 +++++++++-------- ...-import-external-collection.component.html | 4 +- ...port-external-collection.component.spec.ts | 22 +++--- ...on-import-external-collection.component.ts | 11 +-- 6 files changed, 87 insertions(+), 97 deletions(-) diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html index ce5fe0deb8..ccb9cde10d 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.html +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html @@ -1,42 +1,40 @@ -
- +
+
-
- - + - +
    +
  • + {{ item.name}} +
    • +
  • {{ listItem.collection.name}}
    • +
+ +
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts index 612f5a1733..94cb7c857d 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts @@ -226,23 +226,11 @@ describe('CollectionDropdownComponent', () => { }); it('should emit hasChoice true when totalElements is greater then one', () => { - spyOn(component.hasChoice, 'emit').and.callThrough(); + spyOn(component.searchComplete, 'emit').and.callThrough(); component.ngOnInit(); fixture.detectChanges(); - expect(component.hasChoice.emit).toHaveBeenCalledWith(true); - }); - - it('should emit hasChoice false when totalElements is not greater then one', () => { - - componentAsAny.collectionDataService.getAuthorizedCollection.and.returnValue(paginatedEmptyCollectionRD$); - componentAsAny.collectionDataService.getAuthorizedCollectionByEntityType.and.returnValue(paginatedEmptyCollectionRD$); - - spyOn(component.hasChoice, 'emit').and.callThrough(); - component.ngOnInit(); - fixture.detectChanges(); - - expect(component.hasChoice.emit).toHaveBeenCalledWith(false); + expect(component.searchComplete.emit).toHaveBeenCalledWith(); }); it('should emit theOnlySelectable when totalElements is equal to one', () => { diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts index 6c11613512..9826c554bb 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { BehaviorSubject, from as observableFrom, Observable, of as observableOf, Subscription } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, mergeMap, reduce, startWith, switchMap, take } from 'rxjs/operators'; import { hasValue } from '../empty.util'; @@ -22,10 +22,7 @@ import { Community } from '../../core/shared/community.model'; import { CollectionDataService } from '../../core/data/collection-data.service'; import { Collection } from '../../core/shared/collection.model'; import { followLink } from '../utils/follow-link-config.model'; -import { - getFirstSucceededRemoteDataPayload, - getFirstSucceededRemoteWithNotEmptyData -} from '../../core/shared/operators'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; /** * An interface to represent a collection entry @@ -113,9 +110,9 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { @Input() entityType: string; /** - * Emit to notify whether collections to choice from are more than one + * Emit to notify whether search is complete */ - @Output() hasChoice = new EventEmitter(); + @Output() searchComplete = new EventEmitter(); /** * Emit to notify the only selectable collection. @@ -213,35 +210,44 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { query, this.entityType, findOptions, - false, + true, followLink('parentCommunity')); } else { searchListService$ = this.collectionDataService - .getAuthorizedCollection(query, findOptions, true, false, followLink('parentCommunity')); + .getAuthorizedCollection(query, findOptions, true, true, followLink('parentCommunity')); } this.searchListCollection$ = searchListService$.pipe( - getFirstSucceededRemoteWithNotEmptyData(), - switchMap((collections: RemoteData>) => { - if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collections.payload.totalElements ) { + getFirstCompletedRemoteData(), + switchMap((collectionsRD: RemoteData>) => { + this.searchComplete.emit(); + if (collectionsRD.hasSucceeded && collectionsRD.payload.totalElements > 0) { + if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collectionsRD.payload.totalElements ) { + this.hasNextPage = false; + this.emitSelectionEvents(collectionsRD); + return observableFrom(collectionsRD.payload.page).pipe( + mergeMap((collection: Collection) => collection.parentCommunity.pipe( + getFirstSucceededRemoteDataPayload(), + map((community: Community) => ({ + communities: [{ id: community.id, name: community.name }], + collection: { id: collection.id, uuid: collection.id, name: collection.name } + }) + ))), + reduce((acc: any, value: any) => [...acc, value], []), + ); + } + } else { this.hasNextPage = false; + return observableOf([]); } - this.emitSelectionEvents(collections); - return collections.payload.page; - }), - mergeMap((collection: Collection) => collection.parentCommunity.pipe( - getFirstSucceededRemoteDataPayload(), - map((community: Community) => ({ - communities: [{ id: community.id, name: community.name }], - collection: { id: collection.id, uuid: collection.id, name: collection.name } - }) - ))), - reduce((acc: any, value: any) => [...acc, value], []), - startWith([]) + }) ); - this.subs.push(this.searchListCollection$.subscribe( - (next) => { this.searchListCollection.push(...next); }, undefined, - () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); } - )); + this.subs.push( + this.searchListCollection$.subscribe((list: CollectionListEntry[]) => { + this.searchListCollection.push(...list); + this.hideShowLoader(false); + this.changeDetectorRef.detectChanges(); + }) + ); } /** @@ -284,7 +290,6 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { * @private */ private emitSelectionEvents(collections: RemoteData>) { - this.hasChoice.emit(collections.payload.totalElements > 1); if (collections.payload.totalElements === 1) { const collection = collections.payload.page[0]; collections.payload.page[0].parentCommunity.pipe( 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 e1f03c40d5..6fb6ab3382 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 @@ -1,5 +1,5 @@
-
{{'dso-selector.create.collection.head' | translate}} +
{{'dso-selector.select.collection.head' | translate}} @@ -8,7 +8,7 @@ diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts index 3fb2d971b5..cd7fa86b0a 100644 --- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts +++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts @@ -78,25 +78,23 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => { expect(compAsAny.activeModal.dismiss).toHaveBeenCalled(); }); - it('should be in loading state when hasChoice variable is different to true', () => { - comp.hasChoice = null; + it('should be in loading state when search is not completed', () => { + comp.loading = null; + expect(comp.isLoading()).toBeFalse(); + + comp.loading = true; expect(comp.isLoading()).toBeTrue(); - comp.hasChoice = false; - expect(comp.isLoading()).toBeTrue(); - - comp.hasChoice = true; + comp.loading = false; expect(comp.isLoading()).toBeFalse(); }); - it('should set hasChoice variable on hasChoice event', () => { - comp.hasChoice = null; + it('should set loading variable to false on searchComplete event', () => { + comp.loading = null; - comp.onHasChoice(true); - expect(comp.hasChoice).toBe(true); + comp.searchComplete(); + expect(comp.loading).toBe(false); - comp.onHasChoice(false); - expect(comp.hasChoice).toBe(false); }); it('should emit theOnlySelectable', () => { 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 588bce89f9..e35bde03cf 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 @@ -22,9 +22,9 @@ export class SubmissionImportExternalCollectionComponent { public entityType: string; /** - * If a collection choice is available + * If collection searching is pending or not */ - public hasChoice: boolean = null; + public loading = true; /** * Initialize the component variables. @@ -60,14 +60,15 @@ export class SubmissionImportExternalCollectionComponent { * Set the hasChoice state * @param hasChoice */ - public onHasChoice(hasChoice: boolean) { - this.hasChoice = hasChoice; + public searchComplete() { + this.loading = false; } /** * If the component is in loading state. */ public isLoading(): boolean { - return this.hasChoice !== true; + return !!this.loading; } + } From d29c27b4003b4de0bd44d3a822a69368d88c0840 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 24 Sep 2021 13:20:36 +0200 Subject: [PATCH 073/161] [CST-4591] Use search collection dropdown when importing from external source with lookup modal --- src/app/core/shared/external-source.model.ts | 15 +++++- ...dynamic-lookup-relation-modal.component.ts | 14 +++++- ...tion-external-source-tab.component.spec.ts | 5 +- ...-relation-external-source-tab.component.ts | 19 ++++++- ...l-source-entry-import-modal.component.html | 7 --- ...ource-entry-import-modal.component.spec.ts | 1 - ...nal-source-entry-import-modal.component.ts | 49 ++++++++++++------- .../mocks/external-source.service.mock.ts | 9 ++++ src/assets/i18n/en.json5 | 3 ++ 9 files changed, 90 insertions(+), 32 deletions(-) diff --git a/src/app/core/shared/external-source.model.ts b/src/app/core/shared/external-source.model.ts index e28c8953e9..9f20a732f4 100644 --- a/src/app/core/shared/external-source.model.ts +++ b/src/app/core/shared/external-source.model.ts @@ -1,10 +1,15 @@ import { autoserialize, deserialize } from 'cerialize'; -import { typedObject } from '../cache/builders/build-decorators'; +import { link, typedObject } from '../cache/builders/build-decorators'; import { CacheableObject } from '../cache/object-cache.reducer'; import { excludeFromEquals } from '../utilities/equals.decorators'; import { EXTERNAL_SOURCE } from './external-source.resource-type'; import { HALLink } from './hal-link.model'; import { ResourceType } from './resource-type'; +import { RemoteData } from '../data/remote-data'; +import { PaginatedList } from '../data/paginated-list.model'; +import { Observable } from 'rxjs/internal/Observable'; +import { ITEM_TYPE } from './item-relationships/item-type.resource-type'; +import { ItemType } from './item-relationships/item-type.model'; /** * Model class for an external source @@ -38,6 +43,13 @@ export class ExternalSource extends CacheableObject { @autoserialize hierarchical: boolean; + /** + * The list of entity types that are compatible with this external source + * Will be undefined unless the entityTypes {@link HALLink} has been resolved. + */ + @link(ITEM_TYPE, true) + entityTypes?: Observable>>; + /** * The {@link HALLink}s for this ExternalSource */ @@ -45,5 +57,6 @@ export class ExternalSource extends CacheableObject { _links: { self: HALLink; entries: HALLink; + entityTypes: HALLink; }; } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts index 5ce451d6c2..b1afd08909 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts @@ -12,7 +12,9 @@ import { RelationshipOptions } from '../../models/relationship-options.model'; import { SearchResult } from '../../../../search/search-result.model'; import { Item } from '../../../../../core/shared/item.model'; import { - AddRelationshipAction, RemoveRelationshipAction, UpdateRelationshipNameVariantAction, + AddRelationshipAction, + RemoveRelationshipAction, + UpdateRelationshipNameVariantAction, } from './relationship.actions'; import { RelationshipService } from '../../../../../core/data/relationship.service'; import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service'; @@ -25,6 +27,7 @@ import { ExternalSourceService } from '../../../../../core/data/external-source. import { Router } from '@angular/router'; import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators'; +import { followLink } from '../../../../utils/follow-link-config.model'; @Component({ selector: 'ds-dynamic-lookup-relation-modal', @@ -146,7 +149,14 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy if (isNotEmpty(this.relationshipOptions.externalSources)) { this.externalSourcesRD$ = this.rdbService.aggregate( - this.relationshipOptions.externalSources.map((source) => this.externalSourceService.findById(source)) + this.relationshipOptions.externalSources.map((source) => { + return this.externalSourceService.findById( + source, + true, + true, + followLink('entityTypes') + ); + }) ).pipe( getAllSucceededRemoteDataPayload() ); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts index 6309b74792..62c33bd967 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts @@ -26,6 +26,7 @@ import { ExternalSourceEntryImportModalComponent } from './external-source-entry import { createPaginatedList } from '../../../../../testing/utils.test'; import { PaginationService } from '../../../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub'; +import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model'; describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { let component: DsDynamicLookupRelationExternalSourceTabComponent; @@ -35,10 +36,12 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { let selectableListService; let modalService; + const itemType = Object.assign(new ItemType(), { label: 'Person' }); const externalSource = { id: 'orcidV2', name: 'orcidV2', - hierarchical: false + hierarchical: false, + entityTypes: createSuccessfulRemoteDataObject$(createPaginatedList([itemType])) } as ExternalSource; const externalEntries = [ Object.assign({ diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts index 57abdd1a32..48b9edc82a 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts @@ -7,7 +7,7 @@ import { RemoteData } from '../../../../../../core/data/remote-data'; import { PaginatedList } from '../../../../../../core/data/paginated-list.model'; import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model'; import { ExternalSource } from '../../../../../../core/shared/external-source.model'; -import { startWith, switchMap } from 'rxjs/operators'; +import { map, startWith, switchMap } from 'rxjs/operators'; import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model'; import { Context } from '../../../../../../core/shared/context.model'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; @@ -22,6 +22,8 @@ import { Item } from '../../../../../../core/shared/item.model'; import { Collection } from '../../../../../../core/shared/collection.model'; import { PaginationService } from '../../../../../../core/pagination/pagination.service'; import { Observable, Subscription } from 'rxjs'; +import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model'; +import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators'; @Component({ selector: 'ds-dynamic-lookup-relation-external-source-tab', @@ -116,6 +118,11 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit */ importObjectSub: Subscription; + /** + * The entity types compatible with the given external source + */ + relatedEntityType: ItemType; + constructor(private router: Router, public searchConfigService: SearchConfigurationService, private externalSourceService: ExternalSourceService, @@ -129,6 +136,15 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit * Get the entries for the selected external source */ ngOnInit(): void { + this.externalSource.entityTypes.pipe( + getFirstCompletedRemoteData(), + map((entityTypesRD: RemoteData>) => { + return (entityTypesRD.hasSucceeded && entityTypesRD.payload.totalElements > 0) ? entityTypesRD.payload.page[0] : null; + }) + ).subscribe((entityType: ItemType) => { + this.relatedEntityType = entityType; + }); + this.resetRoute(); this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe( switchMap((searchOptions: PaginatedSearchOptions) => @@ -155,6 +171,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit modalComp.collection = this.collection; modalComp.relationship = this.relationship; modalComp.label = this.label; + modalComp.relatedEntityType = this.relatedEntityType; this.importObjectSub = modalComp.importedObject.subscribe((object) => { this.selectableListService.selectSingle(this.listId, object); this.importedObject.emit(object); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html index a4fc356ef9..44f21fb4b4 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html @@ -17,13 +17,6 @@
{{ (labelPrefix + 'entities' | translate) }}
-
-
- - -
-
- { component.externalSourceEntry = entry; component.label = label; component.relationship = relationship; - component.collection = submissionCollection; component.item = submissionItem; fixture.detectChanges(); }); diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index ca179a8080..9a0b49e3f6 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, OnInit } from '@angular/core'; -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model'; import { MetadataValue } from '../../../../../../../core/shared/metadata.models'; import { Metadata } from '../../../../../../../core/shared/metadata.utils'; @@ -15,14 +15,16 @@ import { CollectionElementLinkType } from '../../../../../../object-collection/c import { Context } from '../../../../../../../core/shared/context.model'; import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service'; import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model'; -import { Collection } from '../../../../../../../core/shared/collection.model'; import { ItemDataService } from '../../../../../../../core/data/item-data.service'; import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model'; -import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../../../../../core/shared/operators'; -import { take } from 'rxjs/operators'; +import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../../core/shared/operators'; +import { mergeMap, take } from 'rxjs/operators'; import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model'; import { NotificationsService } from '../../../../../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import { ItemType } from '../../../../../../../core/shared/item-relationships/item-type.model'; +import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component'; +import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component'; /** * The possible types of import for the external entry @@ -67,16 +69,6 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { */ item: Item; - /** - * The collection the user is submitting in - */ - collection: Collection; - - /** - * The ID of the collection to import entries to - */ - collectionId: string; - /** * The current relationship-options used for filtering results */ @@ -147,8 +139,19 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { */ authorityEnabled = false; + /** + * The entity types compatible with the given external source + */ + relatedEntityType: ItemType; + + /** + * The modal for the collection selection + */ + modalRef: NgbModalRef; + constructor(public modal: NgbActiveModal, public lookupRelationService: LookupRelationService, + private modalService: NgbModal, private selectService: SelectableListService, private itemService: ItemDataService, private notificationsService: NotificationsService, @@ -160,7 +163,6 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { const pagination = Object.assign(new PaginationComponentOptions(), { id: 'external-entry-import', pageSize: 5 }); this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: this.externalSourceEntry.value, pagination: pagination })); this.localEntitiesRD$ = this.lookupRelationService.getLocalResults(this.relationship, this.searchOptions); - this.collectionId = this.collection.id; } /** @@ -211,10 +213,19 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { * Create and import a new entity from the external entry */ importNewEntity() { - this.itemService.importExternalSourceEntry(this.externalSourceEntry, this.collectionId).pipe( - getFirstSucceededRemoteData(), - getRemoteDataPayload(), - take(1) + this.modalRef = this.modalService.open(SubmissionImportExternalCollectionComponent, { + size: 'lg', + }); + this.modalRef.componentInstance.entityType = this.relatedEntityType.label; + + this.modalRef.componentInstance.selectedEvent.pipe( + mergeMap((collectionListEntry: CollectionListEntry) => { + return this.itemService.importExternalSourceEntry(this.externalSourceEntry, collectionListEntry.collection.id).pipe( + getFirstSucceededRemoteData(), + getRemoteDataPayload(), + take(1) + ); + }) ).subscribe((item: Item) => { this.lookupRelationService.removeLocalResultsCache(); const searchResult = Object.assign(new ItemSearchResult(), { diff --git a/src/app/shared/mocks/external-source.service.mock.ts b/src/app/shared/mocks/external-source.service.mock.ts index 89b2927939..f1afed19af 100644 --- a/src/app/shared/mocks/external-source.service.mock.ts +++ b/src/app/shared/mocks/external-source.service.mock.ts @@ -11,6 +11,9 @@ export const externalSourceOrcid: ExternalSource = { entries: { href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid/entries' }, + entityTypes: { + href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes' + }, self: { href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid' } @@ -26,6 +29,9 @@ export const externalSourceCiencia: ExternalSource = { entries: { href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia/entries' }, + entityTypes: { + href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes' + }, self: { href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia' } @@ -41,6 +47,9 @@ export const externalSourceMyStaffDb: ExternalSource = { entries: { href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entries' }, + entityTypes: { + href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes' + }, self: { href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db' } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index a90d6329bf..20f9b8ca30 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1193,6 +1193,8 @@ "dso-selector.placeholder": "Search for a {{ type }}", + "dso-selector.select.collection.head": "Select a collection", + "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", @@ -3730,6 +3732,7 @@ "vocabulary-treeview.tree.description.srsc": "Research Subject Categories", + "unset.listelement.badge": "Untyped", "uploader.browse": "browse", From 93f2274c5d83a316f2a5938ab1c80cf6bbfe4f74 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 24 Sep 2021 14:33:30 +0200 Subject: [PATCH 074/161] [CST-4591] add missing label --- src/assets/i18n/en.json5 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 20f9b8ca30..60b9846f0c 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3227,6 +3227,8 @@ "submission.import-external.title.Publication": "Import a publication from an external source", + "submission.import-external.title.unset": "Import metadata from an external source", + "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", "submission.import-external.page.noentity": "An entity type must be selected in order to use this page. Select it using the 'Import metadata from an external source' button in 'MyDspace' page.", From b22d8358fb126aa78451ac3606bcd503756d2014 Mon Sep 17 00:00:00 2001 From: Alba Aliu Date: Fri, 24 Sep 2021 17:07:38 +0200 Subject: [PATCH 075/161] [DSC-112] unit testing --- .../edit-in-place-field.component.spec.ts | 36 +++++++++++++++++++ .../validation-suggestions.component.spec.ts | 26 ++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts index 0a4df1bda5..3b71ba3a6a 100644 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts @@ -463,4 +463,40 @@ describe('EditInPlaceFieldComponent', () => { }); }); + + describe('canEditMetadataField', () => { + describe('when the fieldUpdate\'s changeType is currently ADD', () => { + beforeEach(() => { + objectUpdatesService.isEditable.and.returnValue(observableOf(true)); + comp.fieldUpdate.changeType = FieldChangeType.ADD; + fixture.detectChanges(); + }); + it('can edit metadata field', () => { + const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable + expect(disabledMetadataField).toBe(false); + }); + }); + describe('when the fieldUpdate\'s changeType is currently REMOVE', () => { + beforeEach(() => { + objectUpdatesService.isEditable.and.returnValue(observableOf(true)); + comp.fieldUpdate.changeType = FieldChangeType.REMOVE; + fixture.detectChanges(); + }); + it('can edit metadata field', () => { + const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable + expect(disabledMetadataField).toBe(true); + }); + }); + describe('when the fieldUpdate\'s changeType is currently UPDATE', () => { + beforeEach(() => { + objectUpdatesService.isEditable.and.returnValue(observableOf(true)); + comp.fieldUpdate.changeType = FieldChangeType.UPDATE; + fixture.detectChanges(); + }); + it('can edit metadata field', () => { + const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable + expect(disabledMetadataField).toBe(true); + }); + }); + }); }); diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts index 388ed40cfe..98d9b0ac6d 100644 --- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts +++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts @@ -60,4 +60,30 @@ describe('ValidationSuggestionsComponent', () => { expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex].value); }); }); + describe('can edit input', () => { + describe('test input field readonly property when input disable is true', () => { + beforeEach(() => { + comp.disable = true; + fixture.detectChanges(); + }); + it('it should be true', () => { + fixture.detectChanges(); + let input = fixture.debugElement.query(By.css('input')); + let el = input.nativeElement; + expect(el.readOnly).toBe(true) + }); + }) + describe('test input field readonly property when input disable is false', () => { + beforeEach(() => { + comp.disable = false; + fixture.detectChanges(); + }); + it('it should be true', () => { + fixture.detectChanges(); + let input = fixture.debugElement.query(By.css('input')); + let el = input.nativeElement; + expect(el.readOnly).toBe(false) + }); + }) + }) }); From d9237acb701491106acb6873e599d2adbd762e57 Mon Sep 17 00:00:00 2001 From: Rezart Vata Date: Fri, 24 Sep 2021 17:16:53 +0200 Subject: [PATCH 076/161] [CST-4634] Added custom validator and messages and show error message for not valid email, lint fixes & unit testing --- .../access-control/access-control.module.ts | 1 + .../eperson-form/eperson-form.component.ts | 14 +++++++++-- .../validators/email-taken.validator.ts | 23 +++++++++++++++++++ src/assets/i18n/en.json5 | 5 ++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts index 0e872458bd..6968bff63d 100644 --- a/src/app/access-control/access-control.module.ts +++ b/src/app/access-control/access-control.module.ts @@ -10,6 +10,7 @@ import { MembersListComponent } from './group-registry/group-form/members-list/m import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component'; import { GroupsRegistryComponent } from './group-registry/groups-registry.component'; + @NgModule({ imports: [ CommonModule, 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 b1d0c5bed3..f4eeaf468a 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,5 +1,5 @@ import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'; -import { FormGroup } from '@angular/forms'; +import { FormGroup, Validators } from '@angular/forms'; import { DynamicCheckboxModel, DynamicFormControlModel, @@ -33,6 +33,7 @@ import { RequestService } from '../../../core/data/request.service'; import { NoContent } from '../../../core/shared/NoContent.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { followLink } from '../../../shared/utils/follow-link-config.model'; +import { ValidateEmailNotTaken } from './validators/email-taken.validator'; @Component({ selector: 'ds-eperson-form', @@ -187,6 +188,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { * This method will initialise the page */ initialisePage() { + observableCombineLatest( this.translateService.get(`${this.messagePrefix}.firstName`), this.translateService.get(`${this.messagePrefix}.lastName`), @@ -219,9 +221,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy { name: 'email', validators: { required: null, - pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$' + pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$', }, required: true, + errorMessages: { + emailTaken: 'error.validation.emailTaken', + pattern: 'error.validation.NotValidEmail' + }, hint: emailHint }); this.canLogIn = new DynamicCheckboxModel( @@ -262,6 +268,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy { }); })); + if (!!this.formGroup.controls.email) { + this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService)); + } + const activeEPerson$ = this.epersonService.getActiveEPerson(); this.groups = activeEPerson$.pipe( diff --git a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts new file mode 100644 index 0000000000..8e5303c00c --- /dev/null +++ b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts @@ -0,0 +1,23 @@ +import { AbstractControl, ValidationErrors } from '@angular/forms'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { getFirstSucceededRemoteData, } from '../../../../core/shared/operators'; + +export class ValidateEmailNotTaken { + + /** + * This method will create the validator with the ePersonDataService requested from component + * @param ePersonDataService the service with DI in the component that this validator is being utilized. + */ + static createValidator(ePersonDataService: EPersonDataService) { + return (control: AbstractControl): Promise | Observable => { + return ePersonDataService.getEPersonByEmail(control.value) + .pipe( + getFirstSucceededRemoteData(), + map(res => { return !!res.payload ? { emailTaken: true } : null; }) + ); + }; + } +} diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index aa76d2e422..373e25d2bd 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1260,6 +1260,11 @@ "error.validation.filerequired": "The file upload is mandatory", + "error.validation.required": "This field is required", + + "error.validation.NotValidEmail": "This E-mail is not a valid email", + + "error.validation.emailTaken": "This E-mail is already taken", "file-section.error.header": "Error obtaining files for this item", From eb14b6c5ad82f729e9cc11928db6c53902c49b26 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Fri, 24 Sep 2021 18:49:13 +0200 Subject: [PATCH 077/161] [DSC-192] lint fixes --- .../edit-in-place-field.component.spec.ts | 9 ++++++--- .../validation-suggestions.component.spec.ts | 18 +++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts index 3b71ba3a6a..03e8e5d720 100644 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts @@ -472,7 +472,8 @@ describe('EditInPlaceFieldComponent', () => { fixture.detectChanges(); }); it('can edit metadata field', () => { - const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable + const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')) + .componentInstance.disable; expect(disabledMetadataField).toBe(false); }); }); @@ -483,7 +484,8 @@ describe('EditInPlaceFieldComponent', () => { fixture.detectChanges(); }); it('can edit metadata field', () => { - const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable + const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')) + .componentInstance.disable; expect(disabledMetadataField).toBe(true); }); }); @@ -494,7 +496,8 @@ describe('EditInPlaceFieldComponent', () => { fixture.detectChanges(); }); it('can edit metadata field', () => { - const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')).componentInstance.disable + const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions')) + .componentInstance.disable; expect(disabledMetadataField).toBe(true); }); }); diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts index 98d9b0ac6d..dad2edc30e 100644 --- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts +++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts @@ -68,11 +68,11 @@ describe('ValidationSuggestionsComponent', () => { }); it('it should be true', () => { fixture.detectChanges(); - let input = fixture.debugElement.query(By.css('input')); - let el = input.nativeElement; - expect(el.readOnly).toBe(true) + const input = fixture.debugElement.query(By.css('input')); + const element = input.nativeElement; + expect(element.readOnly).toBe(true); }); - }) + }); describe('test input field readonly property when input disable is false', () => { beforeEach(() => { comp.disable = false; @@ -80,10 +80,10 @@ describe('ValidationSuggestionsComponent', () => { }); it('it should be true', () => { fixture.detectChanges(); - let input = fixture.debugElement.query(By.css('input')); - let el = input.nativeElement; - expect(el.readOnly).toBe(false) + const input = fixture.debugElement.query(By.css('input')); + const element = input.nativeElement; + expect(element.readOnly).toBe(false); }); - }) - }) + }); + }); }); From f60755b2b003469108904215762bc7b60625af50 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Sat, 25 Sep 2021 00:59:19 +0200 Subject: [PATCH 078/161] [CST-4499] Version history - New version refactored - Test TBD --- src/app/item-page/item-page.module.ts | 4 +- .../untyped-item/untyped-item.component.html | 2 +- .../untyped-item/untyped-item.component.ts | 67 +-------------- .../versioned-item.component.html | 1 + .../versioned-item.component.scss | 0 .../versioned-item.component.spec.ts | 25 ++++++ .../versioned-item.component.ts | 55 ++++++++++++ .../item-versions-shared.service.spec.ts | 16 ++++ .../item-versions-shared.service.ts | 50 +++++++++++ ...item-versions-summary-modal.component.html | 12 ++- .../item-versions-summary-modal.component.ts | 9 +- .../item-versions.component.spec.ts | 84 ++++++++++++++----- .../item-versions/item-versions.component.ts | 54 +++++------- 13 files changed, 253 insertions(+), 126 deletions(-) create mode 100644 src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html create mode 100644 src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss create mode 100644 src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts create mode 100644 src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts create mode 100644 src/app/shared/item/item-versions/item-versions-shared.service.spec.ts create mode 100644 src/app/shared/item/item-versions/item-versions-shared.service.ts diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts index 6556617e4a..937be86285 100644 --- a/src/app/item-page/item-page.module.ts +++ b/src/app/item-page/item-page.module.ts @@ -32,6 +32,7 @@ import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/med import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/media-viewer-image.component'; import { NgxGalleryModule } from '@kolkov/ngx-gallery'; import { VersionPageComponent } from './version-page/version-page/version-page.component'; +import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator @@ -77,7 +78,8 @@ const DECLARATIONS = [ NgxGalleryModule, ], declarations: [ - ...DECLARATIONS + ...DECLARATIONS, + VersionedItemComponent ], exports: [ ...DECLARATIONS diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index 533d7c6ccf..5d42e8949e 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -3,7 +3,7 @@
- diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts index 2a17c9f148..3ce33dc90a 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts @@ -1,18 +1,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; -import { ItemComponent } from '../shared/item.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { take } from 'rxjs/operators'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Version } from '../../../../core/shared/version.model'; +import { VersionedItemComponent } from '../versioned-item/versioned-item.component'; /** * Component that represents a publication Item page @@ -25,59 +15,6 @@ import { Version } from '../../../../core/shared/version.model'; templateUrl: './untyped-item.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class UntypedItemComponent extends ItemComponent { - private activeModal: NgbModalRef; +export class UntypedItemComponent extends VersionedItemComponent { - constructor( - private modalService: NgbModal, - private versionHistoryService: VersionHistoryDataService, - private notificationsService: NotificationsService, - private translateService: TranslateService, - // private itemService: ItemDataService, - private versionService: VersionDataService, - ) { - super(); - } - - createNewVersionNotify(success: boolean, newVersionNumber: number) { - const successMessageKey = 'item.version.create.notification.success'; - const failureMessageKey = 'item.version.create.notification.failure'; - if (success) { - this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); - } else { - this.notificationsService.error(null, this.translateService.get(failureMessageKey)); - } - } - - createNewVersionSubmit(item: Item, summary: string) { - const itemHref = item._links.self.href; - this.versionHistoryService.createVersion(itemHref, summary).pipe( - take(1) - ).subscribe((postResult) => { - this.createNewVersionNotify(postResult.hasSucceeded, postResult?.payload.version); - }); - } - - createNewVersionModal() { - const item = this.object; - - // Open modal - this.activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); - - // Show current version in modal - this.versionService.findByHref(item._links.version.href).pipe( - getFirstCompletedRemoteData() - ).subscribe( - (res: RemoteData) => { - // if response is empty then the item is unversioned - this.activeModal.componentInstance.firstVersion = res.hasNoContent; - this.activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version); - } - ); - - // On modal submit create version - this.activeModal.result.then((modalResult) => { - this.createNewVersionSubmit(item, modalResult); - }); - } } diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html new file mode 100644 index 0000000000..eed81441ab --- /dev/null +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html @@ -0,0 +1 @@ +

versioned-item works!

diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts new file mode 100644 index 0000000000..5ba80717f0 --- /dev/null +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VersionedItemComponent } from './versioned-item.component'; + +describe('VersionedItemComponent', () => { + let component: VersionedItemComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ VersionedItemComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(VersionedItemComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts new file mode 100644 index 0000000000..13cab84902 --- /dev/null +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts @@ -0,0 +1,55 @@ +import { Component } from '@angular/core'; +import { ItemComponent } from '../shared/item.component'; +import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { Version } from '../../../../core/shared/version.model'; +import { switchMap, take } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionDataService } from '../../../../core/data/version-data.service'; +import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service'; + +@Component({ + selector: 'ds-versioned-item', + templateUrl: './versioned-item.component.html', + styleUrls: ['./versioned-item.component.scss'] +}) +export class VersionedItemComponent extends ItemComponent { + + constructor( + private modalService: NgbModal, + private versionHistoryService: VersionHistoryDataService, + private translateService: TranslateService, + private versionService: VersionDataService, + private itemVersionShared: ItemVersionsSharedService, + ) { + super(); + } + + /** + * Open a modal that allows to create a new version starting from the specified item, with optional summary + */ + onCreateNewVersion(): void { + + const item = this.object; + const versionHref = item._links.version.href; + + // Open modal + const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); + + // Show current version in modal + this.versionService.findByHref(versionHref).pipe(getFirstCompletedRemoteData()).subscribe((res: RemoteData) => { + // if res.hasNoContent then the item is unversioned + activeModal.componentInstance.firstVersion = res.hasNoContent; + activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version); + }); + + // On createVersionEvent emitted create new version and notify + activeModal.componentInstance.createVersionEvent.pipe( + switchMap((summary: string) => this.itemVersionShared.createNewVersionAndNotify(item, summary)), + take(1) + ).subscribe(); + } +} diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts new file mode 100644 index 0000000000..cf9a65c0e7 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ItemVersionsSharedService } from './item-versions-shared.service'; + +describe('ItemVersionsSharedService', () => { + let service: ItemVersionsSharedService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ItemVersionsSharedService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.ts b/src/app/shared/item/item-versions/item-versions-shared.service.ts new file mode 100644 index 0000000000..c3d82bf744 --- /dev/null +++ b/src/app/shared/item/item-versions/item-versions-shared.service.ts @@ -0,0 +1,50 @@ +import { Injectable } from '@angular/core'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { Item } from '../../../core/shared/item.model'; +import { switchMap } from 'rxjs/operators'; +import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; +import { Observable, of } from 'rxjs'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Version } from '../../../core/shared/version.model'; + +@Injectable({ + providedIn: 'root' +}) +export class ItemVersionsSharedService { + + constructor( + private notificationsService: NotificationsService, + private translateService: TranslateService, + private versionHistoryService: VersionHistoryDataService, + ) { + } + + private static msg(key: string): string { + const translationPrefix = 'item.version.create.notification'; + return translationPrefix + '.' + key; + } + + /** + * Create a new version, notify success/failure and return new version number + * + * @param item the item from which a new version will be created + * @param summary the optional summary for the new version + */ + createNewVersionAndNotify(item: Item, summary: string): Observable { + return this.versionHistoryService.createVersion(item._links.self.href, summary).pipe( + switchMap((postResult: RemoteData) => { + const newVersionNumber = postResult?.payload.version; + this.createNewVersionNotify(postResult.hasSucceeded, newVersionNumber); + return of(postResult.hasSucceeded); + }) + ); + } + + private createNewVersionNotify(success: boolean, newVersionNumber: number) { + success ? + this.notificationsService.success(null, this.translateService.get(ItemVersionsSharedService.msg('success'), {version: newVersionNumber})) : + this.notificationsService.error(null, this.translateService.get(ItemVersionsSharedService.msg('failure'))); + } + +} diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html index 6065cb289e..e49e257339 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html @@ -7,24 +7,30 @@

{{ "item.version.create.modal.text" | translate }} - {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }} + + {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }} +

- +
+
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts index 840af4b600..cc4eefcdc0 100644 --- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts +++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ @@ -12,17 +12,22 @@ export class ItemVersionsSummaryModalComponent { newVersionSummary: string; firstVersion = true; + @Output() createVersionEvent: EventEmitter = new EventEmitter(); + constructor( protected activeModal: NgbActiveModal, ) { } onModalClose() { + console.log('onModalClose() dismiss modal'); this.activeModal.dismiss(); } onModalSubmit() { - this.activeModal.close(this.newVersionSummary); + console.log('onModalSubmit() emits \'' + this.newVersionSummary + '\''); + this.createVersionEvent.emit(this.newVersionSummary); + this.activeModal.close(); } } diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts index 81b5489439..42b1148f07 100644 --- a/src/app/shared/item/item-versions/item-versions.component.spec.ts +++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts @@ -11,7 +11,7 @@ import { VersionHistoryDataService } from '../../../core/data/version-history-da import { By } from '@angular/platform-browser'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { createPaginatedList } from '../../testing/utils.test'; -import { of as observableOf } from 'rxjs'; +import { of, of as observableOf } from 'rxjs'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../testing/pagination-service.stub'; import { AuthService } from '../../../core/auth/auth.service'; @@ -21,12 +21,14 @@ import { FormBuilder } from '@angular/forms'; import { NotificationsService } from '../../notifications/notifications.service'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -describe('ItemVersionsComponent', () => { +fdescribe('ItemVersionsComponent', () => { let component: ItemVersionsComponent; let fixture: ComponentFixture; let authenticationService: AuthService; let authorizationService: AuthorizationDataService; + let versionHistoryService: VersionHistoryDataService; const versionHistory = Object.assign(new VersionHistory(), { id: '1' @@ -37,16 +39,25 @@ describe('ItemVersionsComponent', () => { version: 1, created: new Date(2020, 1, 1), summary: 'first version', - versionhistory: createSuccessfulRemoteDataObject$(versionHistory) + versionhistory: createSuccessfulRemoteDataObject$(versionHistory), + _links: { + self: { + href: 'version2-url', + }, + }, }); const version2 = Object.assign(new Version(), { id: '2', version: 2, summary: 'second version', created: new Date(2020, 1, 2), - versionhistory: createSuccessfulRemoteDataObject$(versionHistory) + versionhistory: createSuccessfulRemoteDataObject$(versionHistory), + _links: { + self: { + href: 'version2-url', + }, + }, }); - const versions = [version1, version2]; versionHistory.versions = createSuccessfulRemoteDataObject$(createPaginatedList(versions)); @@ -74,42 +85,46 @@ describe('ItemVersionsComponent', () => { version1.item = createSuccessfulRemoteDataObject$(item1); version2.item = createSuccessfulRemoteDataObject$(item2); - const versionHistoryService = jasmine.createSpyObj('versionHistoryService', { + const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', { getVersions: createSuccessfulRemoteDataObject$(createPaginatedList(versions)) }); + const authenticationServiceSpy = jasmine.createSpyObj('authenticationService', { + isAuthenticated: observableOf(true), + setRedirectUrl: {} + } + ); + const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']); + beforeEach(waitForAsync(() => { - authenticationService = jasmine.createSpyObj('authenticationService', { - isAuthenticated: observableOf(true), - setRedirectUrl: {} - } - ); - authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true), - } - ); TestBed.configureTestingModule({ declarations: [ItemVersionsComponent, VarDirective], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ - { provide: PaginationService, useValue: new PaginationServiceStub() }, - { provide: FormBuilder, useValue: new FormBuilder() }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() }, - { provide: AuthService, useValue: authenticationService }, - { provide: AuthorizationDataService, useValue: authorizationService }, - { provide: VersionHistoryDataService, useValue: versionHistoryService }, - { provide: ItemDataService, useValue: {} }, - { provide: VersionDataService, useValue: {} }, + {provide: PaginationService, useValue: new PaginationServiceStub()}, + {provide: FormBuilder, useValue: new FormBuilder()}, + {provide: NotificationsService, useValue: new NotificationsServiceStub()}, + {provide: AuthService, useValue: authenticationServiceSpy}, + {provide: AuthorizationDataService, useValue: authorizationServiceSpy}, + {provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy}, + {provide: ItemDataService, useValue: {}}, + {provide: VersionDataService, useValue: {}}, ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); + + versionHistoryService = TestBed.inject(VersionHistoryDataService); + authenticationService = TestBed.inject(AuthService); + authorizationService = TestBed.inject(AuthorizationDataService); + })); beforeEach(() => { fixture = TestBed.createComponent(ItemVersionsComponent); component = fixture.componentInstance; component.item = item1; + // component.displayActions = true; fixture.detectChanges(); }); @@ -153,4 +168,27 @@ describe('ItemVersionsComponent', () => { expect(summary.nativeElement.textContent).toEqual(version.summary); }); }); + + describe('when the user can only delete a version', () => { + beforeAll(waitForAsync(() => { + const canDelete = (featureID: FeatureID, url: string ) => of(featureID === FeatureID.CanDeleteVersion); + authorizationServiceSpy.isAuthorized.and.callFake(canDelete); + })); + beforeEach(() => { + component.displayActions = true; + }); + it('should not disable the delete button', () => { + const rows = fixture.debugElement.queryAll(By.css('tbody tr')); + expect(rows.length).toBe(versions.length); + console.log(rows); + const btn = fixture.debugElement.query(By.css(`.version-row-element-delete`)); + + console.log(btn); + }); + it('should disable other buttons', () => { + // expect + }); + }); + + }); diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index e941da4e4d..bd6208c261 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -44,6 +44,7 @@ import { ItemDataService } from '../../../core/data/item-data.service'; import { Router } from '@angular/router'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { ItemVersionsSharedService } from './item-versions-shared.service'; @Component({ selector: 'ds-item-versions', @@ -167,7 +168,8 @@ export class ItemVersionsComponent implements OnInit { private notificationsService: NotificationsService, private translateService: TranslateService, private router: Router, - protected authorizationService: AuthorizationDataService, + private itemVersionShared: ItemVersionsSharedService, + private authorizationService: AuthorizationDataService, ) { } @@ -324,41 +326,31 @@ export class ItemVersionsComponent implements OnInit { * @param version the version from which a new one will be created */ createNewVersion(version: Version) { - const successMessageKey = 'item.version.create.notification.success'; - const failureMessageKey = 'item.version.create.notification.failure'; const versionNumber = version.version; - // Open modal + // Open modal and set current version number const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent); activeModal.componentInstance.versionNumber = versionNumber; - // On modal submit/dismiss - activeModal.result.then((modalResult) => { - // TODO spostare in metodo - // TODO recuperare version history e invalidare cache - // this.versionHistoryService.invalidateVersionHistoryCache(versionHistory.id); - const summary = modalResult; - version.item.pipe(getFirstSucceededRemoteDataPayload()).subscribe((item) => { - - const itemHref = item._links.self.href; - - this.versionHistoryService.createVersion(itemHref, summary).pipe(take(1)).subscribe((postResult) => { - if (postResult.hasSucceeded) { - const newVersionNumber = postResult.payload.version; - this.notificationsService.success(null, this.translateService.get(successMessageKey, {version: newVersionNumber})); - console.log(version); - const versionHistory$ = this.versionService.getHistoryFromVersion$(version).pipe( - tap((res) => { - this.versionHistoryService.invalidateVersionHistoryCache(res.id); - }), - ); - this.getAllVersions(versionHistory$); - } else { - this.notificationsService.error(null, this.translateService.get(failureMessageKey)); - } - }); - }); - }); + // On createVersionEvent emitted create new version and notify + activeModal.componentInstance.createVersionEvent.pipe( + mergeMap((summary: string) => combineLatest([ + of(summary), + version.item.pipe(getFirstSucceededRemoteDataPayload()) + ])), + mergeMap(([summary, item]: [string, Item]) => this.itemVersionShared.createNewVersionAndNotify(item, summary)), + map((hasSucceeded: boolean) => { + if (hasSucceeded) { + const versionHistory$ = this.versionService.getHistoryFromVersion$(version).pipe( + tap((res) => { + this.versionHistoryService.invalidateVersionHistoryCache(res.id); + }), + ); + this.getAllVersions(versionHistory$); + } + }), + take(1), + ).subscribe(); } /** From 4e9bd86012b006ab930b3430854ee7c52f97c94c Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Mon, 27 Sep 2021 11:11:54 +0200 Subject: [PATCH 079/161] 83707: Implement tests --- ...llection-source-controls.component.spec.ts | 219 ++++++++++++++++++ .../collection-source-controls.component.ts | 35 ++- .../collection-source.component.spec.ts | 5 +- 3 files changed, 253 insertions(+), 6 deletions(-) create mode 100644 src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts new file mode 100644 index 0000000000..3307b8fc79 --- /dev/null +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts @@ -0,0 +1,219 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ContentSource } from '../../../../core/shared/content-source.model'; +import { Collection } from '../../../../core/shared/collection.model'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { CollectionDataService } from '../../../../core/data/collection-data.service'; +import { RequestService } from '../../../../core/data/request.service'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ProcessDataService } from '../../../../core/data/processes/process-data.service'; +import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; +import { HttpClient } from '@angular/common/http'; +import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; +import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { Process } from '../../../../process-page/processes/process.model'; +import { of as observableOf } from 'rxjs'; +import { CollectionSourceControlsComponent } from './collection-source-controls.component'; +import { Bitstream } from '../../../../core/shared/bitstream.model'; +import { getTestScheduler } from 'jasmine-marbles'; +import { TestScheduler } from 'rxjs/testing'; +import { By } from '@angular/platform-browser'; +import { VarDirective } from '../../../../shared/utils/var.directive'; + +describe('CollectionSourceControlsComponent', () => { + let comp: CollectionSourceControlsComponent; + let fixture: ComponentFixture; + + const uuid = '29481ed7-ae6b-409a-8c51-34dd347a0ce4'; + let contentSource: ContentSource; + let collection: Collection; + let process: Process; + let bitstream: Bitstream; + + let scriptDataService: ScriptDataService; + let processDataService: ProcessDataService; + let requestService: RequestService; + let notificationsService; + let collectionService: CollectionDataService; + let httpClient: HttpClient; + let bitstreamService: BitstreamDataService; + let scheduler: TestScheduler; + + + beforeEach(waitForAsync(() => { + scheduler = getTestScheduler(); + contentSource = Object.assign(new ContentSource(), { + uuid: uuid, + metadataConfigs: [ + { + id: 'dc', + label: 'Simple Dublin Core', + nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/' + }, + { + id: 'qdc', + label: 'Qualified Dublin Core', + nameSpace: 'http://purl.org/dc/terms/' + }, + { + id: 'dim', + label: 'DSpace Intermediate Metadata', + nameSpace: 'http://www.dspace.org/xmlns/dspace/dim' + } + ], + oaiSource: 'oai-harvest-source', + oaiSetId: 'oai-set-id', + _links: {self: {href: 'contentsource-selflink'}} + }); + process = Object.assign(new Process(), { + processId: 'process-id', processStatus: 'COMPLETED', + _links: {output: {href: 'output-href'}} + }); + + bitstream = Object.assign(new Bitstream(), {_links: {content: {href: 'content-href'}}}); + + collection = Object.assign(new Collection(), { + uuid: 'fake-collection-id', + _links: {self: {href: 'collection-selflink'}} + }); + notificationsService = new NotificationsServiceStub(); + collectionService = jasmine.createSpyObj('collectionService', { + getContentSource: createSuccessfulRemoteDataObject$(contentSource), + findByHref: createSuccessfulRemoteDataObject$(collection) + }); + scriptDataService = jasmine.createSpyObj('scriptDataService', { + invoke: createSuccessfulRemoteDataObject$(process), + }); + processDataService = jasmine.createSpyObj('processDataService', { + findById: createSuccessfulRemoteDataObject$(process), + }); + bitstreamService = jasmine.createSpyObj('bitstreamService', { + findByHref: createSuccessfulRemoteDataObject$(bitstream), + }); + httpClient = jasmine.createSpyObj('httpClient', { + get: observableOf('Script text'), + }); + requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring', 'setStaleByHrefSubstring']); + + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), RouterTestingModule], + declarations: [CollectionSourceControlsComponent, VarDirective], + providers: [ + {provide: ScriptDataService, useValue: scriptDataService}, + {provide: ProcessDataService, useValue: processDataService}, + {provide: RequestService, useValue: requestService}, + {provide: NotificationsService, useValue: notificationsService}, + {provide: CollectionDataService, useValue: collectionService}, + {provide: HttpClient, useValue: httpClient}, + {provide: BitstreamDataService, useValue: bitstreamService} + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(CollectionSourceControlsComponent); + comp = fixture.componentInstance; + comp.isEnabled = true; + comp.collection = collection; + comp.shouldShow = true; + fixture.detectChanges(); + }); + describe('init', () => { + it('should', () => { + expect(comp).toBeTruthy(); + }); + }); + describe('testConfiguration', () => { + it('should invoke a script and ping the resulting process until completed and show the resulting info', () => { + comp.testConfiguration(contentSource); + scheduler.flush(); + + expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [ + {name: '-g', value: null}, + {name: '-a', value: contentSource.oaiSource}, + {name: '-i', value: contentSource.oaiSetId}, + ], []); + + expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false); + expect(bitstreamService.findByHref).toHaveBeenCalledWith(process._links.output.href); + expect(notificationsService.info).toHaveBeenCalledWith(jasmine.anything() as any, 'Script text'); + }); + }); + describe('importNow', () => { + it('should invoke a script that will start the harvest', () => { + comp.importNow(); + scheduler.flush(); + + expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [ + {name: '-r', value: null}, + {name: '-e', value: 'dspacedemo+admin@gmail.com'}, + {name: '-c', value: collection.uuid}, + ], []); + expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false); + expect(notificationsService.success).toHaveBeenCalled(); + }); + }); + describe('the controls', () => { + it('should be shown when shouldShow is true', () => { + comp.shouldShow = true; + fixture.detectChanges(); + const buttons = fixture.debugElement.queryAll(By.css('button')); + expect(buttons.length).toEqual(3); + }); + it('should be shown when shouldShow is false', () => { + comp.shouldShow = false; + fixture.detectChanges(); + const buttons = fixture.debugElement.queryAll(By.css('button')); + expect(buttons.length).toEqual(0); + }); + it('should be disabled when isEnabled is false', () => { + comp.shouldShow = true; + comp.isEnabled = false; + + fixture.detectChanges(); + + const buttons = fixture.debugElement.queryAll(By.css('button')); + + expect(buttons[0].nativeElement.disabled).toBeTrue(); + expect(buttons[1].nativeElement.disabled).toBeTrue(); + expect(buttons[2].nativeElement.disabled).toBeTrue(); + }); + it('should be enabled when isEnabled is true', () => { + comp.shouldShow = true; + comp.isEnabled = true; + + fixture.detectChanges(); + + const buttons = fixture.debugElement.queryAll(By.css('button')); + + expect(buttons[0].nativeElement.disabled).toBeFalse(); + expect(buttons[1].nativeElement.disabled).toBeFalse(); + expect(buttons[2].nativeElement.disabled).toBeFalse(); + }); + it('should call the corresponding button when clicked', () => { + spyOn(comp, 'testConfiguration'); + spyOn(comp, 'importNow'); + spyOn(comp, 'resetAndReimport'); + + comp.shouldShow = true; + comp.isEnabled = true; + + fixture.detectChanges(); + + const buttons = fixture.debugElement.queryAll(By.css('button')); + + buttons[0].triggerEventHandler('click', null); + expect(comp.testConfiguration).toHaveBeenCalled(); + + buttons[1].triggerEventHandler('click', null); + expect(comp.importNow).toHaveBeenCalled(); + + buttons[2].triggerEventHandler('click', null); + expect(comp.resetAndReimport).toHaveBeenCalled(); + }); + }); + + +}); diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts index 417627cf46..4562772391 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts @@ -22,14 +22,28 @@ import { TranslateService } from '@ngx-translate/core'; import { HttpClient } from '@angular/common/http'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; +/** + * Component that contains the controls to run, reset and test the harvest + */ @Component({ selector: 'ds-collection-source-controls', templateUrl: './collection-source-controls.component.html', }) export class CollectionSourceControlsComponent implements OnDestroy { + /** + * Should the controls be enabled. + */ @Input() isEnabled: boolean; + + /** + * The current collection + */ @Input() collection: Collection; + + /** + * Should the control section be shown + */ @Input() shouldShow: boolean; contentSource$: Observable; @@ -47,6 +61,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { } ngOnInit() { + // ensure the contentSource gets updated after being set to stale this.contentSource$ = this.collectionService.findByHref(this.collection._links.self.href, false).pipe( getAllSucceededRemoteDataPayload(), switchMap((collection) => this.collectionService.getContentSource(collection.uuid, false)), @@ -54,6 +69,10 @@ export class CollectionSourceControlsComponent implements OnDestroy { ); } + /** + * Tests the provided content source's configuration. + * @param contentSource - The content source to be tested + */ testConfiguration(contentSource) { this.subs.push(this.scriptDataService.invoke('harvest', [ {name: '-g', value: null}, @@ -63,9 +82,11 @@ export class CollectionSourceControlsComponent implements OnDestroy { getFirstCompletedRemoteData(), tap((rd) => { if (rd.hasFailed) { + // show a notification when the script invocation fails this.notificationsService.error(this.translateService.get('collection.source.controls.test.submit.error')); } }), + // filter out responses that aren't successful since the pinging of the process only needs to happen when the invocation was successful. filter((rd) => rd.hasSucceeded && hasValue(rd.payload)), switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)), getAllCompletedRemoteData(), @@ -75,6 +96,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { ).subscribe((process: Process) => { if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() && process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) { + // Ping the current process state every 5s setTimeout(() => { this.requestService.setStaleByHrefSubstring(process._links.self.href); }, 5000); @@ -83,12 +105,12 @@ export class CollectionSourceControlsComponent implements OnDestroy { this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed')); } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { - this.bitstreamService.findByHref(process._links.output.href, false).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => { + this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => { this.httpClient.get(bitstream._links.content.href, {responseType: 'text'}).subscribe((data: any) => { const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1') .replaceAll('The script has started', '') .replaceAll('The script has completed', ''); - this.notificationsService.success(this.translateService.get('collection.source.controls.test.completed'), output); + this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output); }); }); } @@ -96,6 +118,9 @@ export class CollectionSourceControlsComponent implements OnDestroy { )); } + /** + * Start the harvest for the current collection + */ importNow() { this.subs.push(this.scriptDataService.invoke('harvest', [ {name: '-r', value: null}, @@ -118,6 +143,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { ).subscribe((process) => { if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() && process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) { + // Ping the current process state every 5s setTimeout(() => { this.requestService.setStaleByHrefSubstring(process._links.self.href); this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); @@ -128,14 +154,15 @@ export class CollectionSourceControlsComponent implements OnDestroy { } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed')); - setTimeout(() => { this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); - }, 5000); } } )); } + /** + * Reset and reimport the current collection + */ resetAndReimport() { // TODO implement when a single option is present } diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts index 869238b956..3fb1a50bf1 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts @@ -62,7 +62,8 @@ describe('CollectionSourceComponent', () => { label: 'DSpace Intermediate Metadata', nameSpace: 'http://www.dspace.org/xmlns/dspace/dim' } - ] + ], + _links: { self: { href: 'contentsource-selflink' } } }); fieldUpdate = { field: contentSource, @@ -115,7 +116,7 @@ describe('CollectionSourceComponent', () => { updateContentSource: observableOf(contentSource), getHarvesterEndpoint: observableOf('harvester-endpoint') }); - requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring']); + requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring', 'setStaleByHrefSubstring']); TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), RouterTestingModule], From 4f2697bf52b3c438f96008b08758fd3bf5e9e69b Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 27 Sep 2021 12:26:20 +0200 Subject: [PATCH 080/161] [CST-4499] Version history - New version refactored (with tests) --- .../versioned-item.component.spec.ts | 27 ++++++++++++++++++- .../version-page.component.spec.ts | 3 +-- .../item-versions-shared.service.spec.ts | 17 +++++++++++- .../item-versions.component.html | 6 ++--- .../item-versions.component.spec.ts | 27 ++++++++++--------- 5 files changed, 60 insertions(+), 20 deletions(-) diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts index 5ba80717f0..5115255a71 100644 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts @@ -1,6 +1,23 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { VersionedItemComponent } from './versioned-item.component'; +import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionDataService } from '../../../../core/data/version-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service'; +import { Item } from '../../../../core/shared/item.model'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; +import { PageInfo } from '../../../../core/shared/page-info.model'; +import { MetadataMap } from '../../../../core/shared/metadata.models'; +import { createRelationshipsObservable } from '../shared/item.component.spec'; + +const mockItem: Item = Object.assign(new Item(), { + bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), + metadata: new MetadataMap(), + relationships: createRelationshipsObservable() +}); describe('VersionedItemComponent', () => { let component: VersionedItemComponent; @@ -8,7 +25,14 @@ describe('VersionedItemComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ VersionedItemComponent ] + declarations: [ VersionedItemComponent ], + providers: [ + { provide: VersionHistoryDataService, useValue: {} }, + { provide: TranslateService, useValue: {} }, + { provide: VersionDataService, useValue: {} }, + { provide: NotificationsService, useValue: {} }, + { provide: ItemVersionsSharedService, useValue: {} }, + ] }) .compileComponents(); }); @@ -16,6 +40,7 @@ describe('VersionedItemComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(VersionedItemComponent); component = fixture.componentInstance; + component.object = mockItem; fixture.detectChanges(); }); diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts index aedf0aa549..b1dd8bc161 100644 --- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts +++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts @@ -51,8 +51,7 @@ describe('VersionPageComponent', () => { { provide: VersionDataService, useValue: {} }, { provide: AuthService, useValue: authService }, ], - }) - .compileComponents(); + }).compileComponents(); })); diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts index cf9a65c0e7..e9aa2cc18a 100644 --- a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts +++ b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts @@ -1,12 +1,27 @@ import { TestBed } from '@angular/core/testing'; import { ItemVersionsSharedService } from './item-versions-shared.service'; +import { ActivatedRoute } from '@angular/router'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { AuthService } from '../../../core/auth/auth.service'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; describe('ItemVersionsSharedService', () => { let service: ItemVersionsSharedService; beforeEach(() => { - TestBed.configureTestingModule({}); + TestBed.configureTestingModule({ + providers: [ + { provide: ActivatedRoute, useValue: {} }, + { provide: VersionDataService, useValue: {} }, + { provide: VersionHistoryDataService, useValue: {} }, + { provide: AuthService, useValue: {} }, + { provide: NotificationsService, useValue: {} }, + { provide: TranslateService, useValue: {} }, + ], + }); service = TestBed.inject(ItemVersionsSharedService); }); diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index c3bf6a9beb..18bfd446b3 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -47,7 +47,7 @@
-
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index c26e96346f..5c97621fe8 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -279,7 +279,7 @@ export class ItemVersionsComponent implements OnInit { mergeMap((item: Item) => combineLatest([ of(item), this.versionHistoryService.getVersionHistoryFromVersion$(version).pipe( - tap((versionHistory) => { + tap((versionHistory: VersionHistory) => { this.versionHistoryService.invalidateVersionHistoryCache(versionHistory.id); }) ) @@ -298,7 +298,7 @@ export class ItemVersionsComponent implements OnInit { }), ) ])), - ).subscribe(([deleteHasSucceeded, newLatestVersionItem]) => { + ).subscribe(([deleteHasSucceeded, newLatestVersionItem]: [boolean, Item]) => { // Notify operation result and redirect to latest item if (deleteHasSucceeded) { this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber})); @@ -334,7 +334,7 @@ export class ItemVersionsComponent implements OnInit { map((newVersionRD: RemoteData) => { if (newVersionRD.hasSucceeded) { const versionHistory$ = this.versionService.getHistoryFromVersion$(version).pipe( - tap((res) => { + tap((res: VersionHistory) => { this.versionHistoryService.invalidateVersionHistoryCache(res.id); }), ); @@ -374,7 +374,7 @@ export class ItemVersionsComponent implements OnInit { false, true, followLink('item'), followLink('eperson')); }), getFirstCompletedRemoteData(), - ).subscribe((res) => { + ).subscribe((res: RemoteData>) => { this.versionsRD$.next(res); }); } @@ -386,18 +386,10 @@ export class ItemVersionsComponent implements OnInit { if (hasValue(this.item.version)) { this.versionRD$ = this.item.version; this.versionHistoryRD$ = this.versionRD$.pipe( - // switchMap( (res) => { - // if (res.hasFailed) { - // return of(createFailedRemoteDataObject()); - // } else { - // return of(res).pipe( getAllSucceededRemoteData(), getRemoteDataPayload(), hasValueOperator(), switchMap((version: Version) => version.versionhistory), - // ); - // } - // }), ); this.canCreateVersion$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.item.self); From e434bb895246e8ce050b172dcb8fad9e2a4e13f3 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 30 Sep 2021 10:22:48 +0200 Subject: [PATCH 087/161] 83707: Implement feedback --- .../collection-source-controls.component.html | 4 ++ ...llection-source-controls.component.spec.ts | 17 ++++++- .../collection-source-controls.component.ts | 46 +++++++++++++++++-- .../content-source-set-serializer.spec.ts | 26 +++++++++++ .../shared/content-source-set-serializer.ts | 31 +++++++++++++ src/app/core/shared/content-source.model.ts | 22 ++++++++- src/assets/i18n/en.json5 | 5 ++ 7 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 src/app/core/shared/content-source-set-serializer.spec.ts create mode 100644 src/app/core/shared/content-source-set-serializer.ts diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html index 425d773e2d..7a0f07adda 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html @@ -11,6 +11,10 @@
{{'collection.source.controls.harvest.last' | translate}} + {{contentSource?.message ? contentSource?.message : 'collection.source.controls.harvest.no-information'|translate }} +
+
+ {{'collection.source.controls.harvest.message' | translate}} {{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts index 3307b8fc79..3eb83ebe8a 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts @@ -21,6 +21,7 @@ import { getTestScheduler } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; import { By } from '@angular/platform-browser'; import { VarDirective } from '../../../../shared/utils/var.directive'; +import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer'; describe('CollectionSourceControlsComponent', () => { let comp: CollectionSourceControlsComponent; @@ -133,7 +134,7 @@ describe('CollectionSourceControlsComponent', () => { expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [ {name: '-g', value: null}, {name: '-a', value: contentSource.oaiSource}, - {name: '-i', value: contentSource.oaiSetId}, + {name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId)}, ], []); expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false); @@ -148,7 +149,19 @@ describe('CollectionSourceControlsComponent', () => { expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [ {name: '-r', value: null}, - {name: '-e', value: 'dspacedemo+admin@gmail.com'}, + {name: '-c', value: collection.uuid}, + ], []); + expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false); + expect(notificationsService.success).toHaveBeenCalled(); + }); + }); + describe('resetAndReimport', () => { + it('should invoke a script that will start the harvest', () => { + comp.resetAndReimport(); + scheduler.flush(); + + expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [ + {name: '-o', value: null}, {name: '-c', value: collection.uuid}, ], []); expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false); diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts index 4562772391..ca6e1e9cd8 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts @@ -21,6 +21,7 @@ import { Process } from '../../../../process-page/processes/process.model'; import { TranslateService } from '@ngx-translate/core'; import { HttpClient } from '@angular/common/http'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; +import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer'; /** * Component that contains the controls to run, reset and test the harvest @@ -77,7 +78,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { this.subs.push(this.scriptDataService.invoke('harvest', [ {name: '-g', value: null}, {name: '-a', value: contentSource.oaiSource}, - {name: '-i', value: contentSource.oaiSetId}, + {name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId)}, ], []).pipe( getFirstCompletedRemoteData(), tap((rd) => { @@ -124,14 +125,15 @@ export class CollectionSourceControlsComponent implements OnDestroy { importNow() { this.subs.push(this.scriptDataService.invoke('harvest', [ {name: '-r', value: null}, - {name: '-e', value: 'dspacedemo+admin@gmail.com'}, {name: '-c', value: this.collection.uuid}, ], []) .pipe( getFirstCompletedRemoteData(), tap((rd) => { if (rd.hasFailed) { - this.notificationsService.error(this.translateService.get('collection.source.controls.test.submit.error')); + this.notificationsService.error(this.translateService.get('collection.source.controls.import.submit.error')); + } else { + this.notificationsService.success(this.translateService.get('collection.source.controls.import.submit.success')); } }), filter((rd) => rd.hasSucceeded && hasValue(rd.payload)), @@ -164,7 +166,43 @@ export class CollectionSourceControlsComponent implements OnDestroy { * Reset and reimport the current collection */ resetAndReimport() { - // TODO implement when a single option is present + this.subs.push(this.scriptDataService.invoke('harvest', [ + {name: '-o', value: null}, + {name: '-c', value: this.collection.uuid}, + ], []) + .pipe( + getFirstCompletedRemoteData(), + tap((rd) => { + if (rd.hasFailed) { + this.notificationsService.error(this.translateService.get('collection.source.controls.reset.submit.error')); + } else { + this.notificationsService.success(this.translateService.get('collection.source.controls.reset.submit.success')); + } + }), + filter((rd) => rd.hasSucceeded && hasValue(rd.payload)), + switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)), + getAllCompletedRemoteData(), + filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)), + map((rd) => rd.payload), + hasValueOperator(), + ).subscribe((process) => { + if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() && + process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) { + // Ping the current process state every 5s + setTimeout(() => { + this.requestService.setStaleByHrefSubstring(process._links.self.href); + this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); + }, 5000); + } + if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) { + this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed')); + } + if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { + this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed')); + this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); + } + } + )); } ngOnDestroy(): void { diff --git a/src/app/core/shared/content-source-set-serializer.spec.ts b/src/app/core/shared/content-source-set-serializer.spec.ts new file mode 100644 index 0000000000..2203481250 --- /dev/null +++ b/src/app/core/shared/content-source-set-serializer.spec.ts @@ -0,0 +1,26 @@ +import { ContentSourceSetSerializer } from './content-source-set-serializer'; + +describe('ContentSourceSetSerializer', () => { + let serializer: ContentSourceSetSerializer; + + beforeEach(() => { + serializer = new ContentSourceSetSerializer(); + }); + + describe('Serialize', () => { + it('should return all when the value is empty', () => { + expect(serializer.Serialize('')).toEqual('all'); + }); + it('should return the value when it is not empty', () => { + expect(serializer.Serialize('test-value')).toEqual('test-value'); + }); + }); + describe('Deserialize', () => { + it('should return an empty value when the value is \'all\'', () => { + expect(serializer.Deserialize('all')).toEqual(''); + }); + it('should return the value when it is not \'all\'', () => { + expect(serializer.Deserialize('test-value')).toEqual('test-value'); + }); + }); +}); diff --git a/src/app/core/shared/content-source-set-serializer.ts b/src/app/core/shared/content-source-set-serializer.ts new file mode 100644 index 0000000000..ec0baec5a6 --- /dev/null +++ b/src/app/core/shared/content-source-set-serializer.ts @@ -0,0 +1,31 @@ +import { isEmpty } from '../../shared/empty.util'; + +/** + * Serializer to create convert the 'all' value supported by the server to an empty string and vice versa. + */ +export class ContentSourceSetSerializer { + + /** + * Method to serialize a setId + * @param {string} setId + * @returns {string} the provided set ID, unless when an empty set ID is provided. In that case, 'all' will be returned. + */ + Serialize(setId: string): any { + if (isEmpty(setId)) { + return 'all'; + } + return setId; + } + + /** + * Method to deserialize a setId + * @param {string} setId + * @returns {string} the provided set ID. When 'all' is provided, an empty set ID will be returned. + */ + Deserialize(setId: string): string { + if (setId === 'all') { + return ''; + } + return setId; + } +} diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index c98901219d..cb78c85a7c 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -1,4 +1,4 @@ -import { autoserializeAs, deserializeAs, deserialize } from 'cerialize'; +import { autoserializeAs, deserializeAs, deserialize, serializeAs } from 'cerialize'; import { HALLink } from './hal-link.model'; import { MetadataConfig } from './metadata-config.model'; import { CacheableObject } from '../cache/object-cache.reducer'; @@ -6,6 +6,8 @@ import { typedObject } from '../cache/builders/build-decorators'; import { CONTENT_SOURCE } from './content-source.resource-type'; import { excludeFromEquals } from '../utilities/equals.decorators'; import { ResourceType } from './resource-type'; +import { IDToUUIDSerializer } from '../cache/id-to-uuid-serializer'; +import { ContentSourceSetSerializer } from './content-source-set-serializer'; /** * The type of content harvesting used @@ -49,7 +51,8 @@ export class ContentSource extends CacheableObject { /** * OAI Specific set ID */ - @autoserializeAs('oai_set_id') + @deserializeAs(new ContentSourceSetSerializer(), 'oai_set_id') + @serializeAs(new ContentSourceSetSerializer(), 'oai_set_id') oaiSetId: string; /** @@ -70,15 +73,30 @@ export class ContentSource extends CacheableObject { */ metadataConfigs: MetadataConfig[]; + /** + * The current harvest status + */ @autoserializeAs('harvest_status') harvestStatus: string; + /** + * The last's harvest start time + */ @autoserializeAs('harvest_start_time') harvestStartTime: string; + /** + * When the collection was last harvested + */ @autoserializeAs('last_harvested') lastHarvested: string; + /** + * The current harvest message + */ + @autoserializeAs('harvest_message') + message: string; + /** * The {@link HALLink}s for this ContentSource */ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8d89561d68..052f0ecc2b 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -891,10 +891,15 @@ "collection.source.controls.import.submit": "Import now", "collection.source.controls.import.failed": "An error occurred during the import", "collection.source.controls.import.completed": "The import completed", + "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated", + "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport", + "collection.source.controls.reset.failed": "An error occurred during the reset and reimport", + "collection.source.controls.reset.completed": "The reset and reimport completed", "collection.source.controls.reset.submit": "Reset and reimport", "collection.source.controls.harvest.status": "Harvest status:", "collection.source.controls.harvest.start": "Harvest start time:", "collection.source.controls.harvest.last": "Last time harvested:", + "collection.source.controls.harvest.message": "Harvest info:", "collection.source.controls.harvest.no-information": "N/A", From ee9d54245c7651a41c0563847f28012e5815b938 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 30 Sep 2021 13:19:52 +0200 Subject: [PATCH 088/161] [CST-4659] Deque accessibility issues - 469979 --- .../number-picker.component.html | 4 ++-- .../number-picker.component.scss | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/app/shared/number-picker/number-picker.component.html b/src/app/shared/number-picker/number-picker.component.html index 1f6c08d92e..84fb47f0c8 100644 --- a/src/app/shared/number-picker/number-picker.component.html +++ b/src/app/shared/number-picker/number-picker.component.html @@ -1,6 +1,6 @@
- -

{{'form.loading' | translate}}

@@ -40,5 +50,3 @@
- - From 8173d7d80598bf2251f242166789d95003113ef9 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 5 Oct 2021 17:51:31 +0200 Subject: [PATCH 104/161] [CST-4659] Deque accessibility issues - 470010 --- ...amic-form-control-container.component.html | 141 +++++++++--------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html index 2fa3ea1723..3cf06e4121 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html @@ -1,79 +1,80 @@
- - - -
+ + +
-
- - - -
+
+ +
+ + +
-
- {{ message | translate: model.validators }} -
+
+ {{ message | translate: model.validators }} +
-
-
- -
-
- -
- - - - - - - -
- - +
+ +
+
+ +
+
+ + + + + + + +
+ +
- - From 506883c96060c5cd9ff6f3199fca2bcc26d4ea78 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Mon, 20 Sep 2021 16:26:33 +0200 Subject: [PATCH 105/161] 83635: Request a copy - Request page --- src/app/app-routing-paths.ts | 3 + .../bitstream-page-routing.module.ts | 9 + .../data/feature-authorization/feature-id.ts | 1 + .../core/data/item-request-data.service.ts | 59 ++++ src/app/core/shared/item-request.model.ts | 79 ++++++ .../core/shared/item-request.resource-type.ts | 9 + ...tstream-request-a-copy-page.component.html | 86 ++++++ ...ream-request-a-copy-page.component.spec.ts | 256 ++++++++++++++++++ ...bitstream-request-a-copy-page.component.ts | 199 ++++++++++++++ .../file-download-link.component.html | 3 +- .../file-download-link.component.spec.ts | 128 +++++++-- .../file-download-link.component.ts | 36 ++- src/app/shared/shared.module.ts | 3 + .../file/section-upload-file.component.html | 2 +- src/assets/i18n/en.json5 | 34 +++ 15 files changed, 871 insertions(+), 36 deletions(-) create mode 100644 src/app/core/data/item-request-data.service.ts create mode 100644 src/app/core/shared/item-request.model.ts create mode 100644 src/app/core/shared/item-request.resource-type.ts create mode 100644 src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html create mode 100644 src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts create mode 100644 src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index 81b0755d11..f5a4414756 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -22,6 +22,9 @@ export function getBitstreamModuleRoute() { export function getBitstreamDownloadRoute(bitstream): string { return new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(); } +export function getBitstreamRequestACopyRoute(bitstream): string { + return new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'request-a-copy').toString(); +} export const ADMIN_MODULE_PATH = 'admin'; diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts index 27b9db9a05..1027c85b46 100644 --- a/src/app/bitstream-page/bitstream-page-routing.module.ts +++ b/src/app/bitstream-page/bitstream-page-routing.module.ts @@ -10,6 +10,7 @@ import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/re import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component'; import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component'; import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; +import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; const EDIT_BITSTREAM_PATH = ':id/edit'; const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations'; @@ -44,6 +45,14 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations'; bitstream: BitstreamPageResolver }, }, + { + // Resolve angular bitstream download URLs + path: ':id/request-a-copy', + component: BitstreamRequestACopyPageComponent, + resolve: { + bitstream: BitstreamPageResolver + }, + }, { path: EDIT_BITSTREAM_PATH, component: EditBitstreamPageComponent, diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts index ac045b93b0..64a4fdc60f 100644 --- a/src/app/core/data/feature-authorization/feature-id.ts +++ b/src/app/core/data/feature-authorization/feature-id.ts @@ -14,6 +14,7 @@ export enum FeatureID { IsCollectionAdmin = 'isCollectionAdmin', IsCommunityAdmin = 'isCommunityAdmin', CanDownload = 'canDownload', + CanRequestACopy = 'canRequestACopy', CanManageVersions = 'canManageVersions', CanManageBitstreamBundles = 'canManageBitstreamBundles', CanManageRelationships = 'canManageRelationships', diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts new file mode 100644 index 0000000000..dc11e2b0c5 --- /dev/null +++ b/src/app/core/data/item-request-data.service.ts @@ -0,0 +1,59 @@ +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { filter, find, map } from 'rxjs/operators'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { getFirstCompletedRemoteData } from '../shared/operators'; +import { RemoteData } from './remote-data'; +import { PostRequest } from './request.models'; +import { RequestService } from './request.service'; +import { ItemRequest } from '../shared/item-request.model'; +import { hasValue, isNotEmpty } from '../../shared/empty.util'; + +/** + * A service responsible for fetching/sending data from/to the REST API on the bitstreamformats endpoint + */ +@Injectable( + { + providedIn: 'root', + } +) +export class ItemRequestDataService { + + protected linkPath = 'itemrequests'; + + constructor( + protected requestService: RequestService, + protected rdbService: RemoteDataBuildService, + protected halService: HALEndpointService) { + } + + getItemRequestEndpoint(): Observable { + return this.halService.getEndpoint(this.linkPath); + } + + getFindItemRequestEndpoint(requestID: string): Observable { + return this.halService.getEndpoint(this.linkPath).pipe( + filter((href: string) => isNotEmpty(href)), + map((href: string) => `${href}/${requestID}`)); + } + + requestACopy(itemRequest: ItemRequest): Observable> { + const requestId = this.requestService.generateRequestId(); + + const href$ = this.getItemRequestEndpoint(); + + href$.pipe( + find((href: string) => hasValue(href)), + map((href: string) => { + const request = new PostRequest(requestId, href, itemRequest); + this.requestService.send(request); + }) + ).subscribe(); + + return this.rdbService.buildFromRequestUUID(requestId).pipe( + getFirstCompletedRemoteData() + ); + } + +} diff --git a/src/app/core/shared/item-request.model.ts b/src/app/core/shared/item-request.model.ts new file mode 100644 index 0000000000..b14ed07656 --- /dev/null +++ b/src/app/core/shared/item-request.model.ts @@ -0,0 +1,79 @@ +import { autoserialize } from 'cerialize'; +import { typedObject } from '../cache/builders/build-decorators'; +import { excludeFromEquals } from '../utilities/equals.decorators'; +import { ResourceType } from './resource-type'; +import { ITEM_REQUEST } from './item-request.resource-type'; + +/** + * Model class for a Configuration Property + */ +@typedObject +export class ItemRequest { + static type = ITEM_REQUEST; + + /** + * The object type + */ + @excludeFromEquals + @autoserialize + type: ResourceType; + + /** + * opaque string which uniquely identifies this request + */ + @autoserialize + token: string; + + /** + * true if the request is for all bitstreams of the item. + */ + @autoserialize + allfiles: boolean; + /** + * email address of the person requesting the files. + */ + @autoserialize + requestEmail: string; + /** + * Human-readable name of the person requesting the files. + */ + @autoserialize + requestName: string; + /** + * arbitrary message provided by the person requesting the files. + */ + @autoserialize + requestMessage: string; + /** + * date that the request was recorded. + */ + @autoserialize + requestDate: string; + /** + * true if the request has been granted. + */ + @autoserialize + acceptRequest: boolean; + /** + * date that the request was granted or denied. + */ + @autoserialize + decisionDate: string; + /** + * date on which the request is considered expired. + */ + @autoserialize + expires: string; + /** + * UUID of the requested Item. + */ + @autoserialize + itemId: string; + /** + * UUID of the requested bitstream. + */ + @autoserialize + bitstreamId: string; + + +} diff --git a/src/app/core/shared/item-request.resource-type.ts b/src/app/core/shared/item-request.resource-type.ts new file mode 100644 index 0000000000..0535ef1948 --- /dev/null +++ b/src/app/core/shared/item-request.resource-type.ts @@ -0,0 +1,9 @@ +import { ResourceType } from './resource-type'; + +/** + * The resource type for ItemRequest. + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const ITEM_REQUEST = new ResourceType('itemrequest'); diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html new file mode 100644 index 0000000000..4ab6963f74 --- /dev/null +++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html @@ -0,0 +1,86 @@ +
+

{{'bitstream-request-a-copy.header' | translate}}

+
+ {{'bitstream-request-a-copy.alert.canDownload1' | translate}} + {{'bitstream-request-a-copy.alert.canDownload2'| translate}} +
+
+

{{'bitstream-request-a-copy.intro' | translate}}

+

{{itemName}}

+
+
+ +
+
+
+ + +
+ + {{ 'bitstream-request-a-copy.name.error' | translate }} + +
+
+
+
+
+ + +
+ + {{ 'bitstream-request-a-copy.email.error' | translate }} + +
+ {{'bitstream-request-a-copy.email.hint' |translate}} +
+
+
+
+
{{'bitstream-request-a-copy.allfiles.label' |translate}}
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
+
+
+ +
+
+
+ + + {{'bitstream-request-a-copy.return' | translate}} + + + +
+
+
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts new file mode 100644 index 0000000000..20df5dfb03 --- /dev/null +++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts @@ -0,0 +1,256 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { AuthService } from '../../core/auth/auth.service'; +import { of as observableOf } from 'rxjs'; +import { Bitstream } from '../../core/shared/bitstream.model'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { + createFailedRemoteDataObject$, + createSuccessfulRemoteDataObject, + createSuccessfulRemoteDataObject$ +} from '../remote-data.utils'; +import { ActivatedRoute, Router } from '@angular/router'; +import { TranslateModule } from '@ngx-translate/core'; +import { CommonModule } from '@angular/common'; +import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page.component'; +import { By } from '@angular/platform-browser'; +import { RouterStub } from '../testing/router.stub'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NotificationsServiceStub } from '../testing/notifications-service.stub'; +import { ItemRequestDataService } from '../../core/data/item-request-data.service'; +import { NotificationsService } from '../notifications/notifications.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { DSONameServiceMock } from '../mocks/dso-name.service.mock'; +import { Item } from '../../core/shared/item.model'; +import { Bundle } from '../../core/shared/bundle.model'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { ItemRequest } from '../../core/shared/item-request.model'; +import { Location } from '@angular/common'; + + +describe('BitstreamRequestACopyPageComponent', () => { + let component: BitstreamRequestACopyPageComponent; + let fixture: ComponentFixture; + + let authService: AuthService; + let authorizationService: AuthorizationDataService; + let activatedRoute; + let router; + let itemRequestDataService; + let notificationsService; + let location; + + let item: Item; + let bitstream: Bitstream; + let eperson; + + function init() { + eperson = Object.assign(new EPerson(), { + email: 'test@mail.org', + metadata: { + 'eperson.firstname': [{value: 'Test'}], + 'eperson.lastname': [{value: 'User'}], + } + }); + authService = jasmine.createSpyObj('authService', { + isAuthenticated: observableOf(false), + getAuthenticatedUserFromStore: observableOf(eperson) + }); + authorizationService = jasmine.createSpyObj('authorizationSerivice', { + isAuthorized: observableOf(true) + }); + + itemRequestDataService = jasmine.createSpyObj('itemRequestDataService', { + requestACopy: createSuccessfulRemoteDataObject$({}) + }); + + location = jasmine.createSpyObj('location', { + back: {} + }); + + notificationsService = new NotificationsServiceStub(); + + item = Object.assign(new Item(), {uuid: 'item-uuid'}); + + const bundle = Object.assign(new Bundle(), { + uuid: 'bundle-uuid', + item: createSuccessfulRemoteDataObject$(item) + }); + + bitstream = Object.assign(new Bitstream(), { + uuid: 'bitstreamUuid', + bundle: createSuccessfulRemoteDataObject$(bundle), + _links: { + content: {href: 'bitstream-content-link'}, + self: {href: 'bitstream-self-link'}, + } + }); + + activatedRoute = { + data: observableOf({ + bitstream: createSuccessfulRemoteDataObject( + bitstream + ) + }) + }; + + router = new RouterStub(); + } + + function initTestbed() { + TestBed.configureTestingModule({ + imports: [CommonModule, TranslateModule.forRoot(), FormsModule, ReactiveFormsModule], + declarations: [BitstreamRequestACopyPageComponent], + providers: [ + {provide: Location, useValue: location}, + {provide: ActivatedRoute, useValue: activatedRoute}, + {provide: Router, useValue: router}, + {provide: AuthorizationDataService, useValue: authorizationService}, + {provide: AuthService, useValue: authService}, + {provide: ItemRequestDataService, useValue: itemRequestDataService}, + {provide: NotificationsService, useValue: notificationsService}, + {provide: DSONameService, useValue: new DSONameServiceMock()}, + ] + }) + .compileComponents(); + } + + describe('init', () => { + beforeEach(waitForAsync(() => { + init(); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamRequestACopyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('should init the comp', () => { + expect(component).toBeTruthy(); + }); + }); + + describe('should show a form to request a copy', () => { + describe('when the user is not logged in', () => { + beforeEach(waitForAsync(() => { + init(); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamRequestACopyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('show the form with no values filled in based on the user', () => { + expect(component.name.value).toEqual(''); + expect(component.email.value).toEqual(''); + expect(component.allfiles.value).toEqual('true'); + expect(component.message.value).toEqual(''); + }); + }); + + describe('when the user is logged in', () => { + beforeEach(waitForAsync(() => { + init(); + (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(true)); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamRequestACopyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('show the form with values filled in based on the user', () => { + fixture.detectChanges(); + expect(component.name.value).toEqual(eperson.name); + expect(component.email.value).toEqual(eperson.email); + expect(component.allfiles.value).toEqual('true'); + expect(component.message.value).toEqual(''); + }); + }); + describe('when the user has authorization to download the file', () => { + beforeEach(waitForAsync(() => { + init(); + (authService.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(true)); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamRequestACopyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('should show an alert indicating the user can download the file', () => { + const alert = fixture.debugElement.query(By.css('.alert')).nativeElement; + expect(alert.innerHTML).toContain('bitstream-request-a-copy.alert.canDownload'); + }); + }); + }); + + describe('onSubmit', () => { + describe('onSuccess', () => { + beforeEach(waitForAsync(() => { + init(); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamRequestACopyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('should take the current form information and submit it', () => { + component.name.patchValue('User Name'); + component.email.patchValue('user@name.org'); + component.allfiles.patchValue('false'); + component.message.patchValue('I would like to request a copy'); + + component.onSubmit(); + const itemRequest = Object.assign(new ItemRequest(), + { + itemId: item.uuid, + bitstreamId: bitstream.uuid, + allfiles: 'false', + requestEmail: 'user@name.org', + requestName: 'User Name', + requestMessage: 'I would like to request a copy' + }); + + expect(itemRequestDataService.requestACopy).toHaveBeenCalledWith(itemRequest); + expect(notificationsService.success).toHaveBeenCalled(); + expect(location.back).toHaveBeenCalled(); + }); + }); + + describe('onFail', () => { + beforeEach(waitForAsync(() => { + init(); + (itemRequestDataService.requestACopy as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$()); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamRequestACopyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('should take the current form information and submit it', () => { + component.name.patchValue('User Name'); + component.email.patchValue('user@name.org'); + component.allfiles.patchValue('false'); + component.message.patchValue('I would like to request a copy'); + + component.onSubmit(); + const itemRequest = Object.assign(new ItemRequest(), + { + itemId: item.uuid, + bitstreamId: bitstream.uuid, + allfiles: 'false', + requestEmail: 'user@name.org', + requestName: 'User Name', + requestMessage: 'I would like to request a copy' + }); + + expect(itemRequestDataService.requestACopy).toHaveBeenCalledWith(itemRequest); + expect(notificationsService.error).toHaveBeenCalled(); + expect(location.back).not.toHaveBeenCalled(); + }); + }); + }); +}); diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts new file mode 100644 index 0000000000..35b56e5434 --- /dev/null +++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts @@ -0,0 +1,199 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { map, switchMap, take } from 'rxjs/operators'; +import { ActivatedRoute, Router } from '@angular/router'; +import { hasValue, isNotEmpty } from '../empty.util'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; +import { Bitstream } from '../../core/shared/bitstream.model'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { AuthService } from '../../core/auth/auth.service'; +import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs'; +import { getBitstreamDownloadRoute, getForbiddenRoute } from '../../app-routing-paths'; +import { TranslateService } from '@ngx-translate/core'; +import { Subscription } from 'rxjs/internal/Subscription'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { ItemRequestDataService } from '../../core/data/item-request-data.service'; +import { ItemRequest } from '../../core/shared/item-request.model'; +import { Item } from '../../core/shared/item.model'; +import { NotificationsService } from '../notifications/notifications.service'; +import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { Location } from '@angular/common'; + +@Component({ + selector: 'ds-bitstream-request-a-copy-page', + templateUrl: './bitstream-request-a-copy-page.component.html' +}) +/** + * Page component for requesting a copy for a bitstream + */ +export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { + + bitstream$: Observable; + + canDownload$: Observable; + private subs: Subscription[] = []; + requestCopyForm: FormGroup; + bitstream: Bitstream; + item: Item; + itemName: string; + + constructor(private location: Location, + private translateService: TranslateService, + private route: ActivatedRoute, + protected router: Router, + private authorizationService: AuthorizationDataService, + private auth: AuthService, + private formBuilder: FormBuilder, + private itemRequestDataService: ItemRequestDataService, + private notificationsService: NotificationsService, + private dsoNameService: DSONameService, + ) { + } + + ngOnInit(): void { + this.requestCopyForm = this.formBuilder.group({ + name: new FormControl('', { + validators: [Validators.required], + }), + email: new FormControl('', { + validators: [Validators.required, + Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')] + }), + allfiles: new FormControl(''), + message: new FormControl(''), + }); + + + this.bitstream$ = this.route.data.pipe( + map((data) => data.bitstream), + getFirstSucceededRemoteDataPayload() + ); + + this.subs.push(this.bitstream$.subscribe((bitstream) => { + this.bitstream = bitstream; + })); + + this.subs.push(this.bitstream$.pipe( + switchMap((bitstream) => bitstream.bundle), + getFirstSucceededRemoteDataPayload(), + switchMap((bundle) => bundle.item), + getFirstSucceededRemoteDataPayload(), + ).subscribe((item) => { + this.item = item; + this.itemName = this.dsoNameService.getName(item); + })); + + this.canDownload$ = this.bitstream$.pipe( + switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self : undefined)) + ); + const canRequestCopy$ = this.bitstream$.pipe( + switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(bitstream) ? bitstream.self : undefined)), + ); + + this.subs.push(observableCombineLatest([this.canDownload$, canRequestCopy$]).subscribe(([canDownload, canRequestCopy]) => { + if (!canDownload && !canRequestCopy) { + this.router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true}); + } + })); + this.initValues(); + } + + get name() { + return this.requestCopyForm.get('name'); + } + + get email() { + return this.requestCopyForm.get('email'); + } + + get message() { + return this.requestCopyForm.get('message'); + } + + get allfiles() { + return this.requestCopyForm.get('allfiles'); + } + + /** + * Initialise the form values based on the current user. + */ + private initValues() { + this.getCurrentUser().pipe(take(1)).subscribe((user) => { + this.requestCopyForm.patchValue({allfiles: 'true'}); + if (hasValue(user)) { + this.requestCopyForm.patchValue({name: user.name, email: user.email}); + console.log('ping'); + } + }); + } + + /** + * Retrieve the current user + */ + private getCurrentUser(): Observable { + return this.auth.isAuthenticated().pipe( + switchMap((authenticated) => { + if (authenticated) { + return this.auth.getAuthenticatedUserFromStore(); + } else { + return observableOf(undefined); + } + }) + ); + + } + + /** + * Submit the the form values as an item request to the server. + * When the submission is successful, the user will be redirected to the item page and a success notification will be shown. + * When the submission fails, the user will stay on the page and an error notification will be shown + */ + onSubmit() { + const itemRequest = new ItemRequest(); + if (hasValue(this.item)) { + itemRequest.itemId = this.item.uuid; + } + itemRequest.bitstreamId = this.bitstream.uuid; + itemRequest.allfiles = this.allfiles.value; + itemRequest.requestEmail = this.email.value; + itemRequest.requestName = this.name.value; + itemRequest.requestMessage = this.message.value; + + this.itemRequestDataService.requestACopy(itemRequest).pipe( + getFirstCompletedRemoteData() + ).subscribe((rd) => { + if (rd.hasSucceeded) { + this.notificationsService.success(this.translateService.get('bitstream-request-a-copy.submit.success')); + this.navigateBack(); + } else { + this.notificationsService.error(this.translateService.get('bitstream-request-a-copy.submit.error')); + } + }); + } + + ngOnDestroy(): void { + if (hasValue(this.subs)) { + this.subs.forEach((sub) => { + if (hasValue(sub)) { + sub.unsubscribe(); + } + }); + } + } + + /** + * Navigates back to the user's previous location + */ + navigateBack() { + this.location.back(); + } + + /** + * Retrieves the link to the bistream download page + */ + getBitstreamLink() { + return [getBitstreamDownloadRoute(this.bitstream)]; + } +} diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html index 497502d586..fc4b3b97ac 100644 --- a/src/app/shared/file-download-link/file-download-link.component.html +++ b/src/app/shared/file-download-link/file-download-link.component.html @@ -1,4 +1,5 @@ - + + diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts index 6f7f50e585..80a30e3bdd 100644 --- a/src/app/shared/file-download-link/file-download-link.component.spec.ts +++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts @@ -1,62 +1,132 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FileDownloadLinkComponent } from './file-download-link.component'; -import { AuthService } from '../../core/auth/auth.service'; -import { FileService } from '../../core/shared/file.service'; -import { of as observableOf } from 'rxjs'; import { Bitstream } from '../../core/shared/bitstream.model'; import { By } from '@angular/platform-browser'; import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { getBitstreamModuleRoute } from '../../app-routing-paths'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { cold, getTestScheduler } from 'jasmine-marbles'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; describe('FileDownloadLinkComponent', () => { let component: FileDownloadLinkComponent; let fixture: ComponentFixture; - let authService: AuthService; - let fileService: FileService; + let scheduler; + let authorizationService: AuthorizationDataService; + let bitstream: Bitstream; function init() { - authService = jasmine.createSpyObj('authService', { - isAuthenticated: observableOf(true) + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: cold('-a', {a: true}) }); - fileService = jasmine.createSpyObj('fileService', ['downloadFile']); bitstream = Object.assign(new Bitstream(), { uuid: 'bitstreamUuid', + _links: { + self: {href: 'obj-selflink'} + } }); } - beforeEach(waitForAsync(() => { - init(); + function initTestbed() { TestBed.configureTestingModule({ declarations: [FileDownloadLinkComponent], providers: [ - { provide: AuthService, useValue: authService }, - { provide: FileService, useValue: fileService }, + {provide: AuthorizationDataService, useValue: authorizationService}, ] }) .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FileDownloadLinkComponent); - component = fixture.componentInstance; - component.bitstream = bitstream; - fixture.detectChanges(); - }); + } describe('init', () => { - describe('getBitstreamPath', () => { - it('should set the bitstreamPath based on the input bitstream', () => { - expect(component.bitstreamPath).toEqual(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); + describe('when the user has download rights', () => { + beforeEach(waitForAsync(() => { + scheduler = getTestScheduler(); + init(); + initTestbed(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(FileDownloadLinkComponent); + component = fixture.componentInstance; + component.bitstream = bitstream; + fixture.detectChanges(); + }); + it('should return the bitstreamPath based on the input bitstream', () => { + expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()})); + expect(component.canDownload$).toBeObservable(cold('--a', {a: true})); + + }); + it('should init the component', () => { + scheduler.flush(); + fixture.detectChanges(); + const link = fixture.debugElement.query(By.css('a')).nativeElement; + expect(link.href).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); + const lock = fixture.debugElement.query(By.css('.fa-lock')); + expect(lock).toBeNull(); + }); + }); + describe('when the user has no download rights but has the right to request a copy', () => { + beforeEach(waitForAsync(() => { + scheduler = getTestScheduler(); + init(); + (authorizationService.isAuthorized as jasmine.Spy).and.callFake((featureId, object) => { + if (featureId === FeatureID.CanDownload) { + return cold('-a', {a: false}); + } + return cold('-a', {a: true}); + }); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(FileDownloadLinkComponent); + component = fixture.componentInstance; + component.bitstream = bitstream; + fixture.detectChanges(); + }); + it('should return the bitstreamPath based on the input bitstream', () => { + expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'request-a-copy').toString()})); + expect(component.canDownload$).toBeObservable(cold('--a', {a: false})); + + }); + it('should init the component', () => { + scheduler.flush(); + fixture.detectChanges(); + const link = fixture.debugElement.query(By.css('a')).nativeElement; + expect(link.href).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'request-a-copy').toString()); + const lock = fixture.debugElement.query(By.css('.fa-lock')).nativeElement; + expect(lock).toBeTruthy(); + }); + }); + describe('when the user has no download rights and no request a copy rights', () => { + beforeEach(waitForAsync(() => { + scheduler = getTestScheduler(); + init(); + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(cold('-a', {a: false})); + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(FileDownloadLinkComponent); + component = fixture.componentInstance; + component.bitstream = bitstream; + fixture.detectChanges(); + }); + it('should return the bitstreamPath based on the input bitstream', () => { + expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()})); + expect(component.canDownload$).toBeObservable(cold('--a', {a: false})); + + }); + it('should init the component', () => { + scheduler.flush(); + fixture.detectChanges(); + const link = fixture.debugElement.query(By.css('a')).nativeElement; + expect(link.href).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); + const lock = fixture.debugElement.query(By.css('.fa-lock')).nativeElement; + expect(lock).toBeTruthy(); + }); }); }); - - it('should init the component', () => { - const link = fixture.debugElement.query(By.css('a')).nativeElement; - expect(link.href).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); - }); - }); }); diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts index b415e1e701..2d98c97821 100644 --- a/src/app/shared/file-download-link/file-download-link.component.ts +++ b/src/app/shared/file-download-link/file-download-link.component.ts @@ -1,6 +1,11 @@ import { Component, Input, OnInit } from '@angular/core'; import { Bitstream } from '../../core/shared/bitstream.model'; -import { getBitstreamDownloadRoute } from '../../app-routing-paths'; +import { getBitstreamDownloadRoute, getBitstreamRequestACopyRoute } from '../../app-routing-paths'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { isNotEmpty } from '../empty.util'; +import { map } from 'rxjs/operators'; +import { of as observableOf, combineLatest as observableCombineLatest, Observable } from 'rxjs'; @Component({ selector: 'ds-file-download-link', @@ -29,13 +34,34 @@ export class FileDownloadLinkComponent implements OnInit { */ @Input() isBlank = false; - bitstreamPath: string; + @Input() enableRequestACopy = true; - ngOnInit() { - this.bitstreamPath = this.getBitstreamPath(); + bitstreamPath$: Observable; + + canDownload$: Observable; + + constructor( + private authorizationService: AuthorizationDataService, + ) { } - getBitstreamPath() { + ngOnInit() { + if (this.enableRequestACopy) { + this.canDownload$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined); + const canRequestACopy$ = this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined); + this.bitstreamPath$ = observableCombineLatest([this.canDownload$, canRequestACopy$]).pipe( + map(([canDownload, canRequestACopy]) => this.getBitstreamPath(canDownload, canRequestACopy)) + ); + } else { + this.bitstreamPath$ = observableOf(getBitstreamDownloadRoute(this.bitstream)); + this.canDownload$ = observableOf(true); + } + } + + getBitstreamPath(canDownload: boolean, canRequestACopy: boolean) { + if (!canDownload && canRequestACopy) { + return getBitstreamRequestACopyRoute(this.bitstream); + } return getBitstreamDownloadRoute(this.bitstream); } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 9b993e551f..2488ecf1ed 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -233,6 +233,7 @@ import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.com import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component'; import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component'; import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'; +import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; /** * Declaration needed to make sure all decorator functions are called in time @@ -431,6 +432,7 @@ const COMPONENTS = [ GroupSearchBoxComponent, FileDownloadLinkComponent, BitstreamDownloadPageComponent, + BitstreamRequestACopyPageComponent, CollectionDropdownComponent, ExportMetadataSelectorComponent, ConfirmationModalComponent, @@ -512,6 +514,7 @@ const ENTRY_COMPONENTS = [ CollectionDropdownComponent, FileDownloadLinkComponent, BitstreamDownloadPageComponent, + BitstreamRequestACopyPageComponent, CurationFormComponent, ExportMetadataSelectorComponent, ConfirmationModalComponent, diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html index 09c062d191..132f95dcb4 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.html +++ b/src/app/submission/sections/upload/file/section-upload-file.component.html @@ -10,7 +10,7 @@
- +
- + {{"item.page.filesection.download" | translate}}
@@ -74,7 +74,7 @@
- + {{"item.page.filesection.download" | translate}}
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index f2d0a23935..692783e6ab 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -12,6 +12,8 @@ import { MenuItemType } from '../shared/menu/initial-menus-state'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { ThemedItemPageComponent } from './simple/themed-item-page.component'; import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component'; +import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; +import { BitstreamPageResolver } from '../bitstream-page/bitstream-page.resolver'; @NgModule({ imports: [ @@ -42,6 +44,10 @@ import { ThemedFullItemPageComponent } from './full/themed-full-item-page.compon path: UPLOAD_BITSTREAM_PATH, component: UploadBitstreamComponent, canActivate: [AuthenticatedGuard] + }, + { + path: ':request-a-copy', + component: BitstreamRequestACopyPageComponent, } ], data: { diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html index 0fa5daa012..3d093f83c9 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.html +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html @@ -1,7 +1,7 @@
- + {{file?.name}} ({{(file?.sizeBytes) | dsFileSize }}) diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html index 4ab6963f74..1fae737fdb 100644 --- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html +++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html @@ -5,8 +5,9 @@ {{'bitstream-request-a-copy.alert.canDownload2'| translate}}
-

{{'bitstream-request-a-copy.intro' | translate}}

-

{{itemName}}

+

{{'bitstream-request-a-copy.intro' | translate}} {{itemName}}

+

{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}

+

{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}

@@ -45,13 +46,13 @@
{{'bitstream-request-a-copy.allfiles.label' |translate}}
+ id="allfiles-true" formControlName="allfiles" value="true">
+ id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts index 20df5dfb03..cc44ef8587 100644 --- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts +++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts @@ -21,10 +21,10 @@ import { NotificationsService } from '../notifications/notifications.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../mocks/dso-name.service.mock'; import { Item } from '../../core/shared/item.model'; -import { Bundle } from '../../core/shared/bundle.model'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { ItemRequest } from '../../core/shared/item-request.model'; import { Location } from '@angular/common'; +import { BitstreamDataService } from '../../core/data/bitstream-data.service'; describe('BitstreamRequestACopyPageComponent', () => { @@ -38,6 +38,7 @@ describe('BitstreamRequestACopyPageComponent', () => { let itemRequestDataService; let notificationsService; let location; + let bitstreamDataService; let item: Item; let bitstream: Bitstream; @@ -71,14 +72,8 @@ describe('BitstreamRequestACopyPageComponent', () => { item = Object.assign(new Item(), {uuid: 'item-uuid'}); - const bundle = Object.assign(new Bundle(), { - uuid: 'bundle-uuid', - item: createSuccessfulRemoteDataObject$(item) - }); - bitstream = Object.assign(new Bitstream(), { uuid: 'bitstreamUuid', - bundle: createSuccessfulRemoteDataObject$(bundle), _links: { content: {href: 'bitstream-content-link'}, self: {href: 'bitstream-self-link'}, @@ -87,12 +82,19 @@ describe('BitstreamRequestACopyPageComponent', () => { activatedRoute = { data: observableOf({ - bitstream: createSuccessfulRemoteDataObject( - bitstream + dso: createSuccessfulRemoteDataObject( + item ) + }), + queryParams: observableOf({ + bitstream : bitstream.uuid }) }; + bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', { + findById: createSuccessfulRemoteDataObject$(bitstream) + }); + router = new RouterStub(); } @@ -109,6 +111,7 @@ describe('BitstreamRequestACopyPageComponent', () => { {provide: ItemRequestDataService, useValue: itemRequestDataService}, {provide: NotificationsService, useValue: notificationsService}, {provide: DSONameService, useValue: new DSONameServiceMock()}, + {provide: BitstreamDataService, useValue: bitstreamDataService}, ] }) .compileComponents(); @@ -143,7 +146,7 @@ describe('BitstreamRequestACopyPageComponent', () => { it('show the form with no values filled in based on the user', () => { expect(component.name.value).toEqual(''); expect(component.email.value).toEqual(''); - expect(component.allfiles.value).toEqual('true'); + expect(component.allfiles.value).toEqual('false'); expect(component.message.value).toEqual(''); }); }); @@ -163,8 +166,38 @@ describe('BitstreamRequestACopyPageComponent', () => { fixture.detectChanges(); expect(component.name.value).toEqual(eperson.name); expect(component.email.value).toEqual(eperson.email); + expect(component.allfiles.value).toEqual('false'); + expect(component.message.value).toEqual(''); + }); + }); + describe('when no bitstream was provided', () => { + beforeEach(waitForAsync(() => { + init(); + activatedRoute = { + data: observableOf({ + dso: createSuccessfulRemoteDataObject( + item + ) + }), + queryParams: observableOf({ + }) + }; + initTestbed(); + })); + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamRequestACopyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('should set the all files value to true and disable the false value', () => { + expect(component.name.value).toEqual(''); + expect(component.email.value).toEqual(''); expect(component.allfiles.value).toEqual('true'); expect(component.message.value).toEqual(''); + + const allFilesFalse = fixture.debugElement.query(By.css('#allfiles-false')).nativeElement; + expect(allFilesFalse.getAttribute('disabled')).toBeTruthy(); + }); }); describe('when the user has authorization to download the file', () => { diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts index 35b56e5434..7697d5fad8 100644 --- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts +++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { map, switchMap, take } from 'rxjs/operators'; +import { filter, map, switchMap, take, tap } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { hasValue, isNotEmpty } from '../empty.util'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; @@ -17,9 +17,10 @@ import { ItemRequestDataService } from '../../core/data/item-request-data.servic import { ItemRequest } from '../../core/shared/item-request.model'; import { Item } from '../../core/shared/item.model'; import { NotificationsService } from '../notifications/notifications.service'; -import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { Location } from '@angular/common'; +import { BitstreamDataService } from '../../core/data/bitstream-data.service'; +import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; @Component({ selector: 'ds-bitstream-request-a-copy-page', @@ -30,15 +31,19 @@ import { Location } from '@angular/common'; */ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { - bitstream$: Observable; + item$: Observable; canDownload$: Observable; private subs: Subscription[] = []; requestCopyForm: FormGroup; - bitstream: Bitstream; + item: Item; itemName: string; + bitstream$: Observable; + bitstream: Bitstream; + bitstreamName: string; + constructor(private location: Location, private translateService: TranslateService, private route: ActivatedRoute, @@ -49,6 +54,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { private itemRequestDataService: ItemRequestDataService, private notificationsService: NotificationsService, private dsoNameService: DSONameService, + private bitstreamService: BitstreamDataService, ) { } @@ -66,23 +72,25 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { }); - this.bitstream$ = this.route.data.pipe( - map((data) => data.bitstream), + this.item$ = this.route.data.pipe( + map((data) => data.dso), + getFirstSucceededRemoteDataPayload() + ); + + this.subs.push(this.item$.subscribe((item) => { + this.item = item; + this.itemName = this.dsoNameService.getName(item); + })); + + this.bitstream$ = this.route.queryParams.pipe( + filter((params) => hasValue(params) && hasValue(params.bitstream)), + switchMap((params) => this.bitstreamService.findById(params.bitstream)), getFirstSucceededRemoteDataPayload() ); this.subs.push(this.bitstream$.subscribe((bitstream) => { this.bitstream = bitstream; - })); - - this.subs.push(this.bitstream$.pipe( - switchMap((bitstream) => bitstream.bundle), - getFirstSucceededRemoteDataPayload(), - switchMap((bundle) => bundle.item), - getFirstSucceededRemoteDataPayload(), - ).subscribe((item) => { - this.item = item; - this.itemName = this.dsoNameService.getName(item); + this.bitstreamName = this.dsoNameService.getName(bitstream); })); this.canDownload$ = this.bitstream$.pipe( @@ -124,9 +132,11 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { this.requestCopyForm.patchValue({allfiles: 'true'}); if (hasValue(user)) { this.requestCopyForm.patchValue({name: user.name, email: user.email}); - console.log('ping'); } }); + this.bitstream$.pipe(take(1)).subscribe((bitstream) => { + this.requestCopyForm.patchValue({allfiles: 'false'}); + }); } /** @@ -152,10 +162,10 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { */ onSubmit() { const itemRequest = new ItemRequest(); - if (hasValue(this.item)) { - itemRequest.itemId = this.item.uuid; + if (hasValue(this.bitstream)) { + itemRequest.bitstreamId = this.bitstream.uuid; } - itemRequest.bitstreamId = this.bitstream.uuid; + itemRequest.itemId = this.item.uuid; itemRequest.allfiles = this.allfiles.value; itemRequest.requestEmail = this.email.value; itemRequest.requestName = this.name.value; @@ -190,6 +200,10 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy { this.location.back(); } + getItemPath() { + return [getItemPageRoute(this.item)]; + } + /** * Retrieves the link to the bistream download page */ diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts index 80a30e3bdd..cdf4f30837 100644 --- a/src/app/shared/file-download-link/file-download-link.component.spec.ts +++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts @@ -7,6 +7,8 @@ import { getBitstreamModuleRoute } from '../../app-routing-paths'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { cold, getTestScheduler } from 'jasmine-marbles'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { Item } from '../../core/shared/item.model'; +import { getItemModuleRoute } from '../../item-page/item-page-routing-paths'; describe('FileDownloadLinkComponent', () => { let component: FileDownloadLinkComponent; @@ -16,6 +18,7 @@ describe('FileDownloadLinkComponent', () => { let authorizationService: AuthorizationDataService; let bitstream: Bitstream; + let item: Item; function init() { authorizationService = jasmine.createSpyObj('authorizationService', { @@ -27,6 +30,12 @@ describe('FileDownloadLinkComponent', () => { self: {href: 'obj-selflink'} } }); + item = Object.assign(new Item(), { + uuid: 'itemUuid', + _links: { + self: {href: 'obj-selflink'} + } + }); } function initTestbed() { @@ -52,6 +61,7 @@ describe('FileDownloadLinkComponent', () => { fixture = TestBed.createComponent(FileDownloadLinkComponent); component = fixture.componentInstance; component.bitstream = bitstream; + component.item = item; fixture.detectChanges(); }); it('should return the bitstreamPath based on the input bitstream', () => { @@ -83,11 +93,12 @@ describe('FileDownloadLinkComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(FileDownloadLinkComponent); component = fixture.componentInstance; + component.item = item; component.bitstream = bitstream; fixture.detectChanges(); }); it('should return the bitstreamPath based on the input bitstream', () => { - expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'request-a-copy').toString()})); + expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: `${new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString()}?bitstream=${bitstream.uuid}`})); expect(component.canDownload$).toBeObservable(cold('--a', {a: false})); }); @@ -95,7 +106,7 @@ describe('FileDownloadLinkComponent', () => { scheduler.flush(); fixture.detectChanges(); const link = fixture.debugElement.query(By.css('a')).nativeElement; - expect(link.href).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'request-a-copy').toString()); + expect(link.href).toContain(`${new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString()}?bitstream=${bitstream.uuid}`); const lock = fixture.debugElement.query(By.css('.fa-lock')).nativeElement; expect(lock).toBeTruthy(); }); @@ -111,6 +122,7 @@ describe('FileDownloadLinkComponent', () => { fixture = TestBed.createComponent(FileDownloadLinkComponent); component = fixture.componentInstance; component.bitstream = bitstream; + component.item = item; fixture.detectChanges(); }); it('should return the bitstreamPath based on the input bitstream', () => { diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts index 2d98c97821..40d871109a 100644 --- a/src/app/shared/file-download-link/file-download-link.component.ts +++ b/src/app/shared/file-download-link/file-download-link.component.ts @@ -3,9 +3,10 @@ import { Bitstream } from '../../core/shared/bitstream.model'; import { getBitstreamDownloadRoute, getBitstreamRequestACopyRoute } from '../../app-routing-paths'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { isNotEmpty } from '../empty.util'; +import { hasValue, isNotEmpty } from '../empty.util'; import { map } from 'rxjs/operators'; import { of as observableOf, combineLatest as observableCombineLatest, Observable } from 'rxjs'; +import { Item } from '../../core/shared/item.model'; @Component({ selector: 'ds-file-download-link', @@ -24,6 +25,8 @@ export class FileDownloadLinkComponent implements OnInit { */ @Input() bitstream: Bitstream; + @Input() item: Item; + /** * Additional css classes to apply to link */ @@ -59,8 +62,8 @@ export class FileDownloadLinkComponent implements OnInit { } getBitstreamPath(canDownload: boolean, canRequestACopy: boolean) { - if (!canDownload && canRequestACopy) { - return getBitstreamRequestACopyRoute(this.bitstream); + if (!canDownload && canRequestACopy && hasValue(this.item)) { + return getBitstreamRequestACopyRoute(this.item, this.bitstream); } return getBitstreamDownloadRoute(this.bitstream); } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 2448570ab4..d83ef56a5a 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -594,7 +594,10 @@ "bitstream-request-a-copy.header": "Request a copy of the file", - "bitstream-request-a-copy.intro": "Enter the following information to request a copy", + "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ", + + "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ", + "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ", "bitstream-request-a-copy.name.label": "Name *", From 90b706239e86fd6171730ef7285cbe819a868e94 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 30 Sep 2021 16:28:49 +0200 Subject: [PATCH 107/161] Fix page reload when requesting a copy --- .../file-download-link.component.html | 2 +- .../file-download-link.component.spec.ts | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html index fc4b3b97ac..0135f74745 100644 --- a/src/app/shared/file-download-link/file-download-link.component.html +++ b/src/app/shared/file-download-link/file-download-link.component.html @@ -1,4 +1,4 @@ - + diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts index cdf4f30837..8b39b93dc6 100644 --- a/src/app/shared/file-download-link/file-download-link.component.spec.ts +++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts @@ -9,6 +9,7 @@ import { cold, getTestScheduler } from 'jasmine-marbles'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { Item } from '../../core/shared/item.model'; import { getItemModuleRoute } from '../../item-page/item-page-routing-paths'; +import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub'; describe('FileDownloadLinkComponent', () => { let component: FileDownloadLinkComponent; @@ -40,7 +41,7 @@ describe('FileDownloadLinkComponent', () => { function initTestbed() { TestBed.configureTestingModule({ - declarations: [FileDownloadLinkComponent], + declarations: [FileDownloadLinkComponent, RouterLinkDirectiveStub], providers: [ {provide: AuthorizationDataService, useValue: authorizationService}, ] @@ -72,8 +73,8 @@ describe('FileDownloadLinkComponent', () => { it('should init the component', () => { scheduler.flush(); fixture.detectChanges(); - const link = fixture.debugElement.query(By.css('a')).nativeElement; - expect(link.href).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); + const link = fixture.debugElement.query(By.css('a')); + expect(link.injector.get(RouterLinkDirectiveStub).routerLink).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); const lock = fixture.debugElement.query(By.css('.fa-lock')); expect(lock).toBeNull(); }); @@ -105,8 +106,8 @@ describe('FileDownloadLinkComponent', () => { it('should init the component', () => { scheduler.flush(); fixture.detectChanges(); - const link = fixture.debugElement.query(By.css('a')).nativeElement; - expect(link.href).toContain(`${new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString()}?bitstream=${bitstream.uuid}`); + const link = fixture.debugElement.query(By.css('a')); + expect(link.injector.get(RouterLinkDirectiveStub).routerLink).toContain(`${new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString()}?bitstream=${bitstream.uuid}`); const lock = fixture.debugElement.query(By.css('.fa-lock')).nativeElement; expect(lock).toBeTruthy(); }); @@ -133,8 +134,8 @@ describe('FileDownloadLinkComponent', () => { it('should init the component', () => { scheduler.flush(); fixture.detectChanges(); - const link = fixture.debugElement.query(By.css('a')).nativeElement; - expect(link.href).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); + const link = fixture.debugElement.query(By.css('a')); + expect(link.injector.get(RouterLinkDirectiveStub).routerLink).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()); const lock = fixture.debugElement.query(By.css('.fa-lock')).nativeElement; expect(lock).toBeTruthy(); }); From 4feccb99890ab54d970a6f839b984a4fe559e24e Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 30 Sep 2021 17:01:30 +0200 Subject: [PATCH 108/161] intermittent commit --- .../grant-deny-request-copy.component.html | 20 ++++++++ .../grant-deny-request-copy.component.scss | 0 .../grant-deny-request-copy.component.ts | 50 +++++++++++++++++++ .../request-copy-routing.module.ts | 27 ++++++++++ src/app/request-copy/request-copy.module.ts | 22 ++++++++ src/app/request-copy/request-copy.resolver.ts | 19 +++++++ 6 files changed, 138 insertions(+) create mode 100644 src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html create mode 100644 src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.scss create mode 100644 src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts create mode 100644 src/app/request-copy/request-copy-routing.module.ts create mode 100644 src/app/request-copy/request-copy.module.ts create mode 100644 src/app/request-copy/request-copy.resolver.ts diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html new file mode 100644 index 0000000000..ae38a964e8 --- /dev/null +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html @@ -0,0 +1,20 @@ +
+

{{'grant-deny-request-copy.header' | translate}}

+

{{'grant-deny-request-copy.intro' | translate}}

+ + +
+ + {{'grant-deny-request-copy.grant' | translate }} + + + + {{'grant-deny-request-copy.deny' | translate }} + +
+ +
\ No newline at end of file diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.scss b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts new file mode 100644 index 0000000000..f8134cdf96 --- /dev/null +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts @@ -0,0 +1,50 @@ +import { Component, OnInit } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { Store } from '@ngrx/store'; +import { CoreState } from '../../core/core.reducers'; +import { ActivatedRoute, Router } from '@angular/router'; +import { FormBuilder } from '@angular/forms'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service'; +import { map } from 'rxjs/operators'; +import { Registration } from '../../core/shared/registration.model'; +import { ItemRequest } from '../../core/shared/item-request.model'; +import { Observable } from 'rxjs/internal/Observable'; +import { getFirstCompletedRemoteData, redirectOn4xx } from '../../core/shared/operators'; +import { RemoteData } from '../../core/data/remote-data'; +import { AuthService } from '../../core/auth/auth.service'; + +@Component({ + selector: 'ds-grant-deny-request-copy', + styleUrls: ['./grant-deny-request-copy.component.scss'], + templateUrl: './grant-deny-request-copy.component.html' +}) +export class GrantDenyRequestCopyComponent implements OnInit { + private itemRequest$: Observable>; + + + constructor( + private translateService: TranslateService, + private ePersonDataService: EPersonDataService, + private store: Store, + private router: Router, + private route: ActivatedRoute, + private formBuilder: FormBuilder, + private notificationsService: NotificationsService, + private endUserAgreementService: EndUserAgreementService, + private authService: AuthService + ) { + + } + + ngOnInit(): void { + this.itemRequest$ = this.route.data.pipe( + map((data) => data.request as RemoteData), + getFirstCompletedRemoteData(), + redirectOn4xx(this.router, this.authService) + ); + + } + +} diff --git a/src/app/request-copy/request-copy-routing.module.ts b/src/app/request-copy/request-copy-routing.module.ts new file mode 100644 index 0000000000..734a661014 --- /dev/null +++ b/src/app/request-copy/request-copy-routing.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard'; +import { RequestCopyResolver } from './request-copy.resolver'; +import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: ':token', + component: GrantDenyRequestCopyComponent, + resolve: {request: RequestCopyResolver}, + canActivate: [EndUserAgreementCookieGuard] + } + ]) + ], + providers: [ + RequestCopyResolver, + GrantDenyRequestCopyComponent + ] +}) +/** + * Module related to the navigation to components used to register a new user + */ +export class RegisterPageRoutingModule { +} diff --git a/src/app/request-copy/request-copy.module.ts b/src/app/request-copy/request-copy.module.ts new file mode 100644 index 0000000000..eef0ee4313 --- /dev/null +++ b/src/app/request-copy/request-copy.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedModule } from '../shared/shared.module'; +import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; + +@NgModule({ + imports: [ + CommonModule, + SharedModule, + ], + declarations: [ + GrantDenyRequestCopyComponent + ], + providers: [] +}) + +/** + * Module related to components used to register a new user + */ +export class RequestCopyModule { + +} diff --git a/src/app/request-copy/request-copy.resolver.ts b/src/app/request-copy/request-copy.resolver.ts new file mode 100644 index 0000000000..0086d51e57 --- /dev/null +++ b/src/app/request-copy/request-copy.resolver.ts @@ -0,0 +1,19 @@ +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { RemoteData } from '../core/data/remote-data'; +import { ItemRequest } from '../core/shared/item-request.model'; +import { Observable } from 'rxjs/internal/Observable'; +import { ItemRequestDataService } from '../core/data/item-request-data.service'; + +export class RequestCopyResolver implements Resolve> { + + constructor( + private itemRequestDataService: ItemRequestDataService, + ) { + } + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> | Promise> | RemoteData { + // TODO add method after knowing whether they will change the rest object to be compatible with normal dataservice. + return undefined; + } + +} \ No newline at end of file From 11bf10cbde29c20e6f0053dbcb9a4be2a807195c Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 4 Oct 2021 17:53:49 +0200 Subject: [PATCH 109/161] 83635: Intermediate commit --- src/app/app-routing-paths.ts | 5 ++ src/app/app-routing.module.ts | 6 ++- .../core/data/item-request-data.service.ts | 18 ++++++- src/app/core/shared/item-request.model.ts | 15 +++++- .../deny-request-copy.component.html | 9 ++++ .../deny-request-copy.component.scss | 0 .../deny-request-copy.component.ts | 37 ++++++++++++++ .../email-request-copy.component.html | 29 +++++++++++ .../email-request-copy.component.scss | 0 .../email-request-copy.component.ts | 26 ++++++++++ .../request-copy-email.model.ts | 5 ++ .../grant-deny-request-copy.component.html | 34 +++++++------ .../grant-deny-request-copy.component.ts | 51 ++++++++++++++----- .../request-copy-routing-paths.ts | 18 +++++++ .../request-copy-routing.module.ts | 24 ++++++--- src/app/request-copy/request-copy.module.ts | 8 ++- src/app/request-copy/request-copy.resolver.ts | 10 ++-- src/assets/i18n/en.json5 | 31 +++++++++++ 18 files changed, 279 insertions(+), 47 deletions(-) create mode 100644 src/app/request-copy/deny-request-copy/deny-request-copy.component.html create mode 100644 src/app/request-copy/deny-request-copy/deny-request-copy.component.scss create mode 100644 src/app/request-copy/deny-request-copy/deny-request-copy.component.ts create mode 100644 src/app/request-copy/email-request-copy/email-request-copy.component.html create mode 100644 src/app/request-copy/email-request-copy/email-request-copy.component.scss create mode 100644 src/app/request-copy/email-request-copy/email-request-copy.component.ts create mode 100644 src/app/request-copy/email-request-copy/request-copy-email.model.ts create mode 100644 src/app/request-copy/request-copy-routing-paths.ts diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index 74a3f7183e..3fa56698f7 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -94,3 +94,8 @@ export const ACCESS_CONTROL_MODULE_PATH = 'access-control'; export function getAccessControlModuleRoute() { return `/${ACCESS_CONTROL_MODULE_PATH}`; } + +export const REQUEST_COPY_MODULE_PATH = 'request-a-copy'; +export function getRequestCopyModulePath() { + return `/${REQUEST_COPY_MODULE_PATH}`; +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 52a07b89f5..fa75b0b2f0 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -14,7 +14,7 @@ import { PROFILE_MODULE_PATH, REGISTER_PATH, WORKFLOW_ITEM_MODULE_PATH, - LEGACY_BITSTREAM_MODULE_PATH, + LEGACY_BITSTREAM_MODULE_PATH, REQUEST_COPY_MODULE_PATH, } from './app-routing-paths'; import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths'; import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths'; @@ -180,6 +180,10 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu path: INFO_MODULE_PATH, loadChildren: () => import('./info/info.module').then((m) => m.InfoModule), }, + { + path: REQUEST_COPY_MODULE_PATH, + loadChildren: () => import('./request-copy/request-copy.module').then((m) => m.RequestCopyModule), + }, { path: FORBIDDEN_PATH, component: ThemedForbiddenComponent diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts index dc11e2b0c5..a0a7fe6d03 100644 --- a/src/app/core/data/item-request-data.service.ts +++ b/src/app/core/data/item-request-data.service.ts @@ -9,6 +9,13 @@ import { PostRequest } from './request.models'; import { RequestService } from './request.service'; import { ItemRequest } from '../shared/item-request.model'; import { hasValue, isNotEmpty } from '../../shared/empty.util'; +import { DataService } from './data.service'; +import { Store } from '@ngrx/store'; +import { CoreState } from '../core.reducers'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { HttpClient } from '@angular/common/http'; +import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; /** * A service responsible for fetching/sending data from/to the REST API on the bitstreamformats endpoint @@ -18,14 +25,21 @@ import { hasValue, isNotEmpty } from '../../shared/empty.util'; providedIn: 'root', } ) -export class ItemRequestDataService { +export class ItemRequestDataService extends DataService { protected linkPath = 'itemrequests'; constructor( protected requestService: RequestService, protected rdbService: RemoteDataBuildService, - protected halService: HALEndpointService) { + protected store: Store, + protected objectCache: ObjectCacheService, + protected halService: HALEndpointService, + protected notificationsService: NotificationsService, + protected http: HttpClient, + protected comparator: DefaultChangeAnalyzer, + ) { + super(); } getItemRequestEndpoint(): Observable { diff --git a/src/app/core/shared/item-request.model.ts b/src/app/core/shared/item-request.model.ts index b14ed07656..da9c4c9e08 100644 --- a/src/app/core/shared/item-request.model.ts +++ b/src/app/core/shared/item-request.model.ts @@ -1,14 +1,16 @@ -import { autoserialize } from 'cerialize'; +import { autoserialize, deserialize } from 'cerialize'; import { typedObject } from '../cache/builders/build-decorators'; import { excludeFromEquals } from '../utilities/equals.decorators'; import { ResourceType } from './resource-type'; import { ITEM_REQUEST } from './item-request.resource-type'; +import { CacheableObject } from '../cache/object-cache.reducer'; +import { HALLink } from './hal-link.model'; /** * Model class for a Configuration Property */ @typedObject -export class ItemRequest { +export class ItemRequest implements CacheableObject { static type = ITEM_REQUEST; /** @@ -75,5 +77,14 @@ export class ItemRequest { @autoserialize bitstreamId: string; + /** + * The {@link HALLink}s for this ItemRequest + */ + @deserialize + _links: { + self: HALLink; + item: HALLink; + bitstream: HALLink; + }; } diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html new file mode 100644 index 0000000000..226fac1f67 --- /dev/null +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html @@ -0,0 +1,9 @@ +
+

{{'deny-request-copy.header' | translate}}

+
+

{{'deny-request-copy.intro' | translate}}

+ + +
+ +
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.scss b/src/app/request-copy/deny-request-copy/deny-request-copy.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts new file mode 100644 index 0000000000..4ffeb61605 --- /dev/null +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts @@ -0,0 +1,37 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { map } from 'rxjs/operators'; +import { ItemRequest } from '../../core/shared/item-request.model'; +import { Observable } from 'rxjs/internal/Observable'; +import { + getFirstCompletedRemoteData, + redirectOn4xx +} from '../../core/shared/operators'; +import { RemoteData } from '../../core/data/remote-data'; +import { AuthService } from '../../core/auth/auth.service'; + +@Component({ + selector: 'ds-deny-request-copy', + styleUrls: ['./deny-request-copy.component.scss'], + templateUrl: './deny-request-copy.component.html' +}) +export class DenyRequestCopyComponent implements OnInit { + itemRequestRD$: Observable>; + + constructor( + private router: Router, + private route: ActivatedRoute, + private authService: AuthService, + ) { + + } + + ngOnInit(): void { + this.itemRequestRD$ = this.route.data.pipe( + map((data) => data.request as RemoteData), + getFirstCompletedRemoteData(), + redirectOn4xx(this.router, this.authService), + ); + } + +} diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html new file mode 100644 index 0000000000..b4c7b65aba --- /dev/null +++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html @@ -0,0 +1,29 @@ + +
+ + +
+ {{ 'grant-deny-request-copy.email.subject.empty' | translate }} +
+
+
+ + +
+ {{ 'grant-deny-request-copy.email.message.empty' | translate }} +
+
+
+ + +
+ diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.scss b/src/app/request-copy/email-request-copy/email-request-copy.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts new file mode 100644 index 0000000000..0bb2286b4d --- /dev/null +++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts @@ -0,0 +1,26 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { RequestCopyEmail } from './request-copy-email.model'; +import { Location } from '@angular/common'; + +@Component({ + selector: 'ds-email-request-copy', + styleUrls: ['./email-request-copy.component.scss'], + templateUrl: './email-request-copy.component.html' +}) +export class EmailRequestCopyComponent { + @Output() send: EventEmitter = new EventEmitter(); + + @Input() subject: string; + @Input() message: string; + + constructor(protected location: Location) { + } + + submit() { + this.send.emit(new RequestCopyEmail(this.subject, this.message)); + } + + return() { + this.location.back(); + } +} diff --git a/src/app/request-copy/email-request-copy/request-copy-email.model.ts b/src/app/request-copy/email-request-copy/request-copy-email.model.ts new file mode 100644 index 0000000000..45cb44e1ce --- /dev/null +++ b/src/app/request-copy/email-request-copy/request-copy-email.model.ts @@ -0,0 +1,5 @@ +export class RequestCopyEmail { + constructor(public subject: string, + public message: string) { + } +} diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html index ae38a964e8..5be182c4cb 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html @@ -1,20 +1,22 @@ -
-

{{'grant-deny-request-copy.header' | translate}}

-

{{'grant-deny-request-copy.intro' | translate}}

- +
+

{{'grant-deny-request-copy.header' | translate}}

+ \ No newline at end of file +
+ +
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts index f8134cdf96..81e5c8abac 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts @@ -7,13 +7,20 @@ import { ActivatedRoute, Router } from '@angular/router'; import { FormBuilder } from '@angular/forms'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service'; -import { map } from 'rxjs/operators'; -import { Registration } from '../../core/shared/registration.model'; +import { map, switchMap } from 'rxjs/operators'; import { ItemRequest } from '../../core/shared/item-request.model'; import { Observable } from 'rxjs/internal/Observable'; -import { getFirstCompletedRemoteData, redirectOn4xx } from '../../core/shared/operators'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteDataPayload, + redirectOn4xx +} from '../../core/shared/operators'; import { RemoteData } from '../../core/data/remote-data'; import { AuthService } from '../../core/auth/auth.service'; +import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths'; +import { Item } from '../../core/shared/item.model'; +import { ItemDataService } from '../../core/data/item-data.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; @Component({ selector: 'ds-grant-deny-request-copy', @@ -21,30 +28,46 @@ import { AuthService } from '../../core/auth/auth.service'; templateUrl: './grant-deny-request-copy.component.html' }) export class GrantDenyRequestCopyComponent implements OnInit { - private itemRequest$: Observable>; - + itemRequestRD$: Observable>; + itemRD$: Observable>; + itemName$: Observable; + + denyRoute$: Observable; + grantRoute$: Observable; constructor( - private translateService: TranslateService, - private ePersonDataService: EPersonDataService, - private store: Store, private router: Router, private route: ActivatedRoute, - private formBuilder: FormBuilder, - private notificationsService: NotificationsService, - private endUserAgreementService: EndUserAgreementService, - private authService: AuthService + private authService: AuthService, + private itemDataService: ItemDataService, + private nameService: DSONameService, ) { } ngOnInit(): void { - this.itemRequest$ = this.route.data.pipe( + this.itemRequestRD$ = this.route.data.pipe( map((data) => data.request as RemoteData), getFirstCompletedRemoteData(), - redirectOn4xx(this.router, this.authService) + redirectOn4xx(this.router, this.authService), + ); + this.itemRD$ = this.itemRequestRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((itemRequest: ItemRequest) => this.itemDataService.findById(itemRequest.itemId)), + ); + this.itemName$ = this.itemRD$.pipe( + getFirstSucceededRemoteDataPayload(), + map((item) => this.nameService.getName(item)), ); + this.denyRoute$ = this.itemRequestRD$.pipe( + getFirstSucceededRemoteDataPayload(), + map((itemRequest: ItemRequest) => getRequestCopyDenyRoute(itemRequest.token)) + ); + this.grantRoute$ = this.itemRequestRD$.pipe( + getFirstSucceededRemoteDataPayload(), + map((itemRequest: ItemRequest) => getRequestCopyGrantRoute(itemRequest.token)) + ); } } diff --git a/src/app/request-copy/request-copy-routing-paths.ts b/src/app/request-copy/request-copy-routing-paths.ts new file mode 100644 index 0000000000..1d0204a1b8 --- /dev/null +++ b/src/app/request-copy/request-copy-routing-paths.ts @@ -0,0 +1,18 @@ +import { URLCombiner } from '../core/url-combiner/url-combiner'; +import { getRequestCopyModulePath } from '../app-routing-paths'; + +export function getRequestCopyRoute(token: string) { + return new URLCombiner(getRequestCopyModulePath(), token).toString(); +} + +export const REQUEST_COPY_DENY_PATH = 'deny'; + +export function getRequestCopyDenyRoute(token: string) { + return new URLCombiner(getRequestCopyRoute(token), REQUEST_COPY_DENY_PATH).toString(); +} + +export const REQUEST_COPY_GRANT_PATH = 'grant'; + +export function getRequestCopyGrantRoute(token: string) { + return new URLCombiner(getRequestCopyRoute(token), REQUEST_COPY_GRANT_PATH).toString(); +} diff --git a/src/app/request-copy/request-copy-routing.module.ts b/src/app/request-copy/request-copy-routing.module.ts index 734a661014..c25afcc459 100644 --- a/src/app/request-copy/request-copy-routing.module.ts +++ b/src/app/request-copy/request-copy-routing.module.ts @@ -1,17 +1,28 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard'; import { RequestCopyResolver } from './request-copy.resolver'; import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; +import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths'; +import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component'; @NgModule({ imports: [ RouterModule.forChild([ { path: ':token', - component: GrantDenyRequestCopyComponent, - resolve: {request: RequestCopyResolver}, - canActivate: [EndUserAgreementCookieGuard] + resolve: { + request: RequestCopyResolver + }, + children: [ + { + path: '', + component: GrantDenyRequestCopyComponent, + }, + { + path: REQUEST_COPY_DENY_PATH, + component: DenyRequestCopyComponent, + } + ] } ]) ], @@ -20,8 +31,5 @@ import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-d GrantDenyRequestCopyComponent ] }) -/** - * Module related to the navigation to components used to register a new user - */ -export class RegisterPageRoutingModule { +export class RequestCopyRoutingModule { } diff --git a/src/app/request-copy/request-copy.module.ts b/src/app/request-copy/request-copy.module.ts index eef0ee4313..f3b29d5b77 100644 --- a/src/app/request-copy/request-copy.module.ts +++ b/src/app/request-copy/request-copy.module.ts @@ -2,14 +2,20 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from '../shared/shared.module'; import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; +import { RequestCopyRoutingModule } from './request-copy-routing.module'; +import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component'; +import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component'; @NgModule({ imports: [ CommonModule, SharedModule, + RequestCopyRoutingModule ], declarations: [ - GrantDenyRequestCopyComponent + GrantDenyRequestCopyComponent, + DenyRequestCopyComponent, + EmailRequestCopyComponent, ], providers: [] }) diff --git a/src/app/request-copy/request-copy.resolver.ts b/src/app/request-copy/request-copy.resolver.ts index 0086d51e57..948445ee0f 100644 --- a/src/app/request-copy/request-copy.resolver.ts +++ b/src/app/request-copy/request-copy.resolver.ts @@ -3,7 +3,10 @@ import { RemoteData } from '../core/data/remote-data'; import { ItemRequest } from '../core/shared/item-request.model'; import { Observable } from 'rxjs/internal/Observable'; import { ItemRequestDataService } from '../core/data/item-request-data.service'; +import { Injectable } from '@angular/core'; +import { getFirstCompletedRemoteData } from '../core/shared/operators'; +@Injectable() export class RequestCopyResolver implements Resolve> { constructor( @@ -12,8 +15,9 @@ export class RequestCopyResolver implements Resolve> { } resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> | Promise> | RemoteData { - // TODO add method after knowing whether they will change the rest object to be compatible with normal dataservice. - return undefined; + return this.itemRequestDataService.findById(route.params.token).pipe( + getFirstCompletedRemoteData(), + ); } -} \ No newline at end of file +} diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d83ef56a5a..1b7598a7d1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1206,6 +1206,12 @@ + "deny-request-copy.header": "Deny document copy request", + + "deny-request-copy.intro": "This message will be sent to the applicant of the request", + + + "dso.name.untitled": "Untitled", @@ -1430,6 +1436,31 @@ "form.repeatable.sort.tip": "Drop the item in the new position", + + "grant-deny-request-copy.deny": "Don't send copy", + + "grant-deny-request-copy.email.back": "Back", + + "grant-deny-request-copy.email.message": "Message", + + "grant-deny-request-copy.email.message.empty": "Please enter a message", + + "grant-deny-request-copy.email.send": "Send", + + "grant-deny-request-copy.email.subject": "Subject", + + "grant-deny-request-copy.email.subject.empty": "Please enter a subject", + + "grant-deny-request-copy.grant": "Send copy", + + "grant-deny-request-copy.header": "Document copy request", + + "grant-deny-request-copy.intro1": "IF YOU ARE THE AUTHOR (OR AN AUTHOR) OF DOCUMENT \"{{ name }}\" use the buttons to answer the user's request.", + + "grant-deny-request-copy.intro2": "This repository will propose an appropriate model reply, which you may edit.", + + + "home.description": "", "home.breadcrumbs": "Home", From 120b9f5ce94d39fad4ee7e57baeee467b74077a6 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 5 Oct 2021 14:55:34 +0200 Subject: [PATCH 110/161] 83635: Grant/Deny item requests --- src/app/app-routing.module.ts | 1 + .../core/data/item-request-data.service.ts | 72 +++++++++-- .../deny-request-copy.component.html | 2 +- .../deny-request-copy.component.ts | 79 +++++++++++- .../email-request-copy.component.html | 7 +- .../email-request-copy.component.ts | 19 +++ .../request-copy-email.model.ts | 3 + .../grant-deny-request-copy.component.ts | 28 +++-- .../grant-request-copy.component.html | 17 +++ .../grant-request-copy.component.scss | 0 .../grant-request-copy.component.ts | 118 ++++++++++++++++++ .../request-copy-routing.module.ts | 7 +- src/app/request-copy/request-copy.module.ts | 4 +- src/app/request-copy/request-copy.resolver.ts | 3 + src/assets/i18n/en.json5 | 26 ++++ 15 files changed, 364 insertions(+), 22 deletions(-) create mode 100644 src/app/request-copy/grant-request-copy/grant-request-copy.component.html create mode 100644 src/app/request-copy/grant-request-copy/grant-request-copy.component.scss create mode 100644 src/app/request-copy/grant-request-copy/grant-request-copy.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index fa75b0b2f0..157ada622d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -183,6 +183,7 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu { path: REQUEST_COPY_MODULE_PATH, loadChildren: () => import('./request-copy/request-copy.module').then((m) => m.RequestCopyModule), + canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard] }, { path: FORBIDDEN_PATH, diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts index a0a7fe6d03..41ad19211a 100644 --- a/src/app/core/data/item-request-data.service.ts +++ b/src/app/core/data/item-request-data.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { filter, find, map } from 'rxjs/operators'; +import { distinctUntilChanged, filter, find, map } from 'rxjs/operators'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { getFirstCompletedRemoteData } from '../shared/operators'; +import { getFirstCompletedRemoteData, sendRequest } from '../shared/operators'; import { RemoteData } from './remote-data'; -import { PostRequest } from './request.models'; +import { PostRequest, PutRequest } from './request.models'; import { RequestService } from './request.service'; import { ItemRequest } from '../shared/item-request.model'; import { hasValue, isNotEmpty } from '../../shared/empty.util'; @@ -14,11 +14,13 @@ import { Store } from '@ngrx/store'; import { CoreState } from '../core.reducers'; import { ObjectCacheService } from '../cache/object-cache.service'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; +import { RequestCopyEmail } from '../../request-copy/email-request-copy/request-copy-email.model'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; /** - * A service responsible for fetching/sending data from/to the REST API on the bitstreamformats endpoint + * A service responsible for fetching/sending data from/to the REST API on the itemrequests endpoint */ @Injectable( { @@ -46,12 +48,20 @@ export class ItemRequestDataService extends DataService { return this.halService.getEndpoint(this.linkPath); } - getFindItemRequestEndpoint(requestID: string): Observable { + /** + * Get the endpoint for an {@link ItemRequest} by their token + * @param token + */ + getItemRequestEndpointByToken(token: string): Observable { return this.halService.getEndpoint(this.linkPath).pipe( filter((href: string) => isNotEmpty(href)), - map((href: string) => `${href}/${requestID}`)); + map((href: string) => `${href}/${token}`)); } + /** + * Request a copy of an item + * @param itemRequest + */ requestACopy(itemRequest: ItemRequest): Observable> { const requestId = this.requestService.generateRequestId(); @@ -70,4 +80,52 @@ export class ItemRequestDataService extends DataService { ); } + /** + * Deny the request of an item + * @param token Token of the {@link ItemRequest} + * @param email Email to send back to the user requesting the item + */ + deny(token: string, email: RequestCopyEmail): Observable> { + return this.process(token, email, false); + } + + /** + * Grant the request of an item + * @param token Token of the {@link ItemRequest} + * @param email Email to send back to the user requesting the item + * @param suggestOpenAccess Whether or not to suggest the item to become open access + */ + grant(token: string, email: RequestCopyEmail, suggestOpenAccess = false): Observable> { + return this.process(token, email, true, suggestOpenAccess); + } + + /** + * Process the request of an item + * @param token Token of the {@link ItemRequest} + * @param email Email to send back to the user requesting the item + * @param grant Grant or deny the request (true = grant, false = deny) + * @param suggestOpenAccess Whether or not to suggest the item to become open access + */ + process(token: string, email: RequestCopyEmail, grant: boolean, suggestOpenAccess = false): Observable> { + const requestId = this.requestService.generateRequestId(); + + this.getItemRequestEndpointByToken(token).pipe( + distinctUntilChanged(), + map((endpointURL: string) => { + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'application/json'); + options.headers = headers; + return new PutRequest(requestId, endpointURL, JSON.stringify({ + acceptRequest: grant, + responseMessage: email.message, + subject: email.subject, + suggestOpenAccess, + }), options); + }), + sendRequest(this.requestService)).subscribe(); + + return this.rdbService.buildFromRequestUUID(requestId); + } + } diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html index 226fac1f67..b00bc079dd 100644 --- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html @@ -3,7 +3,7 @@

{{'deny-request-copy.intro' | translate}}

- +
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts index 4ffeb61605..0795cf5919 100644 --- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts @@ -1,27 +1,57 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { map } from 'rxjs/operators'; +import { map, switchMap } from 'rxjs/operators'; import { ItemRequest } from '../../core/shared/item-request.model'; import { Observable } from 'rxjs/internal/Observable'; import { - getFirstCompletedRemoteData, + getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, redirectOn4xx } from '../../core/shared/operators'; import { RemoteData } from '../../core/data/remote-data'; import { AuthService } from '../../core/auth/auth.service'; +import { TranslateService } from '@ngx-translate/core'; +import { combineLatest as observableCombineLatest } from 'rxjs'; +import { ItemDataService } from '../../core/data/item-data.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { Item } from '../../core/shared/item.model'; +import { isNotEmpty } from '../../shared/empty.util'; +import { ItemRequestDataService } from '../../core/data/item-request-data.service'; +import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; @Component({ selector: 'ds-deny-request-copy', styleUrls: ['./deny-request-copy.component.scss'], templateUrl: './deny-request-copy.component.html' }) +/** + * Component for denying an item request + */ export class DenyRequestCopyComponent implements OnInit { + /** + * The item request to deny + */ itemRequestRD$: Observable>; + /** + * The default subject of the message to send to the user requesting the item + */ + subject$: Observable; + /** + * The default contents of the message to send to the user requesting the item + */ + message$: Observable; + constructor( private router: Router, private route: ActivatedRoute, private authService: AuthService, + private translateService: TranslateService, + private itemDataService: ItemDataService, + private nameService: DSONameService, + private itemRequestService: ItemRequestDataService, + private notificationsService: NotificationsService, ) { } @@ -32,6 +62,51 @@ export class DenyRequestCopyComponent implements OnInit { getFirstCompletedRemoteData(), redirectOn4xx(this.router, this.authService), ); + + const msgParams$ = observableCombineLatest( + this.itemRequestRD$.pipe(getFirstSucceededRemoteDataPayload()), + this.authService.getAuthenticatedUserFromStore(), + ).pipe( + switchMap(([itemRequest, user]: [ItemRequest, EPerson]) => { + return this.itemDataService.findById(itemRequest.itemId).pipe( + getFirstSucceededRemoteDataPayload(), + map((item: Item) => { + const uri = item.firstMetadataValue('dc.identifier.uri'); + return Object.assign({ + recipientName: itemRequest.requestName, + itemUrl: isNotEmpty(uri) ? uri : item.handle, + itemName: this.nameService.getName(item), + authorName: user.name, + authorEmail: user.email, + }); + }), + ); + }), + ); + + this.subject$ = this.translateService.get('deny-request-copy.email.subject'); + this.message$ = msgParams$.pipe( + switchMap((params) => this.translateService.get('deny-request-copy.email.message', params)), + ); + } + + /** + * Deny the item request + * @param email Subject and contents of the message to send back to the user requesting the item + */ + deny(email: RequestCopyEmail) { + this.itemRequestRD$.pipe( + getFirstSucceededRemoteDataPayload(), + switchMap((itemRequest: ItemRequest) => this.itemRequestService.deny(itemRequest.token, email)), + getFirstCompletedRemoteData() + ).subscribe((rd) => { + if (rd.hasSucceeded) { + this.notificationsService.success(this.translateService.get('deny-request-copy.success')); + this.router.navigateByUrl('/'); + } else { + this.notificationsService.error(this.translateService.get('deny-request-copy.error'), rd.errorMessage); + } + }); } } diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html index b4c7b65aba..6f5bf9189b 100644 --- a/src/app/request-copy/email-request-copy/email-request-copy.component.html +++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html @@ -8,17 +8,18 @@
- +
{{ 'grant-deny-request-copy.email.message.empty' | translate }}
+
-
+
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts index 7697d5fad8..3b9bc38aab 100644 --- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts +++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { filter, map, switchMap, take, tap } from 'rxjs/operators'; +import { filter, map, switchMap, take } from 'rxjs/operators'; import { ActivatedRoute, Router } from '@angular/router'; import { hasValue, isNotEmpty } from '../empty.util'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 64bcde7167..6d9ae075a2 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1453,7 +1453,7 @@ "grant-deny-request-copy.email.message.empty": "Please enter a message", - "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If there is no reason to keep it restricted, please check the box below.", + "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.", "grant-deny-request-copy.email.permissions.label": "Change to open access", From eaa3d96bc7e596a65f2f3d4713060a4c4404c85d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 6 Oct 2021 15:25:37 +0200 Subject: [PATCH 112/161] [CST-4659] Deque accessibility issues - 470010 and tests --- .../ds-dynamic-form-control-container.component.html | 2 +- .../models/date-picker/date-picker.component.spec.ts | 1 + src/app/shared/testing/dynamic-form-mock-services.ts | 3 ++- .../upload/file/edit/section-upload-file-edit.model.ts | 4 ++-- src/assets/i18n/en.json5 | 4 ++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html index 3cf06e4121..fc115e043a 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html @@ -11,7 +11,7 @@
-
+
{ [bindId]='bindId' [group]='group' [model]='model' + [legend]='legend' (blur)='onBlur($event)' (change)='onValueChange($event)' (focus)='onFocus($event)'>`; diff --git a/src/app/shared/testing/dynamic-form-mock-services.ts b/src/app/shared/testing/dynamic-form-mock-services.ts index 2cf705ff90..1cbd470e23 100644 --- a/src/app/shared/testing/dynamic-form-mock-services.ts +++ b/src/app/shared/testing/dynamic-form-mock-services.ts @@ -1,5 +1,6 @@ export const mockDynamicFormLayoutService = jasmine.createSpyObj('DynamicFormLayoutService', { - getElementId: jasmine.createSpy('getElementId') + getElementId: jasmine.createSpy('getElementId'), + getClass: 'class', }); export const mockDynamicFormValidationService = jasmine.createSpyObj('DynamicFormValidationService', { diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts index 300a4b461f..14886128a5 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts @@ -74,7 +74,7 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePicke required: null }, errorMessages: { - required: 'submission.sections.upload.form.date-required' + required: 'submission.sections.upload.form.date-required-from' } }; export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT: DynamicFormControlLayout = { @@ -104,7 +104,7 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerM required: null }, errorMessages: { - required: 'submission.sections.upload.form.date-required' + required: 'submission.sections.upload.form.date-required-until' } }; export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_LAYOUT: DynamicFormControlLayout = { diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 4b6356f556..f3f09da1d4 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3599,6 +3599,10 @@ "submission.sections.upload.form.date-required": "Date is required.", + "submission.sections.upload.form.date-required-from": "Grant access from date is required.", + + "submission.sections.upload.form.date-required-until": "Grant access until date is required.", + "submission.sections.upload.form.from-label": "Grant access from", "submission.sections.upload.form.from-placeholder": "From", From 91218bb5341fe3fb1babc79b3ddcf08e3910b229 Mon Sep 17 00:00:00 2001 From: Corrado Lombardi Date: Wed, 6 Oct 2021 18:00:19 +0200 Subject: [PATCH 113/161] removed unnecessary new lines and commented out code --- src/app/access-control/access-control.module.ts | 1 - .../eperson-form/eperson-form.component.spec.ts | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts index 6968bff63d..0e872458bd 100644 --- a/src/app/access-control/access-control.module.ts +++ b/src/app/access-control/access-control.module.ts @@ -10,7 +10,6 @@ import { MembersListComponent } from './group-registry/group-form/members-list/m import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component'; import { GroupsRegistryComponent } from './group-registry/groups-registry.component'; - @NgModule({ imports: [ CommonModule, diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts index 485cd7668c..1f4a106bfa 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts @@ -248,9 +248,6 @@ describe('EPersonFormComponent', () => { requireCertificate: requireCertificate, }); spyOn(component.submitForm, 'emit'); - // component.firstName.value = firstName; - // component.lastName.value = lastName; - // component.email.value = email; component.canLogIn.value = canLogIn; component.requireCertificate.value = requireCertificate; From 881eb92fa10bbc471da2569ca1de39bd419d229a Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 7 Oct 2021 13:53:02 +0200 Subject: [PATCH 114/161] 83635: Feedback and test cases --- .../data/item-request-data.service.spec.ts | 95 ++++++++++ src/app/core/shared/item-request.model.ts | 2 +- .../deny-request-copy.component.spec.ts | 177 ++++++++++++++++++ .../email-request-copy.component.spec.ts | 47 +++++ .../grant-deny-request-copy.component.html | 2 +- .../grant-deny-request-copy.component.spec.ts | 123 ++++++++++++ .../grant-deny-request-copy.component.ts | 10 + .../grant-request-copy.component.spec.ts | 177 ++++++++++++++++++ src/assets/i18n/en.json5 | 8 +- 9 files changed, 635 insertions(+), 6 deletions(-) create mode 100644 src/app/core/data/item-request-data.service.spec.ts create mode 100644 src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts create mode 100644 src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts create mode 100644 src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts create mode 100644 src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts diff --git a/src/app/core/data/item-request-data.service.spec.ts b/src/app/core/data/item-request-data.service.spec.ts new file mode 100644 index 0000000000..0d99ca5cd4 --- /dev/null +++ b/src/app/core/data/item-request-data.service.spec.ts @@ -0,0 +1,95 @@ +import { ItemRequestDataService } from './item-request-data.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { RequestService } from './request.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { of as observableOf } from 'rxjs'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { ItemRequest } from '../shared/item-request.model'; +import { PostRequest } from './request.models'; +import { RequestCopyEmail } from '../../request-copy/email-request-copy/request-copy-email.model'; +import { RestRequestMethod } from './rest-request-method'; + +describe('ItemRequestDataService', () => { + let service: ItemRequestDataService; + + let requestService: RequestService; + let rdbService: RemoteDataBuildService; + let halService: HALEndpointService; + + const restApiEndpoint = 'rest/api/endpoint/'; + const requestId = 'request-id'; + let itemRequest: ItemRequest; + + beforeEach(() => { + itemRequest = Object.assign(new ItemRequest(), { + token: 'item-request-token', + }); + requestService = jasmine.createSpyObj('requestService', { + generateRequestId: requestId, + send: '', + }); + rdbService = jasmine.createSpyObj('rdbService', { + buildFromRequestUUID: createSuccessfulRemoteDataObject$(itemRequest), + }); + halService = jasmine.createSpyObj('halService', { + getEndpoint: observableOf(restApiEndpoint), + }); + + service = new ItemRequestDataService(requestService, rdbService, null, null, halService, null, null, null); + }); + + describe('requestACopy', () => { + it('should send a POST request containing the provided item request', (done) => { + service.requestACopy(itemRequest).subscribe(() => { + expect(requestService.send).toHaveBeenCalledWith(new PostRequest(requestId, restApiEndpoint, itemRequest)); + done(); + }); + }); + }); + + describe('grant', () => { + let email: RequestCopyEmail; + + beforeEach(() => { + email = new RequestCopyEmail('subject', 'message'); + }); + + it('should send a PUT request containing the correct properties', (done) => { + service.grant(itemRequest.token, email, true).subscribe(() => { + expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({ + method: RestRequestMethod.PUT, + body: JSON.stringify({ + acceptRequest: true, + responseMessage: email.message, + subject: email.subject, + suggestOpenAccess: true, + }), + })); + done(); + }); + }); + }); + + describe('deny', () => { + let email: RequestCopyEmail; + + beforeEach(() => { + email = new RequestCopyEmail('subject', 'message'); + }); + + it('should send a PUT request containing the correct properties', (done) => { + service.deny(itemRequest.token, email).subscribe(() => { + expect(requestService.send).toHaveBeenCalledWith(jasmine.objectContaining({ + method: RestRequestMethod.PUT, + body: JSON.stringify({ + acceptRequest: false, + responseMessage: email.message, + subject: email.subject, + suggestOpenAccess: false, + }), + })); + done(); + }); + }); + }); +}); diff --git a/src/app/core/shared/item-request.model.ts b/src/app/core/shared/item-request.model.ts index da9c4c9e08..08b65abebf 100644 --- a/src/app/core/shared/item-request.model.ts +++ b/src/app/core/shared/item-request.model.ts @@ -7,7 +7,7 @@ import { CacheableObject } from '../cache/object-cache.reducer'; import { HALLink } from './hal-link.model'; /** - * Model class for a Configuration Property + * Model class for an ItemRequest */ @typedObject export class ItemRequest implements CacheableObject { diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts new file mode 100644 index 0000000000..c88bfd3b5e --- /dev/null +++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts @@ -0,0 +1,177 @@ +import { DenyRequestCopyComponent } from './deny-request-copy.component'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { VarDirective } from '../../shared/utils/var.directive'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { AuthService } from '../../core/auth/auth.service'; +import { ItemDataService } from '../../core/data/item-data.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { ItemRequestDataService } from '../../core/data/item-request-data.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { of as observableOf } from 'rxjs'; +import { + createFailedRemoteDataObject$, + createSuccessfulRemoteDataObject, + createSuccessfulRemoteDataObject$ +} from '../../shared/remote-data.utils'; +import { ItemRequest } from '../../core/shared/item-request.model'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { Item } from '../../core/shared/item.model'; +import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model'; + +describe('DenyRequestCopyComponent', () => { + let component: DenyRequestCopyComponent; + let fixture: ComponentFixture; + + let router: Router; + let route: ActivatedRoute; + let authService: AuthService; + let translateService: TranslateService; + let itemDataService: ItemDataService; + let nameService: DSONameService; + let itemRequestService: ItemRequestDataService; + let notificationsService: NotificationsService; + + let itemRequest: ItemRequest; + let user: EPerson; + let item: Item; + let itemName: string; + let itemUrl: string; + + beforeEach(waitForAsync(() => { + itemRequest = Object.assign(new ItemRequest(), { + token: 'item-request-token', + requestName: 'requester name' + }); + user = Object.assign(new EPerson(), { + metadata: { + 'eperson.firstname': [ + { + value: 'first' + } + ], + 'eperson.lastname': [ + { + value: 'last' + } + ] + }, + email: 'user-email', + }); + itemName = 'item-name'; + itemUrl = 'item-url'; + item = Object.assign(new Item(), { + id: 'item-id', + metadata: { + 'dc.identifier.uri': [ + { + value: itemUrl + } + ], + 'dc.title': [ + { + value: itemName + } + ] + } + }); + + router = jasmine.createSpyObj('router', { + navigateByUrl: jasmine.createSpy('navigateByUrl'), + }); + route = jasmine.createSpyObj('route', {}, { + data: observableOf({ + request: createSuccessfulRemoteDataObject(itemRequest), + }), + }); + authService = jasmine.createSpyObj('authService', { + isAuthenticated: observableOf(true), + getAuthenticatedUserFromStore: observableOf(user), + }); + itemDataService = jasmine.createSpyObj('itemDataService', { + findById: createSuccessfulRemoteDataObject$(item), + }); + nameService = jasmine.createSpyObj('nameService', { + getName: itemName, + }); + itemRequestService = jasmine.createSpyObj('itemRequestService', { + deny: createSuccessfulRemoteDataObject$(itemRequest), + }); + notificationsService = jasmine.createSpyObj('notificationsService', ['success', 'error']); + + TestBed.configureTestingModule({ + declarations: [DenyRequestCopyComponent, VarDirective], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], + providers: [ + { provide: Router, useValue: router }, + { provide: ActivatedRoute, useValue: route }, + { provide: AuthService, useValue: authService }, + { provide: ItemDataService, useValue: itemDataService }, + { provide: DSONameService, useValue: nameService }, + { provide: ItemRequestDataService, useValue: itemRequestService }, + { provide: NotificationsService, useValue: notificationsService }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DenyRequestCopyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + + translateService = (component as any).translateService; + spyOn(translateService, 'get').and.returnValue(observableOf('translated-message')); + }); + + it('message$ should be parameterized correctly', (done) => { + component.message$.subscribe(() => { + expect(translateService.get).toHaveBeenCalledWith(jasmine.anything(), Object.assign({ + recipientName: itemRequest.requestName, + itemUrl: itemUrl, + itemName: itemName, + authorName: user.name, + authorEmail: user.email, + })); + done(); + }); + }); + + describe('deny', () => { + let email: RequestCopyEmail; + + describe('when the request is successful', () => { + beforeEach(() => { + email = new RequestCopyEmail('subject', 'message'); + (itemRequestService.deny as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(itemRequest)); + component.deny(email); + }); + + it('should display a success notification', () => { + expect(notificationsService.success).toHaveBeenCalled(); + }); + + it('should navigate to the homepage', () => { + expect(router.navigateByUrl).toHaveBeenCalledWith('/'); + }); + }); + + describe('when the request is unsuccessful', () => { + beforeEach(() => { + email = new RequestCopyEmail('subject', 'message'); + (itemRequestService.deny as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$()); + component.deny(email); + }); + + it('should display a success notification', () => { + expect(notificationsService.error).toHaveBeenCalled(); + }); + + it('should not navigate', () => { + expect(router.navigateByUrl).not.toHaveBeenCalled(); + }); + }); + }); +}); diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts new file mode 100644 index 0000000000..3857c0d91b --- /dev/null +++ b/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts @@ -0,0 +1,47 @@ +import { EmailRequestCopyComponent } from './email-request-copy.component'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { VarDirective } from '../../shared/utils/var.directive'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { Location } from '@angular/common'; +import { RequestCopyEmail } from './request-copy-email.model'; + +describe('EmailRequestCopyComponent', () => { + let component: EmailRequestCopyComponent; + let fixture: ComponentFixture; + + let location: Location; + + beforeEach(waitForAsync(() => { + location = jasmine.createSpyObj('location', ['back']); + + TestBed.configureTestingModule({ + declarations: [EmailRequestCopyComponent, VarDirective], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], + providers: [ + { provide: Location, useValue: location }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EmailRequestCopyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('return should navigate to the previous page', () => { + component.return(); + expect(location.back).toHaveBeenCalled(); + }); + + it('submit should emit an email object', () => { + spyOn(component.send, 'emit').and.stub(); + component.subject = 'test-subject'; + component.message = 'test-message'; + component.submit(); + expect(component.send.emit).toHaveBeenCalledWith(new RequestCopyEmail('test-subject', 'test-message')); + }); +}); diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html index 5be182c4cb..abd013f9a1 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html @@ -1,7 +1,7 @@

{{'grant-deny-request-copy.header' | translate}}

-

{{'grant-deny-request-copy.intro1' | translate:{ name: (itemName$ | async) } }}

+

{{'grant-deny-request-copy.intro2' | translate}}

diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts new file mode 100644 index 0000000000..3a0817b3b0 --- /dev/null +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts @@ -0,0 +1,123 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { VarDirective } from '../../shared/utils/var.directive'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { AuthService } from '../../core/auth/auth.service'; +import { ItemDataService } from '../../core/data/item-data.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { of as observableOf } from 'rxjs'; +import { + createSuccessfulRemoteDataObject, + createSuccessfulRemoteDataObject$ +} from '../../shared/remote-data.utils'; +import { ItemRequest } from '../../core/shared/item-request.model'; +import { Item } from '../../core/shared/item.model'; +import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy.component'; +import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; +import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths'; + +describe('GrantDenyRequestCopyComponent', () => { + let component: GrantDenyRequestCopyComponent; + let fixture: ComponentFixture; + + let router: Router; + let route: ActivatedRoute; + let authService: AuthService; + let itemDataService: ItemDataService; + let nameService: DSONameService; + + let itemRequest: ItemRequest; + let item: Item; + let itemName: string; + let itemUrl: string; + + beforeEach(waitForAsync(() => { + itemRequest = Object.assign(new ItemRequest(), { + token: 'item-request-token', + requestName: 'requester name' + }); + itemName = 'item-name'; + item = Object.assign(new Item(), { + id: 'item-id', + metadata: { + 'dc.identifier.uri': [ + { + value: itemUrl + } + ], + 'dc.title': [ + { + value: itemName + } + ] + } + }); + itemUrl = getItemPageRoute(item); + + route = jasmine.createSpyObj('route', {}, { + data: observableOf({ + request: createSuccessfulRemoteDataObject(itemRequest), + }), + }); + authService = jasmine.createSpyObj('authService', { + isAuthenticated: observableOf(true), + }); + itemDataService = jasmine.createSpyObj('itemDataService', { + findById: createSuccessfulRemoteDataObject$(item), + }); + nameService = jasmine.createSpyObj('nameService', { + getName: itemName, + }); + + TestBed.configureTestingModule({ + declarations: [GrantDenyRequestCopyComponent, VarDirective], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], + providers: [ + { provide: ActivatedRoute, useValue: route }, + { provide: AuthService, useValue: authService }, + { provide: ItemDataService, useValue: itemDataService }, + { provide: DSONameService, useValue: nameService }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(GrantDenyRequestCopyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + + router = (component as any).router; + spyOn(router, 'navigateByUrl').and.stub(); + }); + + it('should initialise itemName$', (done) => { + component.itemName$.subscribe((result) => { + expect(result).toEqual(itemName); + done(); + }); + }); + + it('should initialise itemUrl$', (done) => { + component.itemUrl$.subscribe((result) => { + expect(result).toEqual(itemUrl); + done(); + }); + }); + + it('should initialise denyRoute$', (done) => { + component.denyRoute$.subscribe((result) => { + expect(result).toEqual(getRequestCopyDenyRoute(itemRequest.token)); + done(); + }); + }); + + it('should initialise grantRoute$', (done) => { + component.grantRoute$.subscribe((result) => { + expect(result).toEqual(getRequestCopyGrantRoute(itemRequest.token)); + done(); + }); + }); +}); diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts index fba2e3f4d0..5ba81e991b 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts @@ -14,6 +14,7 @@ import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-co import { Item } from '../../core/shared/item.model'; import { ItemDataService } from '../../core/data/item-data.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; @Component({ selector: 'ds-grant-deny-request-copy', @@ -39,6 +40,11 @@ export class GrantDenyRequestCopyComponent implements OnInit { */ itemName$: Observable; + /** + * The url of the item + */ + itemUrl$: Observable; + /** * The route to the page for denying access to the item */ @@ -73,6 +79,10 @@ export class GrantDenyRequestCopyComponent implements OnInit { getFirstSucceededRemoteDataPayload(), map((item) => this.nameService.getName(item)), ); + this.itemUrl$ = this.itemRD$.pipe( + getFirstSucceededRemoteDataPayload(), + map((item) => getItemPageRoute(item)), + ); this.denyRoute$ = this.itemRequestRD$.pipe( getFirstSucceededRemoteDataPayload(), diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts new file mode 100644 index 0000000000..b6ccb8557e --- /dev/null +++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts @@ -0,0 +1,177 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { VarDirective } from '../../shared/utils/var.directive'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { AuthService } from '../../core/auth/auth.service'; +import { ItemDataService } from '../../core/data/item-data.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { ItemRequestDataService } from '../../core/data/item-request-data.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { of as observableOf } from 'rxjs'; +import { + createFailedRemoteDataObject$, + createSuccessfulRemoteDataObject, + createSuccessfulRemoteDataObject$ +} from '../../shared/remote-data.utils'; +import { ItemRequest } from '../../core/shared/item-request.model'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { Item } from '../../core/shared/item.model'; +import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model'; +import { GrantRequestCopyComponent } from './grant-request-copy.component'; + +describe('GrantRequestCopyComponent', () => { + let component: GrantRequestCopyComponent; + let fixture: ComponentFixture; + + let router: Router; + let route: ActivatedRoute; + let authService: AuthService; + let translateService: TranslateService; + let itemDataService: ItemDataService; + let nameService: DSONameService; + let itemRequestService: ItemRequestDataService; + let notificationsService: NotificationsService; + + let itemRequest: ItemRequest; + let user: EPerson; + let item: Item; + let itemName: string; + let itemUrl: string; + + beforeEach(waitForAsync(() => { + itemRequest = Object.assign(new ItemRequest(), { + token: 'item-request-token', + requestName: 'requester name' + }); + user = Object.assign(new EPerson(), { + metadata: { + 'eperson.firstname': [ + { + value: 'first' + } + ], + 'eperson.lastname': [ + { + value: 'last' + } + ] + }, + email: 'user-email', + }); + itemName = 'item-name'; + itemUrl = 'item-url'; + item = Object.assign(new Item(), { + id: 'item-id', + metadata: { + 'dc.identifier.uri': [ + { + value: itemUrl + } + ], + 'dc.title': [ + { + value: itemName + } + ] + } + }); + + router = jasmine.createSpyObj('router', { + navigateByUrl: jasmine.createSpy('navigateByUrl'), + }); + route = jasmine.createSpyObj('route', {}, { + data: observableOf({ + request: createSuccessfulRemoteDataObject(itemRequest), + }), + }); + authService = jasmine.createSpyObj('authService', { + isAuthenticated: observableOf(true), + getAuthenticatedUserFromStore: observableOf(user), + }); + itemDataService = jasmine.createSpyObj('itemDataService', { + findById: createSuccessfulRemoteDataObject$(item), + }); + nameService = jasmine.createSpyObj('nameService', { + getName: itemName, + }); + itemRequestService = jasmine.createSpyObj('itemRequestService', { + grant: createSuccessfulRemoteDataObject$(itemRequest), + }); + notificationsService = jasmine.createSpyObj('notificationsService', ['success', 'error']); + + TestBed.configureTestingModule({ + declarations: [GrantRequestCopyComponent, VarDirective], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], + providers: [ + { provide: Router, useValue: router }, + { provide: ActivatedRoute, useValue: route }, + { provide: AuthService, useValue: authService }, + { provide: ItemDataService, useValue: itemDataService }, + { provide: DSONameService, useValue: nameService }, + { provide: ItemRequestDataService, useValue: itemRequestService }, + { provide: NotificationsService, useValue: notificationsService }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(GrantRequestCopyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + + translateService = (component as any).translateService; + spyOn(translateService, 'get').and.returnValue(observableOf('translated-message')); + }); + + it('message$ should be parameterized correctly', (done) => { + component.message$.subscribe(() => { + expect(translateService.get).toHaveBeenCalledWith(jasmine.anything(), Object.assign({ + recipientName: itemRequest.requestName, + itemUrl: itemUrl, + itemName: itemName, + authorName: user.name, + authorEmail: user.email, + })); + done(); + }); + }); + + describe('grant', () => { + let email: RequestCopyEmail; + + describe('when the request is successful', () => { + beforeEach(() => { + email = new RequestCopyEmail('subject', 'message'); + (itemRequestService.grant as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$(itemRequest)); + component.grant(email); + }); + + it('should display a success notification', () => { + expect(notificationsService.success).toHaveBeenCalled(); + }); + + it('should navigate to the homepage', () => { + expect(router.navigateByUrl).toHaveBeenCalledWith('/'); + }); + }); + + describe('when the request is unsuccessful', () => { + beforeEach(() => { + email = new RequestCopyEmail('subject', 'message'); + (itemRequestService.grant as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$()); + component.grant(email); + }); + + it('should display a success notification', () => { + expect(notificationsService.error).toHaveBeenCalled(); + }); + + it('should not navigate', () => { + expect(router.navigateByUrl).not.toHaveBeenCalled(); + }); + }); + }); +}); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6d9ae075a2..fb3c27883b 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1206,7 +1206,7 @@ - "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am author (or co-author).\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>", + "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>", "deny-request-copy.email.subject": "Request copy of document", @@ -1467,13 +1467,13 @@ "grant-deny-request-copy.header": "Document copy request", - "grant-deny-request-copy.intro1": "IF YOU ARE THE AUTHOR (OR AN AUTHOR) OF DOCUMENT \"{{ name }}\" use the buttons to answer the user's request.", + "grant-deny-request-copy.intro1": "If you are one of the authors of the document {{ name }}, then please use one of the options below to respond to the user's request.", - "grant-deny-request-copy.intro2": "This repository will propose an appropriate model reply, which you may edit.", + "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.", - "grant-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am author (or co-author).\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>", + "grant-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>", "grant-request-copy.email.subject": "Request copy of document", From 26cfe7d9ea2eae4767737668b02ae250a2660a73 Mon Sep 17 00:00:00 2001 From: Yura Date: Thu, 7 Oct 2021 13:52:59 +0200 Subject: [PATCH 115/161] Remove old commented out code --- .../shared/notifications/notification/notification.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/shared/notifications/notification/notification.component.ts b/src/app/shared/notifications/notification/notification.component.ts index 4de487e50b..5f00084761 100644 --- a/src/app/shared/notifications/notification/notification.component.ts +++ b/src/app/shared/notifications/notification/notification.component.ts @@ -111,7 +111,6 @@ export class NotificationComponent implements OnInit, OnDestroy { ).subscribe(() => { if (this.count++ === this.steps) { this.remove(); - // this.item.timeoutEnd!.emit(); } else if (!this.stopTime) { if (this.showProgressBar) { this.progressWidth += 100 / this.steps; From 1cc167425428d71a312869e10f8c6a6bbb03549f Mon Sep 17 00:00:00 2001 From: Yura Date: Thu, 7 Oct 2021 15:20:28 +0200 Subject: [PATCH 116/161] Add unit tests for notification countdown --- .../notification.component.spec.ts | 52 ++++++++++++++++++- .../notifications-board.component.spec.ts | 39 +++++++++++++- 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/src/app/shared/notifications/notification/notification.component.spec.ts b/src/app/shared/notifications/notification/notification.component.spec.ts index 7b7ee57d26..2bded57636 100644 --- a/src/app/shared/notifications/notification/notification.component.spec.ts +++ b/src/app/shared/notifications/notification/notification.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { BrowserModule, By } from '@angular/platform-browser'; import { ChangeDetectorRef, DebugElement } from '@angular/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -16,6 +16,7 @@ import { Notification } from '../models/notification.model'; import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { storeModuleConfig } from '../../../app.reducer'; +import { BehaviorSubject } from 'rxjs'; describe('NotificationComponent', () => { @@ -83,6 +84,8 @@ describe('NotificationComponent', () => { deContent = fixture.debugElement.query(By.css('.notification-content')); elContent = deContent.nativeElement; elType = fixture.debugElement.query(By.css('.notification-icon')).nativeElement; + + spyOn(comp, 'remove'); }); it('should create component', () => { @@ -124,4 +127,51 @@ describe('NotificationComponent', () => { expect(elContent.innerHTML).toEqual(htmlContent); }); + describe('dismiss countdown', () => { + const TIMEOUT = 5000; + let isPaused$: BehaviorSubject; + + beforeEach(() => { + isPaused$ = new BehaviorSubject(false); + comp.isPaused$ = isPaused$; + comp.notification = { + id: '1', + type: NotificationType.Info, + title: 'Notif. title', + content: 'test', + options: Object.assign( + new NotificationOptions(), + { timeout: TIMEOUT } + ), + html: true + }; + }); + + it('should remove notification after timeout', fakeAsync(() => { + comp.ngOnInit(); + tick(TIMEOUT); + expect(comp.remove).toHaveBeenCalled(); + })); + + describe('isPaused$', () => { + it('should pause countdown on true', fakeAsync(() => { + comp.ngOnInit(); + tick(TIMEOUT / 2); + isPaused$.next(true); + tick(TIMEOUT); + expect(comp.remove).not.toHaveBeenCalled(); + })); + + it('should resume paused countdown on false', fakeAsync(() => { + comp.ngOnInit(); + tick(TIMEOUT / 4); + isPaused$.next(true); + tick(TIMEOUT / 4); + isPaused$.next(false); + tick(TIMEOUT); + expect(comp.remove).toHaveBeenCalled(); + })); + }); + }); + }); diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts index dad667cf3d..1d3faabdaa 100644 --- a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts +++ b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing'; -import { BrowserModule } from '@angular/platform-browser'; +import { BrowserModule, By } from '@angular/platform-browser'; import { ChangeDetectorRef } from '@angular/core'; import { NotificationsService } from '../notifications.service'; @@ -14,6 +14,9 @@ import { NotificationType } from '../models/notification-type'; import { uniqueId } from 'lodash'; import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import { cold } from 'jasmine-marbles'; + +export const bools = { f: false, t: true }; describe('NotificationsBoardComponent', () => { let comp: NotificationsBoardComponent; @@ -67,6 +70,40 @@ describe('NotificationsBoardComponent', () => { it('should have two notifications', () => { expect(comp.notifications.length).toBe(2); + expect(fixture.debugElement.queryAll(By.css('ds-notification')).length).toBe(2); + }); + + describe('notification countdown', () => { + let wrapper; + + beforeEach(() => { + wrapper = fixture.debugElement.query(By.css('div.notifications-wrapper')); + }); + + it('should not be paused by default', () => { + expect(comp.isPaused$).toBeObservable(cold('f', bools)); + }); + + it('should pause on mouseenter', () => { + wrapper.triggerEventHandler('mouseenter'); + + expect(comp.isPaused$).toBeObservable(cold('t', bools)); + }); + + it('should resume on mouseleave', () => { + wrapper.triggerEventHandler('mouseenter'); + wrapper.triggerEventHandler('mouseleave'); + + expect(comp.isPaused$).toBeObservable(cold('f', bools)); + }); + + it('should be passed to all notifications', () => { + fixture.debugElement.queryAll(By.css('ds-notification')) + .map(node => node.componentInstance) + .forEach(notification => { + expect(notification.isPaused$).toEqual(comp.isPaused$); + }); + }); }); }) From c28221623ca1405469db14459e1cffe92a65d575 Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 8 Oct 2021 10:22:43 +0200 Subject: [PATCH 117/161] Added search scope lookup to replace dropdown --- cypress/integration/search-page.spec.ts | 47 ------------ src/app/core/shared/search/search.service.ts | 42 ----------- .../my-dspace-page.component.html | 2 +- .../my-dspace-page.component.ts | 9 --- src/app/search-page/search.component.html | 2 +- src/app/search-page/search.component.ts | 9 +-- .../dso-selector-modal-wrapper.component.ts | 4 +- .../scope-selector-modal.component.html | 19 +++++ .../scope-selector-modal.component.scss | 3 + .../scope-selector-modal.component.spec.ts | 73 +++++++++++++++++++ .../scope-selector-modal.component.ts | 34 +++++++++ .../search-form/search-form.component.html | 23 +++--- .../search-form/search-form.component.scss | 4 + .../search-form/search-form.component.spec.ts | 39 +++------- .../search-form/search-form.component.ts | 55 ++++++++++---- src/app/shared/shared.module.ts | 7 +- src/assets/i18n/en.json5 | 8 ++ src/styles/_variables.scss | 2 + 18 files changed, 214 insertions(+), 168 deletions(-) create mode 100644 src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html create mode 100644 src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.scss create mode 100644 src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts create mode 100644 src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts diff --git a/cypress/integration/search-page.spec.ts b/cypress/integration/search-page.spec.ts index 6de32f8c40..d124f16982 100644 --- a/cypress/integration/search-page.spec.ts +++ b/cypress/integration/search-page.spec.ts @@ -8,52 +8,6 @@ describe('Search Page', () => { cy.get(SEARCHFORM_ID + ' input[name="query"]').should('have.value', queryString); }); - - it('should have right scope selected when navigating to page with scope parameter', () => { - // First, visit search with no params just to get the set of the scope options - cy.visit('/search'); - cy.get(SEARCHFORM_ID + ' select[name="scope"] > option').as('options'); - - // Find length of scope options, select a random index - cy.get('@options').its('length') - .then(len => Math.floor(Math.random() * Math.floor(len))) - .then((index) => { - // return the option at that (randomly selected) index - return cy.get('@options').eq(index); - }) - .then((option) => { - const randomScope: any = option.val(); - // Visit the search page with the randomly selected option as a pararmeter - cy.visit('/search?scope=' + randomScope); - // Verify that scope is selected when the page reloads - cy.get(SEARCHFORM_ID + ' select[name="scope"]').find('option:selected').should('have.value', randomScope); - }); - }); - - - it('should redirect to the correct url when scope was set and submit button was triggered', () => { - // First, visit search with no params just to get the set of scope options - cy.visit('/search'); - cy.get(SEARCHFORM_ID + ' select[name="scope"] > option').as('options'); - - // Find length of scope options, select a random index (i.e. a random option in selectbox) - cy.get('@options').its('length') - .then(len => Math.floor(Math.random() * Math.floor(len))) - .then((index) => { - // return the option at that (randomly selected) index - return cy.get('@options').eq(index); - }) - .then((option) => { - const randomScope: any = option.val(); - // Select the option at our random index & click the search button - cy.get(SEARCHFORM_ID + ' select[name="scope"]').select(randomScope); - cy.get(SEARCHFORM_ID + ' button.search-button').click(); - // Result should be the page URL should include that scope & page will reload with scope selected - cy.url().should('include', 'scope=' + randomScope); - cy.get(SEARCHFORM_ID + ' select[name="scope"]').find('option:selected').should('have.value', randomScope); - }); - }); - it('should redirect to the correct url when query was set and submit button was triggered', () => { const queryString = 'Another interesting query string'; cy.visit('/search'); @@ -62,5 +16,4 @@ describe('Search Page', () => { cy.get(SEARCHFORM_ID + ' button.search-button').click(); cy.url().should('include', 'query=' + encodeURI(queryString)); }); - }); diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts index 75723366bc..939ac569c9 100644 --- a/src/app/core/shared/search/search.service.ts +++ b/src/app/core/shared/search/search.service.ts @@ -395,48 +395,6 @@ export class SearchService implements OnDestroy { return this.rdb.buildFromHref(href); } - /** - * Request a list of DSpaceObjects that can be used as a scope, based on the current scope - * @param {string} scopeId UUID of the current scope, if the scope is empty, the repository wide scopes will be returned - * @returns {Observable} Emits a list of DSpaceObjects which represent possible scopes - */ - getScopes(scopeId?: string): Observable { - - if (isEmpty(scopeId)) { - const top: Observable = this.communityService.findTop({ elementsPerPage: 9999 }).pipe( - getFirstSucceededRemoteData(), - map( - (communities: RemoteData>) => communities.payload.page - ) - ); - return top; - } - - const scopeObject: Observable> = this.dspaceObjectService.findById(scopeId).pipe(getFirstSucceededRemoteData()); - const scopeList: Observable = scopeObject.pipe( - switchMap((dsoRD: RemoteData) => { - if ((dsoRD.payload as any).type === Community.type.value) { - const community: Community = dsoRD.payload as Community; - this.linkService.resolveLinks(community, followLink('subcommunities'), followLink('collections')); - return observableCombineLatest([ - community.subcommunities.pipe(getFirstCompletedRemoteData()), - community.collections.pipe(getFirstCompletedRemoteData()) - ]).pipe( - map(([subCommunities, collections]) => { - /*if this is a community, we also need to show the direct children*/ - return [community, ...subCommunities.payload.page, ...collections.payload.page]; - }) - ); - } else { - return observableOf([dsoRD.payload]); - } - } - )); - - return scopeList; - - } - /** * Requests the current view mode based on the current URL * @returns {Observable} The current view mode diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html index 32e3a0d710..4aadb16255 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.html +++ b/src/app/my-dspace-page/my-dspace-page.component.html @@ -15,7 +15,7 @@ [query]="(searchOptions$ | async)?.query" [scope]="(searchOptions$ | async)?.scope" [currentUrl]="getSearchLink()" - [scopes]="(scopeListRD$ | async)" + [showScopeSelector]="true" [inPlaceSearch]="inPlaceSearch" [searchPlaceholder]="'mydspace.search-form.placeholder' | translate"> diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts index 3ded17191e..90163abc5e 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.ts +++ b/src/app/my-dspace-page/my-dspace-page.component.ts @@ -78,11 +78,6 @@ export class MyDSpacePageComponent implements OnInit { */ sortOptions$: Observable; - /** - * The current relevant scopes - */ - scopeListRD$: Observable; - /** * Emits true if were on a small screen */ @@ -144,10 +139,6 @@ export class MyDSpacePageComponent implements OnInit { this.resultsRD$.next(results); }); - this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( - switchMap((scopeId) => this.service.getScopes(scopeId)) - ); - this.context$ = this.searchConfigService.getCurrentConfiguration('workspace') .pipe( map((configuration: string) => { diff --git a/src/app/search-page/search.component.html b/src/app/search-page/search.component.html index d8aa25e4a3..7825920d16 100644 --- a/src/app/search-page/search.component.html +++ b/src/app/search-page/search.component.html @@ -47,7 +47,7 @@ [query]="(searchOptions$ | async)?.query" [scope]="(searchOptions$ | async)?.scope" [currentUrl]="searchLink" - [scopes]="(scopeListRD$ | async)" + [showScopeSelector]="true" [inPlaceSearch]="inPlaceSearch" [searchPlaceholder]="'search.search-form.placeholder' | translate"> diff --git a/src/app/search-page/search.component.ts b/src/app/search-page/search.component.ts index d4d65b87fe..8be21af552 100644 --- a/src/app/search-page/search.component.ts +++ b/src/app/search-page/search.component.ts @@ -55,11 +55,6 @@ export class SearchComponent implements OnInit { */ sortOptions$: Observable; - /** - * The current relevant scopes - */ - scopeListRD$: Observable; - /** * Emits true if were on a small screen */ @@ -137,9 +132,7 @@ export class SearchComponent implements OnInit { ).subscribe((results) => { this.resultsRD$.next(results); }); - this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe( - switchMap((scopeId) => this.service.getScopes(scopeId)) - ); + if (isEmpty(this.configuration$)) { this.configuration$ = this.searchConfigService.getCurrentConfiguration('default'); } diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts index 8a8f02d72f..ca8343cfad 100644 --- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts @@ -9,7 +9,8 @@ import { hasValue, isNotEmpty } from '../../empty.util'; export enum SelectorActionType { CREATE = 'create', EDIT = 'edit', - EXPORT_METADATA = 'export-metadata' + EXPORT_METADATA = 'export-metadata', + SET_SCOPE = 'set-scope' } /** @@ -77,6 +78,7 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit { } } } + /** * Method called when an object has been selected * @param dso The selected DSpaceObject diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html new file mode 100644 index 0000000000..bf5c15e963 --- /dev/null +++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html @@ -0,0 +1,19 @@ +
+
{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}} + +
+
+ +

+
+
+ or +
+

+ +
{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}
+ +
+
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.scss b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.scss new file mode 100644 index 0000000000..0daf4cfa5f --- /dev/null +++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.scss @@ -0,0 +1,3 @@ +#create-community-or-separator { + top: 0; +} \ No newline at end of file diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts new file mode 100644 index 0000000000..42d00aaa08 --- /dev/null +++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts @@ -0,0 +1,73 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ScopeSelectorModalComponent } from './scope-selector-modal.component'; +import { Community } from '../../../core/shared/community.model'; +import { MetadataValue } from '../../../core/shared/metadata.models'; +import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; +import { RouterStub } from '../../testing/router.stub'; + +describe('ScopeSelectorModalComponent', () => { + let component: ScopeSelectorModalComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const community = new Community(); + community.uuid = '1234-1234-1234-1234'; + community.metadata = { + 'dc.title': [Object.assign(new MetadataValue(), { + value: 'Community title', + language: undefined + })] + }; + const router = new RouterStub(); + const communityRD = createSuccessfulRemoteDataObject(community); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [ScopeSelectorModalComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { + provide: ActivatedRoute, + useValue: { + root: { + snapshot: { + data: { + dso: communityRD, + }, + }, + } + }, + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ScopeSelectorModalComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + spyOn(component.scopeChange, 'emit'); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should call navigate on the router with the correct edit path when navigate is called', () => { + component.navigate(community); + expect(component.scopeChange.emit).toHaveBeenCalledWith(community); + }); + +}); diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts new file mode 100644 index 0000000000..386ff1f115 --- /dev/null +++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts @@ -0,0 +1,34 @@ +import { Component, EventEmitter, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; +import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; + +/** + * Component to wrap a button - for top communities - + * and a list of parent communities - for sub communities + * inside a modal + * Used to create a new community + */ + +@Component({ + selector: 'ds-scope-selector-modal', + styleUrls: ['./scope-selector-modal.component.scss'], + templateUrl: './scope-selector-modal.component.html', +}) +export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponent implements OnInit { + objectType = DSpaceObjectType.COMMUNITY; + selectorTypes = [DSpaceObjectType.COMMUNITY, DSpaceObjectType.COLLECTION]; + action = SelectorActionType.SET_SCOPE; + scopeChange = new EventEmitter(); + + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) { + super(activeModal, route); + } + + navigate(dso: DSpaceObject) { + /* Handle search navigation in underlying component */ + this.scopeChange.emit(dso); + } +} diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html index 940f3502c3..fe6191cee7 100644 --- a/src/app/shared/search-form/search-form.component.html +++ b/src/app/shared/search-form/search-form.component.html @@ -1,17 +1,14 @@ -
-
- -
-
-
- - + +
+
+
+ +
+ + -
+
diff --git a/src/app/shared/search-form/search-form.component.scss b/src/app/shared/search-form/search-form.component.scss index 4576be4b28..1e8f784fc3 100644 --- a/src/app/shared/search-form/search-form.component.scss +++ b/src/app/shared/search-form/search-form.component.scss @@ -3,3 +3,7 @@ background-color: var(--bs-input-bg); color: var(--bs-input-color); } + +.scope-button { + max-width: $search-form-scope-max-width; +} diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts index 1469eac566..333e48336d 100644 --- a/src/app/shared/search-form/search-form.component.spec.ts +++ b/src/app/shared/search-form/search-form.component.spec.ts @@ -8,13 +8,11 @@ import { Community } from '../../core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { SearchService } from '../../core/shared/search/search.service'; -import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/request.models'; -import { of as observableOf } from 'rxjs'; import { PaginationService } from '../../core/pagination/pagination.service'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; +import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; describe('SearchFormComponent', () => { let comp: SearchFormComponent; @@ -35,7 +33,8 @@ describe('SearchFormComponent', () => { useValue: {} }, { provide: PaginationService, useValue: paginationService }, - { provide: SearchConfigurationService, useValue: searchConfigService } + { provide: SearchConfigurationService, useValue: searchConfigService }, + { provide: DSpaceObjectDataService, useValue: { findById: () => createSuccessfulRemoteDataObject$(undefined)} } ], declarations: [SearchFormComponent] }).compileComponents(); @@ -48,24 +47,6 @@ describe('SearchFormComponent', () => { el = de.nativeElement; }); - it('should display scopes when available with default and all scopes', () => { - - comp.scopes = objects; - fixture.detectChanges(); - const select: HTMLElement = de.query(By.css('select')).nativeElement; - expect(select).toBeDefined(); - const options: HTMLCollection = select.children; - const defOption: Element = options.item(0); - expect(defOption.getAttribute('value')).toBe(''); - - let index = 1; - objects.forEach((object) => { - expect(options.item(index).textContent).toBe(object.name); - expect(options.item(index).getAttribute('value')).toBe(object.uuid); - index++; - }); - }); - it('should not display scopes when empty', () => { fixture.detectChanges(); const select = de.query(By.css('select')); @@ -84,17 +65,17 @@ describe('SearchFormComponent', () => { })); it('should select correct scope option in scope select', fakeAsync(() => { - comp.scopes = objects; - fixture.detectChanges(); + fixture.detectChanges(); + comp.showScopeSelector = true; const testCommunity = objects[1]; - comp.scope = testCommunity.id; + comp.selectedScope.next(testCommunity); fixture.detectChanges(); tick(); - const scopeSelect = de.query(By.css('select')).nativeElement; + const scopeSelect = de.query(By.css('.scope-button')).nativeElement; - expect(scopeSelect.value).toBe(testCommunity.id); + expect(scopeSelect.textContent).toBe(testCommunity.name); })); // it('should call updateSearch when clicking the submit button with correct parameters', fakeAsync(() => { // comp.query = 'Test String' @@ -118,7 +99,7 @@ describe('SearchFormComponent', () => { // // expect(comp.updateSearch).toHaveBeenCalledWith({ scope: scope, query: query }); // })); -}); + }); export const objects: DSpaceObject[] = [ Object.assign(new Community(), { diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts index 2791aee378..de6a24b01a 100644 --- a/src/app/shared/search-form/search-form.component.ts +++ b/src/app/shared/search-form/search-form.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { Router } from '@angular/router'; import { isNotEmpty } from '../empty.util'; @@ -6,6 +6,12 @@ import { SearchService } from '../../core/shared/search/search.service'; import { currentPath } from '../utils/route.utils'; import { PaginationService } from '../../core/pagination/pagination.service'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ScopeSelectorModalComponent } from './scope-selector-modal/scope-selector-modal.component'; +import { take } from 'rxjs/operators'; +import { BehaviorSubject } from 'rxjs'; +import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; +import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; /** * This component renders a simple item page. @@ -22,7 +28,7 @@ import { SearchConfigurationService } from '../../core/shared/search/search-conf /** * Component that represents the search form */ -export class SearchFormComponent { +export class SearchFormComponent implements OnInit { /** * The search query */ @@ -39,12 +45,9 @@ export class SearchFormComponent { @Input() scope = ''; - @Input() currentUrl: string; + selectedScope: BehaviorSubject = new BehaviorSubject(undefined); - /** - * The available scopes - */ - @Input() scopes: DSpaceObject[]; + @Input() currentUrl: string; /** * Whether or not the search button should be displayed large @@ -61,6 +64,11 @@ export class SearchFormComponent { */ @Input() searchPlaceholder: string; + /** + * Defines whether or not to show the scope selector + */ + @Input() showScopeSelector = false; + /** * Output the search data on submit */ @@ -68,8 +76,17 @@ export class SearchFormComponent { constructor(private router: Router, private searchService: SearchService, private paginationService: PaginationService, - private searchConfig: SearchConfigurationService - ) { + private searchConfig: SearchConfigurationService, + private modalService: NgbModal, + private dsoService: DSpaceObjectDataService + ) { + } + + ngOnInit(): void { + if (isNotEmpty(this.scope)) { + this.dsoService.findById(this.scope).pipe(getFirstSucceededRemoteDataPayload()) + .subscribe((scope: DSpaceObject) => this.selectedScope.next(scope)); + } } /** @@ -85,8 +102,8 @@ export class SearchFormComponent { * Updates the search when the current scope has been changed * @param {string} scope The new scope */ - onScopeChange(scope: string) { - this.updateSearch({ scope }); + onScopeChange(scope: DSpaceObject) { + this.updateSearch({ scope: scope ? scope.uuid : undefined }); } /** @@ -94,11 +111,11 @@ export class SearchFormComponent { * @param data Updated parameters */ updateSearch(data: any) { - const queryParams = Object.assign({}, data); - const pageParam = this.paginationService.getPageParam(this.searchConfig.paginationID); - queryParams[pageParam] = 1; + const queryParams = Object.assign({}, data); + const pageParam = this.paginationService.getPageParam(this.searchConfig.paginationID); + queryParams[pageParam] = 1; - this.router.navigate(this.getSearchLinkParts(), { + this.router.navigate(this.getSearchLinkParts(), { queryParams: queryParams, queryParamsHandling: 'merge' }); @@ -131,4 +148,12 @@ export class SearchFormComponent { } return this.getSearchLink().split('/'); } + + openScopeModal() { + const ref = this.modalService.open(ScopeSelectorModalComponent); + ref.componentInstance.scopeChange.pipe(take(1)).subscribe((scope: DSpaceObject) => { + this.selectedScope.next(scope); + this.onScopeChange(scope); + }); + } } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 9b993e551f..ad4a0324a6 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -233,6 +233,7 @@ import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.com import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component'; import { ThemedConfigurationSearchPageComponent } from '../search-page/themed-configuration-search-page.component'; import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'; +import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component'; /** * Declaration needed to make sure all decorator functions are called in time @@ -458,7 +459,8 @@ const COMPONENTS = [ PublicationSidebarSearchListElementComponent, CollectionSidebarSearchListElementComponent, CommunitySidebarSearchListElementComponent, - SearchNavbarComponent + SearchNavbarComponent, + ScopeSelectorModalComponent ]; const ENTRY_COMPONENTS = [ @@ -522,7 +524,8 @@ const ENTRY_COMPONENTS = [ CommunitySidebarSearchListElementComponent, LinkMenuItemComponent, OnClickMenuItemComponent, - TextMenuItemComponent + TextMenuItemComponent, + ScopeSelectorModalComponent ]; const SHARED_SEARCH_PAGE_COMPONENTS = [ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index aa76d2e422..665dd62c62 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1203,6 +1203,12 @@ "dso-selector.placeholder": "Search for a {{ type }}", + "dso-selector.set-scope.community.head": "Select a search scope", + + "dso-selector.set-scope.community.button": "Search all of DSpace", + + "dso-selector.set-scope.community.input-header": "Search for a community or collection", + "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", @@ -3101,6 +3107,8 @@ "search.form.search_dspace": "All repository", + "search.form.scope.all": "All of DSpace", + "search.results.head": "Search Results", diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index badc159747..41a8e11334 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -3,3 +3,5 @@ @import '_bootstrap_variables.scss'; @import '../../node_modules/bootstrap/scss/variables.scss'; + +$search-form-scope-max-width: 150px; From 13bce1df60349ba43576a97388f5d136505ad8ec Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 8 Oct 2021 14:08:04 +0200 Subject: [PATCH 118/161] Added missing typedoc --- .../scope-selector-modal.component.ts | 20 ++++++++++++++----- .../search-form/search-form.component.ts | 9 ++++++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts index 386ff1f115..86c3010287 100644 --- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts +++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts @@ -6,12 +6,11 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso- import { DSpaceObject } from '../../../core/shared/dspace-object.model'; /** - * Component to wrap a button - for top communities - - * and a list of parent communities - for sub communities + * Component to wrap a button - to select the entire repository - + * and a list of parent communities - for scope selection * inside a modal - * Used to create a new community + * Used to select a scope */ - @Component({ selector: 'ds-scope-selector-modal', styleUrls: ['./scope-selector-modal.component.scss'], @@ -19,8 +18,19 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model'; }) export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponent implements OnInit { objectType = DSpaceObjectType.COMMUNITY; + /** + * The types of DSO that can be selected from this list + */ selectorTypes = [DSpaceObjectType.COMMUNITY, DSpaceObjectType.COLLECTION]; + + /** + * The type of action to perform + */ action = SelectorActionType.SET_SCOPE; + + /** + * Emits the selected scope as a DSpaceObject when a user clicks one + */ scopeChange = new EventEmitter(); constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) { @@ -28,7 +38,7 @@ export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponen } navigate(dso: DSpaceObject) { - /* Handle search navigation in underlying component */ + /* Handle complex search navigation in underlying component */ this.scopeChange.emit(dso); } } diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts index de6a24b01a..cb9b43dbd1 100644 --- a/src/app/shared/search-form/search-form.component.ts +++ b/src/app/shared/search-form/search-form.component.ts @@ -74,7 +74,8 @@ export class SearchFormComponent implements OnInit { */ @Output() submitSearch = new EventEmitter(); - constructor(private router: Router, private searchService: SearchService, + constructor(private router: Router, + private searchService: SearchService, private paginationService: PaginationService, private searchConfig: SearchConfigurationService, private modalService: NgbModal, @@ -82,6 +83,9 @@ export class SearchFormComponent implements OnInit { ) { } + /** + * Retrieve the scope object from the URL so we can show its name + */ ngOnInit(): void { if (isNotEmpty(this.scope)) { this.dsoService.findById(this.scope).pipe(getFirstSucceededRemoteDataPayload()) @@ -149,6 +153,9 @@ export class SearchFormComponent implements OnInit { return this.getSearchLink().split('/'); } + /** + * Open the scope modal so the user can select DSO as scope + */ openScopeModal() { const ref = this.modalService.open(ScopeSelectorModalComponent); ref.componentInstance.scopeChange.pipe(take(1)).subscribe((scope: DSpaceObject) => { From b651f4e18f5edf93f2f4c3050681669f941c5c33 Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 8 Oct 2021 14:37:57 +0200 Subject: [PATCH 119/161] lgtm fixes --- src/app/core/shared/search/search.service.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts index 939ac569c9..91916a35ac 100644 --- a/src/app/core/shared/search/search.service.ts +++ b/src/app/core/shared/search/search.service.ts @@ -1,8 +1,8 @@ -import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs'; +import { combineLatest as observableCombineLatest, Observable } from 'rxjs'; import { Injectable, OnDestroy } from '@angular/core'; import { Router } from '@angular/router'; import { map, switchMap, take } from 'rxjs/operators'; -import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; +import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { LinkService } from '../../cache/builders/link.service'; import { PaginatedList } from '../../data/paginated-list.model'; import { ResponseParsingService } from '../../data/parsing.service'; @@ -13,7 +13,7 @@ import { DSpaceObject } from '../dspace-object.model'; import { GenericConstructor } from '../generic-constructor'; import { HALEndpointService } from '../hal-endpoint.service'; import { URLCombiner } from '../../url-combiner/url-combiner'; -import { hasValue, isEmpty, isNotEmpty, hasValueOperator } from '../../../shared/empty.util'; +import { hasValue, hasValueOperator, isNotEmpty } from '../../../shared/empty.util'; import { SearchOptions } from '../../../shared/search/search-options.model'; import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model'; import { SearchResponseParsingService } from '../../data/search-response-parsing.service'; @@ -21,16 +21,11 @@ import { SearchObjects } from '../../../shared/search/search-objects.model'; import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service'; import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service'; import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model'; -import { Community } from '../community.model'; import { CommunityDataService } from '../../data/community-data.service'; import { ViewMode } from '../view-mode.model'; import { DSpaceObjectDataService } from '../../data/dspace-object-data.service'; import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service'; -import { - getFirstSucceededRemoteData, - getFirstCompletedRemoteData, - getRemoteDataPayload -} from '../operators'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../operators'; import { RouteService } from '../../services/route.service'; import { SearchResult } from '../../../shared/search/search-result.model'; import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model'; From 82b88c85c2a3e6bc61b52a9dcbf8339a23287547 Mon Sep 17 00:00:00 2001 From: "Gustavo S. Ferreyro" <84462273+gsferreyro@users.noreply.github.com> Date: Sat, 9 Oct 2021 13:40:53 -0300 Subject: [PATCH 120/161] Full Spanish translation Full Spanish translation based on the English en.json5 file at 09 Oct, 2021. --- src/assets/i18n/es.json5 | 11573 ++++++++++++++++++------------------- 1 file changed, 5569 insertions(+), 6004 deletions(-) diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index 480fc5d1ae..09217494d1 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -1,6006 +1,5571 @@ { - - // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.", - // TODO New key - Add a translation - "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.", - - // "401.link.home-page": "Take me to the home page", - // TODO New key - Add a translation - "401.link.home-page": "Take me to the home page", - - // "401.unauthorized": "unauthorized", - // TODO New key - Add a translation - "401.unauthorized": "unauthorized", - - - - // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.", - // TODO New key - Add a translation - "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.", - - // "403.link.home-page": "Take me to the home page", - // TODO New key - Add a translation - "403.link.home-page": "Take me to the home page", - - // "403.forbidden": "forbidden", - // TODO New key - Add a translation - "403.forbidden": "forbidden", - - - - // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ", - "404.help": "No es posible encontrar la página que busca. La página puede haber sido movida o eliminada. Puede utilizar el botón de abajo para regresar a la página de inicio. ", - - // "404.link.home-page": "Take me to the home page", - "404.link.home-page": "Ir a la página de inicio", - - // "404.page-not-found": "page not found", - "404.page-not-found": "Página no encontrada", - - // "admin.curation-tasks.breadcrumbs": "System curation tasks", - // TODO New key - Add a translation - "admin.curation-tasks.breadcrumbs": "System curation tasks", - - // "admin.curation-tasks.title": "System curation tasks", - // TODO New key - Add a translation - "admin.curation-tasks.title": "System curation tasks", - - // "admin.curation-tasks.header": "System curation tasks", - // TODO New key - Add a translation - "admin.curation-tasks.header": "System curation tasks", - - // "admin.registries.bitstream-formats.breadcrumbs": "Format registry", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.breadcrumbs": "Format registry", - - // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format", - - // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.", - "admin.registries.bitstream-formats.create.failure.content": "Ha ocurrido un error mientras se creaba el nuevo formato del archivo.", - - // "admin.registries.bitstream-formats.create.failure.head": "Failure", - "admin.registries.bitstream-formats.create.failure.head": "Error", - - // "admin.registries.bitstream-formats.create.head": "Create Bitstream format", - "admin.registries.bitstream-formats.create.head": "Crear formato de archivo", - - // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format", - "admin.registries.bitstream-formats.create.new": "Agregar un nuevo formato de archivo", - - // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.", - "admin.registries.bitstream-formats.create.success.content": "El nuevo formato de archivo fue creado exitosamente.", - - // "admin.registries.bitstream-formats.create.success.head": "Success", - "admin.registries.bitstream-formats.create.success.head": "Éxito", - - // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)", - "admin.registries.bitstream-formats.delete.failure.amount": "Error al eliminar {{ amount }} formato(s)", - - // "admin.registries.bitstream-formats.delete.failure.head": "Failure", - "admin.registries.bitstream-formats.delete.failure.head": "Error", - - // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)", - "admin.registries.bitstream-formats.delete.success.amount": "Éxito al eliminar {{ amount }} formato(s)", - - // "admin.registries.bitstream-formats.delete.success.head": "Success", - "admin.registries.bitstream-formats.delete.success.head": "Éxito", - - // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.", - "admin.registries.bitstream-formats.description": "Este listado de formatos de archivos provee información acerca de formatos conocidos y su nivel de soporte.", - - // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format", - - // "admin.registries.bitstream-formats.edit.description.hint": "", - "admin.registries.bitstream-formats.edit.description.hint": "", - - // "admin.registries.bitstream-formats.edit.description.label": "Description", - "admin.registries.bitstream-formats.edit.description.label": "Descripción", - - // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.", - "admin.registries.bitstream-formats.edit.extensions.hint": "Las extensiones son extensiones de archivos que son usados para identificar automáticamente el formato de los archivos cargados. Se puede ingresar varias extensiones para cada formato.", - - // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions", - "admin.registries.bitstream-formats.edit.extensions.label": "Extensiones de los archivos", - - // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot", - // TODO Source message changed - Revise the translation - "admin.registries.bitstream-formats.edit.extensions.placeholder": "Ingrese la extensión del archivo sin punto", - - // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.", - "admin.registries.bitstream-formats.edit.failure.content": "Ha ocurrido un error mientras se editaba el formato del archivo.", - - // "admin.registries.bitstream-formats.edit.failure.head": "Failure", - "admin.registries.bitstream-formats.edit.failure.head": "Error", - - // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}", - "admin.registries.bitstream-formats.edit.head": "Formato de Archivo: {{ format }}", - - // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.", - // TODO Source message changed - Revise the translation - "admin.registries.bitstream-formats.edit.internal.hint": "Los formatos marcados como internos están ocultos para el usuario y se utilizan con fines administrativos.", - - // "admin.registries.bitstream-formats.edit.internal.label": "Internal", - "admin.registries.bitstream-formats.edit.internal.label": "Interno", - - // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.", - "admin.registries.bitstream-formats.edit.mimetype.hint": "El tipo MIME asociado con este formato no tiene que ser único.", - - // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type", - "admin.registries.bitstream-formats.edit.mimetype.label": "Tipo MIME", - - // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)", - "admin.registries.bitstream-formats.edit.shortDescription.hint": "Único nombre para este formato, (e.j. Microsoft Word XP o Microsoft Word 2000)", - - // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name", - "admin.registries.bitstream-formats.edit.shortDescription.label": "Nombre", - - // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.", - "admin.registries.bitstream-formats.edit.success.content": "El formato del archivo fue editado exitosamente.", - - // "admin.registries.bitstream-formats.edit.success.head": "Success", - "admin.registries.bitstream-formats.edit.success.head": "Éxito", - - // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.", - "admin.registries.bitstream-formats.edit.supportLevel.hint": "El nivel de apoyo que su institución compromete para este formato.", - - // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level", - "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivel de soporte", - - // "admin.registries.bitstream-formats.head": "Bitstream Format Registry", - "admin.registries.bitstream-formats.head": "Registro de formato de archivo", - - // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.", - "admin.registries.bitstream-formats.no-items": "No hay formatos de archivo para mostrar.", - - // "admin.registries.bitstream-formats.table.delete": "Delete selected", - "admin.registries.bitstream-formats.table.delete": "Eliminar lo seleccionado", - - // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all", - "admin.registries.bitstream-formats.table.deselect-all": "Eliminar selección", - - // "admin.registries.bitstream-formats.table.internal": "internal", - "admin.registries.bitstream-formats.table.internal": "interno", - - // "admin.registries.bitstream-formats.table.mimetype": "MIME Type", - "admin.registries.bitstream-formats.table.mimetype": "Tipo MIME", - - // "admin.registries.bitstream-formats.table.name": "Name", - "admin.registries.bitstream-formats.table.name": "Nombre", - - // "admin.registries.bitstream-formats.table.return": "Return", - "admin.registries.bitstream-formats.table.return": "Regreso", - - // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known", - "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conocido", - - // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported", - "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Soportado", - - // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown", - "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Desconocido", - - // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level", - "admin.registries.bitstream-formats.table.supportLevel.head": "Nivel de soporte", - - // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry", - "admin.registries.bitstream-formats.title": "DSpace Angular :: Registro de formato de archivo", - - - - // "admin.registries.metadata.breadcrumbs": "Metadata registry", - // TODO New key - Add a translation - "admin.registries.metadata.breadcrumbs": "Metadata registry", - - // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.", - "admin.registries.metadata.description": "El registro de metadatos mantiene una lista de todos los campos de metadatos disponibles en el repositorio. Estos campos pueden dividirse entre múltiples esquemas. Sin embargo, DSpace requiere el esquema calificado de Dublin Core.", - - // "admin.registries.metadata.form.create": "Create metadata schema", - "admin.registries.metadata.form.create": "Crear esquema de metadatos", - - // "admin.registries.metadata.form.edit": "Edit metadata schema", - "admin.registries.metadata.form.edit": "Editar esquema de metadatos", - - // "admin.registries.metadata.form.name": "Name", - "admin.registries.metadata.form.name": "Nombre", - - // "admin.registries.metadata.form.namespace": "Namespace", - "admin.registries.metadata.form.namespace": "Namespace", - - // "admin.registries.metadata.head": "Metadata Registry", - "admin.registries.metadata.head": "Registro de metadatos", - - // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.", - "admin.registries.metadata.schemas.no-items": "No existen esquemas de metadatos para mostrar.", - - // "admin.registries.metadata.schemas.table.delete": "Delete selected", - "admin.registries.metadata.schemas.table.delete": "Eliminar selección", - - // "admin.registries.metadata.schemas.table.id": "ID", - "admin.registries.metadata.schemas.table.id": "ID", - - // "admin.registries.metadata.schemas.table.name": "Name", - "admin.registries.metadata.schemas.table.name": "Nombre", - - // "admin.registries.metadata.schemas.table.namespace": "Namespace", - "admin.registries.metadata.schemas.table.namespace": "Namespace", - - // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry", - "admin.registries.metadata.title": "DSpace Angular :: Registro de metadatos", - - - - // "admin.registries.schema.breadcrumbs": "Metadata schema", - // TODO New key - Add a translation - "admin.registries.schema.breadcrumbs": "Metadata schema", - - // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".", - "admin.registries.schema.description": "Este es el esquema de metadatos para \"{{namespace}}\".", - - // "admin.registries.schema.fields.head": "Schema metadata fields", - "admin.registries.schema.fields.head": "Campos del esquema de metadatos", - - // "admin.registries.schema.fields.no-items": "No metadata fields to show.", - "admin.registries.schema.fields.no-items": "No hay campos de metadatos para mostrar.", - - // "admin.registries.schema.fields.table.delete": "Delete selected", - "admin.registries.schema.fields.table.delete": "Eliminar selección", - - // "admin.registries.schema.fields.table.field": "Field", - "admin.registries.schema.fields.table.field": "Campos", - - // "admin.registries.schema.fields.table.scopenote": "Scope Note", - "admin.registries.schema.fields.table.scopenote": "Nota de alcance", - - // "admin.registries.schema.form.create": "Create metadata field", - "admin.registries.schema.form.create": "Crear campos de metadatos", - - // "admin.registries.schema.form.edit": "Edit metadata field", - "admin.registries.schema.form.edit": "Editar campos de metadatos", - - // "admin.registries.schema.form.element": "Element", - "admin.registries.schema.form.element": "Elemento", - - // "admin.registries.schema.form.qualifier": "Qualifier", - "admin.registries.schema.form.qualifier": "Calificador", - - // "admin.registries.schema.form.scopenote": "Scope Note", - "admin.registries.schema.form.scopenote": "Nota de alcance", - - // "admin.registries.schema.head": "Metadata Schema", - "admin.registries.schema.head": "Esquema de Metadatos", - - // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"", - "admin.registries.schema.notification.created": "Esquema de metadatos creado exitosamente \"{{prefix}}\"", - - // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas", - "admin.registries.schema.notification.deleted.failure": "Error al eliminar {{amount}} esquema de metadatos", - - // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas", - "admin.registries.schema.notification.deleted.success": "Exitosamente eliminado {{amount}} esquema de metadatos", - - // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"", - "admin.registries.schema.notification.edited": "Exitosamente editado el esquema de metadato \"{{prefix}}\"", - - // "admin.registries.schema.notification.failure": "Error", - "admin.registries.schema.notification.failure": "Error", - - // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"", - "admin.registries.schema.notification.field.created": "Exitosamente creado el campo de metadato \"{{field}}\"", - - // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields", - "admin.registries.schema.notification.field.deleted.failure": "Error al eliminar {{amount}} campos de metadata", - - // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields", - "admin.registries.schema.notification.field.deleted.success": "Exitosamente eliminado {{amount}} campos de metadatos", - - // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"", - "admin.registries.schema.notification.field.edited": "Exitosamente editado el campo de metadato \"{{field}}\"", - - // "admin.registries.schema.notification.success": "Success", - "admin.registries.schema.notification.success": "Éxito", - - // "admin.registries.schema.return": "Return", - "admin.registries.schema.return": "Regreso", - - // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry", - "admin.registries.schema.title": "DSpace Angular :: Registro de Esquema de Metadatos", - - - - // "admin.access-control.epeople.actions.delete": "Delete EPerson", - // TODO New key - Add a translation - "admin.access-control.epeople.actions.delete": "Delete EPerson", - - // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson", - // TODO New key - Add a translation - "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson", - - // "admin.access-control.epeople.actions.reset": "Reset password", - // TODO New key - Add a translation - "admin.access-control.epeople.actions.reset": "Reset password", - - // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson", - // TODO New key - Add a translation - "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson", - - // "admin.access-control.epeople.title": "DSpace Angular :: EPeople", - // TODO New key - Add a translation - "admin.access-control.epeople.title": "DSpace Angular :: EPeople", - - // "admin.access-control.epeople.head": "EPeople", - // TODO New key - Add a translation - "admin.access-control.epeople.head": "EPeople", - - // "admin.access-control.epeople.search.head": "Search", - // TODO New key - Add a translation - "admin.access-control.epeople.search.head": "Search", - - // "admin.access-control.epeople.button.see-all": "Browse All", - // TODO New key - Add a translation - "admin.access-control.epeople.button.see-all": "Browse All", - - // "admin.access-control.epeople.search.scope.metadata": "Metadata", - // TODO New key - Add a translation - "admin.access-control.epeople.search.scope.metadata": "Metadata", - - // "admin.access-control.epeople.search.scope.email": "E-mail (exact)", - // TODO New key - Add a translation - "admin.access-control.epeople.search.scope.email": "E-mail (exact)", - - // "admin.access-control.epeople.search.button": "Search", - // TODO New key - Add a translation - "admin.access-control.epeople.search.button": "Search", - - // "admin.access-control.epeople.button.add": "Add EPerson", - // TODO New key - Add a translation - "admin.access-control.epeople.button.add": "Add EPerson", - - // "admin.access-control.epeople.table.id": "ID", - // TODO New key - Add a translation - "admin.access-control.epeople.table.id": "ID", - - // "admin.access-control.epeople.table.name": "Name", - // TODO New key - Add a translation - "admin.access-control.epeople.table.name": "Name", - - // "admin.access-control.epeople.table.email": "E-mail (exact)", - // TODO New key - Add a translation - "admin.access-control.epeople.table.email": "E-mail (exact)", - - // "admin.access-control.epeople.table.edit": "Edit", - // TODO New key - Add a translation - "admin.access-control.epeople.table.edit": "Edit", - - // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"", - - // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"", - - // "admin.access-control.epeople.no-items": "No EPeople to show.", - // TODO New key - Add a translation - "admin.access-control.epeople.no-items": "No EPeople to show.", - - // "admin.access-control.epeople.form.create": "Create EPerson", - // TODO New key - Add a translation - "admin.access-control.epeople.form.create": "Create EPerson", - - // "admin.access-control.epeople.form.edit": "Edit EPerson", - // TODO New key - Add a translation - "admin.access-control.epeople.form.edit": "Edit EPerson", - - // "admin.access-control.epeople.form.firstName": "First name", - // TODO New key - Add a translation - "admin.access-control.epeople.form.firstName": "First name", - - // "admin.access-control.epeople.form.lastName": "Last name", - // TODO New key - Add a translation - "admin.access-control.epeople.form.lastName": "Last name", - - // "admin.access-control.epeople.form.email": "E-mail", - // TODO New key - Add a translation - "admin.access-control.epeople.form.email": "E-mail", - - // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address", - // TODO New key - Add a translation - "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address", - - // "admin.access-control.epeople.form.canLogIn": "Can log in", - // TODO New key - Add a translation - "admin.access-control.epeople.form.canLogIn": "Can log in", - - // "admin.access-control.epeople.form.requireCertificate": "Requires certificate", - // TODO New key - Add a translation - "admin.access-control.epeople.form.requireCertificate": "Requires certificate", - - // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"", - - // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"", - - // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.", - - // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.", - - // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"", - - // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"", - - // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"", - - // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"", - - // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:", - // TODO New key - Add a translation - "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:", - - // "admin.access-control.epeople.form.table.id": "ID", - // TODO New key - Add a translation - "admin.access-control.epeople.form.table.id": "ID", - - // "admin.access-control.epeople.form.table.name": "Name", - // TODO New key - Add a translation - "admin.access-control.epeople.form.table.name": "Name", - - // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups", - // TODO New key - Add a translation - "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups", - - // "admin.access-control.epeople.form.goToGroups": "Add to groups", - // TODO New key - Add a translation - "admin.access-control.epeople.form.goToGroups": "Add to groups", - - // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"", - - // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"", - - - - // "admin.access-control.groups.title": "DSpace Angular :: Groups", - // TODO New key - Add a translation - "admin.access-control.groups.title": "DSpace Angular :: Groups", - - // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group", - // TODO New key - Add a translation - "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group", - - // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group", - // TODO New key - Add a translation - "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group", - - // "admin.access-control.groups.head": "Groups", - // TODO New key - Add a translation - "admin.access-control.groups.head": "Groups", - - // "admin.access-control.groups.button.add": "Add group", - // TODO New key - Add a translation - "admin.access-control.groups.button.add": "Add group", - - // "admin.access-control.groups.search.head": "Search groups", - // TODO New key - Add a translation - "admin.access-control.groups.search.head": "Search groups", - - // "admin.access-control.groups.button.see-all": "Browse all", - // TODO New key - Add a translation - "admin.access-control.groups.button.see-all": "Browse all", - - // "admin.access-control.groups.search.button": "Search", - // TODO New key - Add a translation - "admin.access-control.groups.search.button": "Search", - - // "admin.access-control.groups.table.id": "ID", - // TODO New key - Add a translation - "admin.access-control.groups.table.id": "ID", - - // "admin.access-control.groups.table.name": "Name", - // TODO New key - Add a translation - "admin.access-control.groups.table.name": "Name", - - // "admin.access-control.groups.table.members": "Members", - // TODO New key - Add a translation - "admin.access-control.groups.table.members": "Members", - - // "admin.access-control.groups.table.edit": "Edit", - // TODO New key - Add a translation - "admin.access-control.groups.table.edit": "Edit", - - // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"", - - // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"", - - // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID", - // TODO New key - Add a translation - "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID", - - // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"", - - // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"", - - // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"", - - - - // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.", - // TODO New key - Add a translation - "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.", - - // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the \"assign roles\" tab on the edit {{comcol}} page. You can still add and remove group members using this page.", - // TODO New key - Add a translation - "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the \"assign roles\" tab on the edit {{comcol}} page. You can still add and remove group members using this page.", - - // "admin.access-control.groups.form.head.create": "Create group", - // TODO New key - Add a translation - "admin.access-control.groups.form.head.create": "Create group", - - // "admin.access-control.groups.form.head.edit": "Edit group", - // TODO New key - Add a translation - "admin.access-control.groups.form.head.edit": "Edit group", - - // "admin.access-control.groups.form.groupName": "Group name", - // TODO New key - Add a translation - "admin.access-control.groups.form.groupName": "Group name", - - // "admin.access-control.groups.form.groupDescription": "Description", - // TODO New key - Add a translation - "admin.access-control.groups.form.groupDescription": "Description", - - // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"", - - // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"", - - // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.", - - // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"", - - // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!", - - // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"", - - // "admin.access-control.groups.form.actions.delete": "Delete Group", - // TODO New key - Add a translation - "admin.access-control.groups.form.actions.delete": "Delete Group", - - // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"", - - // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"", - - // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel", - // TODO New key - Add a translation - "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel", - - // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete", - // TODO New key - Add a translation - "admin.access-control.groups.form.delete-group.modal.confirm": "Delete", - - // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"", - - // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"", - - // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"", - - // "admin.access-control.groups.form.members-list.head": "EPeople", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.head": "EPeople", - - // "admin.access-control.groups.form.members-list.search.head": "Add EPeople", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.search.head": "Add EPeople", - - // "admin.access-control.groups.form.members-list.button.see-all": "Browse All", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.button.see-all": "Browse All", - - // "admin.access-control.groups.form.members-list.headMembers": "Current Members", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.headMembers": "Current Members", - - // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata", - - // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)", - - // "admin.access-control.groups.form.members-list.search.button": "Search", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.search.button": "Search", - - // "admin.access-control.groups.form.members-list.table.id": "ID", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.table.id": "ID", - - // "admin.access-control.groups.form.members-list.table.name": "Name", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.table.name": "Name", - - // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.table.edit": "Remove / Add", - - // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", - - // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", - - // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", - - // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", - - // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", - - // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", - - // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", - - // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.", - - // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search", - - // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"", - - // "admin.access-control.groups.form.subgroups-list.head": "Groups", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.head": "Groups", - - // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup", - - // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All", - - // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups", - - // "admin.access-control.groups.form.subgroups-list.search.button": "Search", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.search.button": "Search", - - // "admin.access-control.groups.form.subgroups-list.table.id": "ID", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.table.id": "ID", - - // "admin.access-control.groups.form.subgroups-list.table.name": "Name", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.table.name": "Name", - - // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add", - - // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"", - - // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"", - - // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group", - - // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"", - - // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"", - - // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"", - - // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"", - - // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", - - // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.", - - // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID", - - // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.", - - // "admin.access-control.groups.form.return": "Return to groups", - // TODO New key - Add a translation - "admin.access-control.groups.form.return": "Return to groups", - - - - // "admin.search.breadcrumbs": "Administrative Search", - // TODO New key - Add a translation - "admin.search.breadcrumbs": "Administrative Search", - - // "admin.search.collection.edit": "Edit", - // TODO New key - Add a translation - "admin.search.collection.edit": "Edit", - - // "admin.search.community.edit": "Edit", - // TODO New key - Add a translation - "admin.search.community.edit": "Edit", - - // "admin.search.item.delete": "Delete", - // TODO New key - Add a translation - "admin.search.item.delete": "Delete", - - // "admin.search.item.edit": "Edit", - // TODO New key - Add a translation - "admin.search.item.edit": "Edit", - - // "admin.search.item.make-private": "Make Private", - // TODO New key - Add a translation - "admin.search.item.make-private": "Make Private", - - // "admin.search.item.make-public": "Make Public", - // TODO New key - Add a translation - "admin.search.item.make-public": "Make Public", - - // "admin.search.item.move": "Move", - // TODO New key - Add a translation - "admin.search.item.move": "Move", - - // "admin.search.item.reinstate": "Reinstate", - // TODO New key - Add a translation - "admin.search.item.reinstate": "Reinstate", - - // "admin.search.item.withdraw": "Withdraw", - // TODO New key - Add a translation - "admin.search.item.withdraw": "Withdraw", - - // "admin.search.title": "Administrative Search", - // TODO New key - Add a translation - "admin.search.title": "Administrative Search", - - // "administrativeView.search.results.head": "Administrative Search", - // TODO New key - Add a translation - "administrativeView.search.results.head": "Administrative Search", - - - - - // "admin.workflow.breadcrumbs": "Administer Workflow", - // TODO New key - Add a translation - "admin.workflow.breadcrumbs": "Administer Workflow", - - // "admin.workflow.title": "Administer Workflow", - // TODO New key - Add a translation - "admin.workflow.title": "Administer Workflow", - - // "admin.workflow.item.workflow": "Workflow", - // TODO New key - Add a translation - "admin.workflow.item.workflow": "Workflow", - - // "admin.workflow.item.delete": "Delete", - // TODO New key - Add a translation - "admin.workflow.item.delete": "Delete", - - // "admin.workflow.item.send-back": "Send back", - // TODO New key - Add a translation - "admin.workflow.item.send-back": "Send back", - - - - // "admin.metadata-import.breadcrumbs": "Import Metadata", - // TODO New key - Add a translation - "admin.metadata-import.breadcrumbs": "Import Metadata", - - // "admin.metadata-import.title": "Import Metadata", - // TODO New key - Add a translation - "admin.metadata-import.title": "Import Metadata", - - // "admin.metadata-import.page.header": "Import Metadata", - // TODO New key - Add a translation - "admin.metadata-import.page.header": "Import Metadata", - - // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here", - // TODO New key - Add a translation - "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here", - - // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import", - // TODO New key - Add a translation - "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import", - - // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import", - // TODO New key - Add a translation - "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import", - - // "admin.metadata-import.page.button.return": "Return", - // TODO New key - Add a translation - "admin.metadata-import.page.button.return": "Return", - - // "admin.metadata-import.page.button.proceed": "Proceed", - // TODO New key - Add a translation - "admin.metadata-import.page.button.proceed": "Proceed", - - // "admin.metadata-import.page.error.addFile": "Select file first!", - // TODO New key - Add a translation - "admin.metadata-import.page.error.addFile": "Select file first!", - - - - - // "auth.errors.invalid-user": "Invalid email address or password.", - "auth.errors.invalid-user": "No es válida la dirección de correo o la clave.", - - // "auth.messages.expired": "Your session has expired. Please log in again.", - "auth.messages.expired": "Su sesión ha expirado. Favor ingresar de nuevo.", - - - - // "bitstream.edit.bitstream": "Bitstream: ", - // TODO New key - Add a translation - "bitstream.edit.bitstream": "Bitstream: ", - - // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"Main article\" or \"Experiment data readings\".", - // TODO New key - Add a translation - "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"Main article\" or \"Experiment data readings\".", - - // "bitstream.edit.form.description.label": "Description", - // TODO New key - Add a translation - "bitstream.edit.form.description.label": "Description", - - // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. This date cannot be modified on this form. To set an embargo date for a bitstream, go to the Item Status tab, click Authorizations..., create or edit the bitstream's READ policy, and set the Start Date as desired.", - // TODO New key - Add a translation - "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. This date cannot be modified on this form. To set an embargo date for a bitstream, go to the Item Status tab, click Authorizations..., create or edit the bitstream's READ policy, and set the Start Date as desired.", - - // "bitstream.edit.form.embargo.label": "Embargo until specific date", - // TODO New key - Add a translation - "bitstream.edit.form.embargo.label": "Embargo until specific date", - - // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.", - // TODO New key - Add a translation - "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.", - - // "bitstream.edit.form.fileName.label": "Filename", - // TODO New key - Add a translation - "bitstream.edit.form.fileName.label": "Filename", - - // "bitstream.edit.form.newFormat.label": "Describe new format", - // TODO New key - Add a translation - "bitstream.edit.form.newFormat.label": "Describe new format", - - // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"ACMESoft SuperApp version 1.5\").", - // TODO New key - Add a translation - "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"ACMESoft SuperApp version 1.5\").", - - // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream", - // TODO New key - Add a translation - "bitstream.edit.form.primaryBitstream.label": "Primary bitstream", - - // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, select \"format not in list\" above and describe it under \"Describe new format\".", - // TODO New key - Add a translation - "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, select \"format not in list\" above and describe it under \"Describe new format\".", - - // "bitstream.edit.form.selectedFormat.label": "Selected Format", - // TODO New key - Add a translation - "bitstream.edit.form.selectedFormat.label": "Selected Format", - - // "bitstream.edit.form.selectedFormat.unknown": "Format not in list", - // TODO New key - Add a translation - "bitstream.edit.form.selectedFormat.unknown": "Format not in list", - - // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format", - // TODO New key - Add a translation - "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format", - - // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.", - // TODO New key - Add a translation - "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.", - - // "bitstream.edit.notifications.saved.title": "Bitstream saved", - // TODO New key - Add a translation - "bitstream.edit.notifications.saved.title": "Bitstream saved", - - // "bitstream.edit.title": "Edit bitstream", - // TODO New key - Add a translation - "bitstream.edit.title": "Edit bitstream", - - - - // "browse.comcol.by.author": "By Author", - "browse.comcol.by.author": "Por Autor", - - // "browse.comcol.by.dateissued": "By Issue Date", - "browse.comcol.by.dateissued": "Por Fecha de Publicación", - - // "browse.comcol.by.subject": "By Subject", - "browse.comcol.by.subject": "Por Materia", - - // "browse.comcol.by.title": "By Title", - "browse.comcol.by.title": "Por Título", - - // "browse.comcol.head": "Browse", - "browse.comcol.head": "Navegar", - - // "browse.empty": "No items to show.", - "browse.empty": "No ítemes para mostrar.", - - // "browse.metadata.author": "Author", - "browse.metadata.author": "Autor", - - // "browse.metadata.dateissued": "Issue Date", - "browse.metadata.dateissued": "Fecha de Publicación", - - // "browse.metadata.subject": "Subject", - "browse.metadata.subject": "Materia", - - // "browse.metadata.title": "Title", - "browse.metadata.title": "Título", - - // "browse.metadata.author.breadcrumbs": "Browse by Author", - // TODO New key - Add a translation - "browse.metadata.author.breadcrumbs": "Browse by Author", - - // "browse.metadata.dateissued.breadcrumbs": "Browse by Date", - // TODO New key - Add a translation - "browse.metadata.dateissued.breadcrumbs": "Browse by Date", - - // "browse.metadata.subject.breadcrumbs": "Browse by Subject", - // TODO New key - Add a translation - "browse.metadata.subject.breadcrumbs": "Browse by Subject", - - // "browse.metadata.title.breadcrumbs": "Browse by Title", - // TODO New key - Add a translation - "browse.metadata.title.breadcrumbs": "Browse by Title", - - // "browse.startsWith.choose_start": "(Choose start)", - "browse.startsWith.choose_start": "(Seleccionar el inicio)", - - // "browse.startsWith.choose_year": "(Choose year)", - "browse.startsWith.choose_year": "(Seleccionar el año)", - - // "browse.startsWith.jump": "Jump to a point in the index:", - "browse.startsWith.jump": "Saltar a un punto en el índice:", - - // "browse.startsWith.months.april": "April", - "browse.startsWith.months.april": "Abril", - - // "browse.startsWith.months.august": "August", - "browse.startsWith.months.august": "Agosto", - - // "browse.startsWith.months.december": "December", - "browse.startsWith.months.december": "Diciembre", - - // "browse.startsWith.months.february": "February", - "browse.startsWith.months.february": "Febrero", - - // "browse.startsWith.months.january": "January", - "browse.startsWith.months.january": "Enero", - - // "browse.startsWith.months.july": "July", - "browse.startsWith.months.july": "Julio", - - // "browse.startsWith.months.june": "June", - "browse.startsWith.months.june": "Junio", - - // "browse.startsWith.months.march": "March", - "browse.startsWith.months.march": "Marzo", - - // "browse.startsWith.months.may": "May", - "browse.startsWith.months.may": "Mayo", - - // "browse.startsWith.months.none": "(Choose month)", - "browse.startsWith.months.none": "(Seleccionar el mes)", - - // "browse.startsWith.months.november": "November", - "browse.startsWith.months.november": "Noviembre", - - // "browse.startsWith.months.october": "October", - "browse.startsWith.months.october": "Octubre", - - // "browse.startsWith.months.september": "September", - "browse.startsWith.months.september": "Septiembre", - - // "browse.startsWith.submit": "Go", - "browse.startsWith.submit": "Ir", - - // "browse.startsWith.type_date": "Or type in a date (year-month):", - "browse.startsWith.type_date": "O escriba una fecha (año-mes):", - - // "browse.startsWith.type_text": "Or enter first few letters:", - "browse.startsWith.type_text": "O ingrese las primeras letras:", - - // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}", - "browse.title": "Navegando {{ collection }} por {{ field }} {{ value }}", - - - // "chips.remove": "Remove chip", - "chips.remove": "Eliminar chip", - - - - // "collection.create.head": "Create a Collection", - "collection.create.head": "Crear una Colección", - - // "collection.create.notifications.success": "Successfully created the Collection", - // TODO New key - Add a translation - "collection.create.notifications.success": "Successfully created the Collection", - - // "collection.create.sub-head": "Create a Collection for Community {{ parent }}", - "collection.create.sub-head": "Crear una Colección por Comunidad {{ parent }}", - - // "collection.curate.header": "Curate Collection: {{collection}}", - // TODO New key - Add a translation - "collection.curate.header": "Curate Collection: {{collection}}", - - // "collection.delete.cancel": "Cancel", - "collection.delete.cancel": "Cancelar", - - // "collection.delete.confirm": "Confirm", - "collection.delete.confirm": "Confirmar", - - // "collection.delete.head": "Delete Collection", - "collection.delete.head": "Eliminar la Colección", - - // "collection.delete.notification.fail": "Collection could not be deleted", - "collection.delete.notification.fail": "La Colección no puede ser eliminada", - - // "collection.delete.notification.success": "Successfully deleted collection", - "collection.delete.notification.success": "Colección eliminada exitosamente", - - // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"", - "collection.delete.text": "Está seguro de eliminar la colección \"{{ dso }}\"", - - - - // "collection.edit.delete": "Delete this collection", - "collection.edit.delete": "Eliminar esta colección", - - // "collection.edit.head": "Edit Collection", - "collection.edit.head": "Editar la Colección", - - // "collection.edit.breadcrumbs": "Edit Collection", - // TODO New key - Add a translation - "collection.edit.breadcrumbs": "Edit Collection", - - - - // "collection.edit.tabs.mapper.head": "Item Mapper", - // TODO New key - Add a translation - "collection.edit.tabs.mapper.head": "Item Mapper", - - // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper", - // TODO New key - Add a translation - "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper", - - // "collection.edit.item-mapper.cancel": "Cancel", - "collection.edit.item-mapper.cancel": "Cancelar", - - // "collection.edit.item-mapper.collection": "Collection: \"{{name}}\"", - "collection.edit.item-mapper.collection": "Colección: \"{{name}}\"", - - // "collection.edit.item-mapper.confirm": "Map selected items", - "collection.edit.item-mapper.confirm": "Mapa de ítemes seleccionados", - - // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.", - "collection.edit.item-mapper.description": "Esta es la herramienta de asignación de ítemes que permite a los administradores de colecciones asignar ítemes de otras colecciones a esta colección. Puede buscar ítemes de otras colecciones y asignarlos, o navegar la lista de elementos asignados actualmente.", - - // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections", - "collection.edit.item-mapper.head": "Asignación de ítem - Asignación de ítemes para otras Colecciones", - - // "collection.edit.item-mapper.no-search": "Please enter a query to search", - "collection.edit.item-mapper.no-search": "Favor ingrese una consulta para buscar", - - // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.", - "collection.edit.item-mapper.notifications.map.error.content": "Errores encontrados para asignar {{amount}} ítemes.", - - // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors", - "collection.edit.item-mapper.notifications.map.error.head": "Errores asignados", - - // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.", - "collection.edit.item-mapper.notifications.map.success.content": "Exitosamente asignado {{amount}} ítemes.", - - // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed", - "collection.edit.item-mapper.notifications.map.success.head": "Asignación completa", - - // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.", - "collection.edit.item-mapper.notifications.unmap.error.content": "Errores encontrados al eliminar la asignación de {{amount}} ítemes.", - - // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors", - "collection.edit.item-mapper.notifications.unmap.error.head": "Eliminar errores de asignación", - - // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.", - "collection.edit.item-mapper.notifications.unmap.success.content": "Exitosamente eliminado las asignaciones de {{amount}} ítemes.", - - // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", - "collection.edit.item-mapper.notifications.unmap.success.head": "Asignación eliminada completa", - - // "collection.edit.item-mapper.remove": "Remove selected item mappings", - "collection.edit.item-mapper.remove": "Eliminar asignaciones de ítemes seleccionados", - - // "collection.edit.item-mapper.tabs.browse": "Browse mapped items", - "collection.edit.item-mapper.tabs.browse": "Navegar asignación de ítemes", - - // "collection.edit.item-mapper.tabs.map": "Map new items", - "collection.edit.item-mapper.tabs.map": "Asignar nuevo ítemes", - - - - // "collection.edit.logo.label": "Collection logo", - // TODO New key - Add a translation - "collection.edit.logo.label": "Collection logo", - - // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.", - // TODO New key - Add a translation - "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.", - - // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.", - // TODO New key - Add a translation - "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.", - - // "collection.edit.logo.notifications.delete.success.title": "Logo deleted", - // TODO New key - Add a translation - "collection.edit.logo.notifications.delete.success.title": "Logo deleted", - - // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo", - // TODO New key - Add a translation - "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo", - - // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo", - // TODO New key - Add a translation - "collection.edit.logo.notifications.delete.error.title": "Error deleting logo", - - // "collection.edit.logo.upload": "Drop a Collection Logo to upload", - // TODO New key - Add a translation - "collection.edit.logo.upload": "Drop a Collection Logo to upload", - - - - // "collection.edit.notifications.success": "Successfully edited the Collection", - // TODO New key - Add a translation - "collection.edit.notifications.success": "Successfully edited the Collection", - - // "collection.edit.return": "Return", - // TODO New key - Add a translation - "collection.edit.return": "Return", - - - - // "collection.edit.tabs.curate.head": "Curate", - // TODO New key - Add a translation - "collection.edit.tabs.curate.head": "Curate", - - // "collection.edit.tabs.curate.title": "Collection Edit - Curate", - // TODO New key - Add a translation - "collection.edit.tabs.curate.title": "Collection Edit - Curate", - - // "collection.edit.tabs.authorizations.head": "Authorizations", - // TODO New key - Add a translation - "collection.edit.tabs.authorizations.head": "Authorizations", - - // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations", - // TODO New key - Add a translation - "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations", - - // "collection.edit.tabs.metadata.head": "Edit Metadata", - // TODO New key - Add a translation - "collection.edit.tabs.metadata.head": "Edit Metadata", - - // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata", - // TODO New key - Add a translation - "collection.edit.tabs.metadata.title": "Collection Edit - Metadata", - - // "collection.edit.tabs.roles.head": "Assign Roles", - // TODO New key - Add a translation - "collection.edit.tabs.roles.head": "Assign Roles", - - // "collection.edit.tabs.roles.title": "Collection Edit - Roles", - // TODO New key - Add a translation - "collection.edit.tabs.roles.title": "Collection Edit - Roles", - - // "collection.edit.tabs.source.external": "This collection harvests its content from an external source", - // TODO New key - Add a translation - "collection.edit.tabs.source.external": "This collection harvests its content from an external source", - - // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.", - - // "collection.edit.tabs.source.form.harvestType": "Content being harvested", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.harvestType": "Content being harvested", - - // "collection.edit.tabs.source.form.head": "Configure an external source", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.head": "Configure an external source", - - // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format", - - // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id", - - // "collection.edit.tabs.source.form.oaiSource": "OAI Provider", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.oaiSource": "OAI Provider", - - // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)", - - // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)", - - // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only", - // TODO New key - Add a translation - "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only", - - // "collection.edit.tabs.source.head": "Content Source", - // TODO New key - Add a translation - "collection.edit.tabs.source.head": "Content Source", - - // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - // TODO New key - Add a translation - "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - - // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded", - // TODO New key - Add a translation - "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded", - - // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", - // TODO New key - Add a translation - "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", - - // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid", - // TODO New key - Add a translation - "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid", - - // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.", - // TODO New key - Add a translation - "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.", - - // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved", - // TODO New key - Add a translation - "collection.edit.tabs.source.notifications.saved.title": "Content Source saved", - - // "collection.edit.tabs.source.title": "Collection Edit - Content Source", - // TODO New key - Add a translation - "collection.edit.tabs.source.title": "Collection Edit - Content Source", - - - - // "collection.edit.template.add-button": "Add", - // TODO New key - Add a translation - "collection.edit.template.add-button": "Add", - - // "collection.edit.template.breadcrumbs": "Item template", - // TODO New key - Add a translation - "collection.edit.template.breadcrumbs": "Item template", - - // "collection.edit.template.cancel": "Cancel", - // TODO New key - Add a translation - "collection.edit.template.cancel": "Cancel", - - // "collection.edit.template.delete-button": "Delete", - // TODO New key - Add a translation - "collection.edit.template.delete-button": "Delete", - - // "collection.edit.template.edit-button": "Edit", - // TODO New key - Add a translation - "collection.edit.template.edit-button": "Edit", - - // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"", - // TODO New key - Add a translation - "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"", - - // "collection.edit.template.label": "Template item", - // TODO New key - Add a translation - "collection.edit.template.label": "Template item", - - // "collection.edit.template.notifications.delete.error": "Failed to delete the item template", - // TODO New key - Add a translation - "collection.edit.template.notifications.delete.error": "Failed to delete the item template", - - // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template", - // TODO New key - Add a translation - "collection.edit.template.notifications.delete.success": "Successfully deleted the item template", - - // "collection.edit.template.title": "Edit Template Item", - // TODO New key - Add a translation - "collection.edit.template.title": "Edit Template Item", - - - - // "collection.form.abstract": "Short Description", - "collection.form.abstract": "Descripción breve", - - // "collection.form.description": "Introductory text (HTML)", - "collection.form.description": "Texto introductorio (HTML)", - - // "collection.form.errors.title.required": "Please enter a collection name", - "collection.form.errors.title.required": "Favor ingrese un nombre a la colección", - - // "collection.form.license": "License", - "collection.form.license": "Licencia", - - // "collection.form.provenance": "Provenance", - "collection.form.provenance": "Procedencia", - - // "collection.form.rights": "Copyright text (HTML)", - "collection.form.rights": "Texto de copyright (HTML)", - - // "collection.form.tableofcontents": "News (HTML)", - "collection.form.tableofcontents": "Noticias (HTML)", - - // "collection.form.title": "Name", - "collection.form.title": "Nombre", - - - - // "collection.listelement.badge": "Collection", - // TODO New key - Add a translation - "collection.listelement.badge": "Collection", - - - - // "collection.page.browse.recent.head": "Recent Submissions", - "collection.page.browse.recent.head": "Envíos recientes", - - // "collection.page.browse.recent.empty": "No items to show", - "collection.page.browse.recent.empty": "No ítemes para mostrar", - - // "collection.page.edit": "Edit this collection", - // TODO New key - Add a translation - "collection.page.edit": "Edit this collection", - - // "collection.page.handle": "Permanent URI for this collection", - "collection.page.handle": "URI permanente para esta colección", - - // "collection.page.license": "License", - "collection.page.license": "Licencia", - - // "collection.page.news": "News", - "collection.page.news": "Noticias", - - - - // "collection.select.confirm": "Confirm selected", - "collection.select.confirm": "Confirmar la selección", - - // "collection.select.empty": "No collections to show", - "collection.select.empty": "No hay colecciones para mostrar", - - // "collection.select.table.title": "Title", - "collection.select.table.title": "Título", - - - - // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.", - // TODO New key - Add a translation - "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.", - - // "collection.source.update.notifications.error.title": "Server Error", - // TODO New key - Add a translation - "collection.source.update.notifications.error.title": "Server Error", - - - - // "communityList.tabTitle": "DSpace - Community List", - // TODO New key - Add a translation - "communityList.tabTitle": "DSpace - Community List", - - // "communityList.title": "List of Communities", - // TODO New key - Add a translation - "communityList.title": "List of Communities", - - // "communityList.showMore": "Show More", - // TODO New key - Add a translation - "communityList.showMore": "Show More", - - - - // "community.create.head": "Create a Community", - "community.create.head": "Crear una Comunidad", - - // "community.create.notifications.success": "Successfully created the Community", - // TODO New key - Add a translation - "community.create.notifications.success": "Successfully created the Community", - - // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}", - "community.create.sub-head": "Crear una Sub-Comunidad por Communidad {{ parent }}", - - // "community.curate.header": "Curate Community: {{community}}", - // TODO New key - Add a translation - "community.curate.header": "Curate Community: {{community}}", - - // "community.delete.cancel": "Cancel", - "community.delete.cancel": "Cancelar", - - // "community.delete.confirm": "Confirm", - "community.delete.confirm": "Confirmar", - - // "community.delete.head": "Delete Community", - "community.delete.head": "Eliminar Comunidad", - - // "community.delete.notification.fail": "Community could not be deleted", - "community.delete.notification.fail": "Esta comunidad no puede ser eliminada", - - // "community.delete.notification.success": "Successfully deleted community", - "community.delete.notification.success": "Comunidad eliminada exitosamente", - - // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"", - "community.delete.text": "Está seguro de eliminar la comunidad \"{{ dso }}\"", - - // "community.edit.delete": "Delete this community", - "community.edit.delete": "Eliminar esta comunidad", - - // "community.edit.head": "Edit Community", - "community.edit.head": "Editar la Comunidad", - - // "community.edit.breadcrumbs": "Edit Community", - // TODO New key - Add a translation - "community.edit.breadcrumbs": "Edit Community", - - - // "community.edit.logo.label": "Community logo", - // TODO New key - Add a translation - "community.edit.logo.label": "Community logo", - - // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.", - // TODO New key - Add a translation - "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.", - - // "community.edit.logo.notifications.add.success": "Upload Community logo successful.", - // TODO New key - Add a translation - "community.edit.logo.notifications.add.success": "Upload Community logo successful.", - - // "community.edit.logo.notifications.delete.success.title": "Logo deleted", - // TODO New key - Add a translation - "community.edit.logo.notifications.delete.success.title": "Logo deleted", - - // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo", - // TODO New key - Add a translation - "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo", - - // "community.edit.logo.notifications.delete.error.title": "Error deleting logo", - // TODO New key - Add a translation - "community.edit.logo.notifications.delete.error.title": "Error deleting logo", - - // "community.edit.logo.upload": "Drop a Community Logo to upload", - // TODO New key - Add a translation - "community.edit.logo.upload": "Drop a Community Logo to upload", - - - - // "community.edit.notifications.success": "Successfully edited the Community", - // TODO New key - Add a translation - "community.edit.notifications.success": "Successfully edited the Community", - - // "community.edit.notifications.unauthorized": "You do not have privileges to make this change", - // TODO New key - Add a translation - "community.edit.notifications.unauthorized": "You do not have privileges to make this change", - - // "community.edit.notifications.error": "An error occured while editing the Community", - // TODO New key - Add a translation - "community.edit.notifications.error": "An error occured while editing the Community", - - // "community.edit.return": "Return", - // TODO New key - Add a translation - "community.edit.return": "Return", - - - - // "community.edit.tabs.curate.head": "Curate", - // TODO New key - Add a translation - "community.edit.tabs.curate.head": "Curate", - - // "community.edit.tabs.curate.title": "Community Edit - Curate", - // TODO New key - Add a translation - "community.edit.tabs.curate.title": "Community Edit - Curate", - - // "community.edit.tabs.metadata.head": "Edit Metadata", - // TODO New key - Add a translation - "community.edit.tabs.metadata.head": "Edit Metadata", - - // "community.edit.tabs.metadata.title": "Community Edit - Metadata", - // TODO New key - Add a translation - "community.edit.tabs.metadata.title": "Community Edit - Metadata", - - // "community.edit.tabs.roles.head": "Assign Roles", - // TODO New key - Add a translation - "community.edit.tabs.roles.head": "Assign Roles", - - // "community.edit.tabs.roles.title": "Community Edit - Roles", - // TODO New key - Add a translation - "community.edit.tabs.roles.title": "Community Edit - Roles", - - // "community.edit.tabs.authorizations.head": "Authorizations", - // TODO New key - Add a translation - "community.edit.tabs.authorizations.head": "Authorizations", - - // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations", - // TODO New key - Add a translation - "community.edit.tabs.authorizations.title": "Community Edit - Authorizations", - - - - // "community.listelement.badge": "Community", - // TODO New key - Add a translation - "community.listelement.badge": "Community", - - - - // "comcol-role.edit.no-group": "None", - // TODO New key - Add a translation - "comcol-role.edit.no-group": "None", - - // "comcol-role.edit.create": "Create", - // TODO New key - Add a translation - "comcol-role.edit.create": "Create", - - // "comcol-role.edit.restrict": "Restrict", - // TODO New key - Add a translation - "comcol-role.edit.restrict": "Restrict", - - // "comcol-role.edit.delete": "Delete", - // TODO New key - Add a translation - "comcol-role.edit.delete": "Delete", - - - // "comcol-role.edit.community-admin.name": "Administrators", - // TODO New key - Add a translation - "comcol-role.edit.community-admin.name": "Administrators", - - // "comcol-role.edit.collection-admin.name": "Administrators", - // TODO New key - Add a translation - "comcol-role.edit.collection-admin.name": "Administrators", - - - // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", - // TODO New key - Add a translation - "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", - - // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).", - // TODO New key - Add a translation - "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).", - - - // "comcol-role.edit.submitters.name": "Submitters", - // TODO New key - Add a translation - "comcol-role.edit.submitters.name": "Submitters", - - // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.", - // TODO New key - Add a translation - "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.", - - - // "comcol-role.edit.item_read.name": "Default item read access", - // TODO New key - Add a translation - "comcol-role.edit.item_read.name": "Default item read access", - - // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.", - // TODO New key - Add a translation - "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.", - - // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.", - // TODO New key - Add a translation - "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.", - - - // "comcol-role.edit.bitstream_read.name": "Default bitstream read access", - // TODO New key - Add a translation - "comcol-role.edit.bitstream_read.name": "Default bitstream read access", - - // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", - // TODO New key - Add a translation - "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", - - // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.", - // TODO New key - Add a translation - "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.", - - - // "comcol-role.edit.editor.name": "Editors", - // TODO New key - Add a translation - "comcol-role.edit.editor.name": "Editors", - - // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.", - // TODO New key - Add a translation - "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.", - - - // "comcol-role.edit.finaleditor.name": "Final editors", - // TODO New key - Add a translation - "comcol-role.edit.finaleditor.name": "Final editors", - - // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.", - // TODO New key - Add a translation - "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.", - - - // "comcol-role.edit.reviewer.name": "Reviewers", - // TODO New key - Add a translation - "comcol-role.edit.reviewer.name": "Reviewers", - - // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.", - // TODO New key - Add a translation - "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.", - - - - // "community.form.abstract": "Short Description", - "community.form.abstract": "Descripción breve", - - // "community.form.description": "Introductory text (HTML)", - "community.form.description": "Texto introductorio (HTML)", - - // "community.form.errors.title.required": "Please enter a community name", - "community.form.errors.title.required": "Favor ingresar el nombre de la comunidad", - - // "community.form.rights": "Copyright text (HTML)", - "community.form.rights": "Texto de copyright (HTML)", - - // "community.form.tableofcontents": "News (HTML)", - "community.form.tableofcontents": "Noticias (HTML)", - - // "community.form.title": "Name", - "community.form.title": "Nombre", - - // "community.page.edit": "Edit this community", - // TODO New key - Add a translation - "community.page.edit": "Edit this community", - - // "community.page.handle": "Permanent URI for this community", - "community.page.handle": "URI permanente para esta comunidad", - - // "community.page.license": "License", - "community.page.license": "Licencia", - - // "community.page.news": "News", - "community.page.news": "Noticias", - - // "community.all-lists.head": "Subcommunities and Collections", - "community.all-lists.head": "Subcomunidades y Colecciones", - - // "community.sub-collection-list.head": "Collections of this Community", - "community.sub-collection-list.head": "Colecciones de esta Comunidad", - - // "community.sub-community-list.head": "Communities of this Community", - "community.sub-community-list.head": "Comunidades de esta Comunidad", - - - - // "cookies.consent.accept-all": "Accept all", - // TODO New key - Add a translation - "cookies.consent.accept-all": "Accept all", - - // "cookies.consent.accept-selected": "Accept selected", - // TODO New key - Add a translation - "cookies.consent.accept-selected": "Accept selected", - - // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)", - // TODO New key - Add a translation - "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)", - - // "cookies.consent.app.opt-out.title": "(opt-out)", - // TODO New key - Add a translation - "cookies.consent.app.opt-out.title": "(opt-out)", - - // "cookies.consent.app.purpose": "purpose", - // TODO New key - Add a translation - "cookies.consent.app.purpose": "purpose", - - // "cookies.consent.app.required.description": "This application is always required", - // TODO New key - Add a translation - "cookies.consent.app.required.description": "This application is always required", - - // "cookies.consent.app.required.title": "(always required)", - // TODO New key - Add a translation - "cookies.consent.app.required.title": "(always required)", - - // "cookies.consent.update": "There were changes since your last visit, please update your consent.", - // TODO New key - Add a translation - "cookies.consent.update": "There were changes since your last visit, please update your consent.", - - // "cookies.consent.close": "Close", - // TODO New key - Add a translation - "cookies.consent.close": "Close", - - // "cookies.consent.decline": "Decline", - // TODO New key - Add a translation - "cookies.consent.decline": "Decline", - - // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: Authentication, Preferences, Acknowledgement and Statistics.
To learn more, please read our {privacyPolicy}.", - // TODO New key - Add a translation - "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: Authentication, Preferences, Acknowledgement and Statistics.
To learn more, please read our {privacyPolicy}.", - - // "cookies.consent.content-notice.learnMore": "Customize", - // TODO New key - Add a translation - "cookies.consent.content-notice.learnMore": "Customize", - - // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.", - // TODO New key - Add a translation - "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.", - - // "cookies.consent.content-modal.privacy-policy.name": "privacy policy", - // TODO New key - Add a translation - "cookies.consent.content-modal.privacy-policy.name": "privacy policy", - - // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.", - // TODO New key - Add a translation - "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.", - - // "cookies.consent.content-modal.title": "Information that we collect", - // TODO New key - Add a translation - "cookies.consent.content-modal.title": "Information that we collect", - - - - // "cookies.consent.app.title.authentication": "Authentication", - // TODO New key - Add a translation - "cookies.consent.app.title.authentication": "Authentication", - - // "cookies.consent.app.description.authentication": "Required for signing you in", - // TODO New key - Add a translation - "cookies.consent.app.description.authentication": "Required for signing you in", - - - // "cookies.consent.app.title.preferences": "Preferences", - // TODO New key - Add a translation - "cookies.consent.app.title.preferences": "Preferences", - - // "cookies.consent.app.description.preferences": "Required for saving your preferences", - // TODO New key - Add a translation - "cookies.consent.app.description.preferences": "Required for saving your preferences", - - - - // "cookies.consent.app.title.acknowledgement": "Acknowledgement", - // TODO New key - Add a translation - "cookies.consent.app.title.acknowledgement": "Acknowledgement", - - // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents", - // TODO New key - Add a translation - "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents", - - - - // "cookies.consent.app.title.google-analytics": "Google Analytics", - // TODO New key - Add a translation - "cookies.consent.app.title.google-analytics": "Google Analytics", - - // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data", - // TODO New key - Add a translation - "cookies.consent.app.description.google-analytics": "Allows us to track statistical data", - - - - // "cookies.consent.purpose.functional": "Functional", - // TODO New key - Add a translation - "cookies.consent.purpose.functional": "Functional", - - // "cookies.consent.purpose.statistical": "Statistical", - // TODO New key - Add a translation - "cookies.consent.purpose.statistical": "Statistical", - - - // "curation-task.task.checklinks.label": "Check Links in Metadata", - // TODO New key - Add a translation - "curation-task.task.checklinks.label": "Check Links in Metadata", - - // "curation-task.task.noop.label": "NOOP", - // TODO New key - Add a translation - "curation-task.task.noop.label": "NOOP", - - // "curation-task.task.profileformats.label": "Profile Bitstream Formats", - // TODO New key - Add a translation - "curation-task.task.profileformats.label": "Profile Bitstream Formats", - - // "curation-task.task.requiredmetadata.label": "Check for Required Metadata", - // TODO New key - Add a translation - "curation-task.task.requiredmetadata.label": "Check for Required Metadata", - - // "curation-task.task.translate.label": "Microsoft Translator", - // TODO New key - Add a translation - "curation-task.task.translate.label": "Microsoft Translator", - - // "curation-task.task.vscan.label": "Virus Scan", - // TODO New key - Add a translation - "curation-task.task.vscan.label": "Virus Scan", - - - - // "curation.form.task-select.label": "Task:", - // TODO New key - Add a translation - "curation.form.task-select.label": "Task:", - - // "curation.form.submit": "Start", - // TODO New key - Add a translation - "curation.form.submit": "Start", - - // "curation.form.submit.success.head": "The curation task has been started successfully", - // TODO New key - Add a translation - "curation.form.submit.success.head": "The curation task has been started successfully", - - // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.", - // TODO New key - Add a translation - "curation.form.submit.success.content": "You will be redirected to the corresponding process page.", - - // "curation.form.submit.error.head": "Running the curation task failed", - // TODO New key - Add a translation - "curation.form.submit.error.head": "Running the curation task failed", - - // "curation.form.submit.error.content": "An error occured when trying to start the curation task.", - // TODO New key - Add a translation - "curation.form.submit.error.content": "An error occured when trying to start the curation task.", - - // "curation.form.handle.label": "Handle:", - // TODO New key - Add a translation - "curation.form.handle.label": "Handle:", - - // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)", - // TODO New key - Add a translation - "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)", - - - - // "dso-selector.create.collection.head": "New collection", - "dso-selector.create.collection.head": "Nueva colección", - - // "dso-selector.create.collection.sub-level": "Create a new collection in", - // TODO New key - Add a translation - "dso-selector.create.collection.sub-level": "Create a new collection in", - - // "dso-selector.create.community.head": "New community", - "dso-selector.create.community.head": "Nueva comunidad", - - // "dso-selector.create.community.sub-level": "Create a new community in", - "dso-selector.create.community.sub-level": "Crear una nueva comunidad en", - - // "dso-selector.create.community.top-level": "Create a new top-level community", - "dso-selector.create.community.top-level": "Crear una nueva comunidad de nivel superior", - - // "dso-selector.create.item.head": "New item", - "dso-selector.create.item.head": "Nuevo ítem", - - // "dso-selector.create.item.sub-level": "Create a new item in", - // TODO New key - Add a translation - "dso-selector.create.item.sub-level": "Create a new item in", - - // "dso-selector.create.submission.head": "New submission", - // TODO New key - Add a translation - "dso-selector.create.submission.head": "New submission", - - // "dso-selector.edit.collection.head": "Edit collection", - "dso-selector.edit.collection.head": "Editar colección", - - // "dso-selector.edit.community.head": "Edit community", - "dso-selector.edit.community.head": "Editar comunidad", - - // "dso-selector.edit.item.head": "Edit item", - "dso-selector.edit.item.head": "Editar ítem", - - // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", - // TODO New key - Add a translation - "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", - - // "dso-selector.no-results": "No {{ type }} found", - "dso-selector.no-results": "No se ha encontrado {{ type }}", - - // "dso-selector.placeholder": "Search for a {{ type }}", - "dso-selector.placeholder": "Buscar por {{ type }}", - - - - // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", - // TODO New key - Add a translation - "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", - - // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}", - // TODO New key - Add a translation - "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}", - - // "confirmation-modal.export-metadata.cancel": "Cancel", - // TODO New key - Add a translation - "confirmation-modal.export-metadata.cancel": "Cancel", - - // "confirmation-modal.export-metadata.confirm": "Export", - // TODO New key - Add a translation - "confirmation-modal.export-metadata.confirm": "Export", - - // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"", - // TODO New key - Add a translation - "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"", - - // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"", - // TODO New key - Add a translation - "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"", - - // "confirmation-modal.delete-eperson.cancel": "Cancel", - // TODO New key - Add a translation - "confirmation-modal.delete-eperson.cancel": "Cancel", - - // "confirmation-modal.delete-eperson.confirm": "Delete", - // TODO New key - Add a translation - "confirmation-modal.delete-eperson.confirm": "Delete", - - - // "error.bitstream": "Error fetching bitstream", - // TODO New key - Add a translation - "error.bitstream": "Error fetching bitstream", - - // "error.browse-by": "Error fetching items", - "error.browse-by": "Error al recuperar los ítemes", - - // "error.collection": "Error fetching collection", - "error.collection": "Error al recuperar la colección", - - // "error.collections": "Error fetching collections", - "error.collections": "Error al recuperar las colecciones", - - // "error.community": "Error fetching community", - "error.community": "Error al recuperar la comunidad", - - // "error.identifier": "No item found for the identifier", - "error.identifier": "No se ha encontrado ningún ítem para el identificador.", - - // "error.default": "Error", - "error.default": "Error", - - // "error.item": "Error fetching item", - "error.item": "Error al recuperar el ítem", - - // "error.items": "Error fetching items", - "error.items": "Error al recuperar los ítemes", - - // "error.objects": "Error fetching objects", - "error.objects": "Error al recuperar los objetos", - - // "error.recent-submissions": "Error fetching recent submissions", - "error.recent-submissions": "Error al recuperar los envíos recientes", - - // "error.search-results": "Error fetching search results", - "error.search-results": "Error al recuperar los resultados de búsqueda", - - // "error.sub-collections": "Error fetching sub-collections", - "error.sub-collections": "Error al recuperar las sub-colecciones", - - // "error.sub-communities": "Error fetching sub-communities", - "error.sub-communities": "Error al recuperar las sub-comunidades", - - // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below :

", - "error.submission.sections.init-form-error": "Se produjo un error ocurrió durante el inicio de sesión, favor verifique su configuración del formulario de entrada. Los detalles están abajo :

", - - // "error.top-level-communities": "Error fetching top-level communities", - "error.top-level-communities": "Error al recuperar las comunidades de nivel superior", - - // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.", - "error.validation.license.notgranted": "Debe otorgar esta licencia para completar su envío. Si no puede otorgar esta licencia en este momento, puede guardar su trabajo y regresar más tarde o eliminar el envío.", - - // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.", - "error.validation.pattern": "Esta entrada está restringida por el patrón actual: {{ pattern }}.", - - // "error.validation.filerequired": "The file upload is mandatory", - // TODO New key - Add a translation - "error.validation.filerequired": "The file upload is mandatory", - - - - // "file-section.error.header": "Error obtaining files for this item", - // TODO New key - Add a translation - "file-section.error.header": "Error obtaining files for this item", - - - - // "footer.copyright": "copyright © 2002-{{ year }}", - "footer.copyright": "derechos de autor © 2002-{{ year }}", - - // "footer.link.dspace": "DSpace software", - "footer.link.dspace": "Software DSpace", - - // "footer.link.lyrasis": "LYRASIS", - "footer.link.lyrasis": "LYRASIS", - - // "footer.link.cookies": "Cookie settings", - // TODO New key - Add a translation - "footer.link.cookies": "Cookie settings", - - // "footer.link.privacy-policy": "Privacy policy", - // TODO New key - Add a translation - "footer.link.privacy-policy": "Privacy policy", - - // "footer.link.end-user-agreement":"End User Agreement", - // TODO New key - Add a translation - "footer.link.end-user-agreement":"End User Agreement", - - - - // "forgot-email.form.header": "Forgot Password", - // TODO New key - Add a translation - "forgot-email.form.header": "Forgot Password", - - // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.", - // TODO New key - Add a translation - "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.", - - // "forgot-email.form.email": "Email Address *", - // TODO New key - Add a translation - "forgot-email.form.email": "Email Address *", - - // "forgot-email.form.email.error.required": "Please fill in an email address", - // TODO New key - Add a translation - "forgot-email.form.email.error.required": "Please fill in an email address", - - // "forgot-email.form.email.error.pattern": "Please fill in a valid email address", - // TODO New key - Add a translation - "forgot-email.form.email.error.pattern": "Please fill in a valid email address", - - // "forgot-email.form.email.hint": "This address will be verified and used as your login name.", - // TODO New key - Add a translation - "forgot-email.form.email.hint": "This address will be verified and used as your login name.", - - // "forgot-email.form.submit": "Submit", - // TODO New key - Add a translation - "forgot-email.form.submit": "Submit", - - // "forgot-email.form.success.head": "Verification email sent", - // TODO New key - Add a translation - "forgot-email.form.success.head": "Verification email sent", - - // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", - // TODO New key - Add a translation - "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", - - // "forgot-email.form.error.head": "Error when trying to register email", - // TODO New key - Add a translation - "forgot-email.form.error.head": "Error when trying to register email", - - // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}", - // TODO New key - Add a translation - "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}", - - - - // "forgot-password.title": "Forgot Password", - // TODO New key - Add a translation - "forgot-password.title": "Forgot Password", - - // "forgot-password.form.head": "Forgot Password", - // TODO New key - Add a translation - "forgot-password.form.head": "Forgot Password", - - // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", - // TODO New key - Add a translation - "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", - - // "forgot-password.form.card.security": "Security", - // TODO New key - Add a translation - "forgot-password.form.card.security": "Security", - - // "forgot-password.form.identification.header": "Identify", - // TODO New key - Add a translation - "forgot-password.form.identification.header": "Identify", - - // "forgot-password.form.identification.email": "Email address: ", - // TODO New key - Add a translation - "forgot-password.form.identification.email": "Email address: ", - - // "forgot-password.form.label.password": "Password", - // TODO New key - Add a translation - "forgot-password.form.label.password": "Password", - - // "forgot-password.form.label.passwordrepeat": "Retype to confirm", - // TODO New key - Add a translation - "forgot-password.form.label.passwordrepeat": "Retype to confirm", - - // "forgot-password.form.error.empty-password": "Please enter a password in the box below.", - // TODO New key - Add a translation - "forgot-password.form.error.empty-password": "Please enter a password in the box below.", - - // "forgot-password.form.error.matching-passwords": "The passwords do not match.", - // TODO New key - Add a translation - "forgot-password.form.error.matching-passwords": "The passwords do not match.", - - // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.", - // TODO New key - Add a translation - "forgot-password.form.error.password-length": "The password should be at least 6 characters long.", - - // "forgot-password.form.notification.error.title": "Error when trying to submit new password", - // TODO New key - Add a translation - "forgot-password.form.notification.error.title": "Error when trying to submit new password", - - // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.", - // TODO New key - Add a translation - "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.", - - // "forgot-password.form.notification.success.title": "Password reset completed", - // TODO New key - Add a translation - "forgot-password.form.notification.success.title": "Password reset completed", - - // "forgot-password.form.submit": "Submit password", - // TODO New key - Add a translation - "forgot-password.form.submit": "Submit password", - - - - // "form.add": "Add", - // TODO New key - Add a translation - "form.add": "Add", - - // "form.add-help": "Click here to add the current entry and to add another one", - // TODO New key - Add a translation - "form.add-help": "Click here to add the current entry and to add another one", - - // "form.cancel": "Cancel", - "form.cancel": "Cancelar", - - // "form.clear": "Clear", - "form.clear": "Limpiar", - - // "form.clear-help": "Click here to remove the selected value", - "form.clear-help": "Haga clic aquí para eliminar el valor seleccionado.", - - // "form.edit": "Edit", - "form.edit": "Editar", - - // "form.edit-help": "Click here to edit the selected value", - "form.edit-help": "Haga clic aquí para editar el valor seleccionado", - - // "form.first-name": "First name", - "form.first-name": "Primer nombre", - - // "form.group-collapse": "Collapse", - "form.group-collapse": "Contraer", - - // "form.group-collapse-help": "Click here to collapse", - "form.group-collapse-help": "Clic aquí para contraer", - - // "form.group-expand": "Expand", - "form.group-expand": "Expandir", - - // "form.group-expand-help": "Click here to expand and add more elements", - "form.group-expand-help": "Clic aquí para expandir and agregar más elementos", - - // "form.last-name": "Last name", - "form.last-name": "Apellido", - - // "form.loading": "Loading...", - "form.loading": "Cargando...", - - // "form.lookup": "Lookup", - // TODO New key - Add a translation - "form.lookup": "Lookup", - - // "form.lookup-help": "Click here to look up an existing relation", - // TODO New key - Add a translation - "form.lookup-help": "Click here to look up an existing relation", - - // "form.no-results": "No results found", - "form.no-results": "No se han encontrado resultados", - - // "form.no-value": "No value entered", - "form.no-value": "Ningún valor ingresado", - - // "form.other-information": {}, - "form.other-information": {}, - - // "form.remove": "Remove", - "form.remove": "Eliminar", - - // "form.save": "Save", - "form.save": "Guardar", - - // "form.save-help": "Save changes", - "form.save-help": "Guardar cambios", - - // "form.search": "Search", - "form.search": "Buscar", - - // "form.search-help": "Click here to look for an existing correspondence", - // TODO Source message changed - Revise the translation - "form.search-help": "Haga clic aquí para buscar una correspondencia existente", - - // "form.submit": "Submit", - "form.submit": "Enviar", - - - - // "home.description": "", - "home.description": "", - - // "home.breadcrumbs": "Home", - // TODO New key - Add a translation - "home.breadcrumbs": "Home", - - // "home.title": "DSpace Angular :: Home", - "home.title": "DSpace Angular :: Inicio", - - // "home.top-level-communities.head": "Communities in DSpace", - "home.top-level-communities.head": "Comunidades en DSpace", - - // "home.top-level-communities.help": "Select a community to browse its collections.", - "home.top-level-communities.help": "Seleccionar una comunidad para navegar sus colecciones.", - - - - // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement", - // TODO New key - Add a translation - "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement", - - // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement", - // TODO New key - Add a translation - "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement", - - // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement", - // TODO New key - Add a translation - "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement", - - // "info.end-user-agreement.breadcrumbs": "End User Agreement", - // TODO New key - Add a translation - "info.end-user-agreement.breadcrumbs": "End User Agreement", - - // "info.end-user-agreement.buttons.cancel": "Cancel", - // TODO New key - Add a translation - "info.end-user-agreement.buttons.cancel": "Cancel", - - // "info.end-user-agreement.buttons.save": "Save", - // TODO New key - Add a translation - "info.end-user-agreement.buttons.save": "Save", - - // "info.end-user-agreement.head": "End User Agreement", - // TODO New key - Add a translation - "info.end-user-agreement.head": "End User Agreement", - - // "info.end-user-agreement.title": "End User Agreement", - // TODO New key - Add a translation - "info.end-user-agreement.title": "End User Agreement", - - // "info.privacy.breadcrumbs": "Privacy Statement", - // TODO New key - Add a translation - "info.privacy.breadcrumbs": "Privacy Statement", - - // "info.privacy.head": "Privacy Statement", - // TODO New key - Add a translation - "info.privacy.head": "Privacy Statement", - - // "info.privacy.title": "Privacy Statement", - // TODO New key - Add a translation - "info.privacy.title": "Privacy Statement", - - - - // "item.alerts.private": "This item is private", - // TODO New key - Add a translation - "item.alerts.private": "This item is private", - - // "item.alerts.withdrawn": "This item has been withdrawn", - // TODO New key - Add a translation - "item.alerts.withdrawn": "This item has been withdrawn", - - - - // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.", - // TODO New key - Add a translation - "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.", - - // "item.edit.authorizations.title": "Edit item's Policies", - // TODO New key - Add a translation - "item.edit.authorizations.title": "Edit item's Policies", - - - - // "item.badge.private": "Private", - // TODO New key - Add a translation - "item.badge.private": "Private", - - // "item.badge.withdrawn": "Withdrawn", - // TODO New key - Add a translation - "item.badge.withdrawn": "Withdrawn", - - - - // "item.bitstreams.upload.bundle": "Bundle", - // TODO New key - Add a translation - "item.bitstreams.upload.bundle": "Bundle", - - // "item.bitstreams.upload.bundle.placeholder": "Select a bundle", - // TODO New key - Add a translation - "item.bitstreams.upload.bundle.placeholder": "Select a bundle", - - // "item.bitstreams.upload.bundle.new": "Create bundle", - // TODO New key - Add a translation - "item.bitstreams.upload.bundle.new": "Create bundle", - - // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.", - // TODO New key - Add a translation - "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.", - - // "item.bitstreams.upload.cancel": "Cancel", - // TODO New key - Add a translation - "item.bitstreams.upload.cancel": "Cancel", - - // "item.bitstreams.upload.drop-message": "Drop a file to upload", - // TODO New key - Add a translation - "item.bitstreams.upload.drop-message": "Drop a file to upload", - - // "item.bitstreams.upload.item": "Item: ", - // TODO New key - Add a translation - "item.bitstreams.upload.item": "Item: ", - - // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.", - // TODO New key - Add a translation - "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.", - - // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle", - // TODO New key - Add a translation - "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle", - - // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.", - // TODO New key - Add a translation - "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.", - - // "item.bitstreams.upload.title": "Upload bitstream", - // TODO New key - Add a translation - "item.bitstreams.upload.title": "Upload bitstream", - - - - // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload", - // TODO New key - Add a translation - "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload", - - // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.", - // TODO New key - Add a translation - "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.", - - // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})", - // TODO New key - Add a translation - "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})", - - // "item.edit.bitstreams.bundle.load.more": "Load more", - // TODO New key - Add a translation - "item.edit.bitstreams.bundle.load.more": "Load more", - - // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}", - // TODO New key - Add a translation - "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}", - - // "item.edit.bitstreams.discard-button": "Discard", - // TODO New key - Add a translation - "item.edit.bitstreams.discard-button": "Discard", - - // "item.edit.bitstreams.edit.buttons.download": "Download", - // TODO New key - Add a translation - "item.edit.bitstreams.edit.buttons.download": "Download", - - // "item.edit.bitstreams.edit.buttons.drag": "Drag", - // TODO New key - Add a translation - "item.edit.bitstreams.edit.buttons.drag": "Drag", - - // "item.edit.bitstreams.edit.buttons.edit": "Edit", - // TODO New key - Add a translation - "item.edit.bitstreams.edit.buttons.edit": "Edit", - - // "item.edit.bitstreams.edit.buttons.remove": "Remove", - // TODO New key - Add a translation - "item.edit.bitstreams.edit.buttons.remove": "Remove", - - // "item.edit.bitstreams.edit.buttons.undo": "Undo changes", - // TODO New key - Add a translation - "item.edit.bitstreams.edit.buttons.undo": "Undo changes", - - // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.", - // TODO New key - Add a translation - "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.", - - // "item.edit.bitstreams.headers.actions": "Actions", - // TODO New key - Add a translation - "item.edit.bitstreams.headers.actions": "Actions", - - // "item.edit.bitstreams.headers.bundle": "Bundle", - // TODO New key - Add a translation - "item.edit.bitstreams.headers.bundle": "Bundle", - - // "item.edit.bitstreams.headers.description": "Description", - // TODO New key - Add a translation - "item.edit.bitstreams.headers.description": "Description", - - // "item.edit.bitstreams.headers.format": "Format", - // TODO New key - Add a translation - "item.edit.bitstreams.headers.format": "Format", - - // "item.edit.bitstreams.headers.name": "Name", - // TODO New key - Add a translation - "item.edit.bitstreams.headers.name": "Name", - - // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - - // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.discarded.title": "Changes discarded", - - // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams", - - // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.", - - // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved", - - // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", - - // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.outdated.title": "Changes outdated", - - // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream", - - // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.", - - // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved", - // TODO New key - Add a translation - "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved", - - // "item.edit.bitstreams.reinstate-button": "Undo", - // TODO New key - Add a translation - "item.edit.bitstreams.reinstate-button": "Undo", - - // "item.edit.bitstreams.save-button": "Save", - // TODO New key - Add a translation - "item.edit.bitstreams.save-button": "Save", - - // "item.edit.bitstreams.upload-button": "Upload", - // TODO New key - Add a translation - "item.edit.bitstreams.upload-button": "Upload", - - - - // "item.edit.delete.cancel": "Cancel", - "item.edit.delete.cancel": "Cancelar", - - // "item.edit.delete.confirm": "Delete", - "item.edit.delete.confirm": "Eliminar", - - // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.", - "item.edit.delete.description": "¿Estás seguro de que este ítem debe eliminarse por completo? Precaución: en la actualidad no quedaría ningún tombstone.", - - // "item.edit.delete.error": "An error occurred while deleting the item", - "item.edit.delete.error": "Se produjo un error al eliminar el ítem.", - - // "item.edit.delete.header": "Delete item: {{ id }}", - "item.edit.delete.header": "Eliminar el ítem: {{ id }}", - - // "item.edit.delete.success": "The item has been deleted", - "item.edit.delete.success": "El ítem ha sido eliminado", - - // "item.edit.head": "Edit Item", - "item.edit.head": "Editar el ítem", - - // "item.edit.breadcrumbs": "Edit Item", - // TODO New key - Add a translation - "item.edit.breadcrumbs": "Edit Item", - - - // "item.edit.tabs.mapper.head": "Collection Mapper", - // TODO New key - Add a translation - "item.edit.tabs.mapper.head": "Collection Mapper", - - // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper", - // TODO New key - Add a translation - "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper", - - // "item.edit.item-mapper.buttons.add": "Map item to selected collections", - "item.edit.item-mapper.buttons.add": "Asignar el ítem a las colecciones seleccionadas", - - // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections", - "item.edit.item-mapper.buttons.remove": "Eliminar la asignación de ítemes para las colecciones seleccionadas", - - // "item.edit.item-mapper.cancel": "Cancel", - "item.edit.item-mapper.cancel": "Cancelar", - - // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.", - "item.edit.item-mapper.description": "Esta es la herramienta de asignación de ítemes que permite a los administradores asignar este ítem a otras colecciones. Puede buscar colecciones y asignarlas, o navegar la lista de colecciones a las que está asignado actualmente el ítem", - - // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections", - "item.edit.item-mapper.head": "Asignación de ítemes - Asignación del ítem a las Colecciones", - - // "item.edit.item-mapper.item": "Item: \"{{name}}\"", - "item.edit.item-mapper.item": "Item: \"{{name}}\"", - - // "item.edit.item-mapper.no-search": "Please enter a query to search", - "item.edit.item-mapper.no-search": "Favor ingrese una consulta para buscar", - - // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.", - "item.edit.item-mapper.notifications.add.error.content": "Se produjeron errores al asignar el ítem a las {{amount}} colecciones.", - - // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors", - "item.edit.item-mapper.notifications.add.error.head": "Errores de asignación", - - // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.", - "item.edit.item-mapper.notifications.add.success.content": "Exitosamente asignado el ítem a las {{amount}} colecciones.", - - // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed", - "item.edit.item-mapper.notifications.add.success.head": "Asignación completa", - - // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.", - "item.edit.item-mapper.notifications.remove.error.content": "Se produjeron errores al eliminar la asignación a las {{amount}} colecciones.", - - // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors", - "item.edit.item-mapper.notifications.remove.error.head": "Eliminación de errores de mapeo", - - // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.", - "item.edit.item-mapper.notifications.remove.success.content": "Se eliminó con éxito la asignación del elemento a {{amount}} colecciones.", - - // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed", - "item.edit.item-mapper.notifications.remove.success.head": "Eliminación completa de asignación", - - // "item.edit.item-mapper.tabs.browse": "Browse mapped collections", - "item.edit.item-mapper.tabs.browse": "Navegar colecciones asignadas", - - // "item.edit.item-mapper.tabs.map": "Map new collections", - "item.edit.item-mapper.tabs.map": "Asignar nuevas colecciones", - - - - // "item.edit.metadata.add-button": "Add", - "item.edit.metadata.add-button": "Agregar", - - // "item.edit.metadata.discard-button": "Discard", - "item.edit.metadata.discard-button": "Descartar", - - // "item.edit.metadata.edit.buttons.edit": "Edit", - "item.edit.metadata.edit.buttons.edit": "Editar", - - // "item.edit.metadata.edit.buttons.remove": "Remove", - "item.edit.metadata.edit.buttons.remove": "Eliminar", - - // "item.edit.metadata.edit.buttons.undo": "Undo changes", - "item.edit.metadata.edit.buttons.undo": "Deshacer cambios", - - // "item.edit.metadata.edit.buttons.unedit": "Stop editing", - "item.edit.metadata.edit.buttons.unedit": "Parar la edición", - - // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.", - // TODO New key - Add a translation - "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.", - - // "item.edit.metadata.headers.edit": "Edit", - "item.edit.metadata.headers.edit": "Editar", - - // "item.edit.metadata.headers.field": "Field", - "item.edit.metadata.headers.field": "Campo", - - // "item.edit.metadata.headers.language": "Lang", - "item.edit.metadata.headers.language": "Lenguaje", - - // "item.edit.metadata.headers.value": "Value", - "item.edit.metadata.headers.value": "Valor", - - // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", - "item.edit.metadata.metadatafield.invalid": "Favor escoger un campo de metadato válido", - - // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - "item.edit.metadata.notifications.discarded.content": "Los cambios fueron descartados. Para restablecer sus cambios, haga clic en el botón 'Deshacer'", - - // "item.edit.metadata.notifications.discarded.title": "Changed discarded", - "item.edit.metadata.notifications.discarded.title": "Cambio descartado", - - // "item.edit.metadata.notifications.error.title": "An error occurred", - // TODO New key - Add a translation - "item.edit.metadata.notifications.error.title": "An error occurred", - - // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", - "item.edit.metadata.notifications.invalid.content": "No se guardaron los cambios. Asegúrese de que todos los campos sean válidos antes de guardar.", - - // "item.edit.metadata.notifications.invalid.title": "Metadata invalid", - "item.edit.metadata.notifications.invalid.title": "Metadatos inválidos", - - // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", - "item.edit.metadata.notifications.outdated.content": "El ítem en el que está trabajando actualmente ha sido cambiado por otro usuario. Sus cambios actuales se descartan para evitar conflictos", - - // "item.edit.metadata.notifications.outdated.title": "Changed outdated", - "item.edit.metadata.notifications.outdated.title": "Cambio desactualizado", - - // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.", - "item.edit.metadata.notifications.saved.content": "Se guaradaron los cambios de la metadata para este ítem.", - - // "item.edit.metadata.notifications.saved.title": "Metadata saved", - "item.edit.metadata.notifications.saved.title": "Metadatos guardados", - - // "item.edit.metadata.reinstate-button": "Undo", - "item.edit.metadata.reinstate-button": "Deshacer", - - // "item.edit.metadata.save-button": "Save", - "item.edit.metadata.save-button": "Guardar", - - - - // "item.edit.modify.overview.field": "Field", - "item.edit.modify.overview.field": "Campo", - - // "item.edit.modify.overview.language": "Language", - "item.edit.modify.overview.language": "Lenguaje", - - // "item.edit.modify.overview.value": "Value", - "item.edit.modify.overview.value": "Valor", - - - - // "item.edit.move.cancel": "Cancel", - "item.edit.move.cancel": "Cancelar", - - // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.", - "item.edit.move.description": "Seleccione la colección a la que desea mover este ítem. Para reducir la lista de colecciones mostradas, puede ingresar una consulta de búsqueda en el cuadro.", - - // "item.edit.move.error": "An error occurred when attempting to move the item", - "item.edit.move.error": "Ha ocurrido un error cuando ha intentado mover el ítem", - - // "item.edit.move.head": "Move item: {{id}}", - "item.edit.move.head": "Mover el ítem: {{id}}", - - // "item.edit.move.inheritpolicies.checkbox": "Inherit policies", - "item.edit.move.inheritpolicies.checkbox": "Heredar políticas", - - // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection", - "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino.", - - // "item.edit.move.move": "Move", - "item.edit.move.move": "Mover", - - // "item.edit.move.processing": "Moving...", - "item.edit.move.processing": "Moviendo...", - - // "item.edit.move.search.placeholder": "Enter a search query to look for collections", - "item.edit.move.search.placeholder": "Ingrese una consulta para buscar colecciones", - - // "item.edit.move.success": "The item has been moved successfully", - "item.edit.move.success": "El ítem ha sido movido exitosamente", - - // "item.edit.move.title": "Move item", - "item.edit.move.title": "Mover ítem", - - - - // "item.edit.private.cancel": "Cancel", - "item.edit.private.cancel": "Cancelar", - - // "item.edit.private.confirm": "Make it Private", - "item.edit.private.confirm": "Hacerle privado", - - // "item.edit.private.description": "Are you sure this item should be made private in the archive?", - "item.edit.private.description": "¿Está seguro de que este ítem debe ser privado en el archivo?", - - // "item.edit.private.error": "An error occurred while making the item private", - "item.edit.private.error": "Se produjo un error mientras se hacía privado el ítem.", - - // "item.edit.private.header": "Make item private: {{ id }}", - "item.edit.private.header": "Hacer privado el ítem: {{ id }}", - - // "item.edit.private.success": "The item is now private", - "item.edit.private.success": "Ahora está privado el ítem", - - - - // "item.edit.public.cancel": "Cancel", - "item.edit.public.cancel": "Cancelar", - - // "item.edit.public.confirm": "Make it Public", - "item.edit.public.confirm": "Hacerle público", - - // "item.edit.public.description": "Are you sure this item should be made public in the archive?", - "item.edit.public.description": "¿Estás seguro de que este ítem debe hacerse público en el archivo?", - - // "item.edit.public.error": "An error occurred while making the item public", - "item.edit.public.error": "Se produjo un error mientras se hacía público el ítem.", - - // "item.edit.public.header": "Make item public: {{ id }}", - "item.edit.public.header": "Hacer público el ítem: {{ id }}", - - // "item.edit.public.success": "The item is now public", - "item.edit.public.success": "Ahora está público el ítem", - - - - // "item.edit.reinstate.cancel": "Cancel", - "item.edit.reinstate.cancel": "Cancelar", - - // "item.edit.reinstate.confirm": "Reinstate", - "item.edit.reinstate.confirm": "Reintegrar", - - // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?", - "item.edit.reinstate.description": "¿Está seguro de que este ítem debe reintegrarse en el archivo?", - - // "item.edit.reinstate.error": "An error occurred while reinstating the item", - "item.edit.reinstate.error": "Se produjo un error al restablecer el ítem.", - - // "item.edit.reinstate.header": "Reinstate item: {{ id }}", - "item.edit.reinstate.header": "Reintegrar ítem: {{ id }}", - - // "item.edit.reinstate.success": "The item was reinstated successfully", - "item.edit.reinstate.success": "El ítem fue reintegrado exitosamente", - - - - // "item.edit.relationships.discard-button": "Discard", - "item.edit.relationships.discard-button": "Descartar", - - // "item.edit.relationships.edit.buttons.add": "Add", - // TODO New key - Add a translation - "item.edit.relationships.edit.buttons.add": "Add", - - // "item.edit.relationships.edit.buttons.remove": "Remove", - "item.edit.relationships.edit.buttons.remove": "Remover", - - // "item.edit.relationships.edit.buttons.undo": "Undo changes", - "item.edit.relationships.edit.buttons.undo": "Deshacer cambios", - - // "item.edit.relationships.no-relationships": "No relationships", - // TODO New key - Add a translation - "item.edit.relationships.no-relationships": "No relationships", - - // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - "item.edit.relationships.notifications.discarded.content": "Los cambios fueron descartados. Para restablecer sus cambios, haga clic en el botón 'Deshacer'", - - // "item.edit.relationships.notifications.discarded.title": "Changes discarded", - "item.edit.relationships.notifications.discarded.title": "Cambios descartados", - - // "item.edit.relationships.notifications.failed.title": "Error editing relationships", - // TODO Source message changed - Revise the translation - "item.edit.relationships.notifications.failed.title": "Error al eliminar la relación", - - // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", - "item.edit.relationships.notifications.outdated.content": "El ítem en el que está trabajando actualmente ha sido cambiado por otro usuario. Sus cambios actuales se descartan para evitar conflictos", - - // "item.edit.relationships.notifications.outdated.title": "Changes outdated", - "item.edit.relationships.notifications.outdated.title": "Cambio desactualizado", - - // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.", - "item.edit.relationships.notifications.saved.content": "Se guardaron los cambios en las relaciones de este ítem.", - - // "item.edit.relationships.notifications.saved.title": "Relationships saved", - "item.edit.relationships.notifications.saved.title": "Relación guardada", - - // "item.edit.relationships.reinstate-button": "Undo", - "item.edit.relationships.reinstate-button": "Deshacer", - - // "item.edit.relationships.save-button": "Save", - "item.edit.relationships.save-button": "Guardar", - - // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item", - // TODO New key - Add a translation - "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item", - - - - // "item.edit.tabs.bitstreams.head": "Bitstreams", - // TODO Source message changed - Revise the translation - "item.edit.tabs.bitstreams.head": "Archivos del ítem", - - // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams", - "item.edit.tabs.bitstreams.title": "Editar ítem - Archivos", - - // "item.edit.tabs.curate.head": "Curate", - "item.edit.tabs.curate.head": "Curar", - - // "item.edit.tabs.curate.title": "Item Edit - Curate", - "item.edit.tabs.curate.title": "Editar - Curar Item", - - // "item.edit.tabs.metadata.head": "Metadata", - // TODO Source message changed - Revise the translation - "item.edit.tabs.metadata.head": "Metadatos del ítem", - - // "item.edit.tabs.metadata.title": "Item Edit - Metadata", - "item.edit.tabs.metadata.title": "Editar ítem - Metadatos", - - // "item.edit.tabs.relationships.head": "Relationships", - // TODO Source message changed - Revise the translation - "item.edit.tabs.relationships.head": "Relacionador de ítem", - - // "item.edit.tabs.relationships.title": "Item Edit - Relationships", - "item.edit.tabs.relationships.title": "Editar ítem - Relacionador", - - // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...", - "item.edit.tabs.status.buttons.authorizations.button": "Autorizaciones...", - - // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies", - "item.edit.tabs.status.buttons.authorizations.label": "Editar políticas de autorización de ítemes", - - // "item.edit.tabs.status.buttons.delete.button": "Permanently delete", - "item.edit.tabs.status.buttons.delete.button": "Eliminar permanentemente", - - // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item", - "item.edit.tabs.status.buttons.delete.label": "Ítem completamente eliminado", - - // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections", - "item.edit.tabs.status.buttons.mappedCollections.button": "Colecciones asignadas", - - // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections", - "item.edit.tabs.status.buttons.mappedCollections.label": "Gestionar colecciones asignadas", - - // "item.edit.tabs.status.buttons.move.button": "Move...", - "item.edit.tabs.status.buttons.move.button": "Mover...", - - // "item.edit.tabs.status.buttons.move.label": "Move item to another collection", - "item.edit.tabs.status.buttons.move.label": "Mover el ítem a otra colección", - - // "item.edit.tabs.status.buttons.private.button": "Make it private...", - "item.edit.tabs.status.buttons.private.button": "Hacerle privado...", - - // "item.edit.tabs.status.buttons.private.label": "Make item private", - "item.edit.tabs.status.buttons.private.label": "Hacer privado el ítem", - - // "item.edit.tabs.status.buttons.public.button": "Make it public...", - "item.edit.tabs.status.buttons.public.button": "Hacerle público...", - - // "item.edit.tabs.status.buttons.public.label": "Make item public", - "item.edit.tabs.status.buttons.public.label": "Hacer público el ítem", - - // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", - "item.edit.tabs.status.buttons.reinstate.button": "Reintegrar...", - - // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository", - "item.edit.tabs.status.buttons.reinstate.label": "Reintegrar el ítem al repositorio", - - // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...", - "item.edit.tabs.status.buttons.withdraw.button": "Retirar...", - - // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository", - "item.edit.tabs.status.buttons.withdraw.label": "Retirar el ítem del repositorio", - - // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.", - "item.edit.tabs.status.description": "Bienvenido a la página de gestión de ítemes. Desde aquí puede retirar, restablecer, mover o eliminar el ítem. También puede actualizar o agregar nuevos metadatos / archivos en las otras pestañas.", - - // "item.edit.tabs.status.head": "Status", - // TODO Source message changed - Revise the translation - "item.edit.tabs.status.head": "Estado del ítem", - - // "item.edit.tabs.status.labels.handle": "Handle", - "item.edit.tabs.status.labels.handle": "Handle", - - // "item.edit.tabs.status.labels.id": "Item Internal ID", - "item.edit.tabs.status.labels.id": "ID interno del ítem", - - // "item.edit.tabs.status.labels.itemPage": "Item Page", - "item.edit.tabs.status.labels.itemPage": "Página del ítem", - - // "item.edit.tabs.status.labels.lastModified": "Last Modified", - "item.edit.tabs.status.labels.lastModified": "Última modificación", - - // "item.edit.tabs.status.title": "Item Edit - Status", - "item.edit.tabs.status.title": "Editar ítem - Estado", - - // "item.edit.tabs.versionhistory.head": "Version History", - // TODO New key - Add a translation - "item.edit.tabs.versionhistory.head": "Version History", - - // "item.edit.tabs.versionhistory.title": "Item Edit - Version History", - // TODO New key - Add a translation - "item.edit.tabs.versionhistory.title": "Item Edit - Version History", - - // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.", - // TODO New key - Add a translation - "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.", - - // "item.edit.tabs.view.head": "View Item", - "item.edit.tabs.view.head": "Ver ítem", - - // "item.edit.tabs.view.title": "Item Edit - View", - "item.edit.tabs.view.title": "Editar ítem - Ver", - - - - // "item.edit.withdraw.cancel": "Cancel", - "item.edit.withdraw.cancel": "Cancelar", - - // "item.edit.withdraw.confirm": "Withdraw", - "item.edit.withdraw.confirm": "Retirar", - - // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?", - "item.edit.withdraw.description": "¿Estás seguro de que este ítem debe ser retirado del archivo?", - - // "item.edit.withdraw.error": "An error occurred while withdrawing the item", - "item.edit.withdraw.error": "Ha ocurrido un error mientras se retiraba el ítem", - - // "item.edit.withdraw.header": "Withdraw item: {{ id }}", - "item.edit.withdraw.header": "Retirar el ítem: {{ id }}", - - // "item.edit.withdraw.success": "The item was withdrawn successfully", - "item.edit.withdraw.success": "Fue retirado exitosamente el ítem", - - - - // "item.listelement.badge": "Item", - // TODO New key - Add a translation - "item.listelement.badge": "Item", - - // "item.page.description": "Description", - // TODO New key - Add a translation - "item.page.description": "Description", - - // "item.page.edit": "Edit this item", - // TODO New key - Add a translation - "item.page.edit": "Edit this item", - - // "item.page.journal-issn": "Journal ISSN", - // TODO New key - Add a translation - "item.page.journal-issn": "Journal ISSN", - - // "item.page.journal-title": "Journal Title", - // TODO New key - Add a translation - "item.page.journal-title": "Journal Title", - - // "item.page.publisher": "Publisher", - // TODO New key - Add a translation - "item.page.publisher": "Publisher", - - // "item.page.titleprefix": "Item: ", - // TODO New key - Add a translation - "item.page.titleprefix": "Item: ", - - // "item.page.volume-title": "Volume Title", - // TODO New key - Add a translation - "item.page.volume-title": "Volume Title", - - // "item.search.results.head": "Item Search Results", - // TODO New key - Add a translation - "item.search.results.head": "Item Search Results", - - // "item.search.title": "DSpace Angular :: Item Search", - // TODO New key - Add a translation - "item.search.title": "DSpace Angular :: Item Search", - - - - // "item.page.abstract": "Abstract", - "item.page.abstract": "Resumen", - - // "item.page.author": "Authors", - "item.page.author": "Autores", - - // "item.page.citation": "Citation", - "item.page.citation": "Citación", - - // "item.page.collections": "Collections", - "item.page.collections": "Colecciones", - - // "item.page.date": "Date", - "item.page.date": "Fecha", - - // "item.page.edit": "Edit this item", - // TODO New key - Add a translation - "item.page.edit": "Edit this item", - - // "item.page.files": "Files", - "item.page.files": "Archivos", - - // "item.page.filesection.description": "Description:", - "item.page.filesection.description": "Descripción:", - - // "item.page.filesection.download": "Download", - "item.page.filesection.download": "Descargar", - - // "item.page.filesection.format": "Format:", - "item.page.filesection.format": "Formato:", - - // "item.page.filesection.name": "Name:", - "item.page.filesection.name": "Nombre:", - - // "item.page.filesection.size": "Size:", - "item.page.filesection.size": "Tamaño:", - - // "item.page.journal.search.title": "Articles in this journal", - "item.page.journal.search.title": "Artículos en esta revista", - - // "item.page.link.full": "Full item page", - "item.page.link.full": "Página completa del ítem", - - // "item.page.link.simple": "Simple item page", - "item.page.link.simple": "Página simple del ítem", - - // "item.page.person.search.title": "Articles by this author", - "item.page.person.search.title": "Artículos por este autor", - - // "item.page.related-items.view-more": "Show {{ amount }} more", - // TODO Source message changed - Revise the translation - "item.page.related-items.view-more": "Ver más", - - // "item.page.related-items.view-less": "Hide last {{ amount }}", - // TODO Source message changed - Revise the translation - "item.page.related-items.view-less": "View menos", - - // "item.page.relationships.isAuthorOfPublication": "Publications", - // TODO New key - Add a translation - "item.page.relationships.isAuthorOfPublication": "Publications", - - // "item.page.relationships.isJournalOfPublication": "Publications", - // TODO New key - Add a translation - "item.page.relationships.isJournalOfPublication": "Publications", - - // "item.page.relationships.isOrgUnitOfPerson": "Authors", - // TODO New key - Add a translation - "item.page.relationships.isOrgUnitOfPerson": "Authors", - - // "item.page.relationships.isOrgUnitOfProject": "Research Projects", - // TODO New key - Add a translation - "item.page.relationships.isOrgUnitOfProject": "Research Projects", - - // "item.page.subject": "Keywords", - "item.page.subject": "Claves", - - // "item.page.uri": "URI", - "item.page.uri": "URI", - - // "item.page.bitstreams.view-more": "Show more", - // TODO New key - Add a translation - "item.page.bitstreams.view-more": "Show more", - - // "item.page.bitstreams.collapse": "Collapse", - // TODO New key - Add a translation - "item.page.bitstreams.collapse": "Collapse", - - // "item.page.filesection.original.bundle" : "Original bundle", - // TODO New key - Add a translation - "item.page.filesection.original.bundle" : "Original bundle", - - // "item.page.filesection.license.bundle" : "License bundle", - // TODO New key - Add a translation - "item.page.filesection.license.bundle" : "License bundle", - - // "item.preview.dc.identifier.uri": "Identifier:", - // TODO New key - Add a translation - "item.preview.dc.identifier.uri": "Identifier:", - - // "item.preview.dc.contributor.author": "Authors:", - // TODO New key - Add a translation - "item.preview.dc.contributor.author": "Authors:", - - // "item.preview.dc.date.issued": "Published date:", - // TODO New key - Add a translation - "item.preview.dc.date.issued": "Published date:", - - // "item.preview.dc.description.abstract": "Abstract:", - // TODO New key - Add a translation - "item.preview.dc.description.abstract": "Abstract:", - - // "item.preview.dc.identifier.other": "Other identifier:", - // TODO New key - Add a translation - "item.preview.dc.identifier.other": "Other identifier:", - - // "item.preview.dc.language.iso": "Language:", - // TODO New key - Add a translation - "item.preview.dc.language.iso": "Language:", - - // "item.preview.dc.subject": "Subjects:", - // TODO New key - Add a translation - "item.preview.dc.subject": "Subjects:", - - // "item.preview.dc.title": "Title:", - // TODO New key - Add a translation - "item.preview.dc.title": "Title:", - - // "item.preview.person.familyName": "Surname:", - // TODO New key - Add a translation - "item.preview.person.familyName": "Surname:", - - // "item.preview.person.givenName": "Name:", - // TODO New key - Add a translation - "item.preview.person.givenName": "Name:", - - // "item.preview.person.identifier.orcid": "ORCID:", - // TODO New key - Add a translation - "item.preview.person.identifier.orcid": "ORCID:", - - - // "item.select.confirm": "Confirm selected", - "item.select.confirm": "Confirmar lo seleccionado", - - // "item.select.empty": "No items to show", - "item.select.empty": "No ítemes para mostrar", - - // "item.select.table.author": "Author", - "item.select.table.author": "Autor", - - // "item.select.table.collection": "Collection", - "item.select.table.collection": "Colección", - - // "item.select.table.title": "Title", - "item.select.table.title": "Título", - - - // "item.version.history.empty": "There are no other versions for this item yet.", - // TODO New key - Add a translation - "item.version.history.empty": "There are no other versions for this item yet.", - - // "item.version.history.head": "Version History", - // TODO New key - Add a translation - "item.version.history.head": "Version History", - - // "item.version.history.return": "Return", - // TODO New key - Add a translation - "item.version.history.return": "Return", - - // "item.version.history.selected": "Selected version", - // TODO New key - Add a translation - "item.version.history.selected": "Selected version", - - // "item.version.history.table.version": "Version", - // TODO New key - Add a translation - "item.version.history.table.version": "Version", - - // "item.version.history.table.item": "Item", - // TODO New key - Add a translation - "item.version.history.table.item": "Item", - - // "item.version.history.table.editor": "Editor", - // TODO New key - Add a translation - "item.version.history.table.editor": "Editor", - - // "item.version.history.table.date": "Date", - // TODO New key - Add a translation - "item.version.history.table.date": "Date", - - // "item.version.history.table.summary": "Summary", - // TODO New key - Add a translation - "item.version.history.table.summary": "Summary", - - - - // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", - // TODO New key - Add a translation - "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", - - - - // "journal.listelement.badge": "Journal", - "journal.listelement.badge": "Revista", - - // "journal.page.description": "Description", - "journal.page.description": "Descripción", - - // "journal.page.edit": "Edit this item", - // TODO New key - Add a translation - "journal.page.edit": "Edit this item", - - // "journal.page.editor": "Editor-in-Chief", - "journal.page.editor": "Editor-en-Jefe", - - // "journal.page.issn": "ISSN", - "journal.page.issn": "ISSN", - - // "journal.page.publisher": "Publisher", - "journal.page.publisher": "Editor", - - // "journal.page.titleprefix": "Journal: ", - "journal.page.titleprefix": "Revista: ", - - // "journal.search.results.head": "Journal Search Results", - "journal.search.results.head": "Resultados de búsqueda de revistas", - - // "journal.search.title": "DSpace Angular :: Journal Search", - "journal.search.title": "DSpace Angular :: Búsqueda de revistas", - - - - // "journalissue.listelement.badge": "Journal Issue", - "journalissue.listelement.badge": "Número de Revista", - - // "journalissue.page.description": "Description", - "journalissue.page.description": "Descripción", - - // "journalissue.page.edit": "Edit this item", - // TODO New key - Add a translation - "journalissue.page.edit": "Edit this item", - - // "journalissue.page.issuedate": "Issue Date", - "journalissue.page.issuedate": "Fecha de Publicación", - - // "journalissue.page.journal-issn": "Journal ISSN", - "journalissue.page.journal-issn": "ISSN de Revista", - - // "journalissue.page.journal-title": "Journal Title", - "journalissue.page.journal-title": "Título de Revista", - - // "journalissue.page.keyword": "Keywords", - "journalissue.page.keyword": "Claves", - - // "journalissue.page.number": "Number", - "journalissue.page.number": "Número", - - // "journalissue.page.titleprefix": "Journal Issue: ", - "journalissue.page.titleprefix": "Número de Revista: ", - - - - // "journalvolume.listelement.badge": "Journal Volume", - "journalvolume.listelement.badge": "Volumen de la Revista", - - // "journalvolume.page.description": "Description", - "journalvolume.page.description": "Descripción", - - // "journalvolume.page.edit": "Edit this item", - // TODO New key - Add a translation - "journalvolume.page.edit": "Edit this item", - - // "journalvolume.page.issuedate": "Issue Date", - "journalvolume.page.issuedate": "Fecha de Publicación", - - // "journalvolume.page.titleprefix": "Journal Volume: ", - "journalvolume.page.titleprefix": "Volumen de la Revista: ", - - // "journalvolume.page.volume": "Volume", - "journalvolume.page.volume": "Volumen", - - - - // "loading.bitstream": "Loading bitstream...", - // TODO New key - Add a translation - "loading.bitstream": "Loading bitstream...", - - // "loading.bitstreams": "Loading bitstreams...", - // TODO New key - Add a translation - "loading.bitstreams": "Loading bitstreams...", - - // "loading.browse-by": "Loading items...", - "loading.browse-by": "Cargando ítemes...", - - // "loading.browse-by-page": "Loading page...", - "loading.browse-by-page": "Cargando página...", - - // "loading.collection": "Loading collection...", - "loading.collection": "Cargando colección...", - - // "loading.collections": "Loading collections...", - "loading.collections": "Cargando colecciones...", - - // "loading.content-source": "Loading content source...", - // TODO New key - Add a translation - "loading.content-source": "Loading content source...", - - // "loading.community": "Loading community...", - "loading.community": "Cargando comunidad...", - - // "loading.default": "Loading...", - "loading.default": "Cargando...", - - // "loading.item": "Loading item...", - "loading.item": "Cargando ítem...", - - // "loading.items": "Loading items...", - "loading.items": "Cargando ítemes...", - - // "loading.mydspace-results": "Loading items...", - "loading.mydspace-results": "Cargando ítemes...", - - // "loading.objects": "Loading...", - "loading.objects": "Cargando...", - - // "loading.recent-submissions": "Loading recent submissions...", - "loading.recent-submissions": "Cargando envíos recientes...", - - // "loading.search-results": "Loading search results...", - "loading.search-results": "Cargando resultados de búsqueda...", - - // "loading.sub-collections": "Loading sub-collections...", - "loading.sub-collections": "Cargando sub-colecciones...", - - // "loading.sub-communities": "Loading sub-communities...", - "loading.sub-communities": "Cargando sub-comunidades...", - - // "loading.top-level-communities": "Loading top-level communities...", - "loading.top-level-communities": "Cargando comunidades de nivel superior...", - - - - // "login.form.email": "Email address", - "login.form.email": "Dirección de correo electrónico", - - // "login.form.forgot-password": "Have you forgotten your password?", - "login.form.forgot-password": "¿Ha olvidado su contraseña?", - - // "login.form.header": "Please log in to DSpace", - "login.form.header": "Favor inicie sesión en DSpace", - - // "login.form.new-user": "New user? Click here to register.", - "login.form.new-user": "¿Usuario nuevo? Clic aquí para registrarse.", - - // "login.form.or-divider": "or", - // TODO New key - Add a translation - "login.form.or-divider": "or", - - // "login.form.password": "Password", - "login.form.password": "Clave", - - // "login.form.shibboleth": "Log in with Shibboleth", - // TODO New key - Add a translation - "login.form.shibboleth": "Log in with Shibboleth", - - // "login.form.submit": "Log in", - "login.form.submit": "Iniciar sesión", - - // "login.title": "Login", - "login.title": "Iniciar sesión", - - // "login.breadcrumbs": "Login", - // TODO New key - Add a translation - "login.breadcrumbs": "Login", - - - - // "logout.form.header": "Log out from DSpace", - "logout.form.header": "Cerrar sesión de DSpace", - - // "logout.form.submit": "Log out", - "logout.form.submit": "Cerrar sesión", - - // "logout.title": "Logout", - "logout.title": "Cerrar sesión", - - - - // "menu.header.admin": "Admin", - "menu.header.admin": "Administrar", - - // "menu.header.image.logo": "Repository logo", - "menu.header.image.logo": "Logo del Repositorio ", - - - - // "menu.section.access_control": "Access Control", - "menu.section.access_control": "Control de acceso", - - // "menu.section.access_control_authorizations": "Authorizations", - "menu.section.access_control_authorizations": "Autorizaciones", - - // "menu.section.access_control_groups": "Groups", - "menu.section.access_control_groups": "Grupos", - - // "menu.section.access_control_people": "People", - "menu.section.access_control_people": "Personas", - - - - // "menu.section.admin_search": "Admin Search", - // TODO New key - Add a translation - "menu.section.admin_search": "Admin Search", - - - - // "menu.section.browse_community": "This Community", - "menu.section.browse_community": "Esta comunidad", - - // "menu.section.browse_community_by_author": "By Author", - "menu.section.browse_community_by_author": "Por Autor", - - // "menu.section.browse_community_by_issue_date": "By Issue Date", - "menu.section.browse_community_by_issue_date": "Por Fecha de Publicación", - - // "menu.section.browse_community_by_title": "By Title", - "menu.section.browse_community_by_title": "Por Título", - - // "menu.section.browse_global": "All of DSpace", - "menu.section.browse_global": "Todo DSpace", - - // "menu.section.browse_global_by_author": "By Author", - "menu.section.browse_global_by_author": "Por Autor", - - // "menu.section.browse_global_by_dateissued": "By Issue Date", - "menu.section.browse_global_by_dateissued": "Por Fecha de Publicación", - - // "menu.section.browse_global_by_subject": "By Subject", - "menu.section.browse_global_by_subject": "Por Materia", - - // "menu.section.browse_global_by_title": "By Title", - "menu.section.browse_global_by_title": "Por Título", - - // "menu.section.browse_global_communities_and_collections": "Communities & Collections", - "menu.section.browse_global_communities_and_collections": "Comunidades & Colecciones", - - - - // "menu.section.control_panel": "Control Panel", - "menu.section.control_panel": "Panel de Control", - - // "menu.section.curation_task": "Curation Task", - "menu.section.curation_task": "Tarea de Curación", - - - - // "menu.section.edit": "Edit", - "menu.section.edit": "Editar", - - // "menu.section.edit_collection": "Collection", - "menu.section.edit_collection": "Colección", - - // "menu.section.edit_community": "Community", - "menu.section.edit_community": "Comunidad", - - // "menu.section.edit_item": "Item", - "menu.section.edit_item": "Ítem", - - - - // "menu.section.export": "Export", - "menu.section.export": "Exportar", - - // "menu.section.export_collection": "Collection", - "menu.section.export_collection": "Colección", - - // "menu.section.export_community": "Community", - "menu.section.export_community": "Comunidad", - - // "menu.section.export_item": "Item", - "menu.section.export_item": "Ítem", - - // "menu.section.export_metadata": "Metadata", - "menu.section.export_metadata": "Metadatos", - - - - // "menu.section.icon.access_control": "Access Control menu section", - "menu.section.icon.access_control": "Sección del menú de Control de Acceso", - - // "menu.section.icon.admin_search": "Admin search menu section", - // TODO New key - Add a translation - "menu.section.icon.admin_search": "Admin search menu section", - - // "menu.section.icon.control_panel": "Control Panel menu section", - "menu.section.icon.control_panel": "Sección del menú de Panel Control", - - // "menu.section.icon.curation_task": "Curation Task menu section", - "menu.section.icon.curation_task": "Sección del menú de Tarea de Curación", - - // "menu.section.icon.edit": "Edit menu section", - "menu.section.icon.edit": "Sección del Menú Editar", - - // "menu.section.icon.export": "Export menu section", - "menu.section.icon.export": "Sección del Menú Exportar", - - // "menu.section.icon.find": "Find menu section", - "menu.section.icon.find": "Sección del Menú Encontrar", - - // "menu.section.icon.import": "Import menu section", - "menu.section.icon.import": "Sección del Menú Importar", - - // "menu.section.icon.new": "New menu section", - "menu.section.icon.new": "Sección del Menú Nuevo", - - // "menu.section.icon.pin": "Pin sidebar", - "menu.section.icon.pin": "Pin sidebar", - - // "menu.section.icon.processes": "Processes menu section", - // TODO New key - Add a translation - "menu.section.icon.processes": "Processes menu section", - - // "menu.section.icon.registries": "Registries menu section", - "menu.section.icon.registries": "Sección del Menú Registros", - - // "menu.section.icon.statistics_task": "Statistics Task menu section", - "menu.section.icon.statistics_task": "Sección del Menú Tarea de Estadísticas", - - // "menu.section.icon.unpin": "Unpin sidebar", - "menu.section.icon.unpin": "Unpin sidebar", - - - - // "menu.section.import": "Import", - "menu.section.import": "Importar", - - // "menu.section.import_batch": "Batch Import (ZIP)", - "menu.section.import_batch": "Importar Batch (ZIP)", - - // "menu.section.import_metadata": "Metadata", - "menu.section.import_metadata": "Metadatos", - - - - // "menu.section.new": "New", - "menu.section.new": "Nuevo", - - // "menu.section.new_collection": "Collection", - "menu.section.new_collection": "Colección", - - // "menu.section.new_community": "Community", - "menu.section.new_community": "Comunidad", - - // "menu.section.new_item": "Item", - "menu.section.new_item": "Ítem", - - // "menu.section.new_item_version": "Item Version", - "menu.section.new_item_version": "Version del Ítem", - - // "menu.section.new_process": "Process", - // TODO New key - Add a translation - "menu.section.new_process": "Process", - - - - // "menu.section.pin": "Pin sidebar", - "menu.section.pin": "Pin sidebar", - - // "menu.section.unpin": "Unpin sidebar", - "menu.section.unpin": "Unpin sidebar", - - - - // "menu.section.processes": "Processes", - // TODO New key - Add a translation - "menu.section.processes": "Processes", - - - - // "menu.section.registries": "Registries", - "menu.section.registries": "Registros", - - // "menu.section.registries_format": "Format", - "menu.section.registries_format": "Formato", - - // "menu.section.registries_metadata": "Metadata", - "menu.section.registries_metadata": "Metadatos", - - - - // "menu.section.statistics": "Statistics", - "menu.section.statistics": "Estadísticas", - - // "menu.section.statistics_task": "Statistics Task", - "menu.section.statistics_task": "Tarea de Estadíisticas", - - - - // "menu.section.toggle.access_control": "Toggle Access Control section", - "menu.section.toggle.access_control": "Alternar la sección de Control de Acceso", - - // "menu.section.toggle.control_panel": "Toggle Control Panel section", - "menu.section.toggle.control_panel": "Alternar la sección de Panel de Control", - - // "menu.section.toggle.curation_task": "Toggle Curation Task section", - "menu.section.toggle.curation_task": "Alternar la sección de Tarea de Curación", - - // "menu.section.toggle.edit": "Toggle Edit section", - "menu.section.toggle.edit": "Alternar la sección de Editar", - - // "menu.section.toggle.export": "Toggle Export section", - "menu.section.toggle.export": "Alternar la sección de Exportar", - - // "menu.section.toggle.find": "Toggle Find section", - "menu.section.toggle.find": "Alternar la sección de Encontrar", - - // "menu.section.toggle.import": "Toggle Import section", - "menu.section.toggle.import": "Alternar la sección de Importar", - - // "menu.section.toggle.new": "Toggle New section", - "menu.section.toggle.new": "Alternar la sección de Nuevo", - - // "menu.section.toggle.registries": "Toggle Registries section", - "menu.section.toggle.registries": "Alternar la sección de Registros", - - // "menu.section.toggle.statistics_task": "Toggle Statistics Task section", - "menu.section.toggle.statistics_task": "Alternar la sección de Tareas de Estadísticas", - - - // "menu.section.workflow": "Administer Workflow", - // TODO New key - Add a translation - "menu.section.workflow": "Administer Workflow", - - - // "mydspace.description": "", - "mydspace.description": "", - - // "mydspace.general.text-here": "here", - // TODO Source message changed - Revise the translation - "mydspace.general.text-here": "AQUÍ", - - // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.", - "mydspace.messages.controller-help": "Seleccione esta opción para enviar un mensaje al remitente del ítem.", - - // "mydspace.messages.description-placeholder": "Insert your message here...", - "mydspace.messages.description-placeholder": "Ingrese su mensaje aquí...", - - // "mydspace.messages.hide-msg": "Hide message", - "mydspace.messages.hide-msg": "Ocultar mensaje", - - // "mydspace.messages.mark-as-read": "Mark as read", - "mydspace.messages.mark-as-read": "Marcar como leído", - - // "mydspace.messages.mark-as-unread": "Mark as unread", - "mydspace.messages.mark-as-unread": "Macar como no leído", - - // "mydspace.messages.no-content": "No content.", - "mydspace.messages.no-content": "Sin contenido.", - - // "mydspace.messages.no-messages": "No messages yet.", - "mydspace.messages.no-messages": "Aún no hay mensajes.", - - // "mydspace.messages.send-btn": "Send", - "mydspace.messages.send-btn": "Enviar", - - // "mydspace.messages.show-msg": "Show message", - "mydspace.messages.show-msg": "Mostrar mensaje", - - // "mydspace.messages.subject-placeholder": "Subject...", - "mydspace.messages.subject-placeholder": "Materia...", - - // "mydspace.messages.submitter-help": "Select this option to send a message to controller.", - "mydspace.messages.submitter-help": "Seleccione esta opción para enviar un mensaje al controlador.", - - // "mydspace.messages.title": "Messages", - "mydspace.messages.title": "Mensajes", - - // "mydspace.messages.to": "To", - "mydspace.messages.to": "Para", - - // "mydspace.new-submission": "New submission", - "mydspace.new-submission": "Nuevo envío", - - // "mydspace.new-submission-external": "Import metadata from external source", - // TODO New key - Add a translation - "mydspace.new-submission-external": "Import metadata from external source", - - // "mydspace.new-submission-external-short": "Import metadata", - // TODO New key - Add a translation - "mydspace.new-submission-external-short": "Import metadata", - - // "mydspace.results.head": "Your submissions", - "mydspace.results.head": "Sus envíos", - - // "mydspace.results.no-abstract": "No Abstract", - "mydspace.results.no-abstract": "Sin Resumen", - - // "mydspace.results.no-authors": "No Authors", - "mydspace.results.no-authors": "Sin Autores", - - // "mydspace.results.no-collections": "No Collections", - "mydspace.results.no-collections": "Sin Colecciones", - - // "mydspace.results.no-date": "No Date", - "mydspace.results.no-date": "Sin Fecha", - - // "mydspace.results.no-files": "No Files", - "mydspace.results.no-files": "Sin Archivos", - - // "mydspace.results.no-results": "There were no items to show", - "mydspace.results.no-results": "No hay ítemes para mostrar", - - // "mydspace.results.no-title": "No title", - "mydspace.results.no-title": "Sin título", - - // "mydspace.results.no-uri": "No Uri", - "mydspace.results.no-uri": "Sin Uri", - - // "mydspace.show.workflow": "All tasks", - "mydspace.show.workflow": "Todas las tareas", - - // "mydspace.show.workspace": "Your Submissions", - "mydspace.show.workspace": "Sus envíos", - - // "mydspace.status.archived": "Archived", - "mydspace.status.archived": "Archivado", - - // "mydspace.status.validation": "Validation", - "mydspace.status.validation": "Validación", - - // "mydspace.status.waiting-for-controller": "Waiting for controller", - "mydspace.status.waiting-for-controller": "Esperando controlador", - - // "mydspace.status.workflow": "Workflow", - "mydspace.status.workflow": "Flujo de trabajo", - - // "mydspace.status.workspace": "Workspace", - "mydspace.status.workspace": "Workspace", - - // "mydspace.title": "MyDSpace", - "mydspace.title": "MiDSpace", - - // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", - "mydspace.upload.upload-failed": "Error al crear nuevo Workspace. Verifique el contenido cargado antes de intentar.", - - // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.", - // TODO New key - Add a translation - "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.", - - // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.", - // TODO New key - Add a translation - "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.", - - // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.", - "mydspace.upload.upload-multiple-successful": "{{qty}} Nuevos ítemes de workspace creados.", - - // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.", - "mydspace.upload.upload-successful": "Nuevos ítemes de workspace creados. Clic {{here}} para editar.", - - // "mydspace.view-btn": "View", - "mydspace.view-btn": "Ver", - - - - // "nav.browse.header": "All of DSpace", - "nav.browse.header": "Todo DSpace", - - // "nav.community-browse.header": "By Community", - "nav.community-browse.header": "Por Comunidad", - - // "nav.language": "Language switch", - "nav.language": "Cambio de idioma", - - // "nav.login": "Log In", - "nav.login": "Inicio de Sesión", - - // "nav.logout": "Log Out", - "nav.logout": "Cerrar Sesión", - - // "nav.mydspace": "MyDSpace", - "nav.mydspace": "Mi DSpace", - - // "nav.profile": "Profile", - // TODO New key - Add a translation - "nav.profile": "Profile", - - // "nav.search": "Search", - "nav.search": "Buscar", - - // "nav.statistics.header": "Statistics", - "nav.statistics.header": "Estadísticas", - - // "nav.stop-impersonating": "Stop impersonating EPerson", - // TODO New key - Add a translation - "nav.stop-impersonating": "Stop impersonating EPerson", - - - - // "orgunit.listelement.badge": "Organizational Unit", - "orgunit.listelement.badge": "Unidad organizacional", - - // "orgunit.page.city": "City", - "orgunit.page.city": "Ciudad", - - // "orgunit.page.country": "Country", - "orgunit.page.country": "País", - - // "orgunit.page.dateestablished": "Date established", - "orgunit.page.dateestablished": "Fecha establecida", - - // "orgunit.page.description": "Description", - "orgunit.page.description": "Descripción", - - // "orgunit.page.edit": "Edit this item", - // TODO New key - Add a translation - "orgunit.page.edit": "Edit this item", - - // "orgunit.page.id": "ID", - "orgunit.page.id": "ID", - - // "orgunit.page.titleprefix": "Organizational Unit: ", - "orgunit.page.titleprefix": "Unidad organizacional: ", - - - - // "pagination.results-per-page": "Results Per Page", - "pagination.results-per-page": "Resultados por Página", - - // "pagination.showing.detail": "{{ range }} of {{ total }}", - "pagination.showing.detail": "{{ range }} de {{ total }}", - - // "pagination.showing.label": "Now showing ", - "pagination.showing.label": "Mostrando ", - - // "pagination.sort-direction": "Sort Options", - "pagination.sort-direction": "Opciones de orden", - - - - // "person.listelement.badge": "Person", - "person.listelement.badge": "Persona", - - // "person.listelement.no-title": "No name found", - // TODO New key - Add a translation - "person.listelement.no-title": "No name found", - - // "person.page.birthdate": "Birth Date", - "person.page.birthdate": "Fecha de Nacimiento", - - // "person.page.edit": "Edit this item", - // TODO New key - Add a translation - "person.page.edit": "Edit this item", - - // "person.page.email": "Email Address", - "person.page.email": "Dirección de correo electrónico", - - // "person.page.firstname": "First Name", - "person.page.firstname": "Nombre", - - // "person.page.jobtitle": "Job Title", - "person.page.jobtitle": "Título profesional", - - // "person.page.lastname": "Last Name", - "person.page.lastname": "Apellido", - - // "person.page.link.full": "Show all metadata", - "person.page.link.full": "Mostrar todos los metadatos", - - // "person.page.orcid": "ORCID", - "person.page.orcid": "ORCID", - - // "person.page.staffid": "Staff ID", - "person.page.staffid": "Identificación del personal", - - // "person.page.titleprefix": "Person: ", - "person.page.titleprefix": "Persona: ", - - // "person.search.results.head": "Person Search Results", - "person.search.results.head": "Resultados de búsqueda de personas", - - // "person.search.title": "DSpace Angular :: Person Search", - "person.search.title": "DSpace Angular :: Búsqueda de persona", - - - - // "process.new.select-parameters": "Parameters", - // TODO New key - Add a translation - "process.new.select-parameters": "Parameters", - - // "process.new.cancel": "Cancel", - // TODO New key - Add a translation - "process.new.cancel": "Cancel", - - // "process.new.submit": "Submit", - // TODO New key - Add a translation - "process.new.submit": "Submit", - - // "process.new.select-script": "Script", - // TODO New key - Add a translation - "process.new.select-script": "Script", - - // "process.new.select-script.placeholder": "Choose a script...", - // TODO New key - Add a translation - "process.new.select-script.placeholder": "Choose a script...", - - // "process.new.select-script.required": "Script is required", - // TODO New key - Add a translation - "process.new.select-script.required": "Script is required", - - // "process.new.parameter.file.upload-button": "Select file...", - // TODO New key - Add a translation - "process.new.parameter.file.upload-button": "Select file...", - - // "process.new.parameter.file.required": "Please select a file", - // TODO New key - Add a translation - "process.new.parameter.file.required": "Please select a file", - - // "process.new.parameter.string.required": "Parameter value is required", - // TODO New key - Add a translation - "process.new.parameter.string.required": "Parameter value is required", - - // "process.new.parameter.type.value": "value", - // TODO New key - Add a translation - "process.new.parameter.type.value": "value", - - // "process.new.parameter.type.file": "file", - // TODO New key - Add a translation - "process.new.parameter.type.file": "file", - - // "process.new.parameter.required.missing": "The following parameters are required but still missing:", - // TODO New key - Add a translation - "process.new.parameter.required.missing": "The following parameters are required but still missing:", - - // "process.new.notification.success.title": "Success", - // TODO New key - Add a translation - "process.new.notification.success.title": "Success", - - // "process.new.notification.success.content": "The process was successfully created", - // TODO New key - Add a translation - "process.new.notification.success.content": "The process was successfully created", - - // "process.new.notification.error.title": "Error", - // TODO New key - Add a translation - "process.new.notification.error.title": "Error", - - // "process.new.notification.error.content": "An error occurred while creating this process", - // TODO New key - Add a translation - "process.new.notification.error.content": "An error occurred while creating this process", - - // "process.new.header": "Create a new process", - // TODO New key - Add a translation - "process.new.header": "Create a new process", - - // "process.new.title": "Create a new process", - // TODO New key - Add a translation - "process.new.title": "Create a new process", - - // "process.new.breadcrumbs": "Create a new process", - // TODO New key - Add a translation - "process.new.breadcrumbs": "Create a new process", - - - - // "process.detail.arguments" : "Arguments", - // TODO New key - Add a translation - "process.detail.arguments" : "Arguments", - - // "process.detail.arguments.empty" : "This process doesn't contain any arguments", - // TODO New key - Add a translation - "process.detail.arguments.empty" : "This process doesn't contain any arguments", - - // "process.detail.back" : "Back", - // TODO New key - Add a translation - "process.detail.back" : "Back", - - // "process.detail.output" : "Process Output", - // TODO New key - Add a translation - "process.detail.output" : "Process Output", - - // "process.detail.logs.button": "Retrieve process output", - // TODO New key - Add a translation - "process.detail.logs.button": "Retrieve process output", - - // "process.detail.logs.loading": "Retrieving", - // TODO New key - Add a translation - "process.detail.logs.loading": "Retrieving", - - // "process.detail.logs.none": "This process has no output", - // TODO New key - Add a translation - "process.detail.logs.none": "This process has no output", - - // "process.detail.output-files" : "Output Files", - // TODO New key - Add a translation - "process.detail.output-files" : "Output Files", - - // "process.detail.output-files.empty" : "This process doesn't contain any output files", - // TODO New key - Add a translation - "process.detail.output-files.empty" : "This process doesn't contain any output files", - - // "process.detail.script" : "Script", - // TODO New key - Add a translation - "process.detail.script" : "Script", - - // "process.detail.title" : "Process: {{ id }} - {{ name }}", - // TODO New key - Add a translation - "process.detail.title" : "Process: {{ id }} - {{ name }}", - - // "process.detail.start-time" : "Start time", - // TODO New key - Add a translation - "process.detail.start-time" : "Start time", - - // "process.detail.end-time" : "Finish time", - // TODO New key - Add a translation - "process.detail.end-time" : "Finish time", - - // "process.detail.status" : "Status", - // TODO New key - Add a translation - "process.detail.status" : "Status", - - // "process.detail.create" : "Create similar process", - // TODO New key - Add a translation - "process.detail.create" : "Create similar process", - - - - // "process.overview.table.finish" : "Finish time", - // TODO New key - Add a translation - "process.overview.table.finish" : "Finish time", - - // "process.overview.table.id" : "Process ID", - // TODO New key - Add a translation - "process.overview.table.id" : "Process ID", - - // "process.overview.table.name" : "Name", - // TODO New key - Add a translation - "process.overview.table.name" : "Name", - - // "process.overview.table.start" : "Start time", - // TODO New key - Add a translation - "process.overview.table.start" : "Start time", - - // "process.overview.table.status" : "Status", - // TODO New key - Add a translation - "process.overview.table.status" : "Status", - - // "process.overview.table.user" : "User", - // TODO New key - Add a translation - "process.overview.table.user" : "User", - - // "process.overview.title": "Processes Overview", - // TODO New key - Add a translation - "process.overview.title": "Processes Overview", - - // "process.overview.breadcrumbs": "Processes Overview", - // TODO New key - Add a translation - "process.overview.breadcrumbs": "Processes Overview", - - // "process.overview.new": "New", - // TODO New key - Add a translation - "process.overview.new": "New", - - - // "profile.breadcrumbs": "Update Profile", - // TODO New key - Add a translation - "profile.breadcrumbs": "Update Profile", - - // "profile.card.identify": "Identify", - // TODO New key - Add a translation - "profile.card.identify": "Identify", - - // "profile.card.security": "Security", - // TODO New key - Add a translation - "profile.card.security": "Security", - - // "profile.form.submit": "Update Profile", - // TODO New key - Add a translation - "profile.form.submit": "Update Profile", - - // "profile.groups.head": "Authorization groups you belong to", - // TODO New key - Add a translation - "profile.groups.head": "Authorization groups you belong to", - - // "profile.head": "Update Profile", - // TODO New key - Add a translation - "profile.head": "Update Profile", - - // "profile.metadata.form.error.firstname.required": "First Name is required", - // TODO New key - Add a translation - "profile.metadata.form.error.firstname.required": "First Name is required", - - // "profile.metadata.form.error.lastname.required": "Last Name is required", - // TODO New key - Add a translation - "profile.metadata.form.error.lastname.required": "Last Name is required", - - // "profile.metadata.form.label.email": "Email Address", - // TODO New key - Add a translation - "profile.metadata.form.label.email": "Email Address", - - // "profile.metadata.form.label.firstname": "First Name", - // TODO New key - Add a translation - "profile.metadata.form.label.firstname": "First Name", - - // "profile.metadata.form.label.language": "Language", - // TODO New key - Add a translation - "profile.metadata.form.label.language": "Language", - - // "profile.metadata.form.label.lastname": "Last Name", - // TODO New key - Add a translation - "profile.metadata.form.label.lastname": "Last Name", - - // "profile.metadata.form.label.phone": "Contact Telephone", - // TODO New key - Add a translation - "profile.metadata.form.label.phone": "Contact Telephone", - - // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.", - // TODO New key - Add a translation - "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.", - - // "profile.metadata.form.notifications.success.title": "Profile saved", - // TODO New key - Add a translation - "profile.metadata.form.notifications.success.title": "Profile saved", - - // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.", - // TODO New key - Add a translation - "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.", - - // "profile.notifications.warning.no-changes.title": "No changes", - // TODO New key - Add a translation - "profile.notifications.warning.no-changes.title": "No changes", - - // "profile.security.form.error.matching-passwords": "The passwords do not match.", - // TODO New key - Add a translation - "profile.security.form.error.matching-passwords": "The passwords do not match.", - - // "profile.security.form.error.password-length": "The password should be at least 6 characters long.", - // TODO New key - Add a translation - "profile.security.form.error.password-length": "The password should be at least 6 characters long.", - - // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", - // TODO New key - Add a translation - "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", - - // "profile.security.form.label.password": "Password", - // TODO New key - Add a translation - "profile.security.form.label.password": "Password", - - // "profile.security.form.label.passwordrepeat": "Retype to confirm", - // TODO New key - Add a translation - "profile.security.form.label.passwordrepeat": "Retype to confirm", - - // "profile.security.form.notifications.success.content": "Your changes to the password were saved.", - // TODO New key - Add a translation - "profile.security.form.notifications.success.content": "Your changes to the password were saved.", - - // "profile.security.form.notifications.success.title": "Password saved", - // TODO New key - Add a translation - "profile.security.form.notifications.success.title": "Password saved", - - // "profile.security.form.notifications.error.title": "Error changing passwords", - // TODO New key - Add a translation - "profile.security.form.notifications.error.title": "Error changing passwords", - - // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.", - // TODO New key - Add a translation - "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.", - - // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.", - // TODO New key - Add a translation - "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.", - - // "profile.title": "Update Profile", - // TODO New key - Add a translation - "profile.title": "Update Profile", - - - - // "project.listelement.badge": "Research Project", - "project.listelement.badge": "Proyecto de investigación", - - // "project.page.contributor": "Contributors", - "project.page.contributor": "Contribuyentes", - - // "project.page.description": "Description", - "project.page.description": "Descripción", - - // "project.page.edit": "Edit this item", - // TODO New key - Add a translation - "project.page.edit": "Edit this item", - - // "project.page.expectedcompletion": "Expected Completion", - "project.page.expectedcompletion": "Finalización prevista", - - // "project.page.funder": "Funders", - "project.page.funder": "Financiadores", - - // "project.page.id": "ID", - "project.page.id": "ID", - - // "project.page.keyword": "Keywords", - "project.page.keyword": "Claves", - - // "project.page.status": "Status", - "project.page.status": "Estado", - - // "project.page.titleprefix": "Research Project: ", - "project.page.titleprefix": "Proyecto de investigación: ", - - // "project.search.results.head": "Project Search Results", - // TODO New key - Add a translation - "project.search.results.head": "Project Search Results", - - - - // "publication.listelement.badge": "Publication", - "publication.listelement.badge": "Publicación", - - // "publication.page.description": "Description", - "publication.page.description": "Descripción", - - // "publication.page.edit": "Edit this item", - // TODO New key - Add a translation - "publication.page.edit": "Edit this item", - - // "publication.page.journal-issn": "Journal ISSN", - "publication.page.journal-issn": "Revista ISSN", - - // "publication.page.journal-title": "Journal Title", - "publication.page.journal-title": "Título de Revista", - - // "publication.page.publisher": "Publisher", - "publication.page.publisher": "Editor", - - // "publication.page.titleprefix": "Publication: ", - "publication.page.titleprefix": "Publicación: ", - - // "publication.page.volume-title": "Volume Title", - "publication.page.volume-title": "Título del Volumen", - - // "publication.search.results.head": "Publication Search Results", - "publication.search.results.head": "Resultados de la búsqueda de publicaciones", - - // "publication.search.title": "DSpace Angular :: Publication Search", - "publication.search.title": "DSpace Angular :: Búsqueda de publicación", - - - // "register-email.title": "New user registration", - // TODO New key - Add a translation - "register-email.title": "New user registration", - - // "register-page.create-profile.header": "Create Profile", - // TODO New key - Add a translation - "register-page.create-profile.header": "Create Profile", - - // "register-page.create-profile.identification.header": "Identify", - // TODO New key - Add a translation - "register-page.create-profile.identification.header": "Identify", - - // "register-page.create-profile.identification.email": "Email Address", - // TODO New key - Add a translation - "register-page.create-profile.identification.email": "Email Address", - - // "register-page.create-profile.identification.first-name": "First Name *", - // TODO New key - Add a translation - "register-page.create-profile.identification.first-name": "First Name *", - - // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name", - // TODO New key - Add a translation - "register-page.create-profile.identification.first-name.error": "Please fill in a First Name", - - // "register-page.create-profile.identification.last-name": "Last Name *", - // TODO New key - Add a translation - "register-page.create-profile.identification.last-name": "Last Name *", - - // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name", - // TODO New key - Add a translation - "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name", - - // "register-page.create-profile.identification.contact": "Contact Telephone", - // TODO New key - Add a translation - "register-page.create-profile.identification.contact": "Contact Telephone", - - // "register-page.create-profile.identification.language": "Language", - // TODO New key - Add a translation - "register-page.create-profile.identification.language": "Language", - - // "register-page.create-profile.security.header": "Security", - // TODO New key - Add a translation - "register-page.create-profile.security.header": "Security", - - // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", - // TODO New key - Add a translation - "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", - - // "register-page.create-profile.security.label.password": "Password *", - // TODO New key - Add a translation - "register-page.create-profile.security.label.password": "Password *", - - // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *", - // TODO New key - Add a translation - "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *", - - // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.", - // TODO New key - Add a translation - "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.", - - // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.", - // TODO New key - Add a translation - "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.", - - // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.", - // TODO New key - Add a translation - "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.", - - // "register-page.create-profile.submit": "Complete Registration", - // TODO New key - Add a translation - "register-page.create-profile.submit": "Complete Registration", - - // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.", - // TODO New key - Add a translation - "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.", - - // "register-page.create-profile.submit.error.head": "Registration failed", - // TODO New key - Add a translation - "register-page.create-profile.submit.error.head": "Registration failed", - - // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.", - // TODO New key - Add a translation - "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.", - - // "register-page.create-profile.submit.success.head": "Registration completed", - // TODO New key - Add a translation - "register-page.create-profile.submit.success.head": "Registration completed", - - - // "register-page.registration.header": "New user registration", - // TODO New key - Add a translation - "register-page.registration.header": "New user registration", - - // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.", - // TODO New key - Add a translation - "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.", - - // "register-page.registration.email": "Email Address *", - // TODO New key - Add a translation - "register-page.registration.email": "Email Address *", - - // "register-page.registration.email.error.required": "Please fill in an email address", - // TODO New key - Add a translation - "register-page.registration.email.error.required": "Please fill in an email address", - - // "register-page.registration.email.error.pattern": "Please fill in a valid email address", - // TODO New key - Add a translation - "register-page.registration.email.error.pattern": "Please fill in a valid email address", - - // "register-page.registration.email.hint": "This address will be verified and used as your login name.", - // TODO New key - Add a translation - "register-page.registration.email.hint": "This address will be verified and used as your login name.", - - // "register-page.registration.submit": "Register", - // TODO New key - Add a translation - "register-page.registration.submit": "Register", - - // "register-page.registration.success.head": "Verification email sent", - // TODO New key - Add a translation - "register-page.registration.success.head": "Verification email sent", - - // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", - // TODO New key - Add a translation - "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", - - // "register-page.registration.error.head": "Error when trying to register email", - // TODO New key - Add a translation - "register-page.registration.error.head": "Error when trying to register email", - - // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}", - // TODO New key - Add a translation - "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}", - - - - // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items", - // TODO New key - Add a translation - "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items", - - // "relationships.add.error.server.content": "The server returned an error", - // TODO New key - Add a translation - "relationships.add.error.server.content": "The server returned an error", - - // "relationships.add.error.title": "Unable to add relationship", - // TODO New key - Add a translation - "relationships.add.error.title": "Unable to add relationship", - - // "relationships.isAuthorOf": "Authors", - "relationships.isAuthorOf": "Autores", - - // "relationships.isAuthorOf.Person": "Authors (persons)", - // TODO New key - Add a translation - "relationships.isAuthorOf.Person": "Authors (persons)", - - // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)", - // TODO New key - Add a translation - "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)", - - // "relationships.isIssueOf": "Journal Issues", - "relationships.isIssueOf": "Números de Revista", - - // "relationships.isJournalIssueOf": "Journal Issue", - "relationships.isJournalIssueOf": "Número de Revista", - - // "relationships.isJournalOf": "Journals", - "relationships.isJournalOf": "Revistas", - - // "relationships.isOrgUnitOf": "Organizational Units", - "relationships.isOrgUnitOf": "Unidades Organizacionales", - - // "relationships.isPersonOf": "Authors", - "relationships.isPersonOf": "Autores", - - // "relationships.isProjectOf": "Research Projects", - "relationships.isProjectOf": "Proyectos de investigación", - - // "relationships.isPublicationOf": "Publications", - "relationships.isPublicationOf": "Publicaciones", - - // "relationships.isPublicationOfJournalIssue": "Articles", - "relationships.isPublicationOfJournalIssue": "Artículos", - - // "relationships.isSingleJournalOf": "Journal", - "relationships.isSingleJournalOf": "Revista", - - // "relationships.isSingleVolumeOf": "Journal Volume", - "relationships.isSingleVolumeOf": "Volumen de Revista", - - // "relationships.isVolumeOf": "Journal Volumes", - "relationships.isVolumeOf": "Volúmenes de Revista", - - // "relationships.isContributorOf": "Contributors", - // TODO New key - Add a translation - "relationships.isContributorOf": "Contributors", - - - - // "resource-policies.add.button": "Add", - // TODO New key - Add a translation - "resource-policies.add.button": "Add", - - // "resource-policies.add.for.": "Add a new policy", - // TODO New key - Add a translation - "resource-policies.add.for.": "Add a new policy", - - // "resource-policies.add.for.bitstream": "Add a new Bitstream policy", - // TODO New key - Add a translation - "resource-policies.add.for.bitstream": "Add a new Bitstream policy", - - // "resource-policies.add.for.bundle": "Add a new Bundle policy", - // TODO New key - Add a translation - "resource-policies.add.for.bundle": "Add a new Bundle policy", - - // "resource-policies.add.for.item": "Add a new Item policy", - // TODO New key - Add a translation - "resource-policies.add.for.item": "Add a new Item policy", - - // "resource-policies.add.for.community": "Add a new Community policy", - // TODO New key - Add a translation - "resource-policies.add.for.community": "Add a new Community policy", - - // "resource-policies.add.for.collection": "Add a new Collection policy", - // TODO New key - Add a translation - "resource-policies.add.for.collection": "Add a new Collection policy", - - // "resource-policies.create.page.heading": "Create new resource policy for ", - // TODO New key - Add a translation - "resource-policies.create.page.heading": "Create new resource policy for ", - - // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.", - // TODO New key - Add a translation - "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.", - - // "resource-policies.create.page.success.content": "Operation successful", - // TODO New key - Add a translation - "resource-policies.create.page.success.content": "Operation successful", - - // "resource-policies.create.page.title": "Create new resource policy", - // TODO New key - Add a translation - "resource-policies.create.page.title": "Create new resource policy", - - // "resource-policies.delete.btn": "Delete selected", - // TODO New key - Add a translation - "resource-policies.delete.btn": "Delete selected", - - // "resource-policies.delete.btn.title": "Delete selected resource policies", - // TODO New key - Add a translation - "resource-policies.delete.btn.title": "Delete selected resource policies", - - // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.", - // TODO New key - Add a translation - "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.", - - // "resource-policies.delete.success.content": "Operation successful", - // TODO New key - Add a translation - "resource-policies.delete.success.content": "Operation successful", - - // "resource-policies.edit.page.heading": "Edit resource policy ", - // TODO New key - Add a translation - "resource-policies.edit.page.heading": "Edit resource policy ", - - // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.", - // TODO New key - Add a translation - "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.", - - // "resource-policies.edit.page.success.content": "Operation successful", - // TODO New key - Add a translation - "resource-policies.edit.page.success.content": "Operation successful", - - // "resource-policies.edit.page.title": "Edit resource policy", - // TODO New key - Add a translation - "resource-policies.edit.page.title": "Edit resource policy", - - // "resource-policies.form.action-type.label": "Select the action type", - // TODO New key - Add a translation - "resource-policies.form.action-type.label": "Select the action type", - - // "resource-policies.form.action-type.required": "You must select the resource policy action.", - // TODO New key - Add a translation - "resource-policies.form.action-type.required": "You must select the resource policy action.", - - // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission", - - // "resource-policies.form.eperson-group-list.select.btn": "Select", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.select.btn": "Select", - - // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson", - - // "resource-policies.form.eperson-group-list.tab.group": "Search for a group", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.tab.group": "Search for a group", - - // "resource-policies.form.eperson-group-list.table.headers.action": "Action", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.table.headers.action": "Action", - - // "resource-policies.form.eperson-group-list.table.headers.id": "ID", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.table.headers.id": "ID", - - // "resource-policies.form.eperson-group-list.table.headers.name": "Name", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.table.headers.name": "Name", - - // "resource-policies.form.date.end.label": "End Date", - // TODO New key - Add a translation - "resource-policies.form.date.end.label": "End Date", - - // "resource-policies.form.date.start.label": "Start Date", - // TODO New key - Add a translation - "resource-policies.form.date.start.label": "Start Date", - - // "resource-policies.form.description.label": "Description", - // TODO New key - Add a translation - "resource-policies.form.description.label": "Description", - - // "resource-policies.form.name.label": "Name", - // TODO New key - Add a translation - "resource-policies.form.name.label": "Name", - - // "resource-policies.form.policy-type.label": "Select the policy type", - // TODO New key - Add a translation - "resource-policies.form.policy-type.label": "Select the policy type", - - // "resource-policies.form.policy-type.required": "You must select the resource policy type.", - // TODO New key - Add a translation - "resource-policies.form.policy-type.required": "You must select the resource policy type.", - - // "resource-policies.table.headers.action": "Action", - // TODO New key - Add a translation - "resource-policies.table.headers.action": "Action", - - // "resource-policies.table.headers.date.end": "End Date", - // TODO New key - Add a translation - "resource-policies.table.headers.date.end": "End Date", - - // "resource-policies.table.headers.date.start": "Start Date", - // TODO New key - Add a translation - "resource-policies.table.headers.date.start": "Start Date", - - // "resource-policies.table.headers.edit": "Edit", - // TODO New key - Add a translation - "resource-policies.table.headers.edit": "Edit", - - // "resource-policies.table.headers.edit.group": "Edit group", - // TODO New key - Add a translation - "resource-policies.table.headers.edit.group": "Edit group", - - // "resource-policies.table.headers.edit.policy": "Edit policy", - // TODO New key - Add a translation - "resource-policies.table.headers.edit.policy": "Edit policy", - - // "resource-policies.table.headers.eperson": "EPerson", - // TODO New key - Add a translation - "resource-policies.table.headers.eperson": "EPerson", - - // "resource-policies.table.headers.group": "Group", - // TODO New key - Add a translation - "resource-policies.table.headers.group": "Group", - - // "resource-policies.table.headers.id": "ID", - // TODO New key - Add a translation - "resource-policies.table.headers.id": "ID", - - // "resource-policies.table.headers.name": "Name", - // TODO New key - Add a translation - "resource-policies.table.headers.name": "Name", - - // "resource-policies.table.headers.policyType": "type", - // TODO New key - Add a translation - "resource-policies.table.headers.policyType": "type", - - // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream", - // TODO New key - Add a translation - "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream", - - // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle", - // TODO New key - Add a translation - "resource-policies.table.headers.title.for.bundle": "Policies for Bundle", - - // "resource-policies.table.headers.title.for.item": "Policies for Item", - // TODO New key - Add a translation - "resource-policies.table.headers.title.for.item": "Policies for Item", - - // "resource-policies.table.headers.title.for.community": "Policies for Community", - // TODO New key - Add a translation - "resource-policies.table.headers.title.for.community": "Policies for Community", - - // "resource-policies.table.headers.title.for.collection": "Policies for Collection", - // TODO New key - Add a translation - "resource-policies.table.headers.title.for.collection": "Policies for Collection", - - - - // "search.description": "", - "search.description": "", - - // "search.switch-configuration.title": "Show", - // TODO Source message changed - Revise the translation - "search.switch-configuration.title": "Show", - - // "search.title": "DSpace Angular :: Search", - // TODO Source message changed - Revise the translation - "search.title": "DSpace Angular :: Search", - - // "search.breadcrumbs": "Search", - // TODO New key - Add a translation - "search.breadcrumbs": "Search", - - - // "search.filters.applied.f.author": "Author", - "search.filters.applied.f.author": "Autor", - - // "search.filters.applied.f.dateIssued.max": "End date", - "search.filters.applied.f.dateIssued.max": "Fecha Final", - - // "search.filters.applied.f.dateIssued.min": "Start date", - "search.filters.applied.f.dateIssued.min": "Fecha de Inicio", - - // "search.filters.applied.f.dateSubmitted": "Date submitted", - "search.filters.applied.f.dateSubmitted": "Fecha de Envío", - - // "search.filters.applied.f.discoverable": "Private", - // TODO New key - Add a translation - "search.filters.applied.f.discoverable": "Private", - - // "search.filters.applied.f.entityType": "Item Type", - "search.filters.applied.f.entityType": "Tipo de Ítem", - - // "search.filters.applied.f.has_content_in_original_bundle": "Has files", - "search.filters.applied.f.has_content_in_original_bundle": "Tiene archivos", - - // "search.filters.applied.f.itemtype": "Type", - "search.filters.applied.f.itemtype": "Tipo", - - // "search.filters.applied.f.namedresourcetype": "Status", - "search.filters.applied.f.namedresourcetype": "Estado", - - // "search.filters.applied.f.subject": "Subject", - "search.filters.applied.f.subject": "Materia", - - // "search.filters.applied.f.submitter": "Submitter", - "search.filters.applied.f.submitter": "Remitente", - - // "search.filters.applied.f.jobTitle": "Job Title", - // TODO New key - Add a translation - "search.filters.applied.f.jobTitle": "Job Title", - - // "search.filters.applied.f.birthDate.max": "End birth date", - // TODO New key - Add a translation - "search.filters.applied.f.birthDate.max": "End birth date", - - // "search.filters.applied.f.birthDate.min": "Start birth date", - // TODO New key - Add a translation - "search.filters.applied.f.birthDate.min": "Start birth date", - - // "search.filters.applied.f.withdrawn": "Withdrawn", - // TODO New key - Add a translation - "search.filters.applied.f.withdrawn": "Withdrawn", - - - - // "search.filters.filter.author.head": "Author", - "search.filters.filter.author.head": "Autor", - - // "search.filters.filter.author.placeholder": "Author name", - "search.filters.filter.author.placeholder": "Nombre del autor", - - // "search.filters.filter.birthDate.head": "Birth Date", - "search.filters.filter.birthDate.head": "Fecha de Nacimiento", - - // "search.filters.filter.birthDate.placeholder": "Birth Date", - "search.filters.filter.birthDate.placeholder": "Fecha de Nacimiento", - - // "search.filters.filter.creativeDatePublished.head": "Date Published", - "search.filters.filter.creativeDatePublished.head": "Fecha de Publicación", - - // "search.filters.filter.creativeDatePublished.placeholder": "Date Published", - "search.filters.filter.creativeDatePublished.placeholder": "Fecha de Publicación", - - // "search.filters.filter.creativeWorkEditor.head": "Editor", - "search.filters.filter.creativeWorkEditor.head": "Editor", - - // "search.filters.filter.creativeWorkEditor.placeholder": "Editor", - "search.filters.filter.creativeWorkEditor.placeholder": "Editor", - - // "search.filters.filter.creativeWorkKeywords.head": "Subject", - "search.filters.filter.creativeWorkKeywords.head": "Materia", - - // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject", - "search.filters.filter.creativeWorkKeywords.placeholder": "Materia", - - // "search.filters.filter.creativeWorkPublisher.head": "Publisher", - "search.filters.filter.creativeWorkPublisher.head": "Editor", - - // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher", - "search.filters.filter.creativeWorkPublisher.placeholder": "Editor", - - // "search.filters.filter.dateIssued.head": "Date", - "search.filters.filter.dateIssued.head": "Fecha", - - // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date", - "search.filters.filter.dateIssued.max.placeholder": "Fecha Mínima", - - // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date", - "search.filters.filter.dateIssued.min.placeholder": "Fecha Máxima", - - // "search.filters.filter.dateSubmitted.head": "Date submitted", - "search.filters.filter.dateSubmitted.head": "Fecha de Envío", - - // "search.filters.filter.dateSubmitted.placeholder": "Date submitted", - "search.filters.filter.dateSubmitted.placeholder": "Fecha de Envío", - - // "search.filters.filter.discoverable.head": "Private", - // TODO New key - Add a translation - "search.filters.filter.discoverable.head": "Private", - - // "search.filters.filter.withdrawn.head": "Withdrawn", - // TODO New key - Add a translation - "search.filters.filter.withdrawn.head": "Withdrawn", - - // "search.filters.filter.entityType.head": "Item Type", - "search.filters.filter.entityType.head": "Tipo de Ítem", - - // "search.filters.filter.entityType.placeholder": "Item Type", - "search.filters.filter.entityType.placeholder": "Tipo de Ítem", - - // "search.filters.filter.has_content_in_original_bundle.head": "Has files", - "search.filters.filter.has_content_in_original_bundle.head": "Tiene archivos", - - // "search.filters.filter.itemtype.head": "Type", - "search.filters.filter.itemtype.head": "Tipo", - - // "search.filters.filter.itemtype.placeholder": "Type", - "search.filters.filter.itemtype.placeholder": "Tipo", - - // "search.filters.filter.jobTitle.head": "Job Title", - "search.filters.filter.jobTitle.head": "Título profesional", - - // "search.filters.filter.jobTitle.placeholder": "Job Title", - "search.filters.filter.jobTitle.placeholder": "Título profesional", - - // "search.filters.filter.knowsLanguage.head": "Known language", - "search.filters.filter.knowsLanguage.head": "Idioma conocido", - - // "search.filters.filter.knowsLanguage.placeholder": "Known language", - "search.filters.filter.knowsLanguage.placeholder": "Idioma conocido", - - // "search.filters.filter.namedresourcetype.head": "Status", - "search.filters.filter.namedresourcetype.head": "Estado", - - // "search.filters.filter.namedresourcetype.placeholder": "Status", - "search.filters.filter.namedresourcetype.placeholder": "Estado", - - // "search.filters.filter.objectpeople.head": "People", - "search.filters.filter.objectpeople.head": "Persona", - - // "search.filters.filter.objectpeople.placeholder": "People", - "search.filters.filter.objectpeople.placeholder": "Persona", - - // "search.filters.filter.organizationAddressCountry.head": "Country", - "search.filters.filter.organizationAddressCountry.head": "País", - - // "search.filters.filter.organizationAddressCountry.placeholder": "Country", - "search.filters.filter.organizationAddressCountry.placeholder": "País", - - // "search.filters.filter.organizationAddressLocality.head": "City", - "search.filters.filter.organizationAddressLocality.head": "Ciudad", - - // "search.filters.filter.organizationAddressLocality.placeholder": "City", - "search.filters.filter.organizationAddressLocality.placeholder": "Ciudad", - - // "search.filters.filter.organizationFoundingDate.head": "Date Founded", - "search.filters.filter.organizationFoundingDate.head": "Fecha de fundación", - - // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded", - "search.filters.filter.organizationFoundingDate.placeholder": "Fecha de fundación", - - // "search.filters.filter.scope.head": "Scope", - "search.filters.filter.scope.head": "Alcance", - - // "search.filters.filter.scope.placeholder": "Scope filter", - "search.filters.filter.scope.placeholder": "Filtro del Alcance", - - // "search.filters.filter.show-less": "Collapse", - "search.filters.filter.show-less": "Contraer", - - // "search.filters.filter.show-more": "Show more", - "search.filters.filter.show-more": "Mostrar más", - - // "search.filters.filter.subject.head": "Subject", - "search.filters.filter.subject.head": "Materia", - - // "search.filters.filter.subject.placeholder": "Subject", - "search.filters.filter.subject.placeholder": "Materia", - - // "search.filters.filter.submitter.head": "Submitter", - "search.filters.filter.submitter.head": "Remitente", - - // "search.filters.filter.submitter.placeholder": "Submitter", - "search.filters.filter.submitter.placeholder": "Remitente", - - - - // "search.filters.entityType.JournalIssue": "Journal Issue", - // TODO New key - Add a translation - "search.filters.entityType.JournalIssue": "Journal Issue", - - // "search.filters.entityType.JournalVolume": "Journal Volume", - // TODO New key - Add a translation - "search.filters.entityType.JournalVolume": "Journal Volume", - - // "search.filters.entityType.OrgUnit": "Organizational Unit", - // TODO New key - Add a translation - "search.filters.entityType.OrgUnit": "Organizational Unit", - - // "search.filters.has_content_in_original_bundle.true": "Yes", - // TODO New key - Add a translation - "search.filters.has_content_in_original_bundle.true": "Yes", - - // "search.filters.has_content_in_original_bundle.false": "No", - // TODO New key - Add a translation - "search.filters.has_content_in_original_bundle.false": "No", - - // "search.filters.discoverable.true": "No", - // TODO New key - Add a translation - "search.filters.discoverable.true": "No", - - // "search.filters.discoverable.false": "Yes", - // TODO New key - Add a translation - "search.filters.discoverable.false": "Yes", - - // "search.filters.withdrawn.true": "Yes", - // TODO New key - Add a translation - "search.filters.withdrawn.true": "Yes", - - // "search.filters.withdrawn.false": "No", - // TODO New key - Add a translation - "search.filters.withdrawn.false": "No", - - - // "search.filters.head": "Filters", - "search.filters.head": "Filtros", - - // "search.filters.reset": "Reset filters", - "search.filters.reset": "Restablecer filtros", - - - - // "search.form.search": "Search", - "search.form.search": "Buscar", - - // "search.form.search_dspace": "Search DSpace", - "search.form.search_dspace": "Buscar DSpace", - - // "search.form.search_mydspace": "Search MyDSpace", - "search.form.search_mydspace": "Buscar MyDSpace", - - - - // "search.results.head": "Search Results", - "search.results.head": "Resultados de Búsqueda", - - // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting", - // TODO Source message changed - Revise the translation - "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting", - - // "search.results.no-results-link": "quotes around it", - "search.results.no-results-link": "citas a su alrededor", - - // "search.results.empty": "Your search returned no results.", - // TODO New key - Add a translation - "search.results.empty": "Your search returned no results.", - - - - // "search.sidebar.close": "Back to results", - "search.sidebar.close": "Regresar a resultados", - - // "search.sidebar.filters.title": "Filters", - "search.sidebar.filters.title": "Filtros", - - // "search.sidebar.open": "Search Tools", - "search.sidebar.open": "Herramientas de búsqueda", - - // "search.sidebar.results": "results", - "search.sidebar.results": "resultados", - - // "search.sidebar.settings.rpp": "Results per page", - "search.sidebar.settings.rpp": "Resultados por página", - - // "search.sidebar.settings.sort-by": "Sort By", - "search.sidebar.settings.sort-by": "Ordenar por", - - // "search.sidebar.settings.title": "Settings", - "search.sidebar.settings.title": "Configuraciones", - - - - // "search.view-switch.show-detail": "Show detail", - "search.view-switch.show-detail": "Mostrar detalle", - - // "search.view-switch.show-grid": "Show as grid", - "search.view-switch.show-grid": "Mostrar como cuadriculado", - - // "search.view-switch.show-list": "Show as list", - "search.view-switch.show-list": "Mostrar como lista", - - - - // "sorting.ASC": "Ascending", - // TODO New key - Add a translation - "sorting.ASC": "Ascending", - - // "sorting.DESC": "Descending", - // TODO New key - Add a translation - "sorting.DESC": "Descending", - - // "sorting.dc.title.ASC": "Title Ascending", - "sorting.dc.title.ASC": "Título Ascendente", - - // "sorting.dc.title.DESC": "Title Descending", - "sorting.dc.title.DESC": "Título Descendente", - - // "sorting.score.DESC": "Relevance", - "sorting.score.DESC": "Relevancia", - - - - // "statistics.title": "Statistics", - // TODO New key - Add a translation - "statistics.title": "Statistics", - - // "statistics.header": "Statistics for {{ scope }}", - // TODO New key - Add a translation - "statistics.header": "Statistics for {{ scope }}", - - // "statistics.breadcrumbs": "Statistics", - // TODO New key - Add a translation - "statistics.breadcrumbs": "Statistics", - - // "statistics.page.no-data": "No data available", - // TODO New key - Add a translation - "statistics.page.no-data": "No data available", - - // "statistics.table.no-data": "No data available", - // TODO New key - Add a translation - "statistics.table.no-data": "No data available", - - // "statistics.table.title.TotalVisits": "Total visits", - // TODO New key - Add a translation - "statistics.table.title.TotalVisits": "Total visits", - - // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month", - // TODO New key - Add a translation - "statistics.table.title.TotalVisitsPerMonth": "Total visits per month", - - // "statistics.table.title.TotalDownloads": "File Visits", - // TODO New key - Add a translation - "statistics.table.title.TotalDownloads": "File Visits", - - // "statistics.table.title.TopCountries": "Top country views", - // TODO New key - Add a translation - "statistics.table.title.TopCountries": "Top country views", - - // "statistics.table.title.TopCities": "Top city views", - // TODO New key - Add a translation - "statistics.table.title.TopCities": "Top city views", - - // "statistics.table.header.views": "Views", - // TODO New key - Add a translation - "statistics.table.header.views": "Views", - - - - // "submission.edit.title": "Edit Submission", - "submission.edit.title": "Editar envío", - - // "submission.general.cannot_submit": "You have not the privilege to make a new submission.", - "submission.general.cannot_submit": "No tiene el privilegio de hacer un nuevo envío.", - - // "submission.general.deposit": "Deposit", - "submission.general.deposit": "Depositar", - - // "submission.general.discard.confirm.cancel": "Cancel", - "submission.general.discard.confirm.cancel": "Cancelar", - - // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?", - "submission.general.discard.confirm.info": "Esta operación no se puede deshacer. Está seguro?", - - // "submission.general.discard.confirm.submit": "Yes, I'm sure", - "submission.general.discard.confirm.submit": "Si, Estoy seguro", - - // "submission.general.discard.confirm.title": "Discard submission", - "submission.general.discard.confirm.title": "Descartar el envío", - - // "submission.general.discard.submit": "Discard", - "submission.general.discard.submit": "Descartar", - - // "submission.general.save": "Save", - "submission.general.save": "Guardar", - - // "submission.general.save-later": "Save for later", - "submission.general.save-later": "Guardar para más adelante", - - - // "submission.import-external.page.title": "Import metadata from an external source", - // TODO New key - Add a translation - "submission.import-external.page.title": "Import metadata from an external source", - - // "submission.import-external.title": "Import metadata from an external source", - // TODO New key - Add a translation - "submission.import-external.title": "Import metadata from an external source", - - // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", - // TODO New key - Add a translation - "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", - - // "submission.import-external.back-to-my-dspace": "Back to MyDSpace", - // TODO New key - Add a translation - "submission.import-external.back-to-my-dspace": "Back to MyDSpace", - - // "submission.import-external.search.placeholder": "Search the external source", - // TODO New key - Add a translation - "submission.import-external.search.placeholder": "Search the external source", - - // "submission.import-external.search.button": "Search", - // TODO New key - Add a translation - "submission.import-external.search.button": "Search", - - // "submission.import-external.search.button.hint": "Write some words to search", - // TODO New key - Add a translation - "submission.import-external.search.button.hint": "Write some words to search", - - // "submission.import-external.search.source.hint": "Pick an external source", - // TODO New key - Add a translation - "submission.import-external.search.source.hint": "Pick an external source", - - // "submission.import-external.source.arxiv": "arXiv", - // TODO New key - Add a translation - "submission.import-external.source.arxiv": "arXiv", - - // "submission.import-external.source.loading": "Loading ...", - // TODO New key - Add a translation - "submission.import-external.source.loading": "Loading ...", - - // "submission.import-external.source.sherpaJournal": "SHERPA Journals", - // TODO New key - Add a translation - "submission.import-external.source.sherpaJournal": "SHERPA Journals", - - // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers", - // TODO New key - Add a translation - "submission.import-external.source.sherpaPublisher": "SHERPA Publishers", - - // "submission.import-external.source.orcid": "ORCID", - // TODO New key - Add a translation - "submission.import-external.source.orcid": "ORCID", - - // "submission.import-external.source.pubmed": "Pubmed", - // TODO New key - Add a translation - "submission.import-external.source.pubmed": "Pubmed", - - // "submission.import-external.source.lcname": "Library of Congress Names", - // TODO New key - Add a translation - "submission.import-external.source.lcname": "Library of Congress Names", - - // "submission.import-external.preview.title": "Item Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title": "Item Preview", - - // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.", - // TODO New key - Add a translation - "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.", - - // "submission.import-external.preview.button.import": "Start submission", - // TODO New key - Add a translation - "submission.import-external.preview.button.import": "Start submission", - - // "submission.import-external.preview.error.import.title": "Submission error", - // TODO New key - Add a translation - "submission.import-external.preview.error.import.title": "Submission error", - - // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.", - // TODO New key - Add a translation - "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.", - - // "submission.sections.describe.relationship-lookup.close": "Close", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.close": "Close", - - // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author", - - // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal", - - // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue", - - // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection", - - // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", - - // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", - - // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page", - - // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...", - - // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query", - - // "submission.sections.describe.relationship-lookup.search-tab.search": "Go", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.search": "Go", - - // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all", - - // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page", - - // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})", - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})", - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})", - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding", - - // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units", - - // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})", - - // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues", - // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues", - - // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes", - // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes", - - // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals", - - // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors", - - // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency", - // "submission.sections.describe.relationship-lookup.title.Project": "Projects", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.Project": "Projects", - - // "submission.sections.describe.relationship-lookup.title.Publication": "Publications", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.Publication": "Publications", - - // "submission.sections.describe.relationship-lookup.title.Person": "Authors", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.Person": "Authors", - - // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units", - - // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages", - - // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files", - - // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency", - - // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding", - - // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit", - - // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown", - - // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings", - - // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume", - // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue", - // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding", - // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results", - - // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results", - - // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.", - - // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant", - - // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission", - - // "submission.sections.ccLicense.type": "License Type", - // TODO New key - Add a translation - "submission.sections.ccLicense.type": "License Type", - - // "submission.sections.ccLicense.select": "Select a license type…", - // TODO New key - Add a translation - "submission.sections.ccLicense.select": "Select a license type…", - - // "submission.sections.ccLicense.change": "Change your license type…", - // TODO New key - Add a translation - "submission.sections.ccLicense.change": "Change your license type…", - - // "submission.sections.ccLicense.none": "No licenses available", - // TODO New key - Add a translation - "submission.sections.ccLicense.none": "No licenses available", - - // "submission.sections.ccLicense.option.select": "Select an option…", - // TODO New key - Add a translation - "submission.sections.ccLicense.option.select": "Select an option…", - - // "submission.sections.ccLicense.link": "You’ve selected the following license:", - // TODO New key - Add a translation - "submission.sections.ccLicense.link": "You’ve selected the following license:", - - // "submission.sections.ccLicense.confirmation": "I grant the license above", - // TODO New key - Add a translation - "submission.sections.ccLicense.confirmation": "I grant the license above", - - // "submission.sections.general.add-more": "Add more", - "submission.sections.general.add-more": "Agregar más", - - // "submission.sections.general.collection": "Collection", - "submission.sections.general.collection": "Colección", - - // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.", - "submission.sections.general.deposit_error_notice": "Hubo un problema al enviar el artículo, inténtelo más tarde.", - - // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.", - "submission.sections.general.deposit_success_notice": "Envío depositado exitosamente.", - - // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.", - "submission.sections.general.discard_error_notice": "Hubo un problema cuando se descartó el ítem, inténtelo más tarde.", - - // "submission.sections.general.discard_success_notice": "Submission discarded successfully.", - "submission.sections.general.discard_success_notice": "Envío descartado exitosamente.", - - // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the {{sectionId}} section.", - "submission.sections.general.metadata-extracted": "Nueva metadata ha sido extraída y agregada a la sección {{sectionId}}.", - - // "submission.sections.general.metadata-extracted-new-section": "New {{sectionId}} section has been added to submission.", - "submission.sections.general.metadata-extracted-new-section": "Nueva sección {{sectionId}} ha sido enviada.", - - // "submission.sections.general.no-collection": "No collection found", - "submission.sections.general.no-collection": "Nueva colección enviada", - - // "submission.sections.general.no-sections": "No options available", - "submission.sections.general.no-sections": "No hay opciones disponibles", - - // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.", - "submission.sections.general.save_error_notice": "Hubo un problema cuando se guardó el ítem, inténtelo más tarde.", - - // "submission.sections.general.save_success_notice": "Submission saved successfully.", - "submission.sections.general.save_success_notice": "Envío guardado exitosamente.", - - // "submission.sections.general.search-collection": "Search for a collection", - "submission.sections.general.search-collection": "Search for a collection", - - // "submission.sections.general.sections_not_valid": "There are incomplete sections.", - "submission.sections.general.sections_not_valid": "Existen secciones incompletas.", - - - - // "submission.sections.submit.progressbar.CClicense": "Creative commons license", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.CClicense": "Creative commons license", - - // "submission.sections.submit.progressbar.describe.recycle": "Recycle", - "submission.sections.submit.progressbar.describe.recycle": "Reciclar", - - // "submission.sections.submit.progressbar.describe.stepcustom": "Describe", - "submission.sections.submit.progressbar.describe.stepcustom": "Describir", - - // "submission.sections.submit.progressbar.describe.stepone": "Describe", - "submission.sections.submit.progressbar.describe.stepone": "Describir", - - // "submission.sections.submit.progressbar.describe.steptwo": "Describe", - "submission.sections.submit.progressbar.describe.steptwo": "Describir", - - // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates", - "submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados", - - // "submission.sections.submit.progressbar.license": "Deposit license", - "submission.sections.submit.progressbar.license": "Licencia de depósito", - - // "submission.sections.submit.progressbar.upload": "Upload files", - "submission.sections.submit.progressbar.upload": "Subir archivos", - - - - // "submission.sections.upload.delete.confirm.cancel": "Cancel", - "submission.sections.upload.delete.confirm.cancel": "Cancelar", - - // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?", - "submission.sections.upload.delete.confirm.info": "Esta operación no se puede deshacer. Está seguro?", - - // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure", - "submission.sections.upload.delete.confirm.submit": "Si, Estoy seguro", - - // "submission.sections.upload.delete.confirm.title": "Delete bitstream", - "submission.sections.upload.delete.confirm.title": "Eliminar archivo", - - // "submission.sections.upload.delete.submit": "Delete", - "submission.sections.upload.delete.submit": "Eliminar", - - // "submission.sections.upload.drop-message": "Drop files to attach them to the item", - "submission.sections.upload.drop-message": "Bajar archivos para adjuntarlos al ítem", - - // "submission.sections.upload.form.access-condition-label": "Access condition type", - "submission.sections.upload.form.access-condition-label": "Tipo de condición de acceso", - - // "submission.sections.upload.form.date-required": "Date is required.", - "submission.sections.upload.form.date-required": "La fecha es requerida.", - - // "submission.sections.upload.form.from-label": "Grant access from", - // TODO Source message changed - Revise the translation - "submission.sections.upload.form.from-label": "Concesión de acceso desde", - - // "submission.sections.upload.form.from-placeholder": "From", - "submission.sections.upload.form.from-placeholder": "Desde", - - // "submission.sections.upload.form.group-label": "Group", - "submission.sections.upload.form.group-label": "Grupo", - - // "submission.sections.upload.form.group-required": "Group is required.", - "submission.sections.upload.form.group-required": "El Grupo es requerido.", - - // "submission.sections.upload.form.until-label": "Grant access until", - // TODO Source message changed - Revise the translation - "submission.sections.upload.form.until-label": "Concesión de acceso hasta", - - // "submission.sections.upload.form.until-placeholder": "Until", - "submission.sections.upload.form.until-placeholder": "Hasta", - - // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):", - "submission.sections.upload.header.policy.default.nolist": "Archivos subidos a la colección {{collectionName}} serán accesibles según el siguiente grupo(s):", - - // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):", - "submission.sections.upload.header.policy.default.withlist": "Tenga en cuenta que los archivos cargados en la colección {{collectionName}} serán accesibles, además de lo que se decida explísitamente para el único archivo con el siguiente grupo(s):", - - // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files just dragging & dropping them everywhere in the page", - "submission.sections.upload.info": "Aquí encontrará todos los archivos aque actualmente están en el ítem.. Puede actualizar los metadatos del archivo y las condiciones de acceso o cargar los archivos adicionales simplemente arrastrándolos y soltándolos en cualquier parte de la página", - - // "submission.sections.upload.no-entry": "No", - "submission.sections.upload.no-entry": "No", - - // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.", - "submission.sections.upload.no-file-uploaded": "Todavía no hay archivos cargados.", - - // "submission.sections.upload.save-metadata": "Save metadata", - "submission.sections.upload.save-metadata": "Metadatos guardados", - - // "submission.sections.upload.undo": "Cancel", - "submission.sections.upload.undo": "Cancelar", - - // "submission.sections.upload.upload-failed": "Upload failed", - "submission.sections.upload.upload-failed": "Falla en la carga", - - // "submission.sections.upload.upload-successful": "Upload successful", - "submission.sections.upload.upload-successful": "Carga exitosa", - - - - // "submission.submit.title": "Submission", - "submission.submit.title": "Envío", - - - - // "submission.workflow.generic.delete": "Delete", - "submission.workflow.generic.delete": "Eliminar", - - // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\". You will then be asked to confirm it.", - "submission.workflow.generic.delete-help": "Si desea descartar este ítem, seleccion \"Eliminar\". Después se solicitará que confirme.", - - // "submission.workflow.generic.edit": "Edit", - "submission.workflow.generic.edit": "Editar", - - // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.", - "submission.workflow.generic.edit-help": "Seleccione la opción para cambiar los metadatos del ítem.", - - // "submission.workflow.generic.view": "View", - "submission.workflow.generic.view": "Ver", - - // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.", - "submission.workflow.generic.view-help": "Seleccion esta opción para visualizar los metadatos del ítem.", - - - - // "submission.workflow.tasks.claimed.approve": "Approve", - "submission.workflow.tasks.claimed.approve": "Aprobar", - - // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".", - "submission.workflow.tasks.claimed.approve_help": "Si ha revisado el ítem y es adecuado para su inclusión en la colección., seleccione \"Aprobar\".", - - // "submission.workflow.tasks.claimed.edit": "Edit", - "submission.workflow.tasks.claimed.edit": "Editar", - - // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", - "submission.workflow.tasks.claimed.edit_help": "Seleccione esta opción para cambiar los metadatos del ítem.", - - // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.", - "submission.workflow.tasks.claimed.reject.reason.info": "Favor ingrese abajo su motivo para rechazar el envío, indicando si el remitente puede solucionar un problema y volver a enviar.", - - // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject", - "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe el motivo del rechazo", - - // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item", - "submission.workflow.tasks.claimed.reject.reason.submit": "Rechazar el 'item", - - // "submission.workflow.tasks.claimed.reject.reason.title": "Reason", - "submission.workflow.tasks.claimed.reject.reason.title": "Razón", - - // "submission.workflow.tasks.claimed.reject.submit": "Reject", - "submission.workflow.tasks.claimed.reject.submit": "Rechazar", - - // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is not suitable for inclusion in the collection, select \"Reject\". You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.", - "submission.workflow.tasks.claimed.reject_help": "Si ha revisado el ítem y ha encontrado que no es adecuado para su inclusión en la colección, seleccione \"Rechazar\". Después se le pedirá que ingrese un mensaje que indique por qué el ítem no es adecuado y si el remitente debe cambiar algo y volver a enviarlo.", - - // "submission.workflow.tasks.claimed.return": "Return to pool", - "submission.workflow.tasks.claimed.return": "Regresar al pool", - - // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.", - "submission.workflow.tasks.claimed.return_help": "Devolver la tarea al pool para que otro usuario pueda realizar la tarea..", - - - - // "submission.workflow.tasks.generic.error": "Error occurred during operation...", - "submission.workflow.tasks.generic.error": "Ha ocurrido un error durante la operación...", - - // "submission.workflow.tasks.generic.processing": "Processing...", - "submission.workflow.tasks.generic.processing": "Procesando...", - - // "submission.workflow.tasks.generic.submitter": "Submitter", - "submission.workflow.tasks.generic.submitter": "Remitente", - - // "submission.workflow.tasks.generic.success": "Operation successful", - "submission.workflow.tasks.generic.success": "Operación exitosa", - - - - // "submission.workflow.tasks.pool.claim": "Claim", - "submission.workflow.tasks.pool.claim": "Reclamar", - - // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.", - "submission.workflow.tasks.pool.claim_help": "Asígnese esta tarea a usted mismo.", - - // "submission.workflow.tasks.pool.hide-detail": "Hide detail", - "submission.workflow.tasks.pool.hide-detail": "Ocultar detalles", - - // "submission.workflow.tasks.pool.show-detail": "Show detail", - "submission.workflow.tasks.pool.show-detail": "Mostrar detalles", - - - - // "title": "DSpace", - "title": "DSpace", - - - - // "vocabulary-treeview.header": "Hierarchical tree view", - // TODO New key - Add a translation - "vocabulary-treeview.header": "Hierarchical tree view", - - // "vocabulary-treeview.load-more": "Load more", - // TODO New key - Add a translation - "vocabulary-treeview.load-more": "Load more", - - // "vocabulary-treeview.search.form.reset": "Reset", - // TODO New key - Add a translation - "vocabulary-treeview.search.form.reset": "Reset", - - // "vocabulary-treeview.search.form.search": "Search", - // TODO New key - Add a translation - "vocabulary-treeview.search.form.search": "Search", - - // "vocabulary-treeview.search.no-result": "There were no items to show", - // TODO New key - Add a translation - "vocabulary-treeview.search.no-result": "There were no items to show", - - // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index", - // TODO New key - Add a translation - "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index", - - // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories", - // TODO New key - Add a translation - "vocabulary-treeview.tree.description.srsc": "Research Subject Categories", - - - - // "uploader.browse": "browse", - "uploader.browse": "navegar", - - // "uploader.drag-message": "Drag & Drop your files here", - "uploader.drag-message": "Arrastrar y soltar sus archivos aquí", - - // "uploader.or": ", or ", - // TODO Source message changed - Revise the translation - "uploader.or": ", o", - - // "uploader.processing": "Processing", - "uploader.processing": "Procesando", - - // "uploader.queue-length": "Queue length", - "uploader.queue-length": "Longitud de la cola", - - // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata", - // TODO New key - Add a translation - "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata", - - // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation", - // TODO New key - Add a translation - "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation", - - // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata", - // TODO New key - Add a translation - "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata", - - - - // "workflowAdmin.search.results.head": "Administer Workflow", - // TODO New key - Add a translation - "workflowAdmin.search.results.head": "Administer Workflow", - - - - // "workflow-item.delete.notification.success.title": "Deleted", - // TODO New key - Add a translation - "workflow-item.delete.notification.success.title": "Deleted", - - // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted", - // TODO New key - Add a translation - "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted", - - // "workflow-item.delete.notification.error.title": "Something went wrong", - // TODO New key - Add a translation - "workflow-item.delete.notification.error.title": "Something went wrong", - - // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted", - // TODO New key - Add a translation - "workflow-item.delete.notification.error.content": "The workflow item could not be deleted", - - // "workflow-item.delete.title": "Delete workflow item", - // TODO New key - Add a translation - "workflow-item.delete.title": "Delete workflow item", - - // "workflow-item.delete.header": "Delete workflow item", - // TODO New key - Add a translation - "workflow-item.delete.header": "Delete workflow item", - - // "workflow-item.delete.button.cancel": "Cancel", - // TODO New key - Add a translation - "workflow-item.delete.button.cancel": "Cancel", - - // "workflow-item.delete.button.confirm": "Delete", - // TODO New key - Add a translation - "workflow-item.delete.button.confirm": "Delete", - - - // "workflow-item.send-back.notification.success.title": "Sent back to submitter", - // TODO New key - Add a translation - "workflow-item.send-back.notification.success.title": "Sent back to submitter", - - // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter", - // TODO New key - Add a translation - "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter", - - // "workflow-item.send-back.notification.error.title": "Something went wrong", - // TODO New key - Add a translation - "workflow-item.send-back.notification.error.title": "Something went wrong", - - // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter", - // TODO New key - Add a translation - "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter", - - // "workflow-item.send-back.title": "Send workflow item back to submitter", - // TODO New key - Add a translation - "workflow-item.send-back.title": "Send workflow item back to submitter", - - // "workflow-item.send-back.header": "Send workflow item back to submitter", - // TODO New key - Add a translation - "workflow-item.send-back.header": "Send workflow item back to submitter", - - // "workflow-item.send-back.button.cancel": "Cancel", - // TODO New key - Add a translation - "workflow-item.send-back.button.cancel": "Cancel", - - // "workflow-item.send-back.button.confirm": "Send back" - // TODO New key - Add a translation - "workflow-item.send-back.button.confirm": "Send back" - -} \ No newline at end of file + // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.", + "401.help": "No está autorizado a acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.", + + // "401.link.home-page": "Take me to the home page", + "401.link.home-page": "Llévame a la página de inicio", + + // "401.unauthorized": "unauthorized", + "401.unauthorized": "no autorizado", + + + + // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.", + "403.help": "No tiene permiso para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.", + + // "403.link.home-page": "Take me to the home page", + "403.link.home-page": "Llévame a la página de inicio", + + // "403.forbidden": "forbidden", + "403.forbidden": "prohibido", + + + + // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ", + "404.help": "No podemos encontrar la página que buscas. La página puede haber sido movida o eliminada. Puedes utilizar el botón de abajo para volver a la página de inicio. ", + + // "404.link.home-page": "Take me to the home page", + "404.link.home-page": "Llévame a la página de inicio", + + // "404.page-not-found": "page not found", + "404.page-not-found": "página no encontrada", + + // "admin.curation-tasks.breadcrumbs": "System curation tasks", + "admin.curation-tasks.breadcrumbs": "Tareas de conservación del sistema", + + // "admin.curation-tasks.title": "System curation tasks", + "admin.curation-tasks.title": "Tareas de conservación del sistema", + + // "admin.curation-tasks.header": "System curation tasks", + "admin.curation-tasks.header": "Tareas de conservación del sistema", + + // "admin.registries.bitstream-formats.breadcrumbs": "Format registry", + "admin.registries.bitstream-formats.breadcrumbs": "Registro de formato", + + // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format", + "admin.registries.bitstream-formats.create.breadcrumbs": "Formato de archivo", + + // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.", + "admin.registries.bitstream-formats.create.failure.content": "Se produjo un error al crear el nuevo formato de archivo.", + + // "admin.registries.bitstream-formats.create.failure.head": "Failure", + "admin.registries.bitstream-formats.create.failure.head": "Falla", + + // "admin.registries.bitstream-formats.create.head": "Create Bitstream format", + "admin.registries.bitstream-formats.create.head": "Crear formato Archivo", + + // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format", + "admin.registries.bitstream-formats.create.new": "Agregar un nuevo formato de archivo", + + // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.", + "admin.registries.bitstream-formats.create.success.content": "El nuevo formato de archivo se creó correctamente.", + + // "admin.registries.bitstream-formats.create.success.head": "Success", + "admin.registries.bitstream-formats.create.success.head": "Éxito", + + // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)", + "admin.registries.bitstream-formats.delete.failure.amount": "Error al eliminar {{ amount }} formato(s)", + + // "admin.registries.bitstream-formats.delete.failure.head": "Failure", + "admin.registries.bitstream-formats.delete.failure.head": "Falla", + + // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)", + "admin.registries.bitstream-formats.delete.success.amount": "Se quitaron correctamente {{ amount }} formato(s)", + + // "admin.registries.bitstream-formats.delete.success.head": "Success", + "admin.registries.bitstream-formats.delete.success.head": "Éxito", + + // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.", + "admin.registries.bitstream-formats.description": "Esta lista de formatos de archivo proporciona información sobre formatos conocidos y su nivel de soporte.", + + // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format", + "admin.registries.bitstream-formats.edit.breadcrumbs": "Formato de archivo", + + // "admin.registries.bitstream-formats.edit.description.hint": "", + "admin.registries.bitstream-formats.edit.description.hint": "", + + // "admin.registries.bitstream-formats.edit.description.label": "Description", + "admin.registries.bitstream-formats.edit.description.label": "Descripción", + + // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.", + "admin.registries.bitstream-formats.edit.extensions.hint": "Las extensiones son extensiones de archivos que se utilizan para identificar automáticamente el formato de los archivos cargados. Puede introducir varias extensiones para cada formato.", + + // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions", + "admin.registries.bitstream-formats.edit.extensions.label": "Extensiones de archivo", + + // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot", + "admin.registries.bitstream-formats.edit.extensions.placeholder": "Ingrese una extensión de archivo sin el punto", + + // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.", + "admin.registries.bitstream-formats.edit.failure.content": "Se produjo un error al editar el formato de archivo.", + + // "admin.registries.bitstream-formats.edit.failure.head": "Failure", + "admin.registries.bitstream-formats.edit.failure.head": "Falla", + + // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}", + "admin.registries.bitstream-formats.edit.head": "Formato de archivo: {{ format }}", + + // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.", + "admin.registries.bitstream-formats.edit.internal.hint": "Los formatos marcados como internos están ocultos al usuario y se utilizan con fines administrativos.", + + // "admin.registries.bitstream-formats.edit.internal.label": "Internal", + "admin.registries.bitstream-formats.edit.internal.label": "Interno", + + // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.", + "admin.registries.bitstream-formats.edit.mimetype.hint": "El tipo MIME asociado con este formato no tiene por qué ser único.", + + // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type", + "admin.registries.bitstream-formats.edit.mimetype.label": "Tipo MIME", + + // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)", + "admin.registries.bitstream-formats.edit.shortDescription.hint": "Un nombre único para este formato, (por ejemplo, Microsoft Word XP o Microsoft Word 2000)", + + // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name", + "admin.registries.bitstream-formats.edit.shortDescription.label": "Nombre", + + // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.", + "admin.registries.bitstream-formats.edit.success.content": "El formato de archivo se editó correctamente.", + + // "admin.registries.bitstream-formats.edit.success.head": "Success", + "admin.registries.bitstream-formats.edit.success.head": "Éxito", + + // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.", + "admin.registries.bitstream-formats.edit.supportLevel.hint": "El nivel de apoyo que su institución promete para este formato.", + + // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level", + "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivel de soporte", + + // "admin.registries.bitstream-formats.head": "Bitstream Format Registry", + "admin.registries.bitstream-formats.head": "Registro de formato Archivo", + + // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.", + "admin.registries.bitstream-formats.no-items": "No hay formatos de archivo para mostrar.", + + // "admin.registries.bitstream-formats.table.delete": "Delete selected", + "admin.registries.bitstream-formats.table.delete": "Eliminar seleccionado", + + // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all", + "admin.registries.bitstream-formats.table.deselect-all": "Deseleccionar todo", + + // "admin.registries.bitstream-formats.table.internal": "internal", + "admin.registries.bitstream-formats.table.internal": "interno", + + // "admin.registries.bitstream-formats.table.mimetype": "MIME Type", + "admin.registries.bitstream-formats.table.mimetype": "Tipo MIME", + + // "admin.registries.bitstream-formats.table.name": "Name", + "admin.registries.bitstream-formats.table.name": "Nombre", + + // "admin.registries.bitstream-formats.table.return": "Back", + "admin.registries.bitstream-formats.table.return": "atrás", + + // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known", + "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conocido", + + // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported", + "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Soportado", + + // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown", + "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Desconocido", + + // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level", + "admin.registries.bitstream-formats.table.supportLevel.head": "Nivel de soporte", + + // "admin.registries.bitstream-formats.title": "Bitstream Format Registry", + "admin.registries.bitstream-formats.title": "Registro de formato Archivo", + + + + // "admin.registries.metadata.breadcrumbs": "Metadata registry", + "admin.registries.metadata.breadcrumbs": "Registro de metadatos", + + // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.", + "admin.registries.metadata.description": "El registro de metadatos mantiene una lista de todos los campos de metadatos disponibles en el repositorio. Estos campos pueden estar divididos entre múltiples esquemas. Sin embargo, DSpace requiere el esquema calificado de Dublin Core.", + + // "admin.registries.metadata.form.create": "Create metadata schema", + "admin.registries.metadata.form.create": "Crear esquema de metadatos", + + // "admin.registries.metadata.form.edit": "Edit metadata schema", + "admin.registries.metadata.form.edit": "Editar esquema de metadatos", + + // "admin.registries.metadata.form.name": "Name", + "admin.registries.metadata.form.name": "Nombre", + + // "admin.registries.metadata.form.namespace": "Namespace", + "admin.registries.metadata.form.namespace": "Espacio de nombres", + + // "admin.registries.metadata.head": "Metadata Registry", + "admin.registries.metadata.head": "Registro de metadatos", + + // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.", + "admin.registries.metadata.schemas.no-items": "No hay esquemas de metadatos para mostrar.", + + // "admin.registries.metadata.schemas.table.delete": "Delete selected", + "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado", + + // "admin.registries.metadata.schemas.table.id": "ID", + "admin.registries.metadata.schemas.table.id": "IDENTIFICACIÓN", + + // "admin.registries.metadata.schemas.table.name": "Name", + "admin.registries.metadata.schemas.table.name": "Nombre", + + // "admin.registries.metadata.schemas.table.namespace": "Namespace", + "admin.registries.metadata.schemas.table.namespace": "Espacio de nombres", + + // "admin.registries.metadata.title": "Metadata Registry", + "admin.registries.metadata.title": "Registro de metadatos", + + + + // "admin.registries.schema.breadcrumbs": "Metadata schema", + "admin.registries.schema.breadcrumbs": "Esquema de metadatos", + + // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".", + "admin.registries.schema.description": "Este es el esquema de metadatos para \"{{ namespace }} \".", + + // "admin.registries.schema.fields.head": "Schema metadata fields", + "admin.registries.schema.fields.head": "Campos de metadatos de esquema", + + // "admin.registries.schema.fields.no-items": "No metadata fields to show.", + "admin.registries.schema.fields.no-items": "No hay campos de metadatos para mostrar.", + + // "admin.registries.schema.fields.table.delete": "Delete selected", + "admin.registries.schema.fields.table.delete": "Eliminar seleccionado", + + // "admin.registries.schema.fields.table.field": "Field", + "admin.registries.schema.fields.table.field": "Campo", + + // "admin.registries.schema.fields.table.scopenote": "Scope Note", + "admin.registries.schema.fields.table.scopenote": "Nota de alcance", + + // "admin.registries.schema.form.create": "Create metadata field", + "admin.registries.schema.form.create": "Crear campo de metadatos", + + // "admin.registries.schema.form.edit": "Edit metadata field", + "admin.registries.schema.form.edit": "Editar campo de metadatos", + + // "admin.registries.schema.form.element": "Element", + "admin.registries.schema.form.element": "Artículo", + + // "admin.registries.schema.form.qualifier": "Qualifier", + "admin.registries.schema.form.qualifier": "Calificatorio", + + // "admin.registries.schema.form.scopenote": "Scope Note", + "admin.registries.schema.form.scopenote": "Nota de alcance", + + // "admin.registries.schema.head": "Metadata Schema", + "admin.registries.schema.head": "Esquema de metadatos", + + // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"", + "admin.registries.schema.notification.created": "Esquema de metadatos creado correctamente \"{{ prefix }} \"", + + // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas", + "admin.registries.schema.notification.deleted.failure": "Error al eliminar {{ amount }} esquemas de metadatos", + + // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas", + "admin.registries.schema.notification.deleted.success": "{{ amount }} esquemas de metadatos eliminados correctamente", + + // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"", + "admin.registries.schema.notification.edited": "Esquema de metadatos editado correctamente \"{{ prefix }} \"", + + // "admin.registries.schema.notification.failure": "Error", + "admin.registries.schema.notification.failure": "Error", + + // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"", + "admin.registries.schema.notification.field.created": "Campo de metadatos creado correctamente \"{{ field }} \"", + + // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields", + "admin.registries.schema.notification.field.deleted.failure": "No se pudieron borrar los campos de metadatos de {{ amount }}", + + // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields", + "admin.registries.schema.notification.field.deleted.success": "{{ amount }} campos de metadatos eliminados correctamente", + + // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"", + "admin.registries.schema.notification.field.edited": "Campo de metadatos editado correctamente \"{{ field }} \"", + + // "admin.registries.schema.notification.success": "Success", + "admin.registries.schema.notification.success": "Éxito", + + // "admin.registries.schema.return": "Back", + "admin.registries.schema.return": "atrás", + + // "admin.registries.schema.title": "Metadata Schema Registry", + "admin.registries.schema.title": "Registro de esquemas de metadatos", + + + + // "admin.access-control.epeople.actions.delete": "Delete EPerson", + "admin.access-control.epeople.actions.delete": "Eliminar EPerson", + + // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson", + "admin.access-control.epeople.actions.impersonate": "Hacerse pasar por EPerson", + + // "admin.access-control.epeople.actions.reset": "Reset password", + "admin.access-control.epeople.actions.reset": "Restablecer la contraseña", + + // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson", + "admin.access-control.epeople.actions.stop-impersonating": "Deja de hacerse pasar por EPerson", + + // "admin.access-control.epeople.breadcrumbs": "EPeople", + "admin.access-control.epeople.breadcrumbs": "EPeople", + + // "admin.access-control.epeople.title": "EPeople", + "admin.access-control.epeople.title": "EPeople", + + // "admin.access-control.epeople.head": "EPeople", + "admin.access-control.epeople.head": "EPeople", + + // "admin.access-control.epeople.search.head": "Search", + "admin.access-control.epeople.search.head": "Buscar", + + // "admin.access-control.epeople.button.see-all": "Browse All", + "admin.access-control.epeople.button.see-all": "Examinar todo", + + // "admin.access-control.epeople.search.scope.metadata": "Metadata", + "admin.access-control.epeople.search.scope.metadata": "Metadatos", + + // "admin.access-control.epeople.search.scope.email": "E-mail (exact)", + "admin.access-control.epeople.search.scope.email": "Correo electrónico (exacto)", + + // "admin.access-control.epeople.search.button": "Search", + "admin.access-control.epeople.search.button": "Buscar", + + // "admin.access-control.epeople.search.placeholder": "Search people...", + "admin.access-control.epeople.search.placeholder": "Busca gente...", + + // "admin.access-control.epeople.button.add": "Add EPerson", + "admin.access-control.epeople.button.add": "Agregar una persona", + + // "admin.access-control.epeople.table.id": "ID", + "admin.access-control.epeople.table.id": "IDENTIFICACIÓN", + + // "admin.access-control.epeople.table.name": "Name", + "admin.access-control.epeople.table.name": "Nombre", + + // "admin.access-control.epeople.table.email": "E-mail (exact)", + "admin.access-control.epeople.table.email": "Correo electrónico (exacto)", + + // "admin.access-control.epeople.table.edit": "Edit", + "admin.access-control.epeople.table.edit": "Editar", + + // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"", + "admin.access-control.epeople.table.edit.buttons.edit": "Editar \"{{ name }}\"", + + // "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group", + "admin.access-control.epeople.table.edit.buttons.edit-disabled": "No tienes autorización para editar este grupo.", + + // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"", + "admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ name }} \"", + + // "admin.access-control.epeople.no-items": "No EPeople to show.", + "admin.access-control.epeople.no-items": "No hay EPeople para mostrar.", + + // "admin.access-control.epeople.form.create": "Create EPerson", + "admin.access-control.epeople.form.create": "Crear una persona", + + // "admin.access-control.epeople.form.edit": "Edit EPerson", + "admin.access-control.epeople.form.edit": "Editar EPerson", + + // "admin.access-control.epeople.form.firstName": "First name", + "admin.access-control.epeople.form.firstName": "Nombre de pila", + + // "admin.access-control.epeople.form.lastName": "Last name", + "admin.access-control.epeople.form.lastName": "Apellido", + + // "admin.access-control.epeople.form.email": "E-mail", + "admin.access-control.epeople.form.email": "Correo electrónico", + + // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address", + "admin.access-control.epeople.form.emailHint": "Debe ser una dirección de correo electrónico válida", + + // "admin.access-control.epeople.form.canLogIn": "Can log in", + "admin.access-control.epeople.form.canLogIn": "Puede iniciar sesión", + + // "admin.access-control.epeople.form.requireCertificate": "Requires certificate", + "admin.access-control.epeople.form.requireCertificate": "Requiere certificado", + + // "admin.access-control.epeople.form.return": "Back", + "admin.access-control.epeople.form.return": "atrás", + + // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.success": "EPerson \"{{ name }} \" creada correctamente", + + // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.failure": "Error al crear EPerson \"{{ name }} \"", + + // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.", + "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Error al crear EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.", + + // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.", + "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Error al editar EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.", + + // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.edited.success": "EPerson \"{{ name }} \" editado correctamente", + + // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.edited.failure": "Error al editar EPerson \"{{ name }} \"", + + // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.deleted.success": "EPerson \"{{ name }} \" eliminada correctamente", + + // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.deleted.failure": "No se pudo borrar EPerson \"{{ name }} \"", + + // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:", + "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Miembro de estos grupos:", + + // "admin.access-control.epeople.form.table.id": "ID", + "admin.access-control.epeople.form.table.id": "IDENTIFICACIÓN", + + // "admin.access-control.epeople.form.table.name": "Name", + "admin.access-control.epeople.form.table.name": "Nombre", + + // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community", + "admin.access-control.epeople.form.table.collectionOrCommunity": "Colección/Comunidad", + + // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups", + "admin.access-control.epeople.form.memberOfNoGroups": "Esta EPerson no es miembro de ningún grupo", + + // "admin.access-control.epeople.form.goToGroups": "Add to groups", + "admin.access-control.epeople.form.goToGroups": "Agregar a grupos", + + // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"", + "admin.access-control.epeople.notification.deleted.failure": "No se pudo borrar EPerson: \"{{ name }} \"", + + // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"", + "admin.access-control.epeople.notification.deleted.success": "EPerson eliminada correctamente: \"{{ name }} \"", + + + + // "admin.access-control.groups.title": "Groups", + "admin.access-control.groups.title": "Grupos", + + // "admin.access-control.groups.breadcrumbs": "Groups", + "admin.access-control.groups.breadcrumbs": "Grupos", + + // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group", + "admin.access-control.groups.singleGroup.breadcrumbs": "Editar grupo", + + // "admin.access-control.groups.title.singleGroup": "Edit Group", + "admin.access-control.groups.title.singleGroup": "Editar grupo", + + // "admin.access-control.groups.title.addGroup": "New Group", + "admin.access-control.groups.title.addGroup": "Nuevo grupo", + + // "admin.access-control.groups.addGroup.breadcrumbs": "New Group", + "admin.access-control.groups.addGroup.breadcrumbs": "Nuevo grupo", + + // "admin.access-control.groups.head": "Groups", + "admin.access-control.groups.head": "Grupos", + + // "admin.access-control.groups.button.add": "Add group", + "admin.access-control.groups.button.add": "Añadir grupo", + + // "admin.access-control.groups.search.head": "Search groups", + "admin.access-control.groups.search.head": "Grupos de búsqueda", + + // "admin.access-control.groups.button.see-all": "Browse all", + "admin.access-control.groups.button.see-all": "Examinar todo", + + // "admin.access-control.groups.search.button": "Search", + "admin.access-control.groups.search.button": "Buscar", + + // "admin.access-control.groups.search.placeholder": "Search groups...", + "admin.access-control.groups.search.placeholder": "Buscar grupos...", + + // "admin.access-control.groups.table.id": "ID", + "admin.access-control.groups.table.id": "IDENTIFICACIÓN", + + // "admin.access-control.groups.table.name": "Name", + "admin.access-control.groups.table.name": "Nombre", + + // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community", + "admin.access-control.groups.table.collectionOrCommunity": "Colección/Comunidad", + + // "admin.access-control.groups.table.members": "Members", + "admin.access-control.groups.table.members": "Miembros", + + // "admin.access-control.groups.table.edit": "Edit", + "admin.access-control.groups.table.edit": "Editar", + + // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"", + "admin.access-control.groups.table.edit.buttons.edit": "Editar \"{{ name }}\"", + + // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"", + "admin.access-control.groups.table.edit.buttons.remove": "Eliminar \"{{ name }}\"", + + // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID", + "admin.access-control.groups.no-items": "No se encontraron grupos con esto en su nombre o esto como UUID", + + // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"", + "admin.access-control.groups.notification.deleted.success": "El grupo \"{{ name }}\" se eliminó correctamente", + + // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"", + "admin.access-control.groups.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }}\"", + + // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"", + "admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{ cause }} \"", + + + + // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.", + "admin.access-control.groups.form.alert.permanent": "Este grupo es permanente, por lo que no se puede editar ni eliminar. Sin embargo, puedes añadir y eliminar miembros del grupo utilizando esta página.", + + // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the \"assign roles\" tab on the edit {{comcol}} page. You can still add and remove group members using this page.", + "admin.access-control.groups.form.alert.workflowGroup": "Este grupo no puede ser modificado o eliminado porque corresponde a un rol en el proceso de presentación y flujo de trabajo en el \"{{ name }}\" {{ comcol }}. Puede eliminarlo desde la pestaña \"asignar roles\" de la página de edición del {{ comcol }}. Todavía puede añadir y eliminar miembros del grupo utilizando esta página.", + + // "admin.access-control.groups.form.head.create": "Create group", + "admin.access-control.groups.form.head.create": "Crea un grupo", + + // "admin.access-control.groups.form.head.edit": "Edit group", + "admin.access-control.groups.form.head.edit": "Editar grupo", + + // "admin.access-control.groups.form.groupName": "Group name", + "admin.access-control.groups.form.groupName": "Nombre del grupo", + + // "admin.access-control.groups.form.groupCommunity": "Community or Collection", + "admin.access-control.groups.form.groupCommunity": "Comunidad o Colección", + + // "admin.access-control.groups.form.groupDescription": "Description", + "admin.access-control.groups.form.groupDescription": "Descripción", + + // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"", + "admin.access-control.groups.form.notification.created.success": "Grupo creado con éxito \"{{ name }} \"", + + // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"", + "admin.access-control.groups.form.notification.created.failure": "No se pudo crear el grupo \"{{ name }} \"", + + // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.", + "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "No se pudo crear el grupo con el nombre: \"{{ name }}\", asegúrese de que el nombre no esté en uso.", + + // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"", + "admin.access-control.groups.form.notification.edited.failure": "No se pudo editar el grupo \"{{ name }} \"", + + // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!", + "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "¡El nombre \"{{ name }} \" ya está en uso!", + + // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"", + "admin.access-control.groups.form.notification.edited.success": "Grupo editado correctamente \"{{ name }} \"", + + // "admin.access-control.groups.form.actions.delete": "Delete Group", + "admin.access-control.groups.form.actions.delete": "Eliminar grupo", + + // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"", + "admin.access-control.groups.form.delete-group.modal.header": "Eliminar grupo \"{{ dsoName }} \"", + + // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"", + "admin.access-control.groups.form.delete-group.modal.info": "¿Está seguro de que desea eliminar el grupo \"{{ dsoName }} \"?", + + // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel", + "admin.access-control.groups.form.delete-group.modal.cancel": "Cancelar", + + // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete", + "admin.access-control.groups.form.delete-group.modal.confirm": "Borrar", + + // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"", + "admin.access-control.groups.form.notification.deleted.success": "El grupo \"{{ name }} \" se eliminó correctamente", + + // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"", + "admin.access-control.groups.form.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }} \"", + + // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"", + "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }} \"", + + // "admin.access-control.groups.form.members-list.head": "EPeople", + "admin.access-control.groups.form.members-list.head": "EPeople", + + // "admin.access-control.groups.form.members-list.search.head": "Add EPeople", + "admin.access-control.groups.form.members-list.search.head": "Agregar EPeople", + + // "admin.access-control.groups.form.members-list.button.see-all": "Browse All", + "admin.access-control.groups.form.members-list.button.see-all": "Examinar todo", + + // "admin.access-control.groups.form.members-list.headMembers": "Current Members", + "admin.access-control.groups.form.members-list.headMembers": "Miembros actuales", + + // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata", + "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadatos", + + // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)", + "admin.access-control.groups.form.members-list.search.scope.email": "Correo electrónico (exacto)", + + // "admin.access-control.groups.form.members-list.search.button": "Search", + "admin.access-control.groups.form.members-list.search.button": "Buscar", + + // "admin.access-control.groups.form.members-list.table.id": "ID", + "admin.access-control.groups.form.members-list.table.id": "IDENTIFICACIÓN", + + // "admin.access-control.groups.form.members-list.table.name": "Name", + "admin.access-control.groups.form.members-list.table.name": "Nombre", + + // "admin.access-control.groups.form.members-list.table.identity": "Identity", + "admin.access-control.groups.form.members-list.table.identity": "Identidad", + + // "admin.access-control.groups.form.members-list.table.email": "Email", + "admin.access-control.groups.form.members-list.table.email": "Correo electrónico", + + // "admin.access-control.groups.form.members-list.table.netid": "NetID", + "admin.access-control.groups.form.members-list.table.netid": "NetID", + + // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add", + "admin.access-control.groups.form.members-list.table.edit": "Eliminar / Agregar", + + // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", + "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Eliminar miembro con nombre \"{{ name }} \"", + + // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.success.addMember": "Miembro agregado exitosamente: \"{{ name }} \"", + + // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.failure.addMember": "No se pudo agregar el miembro: \"{{ name }} \"", + + // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Miembro eliminado correctamente: \"{{ name }} \"", + + // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "No se pudo borrar el miembro: \"{{ name }} \"", + + // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", + "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Agregar miembro con nombre \"{{ name }} \"", + + // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", + "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No hay un grupo activo actual, envíe un nombre primero.", + + // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.", + "admin.access-control.groups.form.members-list.no-members-yet": "Aún no hay miembros en el grupo, busque y agregue.", + + // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search", + "admin.access-control.groups.form.members-list.no-items": "No se encontraron personas en esa búsqueda", + + // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"", + "admin.access-control.groups.form.subgroups-list.notification.failure": "Algo salió mal: \"{{ cause }} \"", + + // "admin.access-control.groups.form.subgroups-list.head": "Groups", + "admin.access-control.groups.form.subgroups-list.head": "Grupos", + + // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup", + "admin.access-control.groups.form.subgroups-list.search.head": "Agregar subgrupo", + + // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All", + "admin.access-control.groups.form.subgroups-list.button.see-all": "Examinar todo", + + // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups", + "admin.access-control.groups.form.subgroups-list.headSubgroups": "Subgrupos actuales", + + // "admin.access-control.groups.form.subgroups-list.search.button": "Search", + "admin.access-control.groups.form.subgroups-list.search.button": "Buscar", + + // "admin.access-control.groups.form.subgroups-list.table.id": "ID", + "admin.access-control.groups.form.subgroups-list.table.id": "IDENTIFICACIÓN", + + // "admin.access-control.groups.form.subgroups-list.table.name": "Name", + "admin.access-control.groups.form.subgroups-list.table.name": "Nombre", + + // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community", + "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Colección/Comunidad", + + // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add", + "admin.access-control.groups.form.subgroups-list.table.edit": "Eliminar / Agregar", + + // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Eliminar subgrupo con nombre \"{{ name }} \"", + + // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Agregar subgrupo con el nombre \"{{ name }} \"", + + // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group", + "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual", + + // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }} \"", + + // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "No se pudo agregar el subgrupo: \"{{ name }} \"", + + // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo eliminado correctamente: \"{{ name }} \"", + + // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "No se pudo borrar el subgrupo: \"{{ name }} \"", + + // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", + "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No hay un grupo activo actual, envíe un nombre primero.", + + // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.", + "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Este es el grupo actual, no se puede agregar.", + + // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID", + "admin.access-control.groups.form.subgroups-list.no-items": "No se encontraron grupos con esto en su nombre o esto como UUID", + + // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.", + "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Aún no hay subgrupos en el grupo.", + + // "admin.access-control.groups.form.return": "Back", + "admin.access-control.groups.form.return": "atrás", + + + + // "admin.search.breadcrumbs": "Administrative Search", + "admin.search.breadcrumbs": "Búsqueda administrativa", + + // "admin.search.collection.edit": "Edit", + "admin.search.collection.edit": "Editar", + + // "admin.search.community.edit": "Edit", + "admin.search.community.edit": "Editar", + + // "admin.search.item.delete": "Delete", + "admin.search.item.delete": "Borrar", + + // "admin.search.item.edit": "Edit", + "admin.search.item.edit": "Editar", + + // "admin.search.item.make-private": "Make Private", + "admin.search.item.make-private": "Hacerlo privado", + + // "admin.search.item.make-public": "Make Public", + "admin.search.item.make-public": "Hacer público", + + // "admin.search.item.move": "Move", + "admin.search.item.move": "Moverse", + + // "admin.search.item.reinstate": "Reinstate", + "admin.search.item.reinstate": "Reintegrar", + + // "admin.search.item.withdraw": "Withdraw", + "admin.search.item.withdraw": "Retirar", + + // "admin.search.title": "Administrative Search", + "admin.search.title": "Búsqueda administrativa", + + // "administrativeView.search.results.head": "Administrative Search", + "administrativeView.search.results.head": "Búsqueda administrativa", + + + + + // "admin.workflow.breadcrumbs": "Administer Workflow", + "admin.workflow.breadcrumbs": "Administrar flujo de trabajo", + + // "admin.workflow.title": "Administer Workflow", + "admin.workflow.title": "Administrar flujo de trabajo", + + // "admin.workflow.item.workflow": "Workflow", + "admin.workflow.item.workflow": "Flujo de trabajo", + + // "admin.workflow.item.delete": "Delete", + "admin.workflow.item.delete": "Borrar", + + // "admin.workflow.item.send-back": "Send back", + "admin.workflow.item.send-back": "Enviar de vuelta", + + + + // "admin.metadata-import.breadcrumbs": "Import Metadata", + "admin.metadata-import.breadcrumbs": "Importar metadatos", + + // "admin.metadata-import.title": "Import Metadata", + "admin.metadata-import.title": "Importar metadatos", + + // "admin.metadata-import.page.header": "Import Metadata", + "admin.metadata-import.page.header": "Importar metadatos", + + // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here", + "admin.metadata-import.page.help": "Puede soltar o explorar archivos CSV que contienen operaciones de metadatos por lotes en archivos aquí", + + // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import", + "admin.metadata-import.page.dropMsg": "Suelta un CSV de metadatos para importar", + + // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import", + "admin.metadata-import.page.dropMsgReplace": "Suelta para reemplazar el CSV de metadatos para importar", + + // "admin.metadata-import.page.button.return": "Back", + "admin.metadata-import.page.button.return": "atrás", + + // "admin.metadata-import.page.button.proceed": "Proceed", + "admin.metadata-import.page.button.proceed": "Continuar", + + // "admin.metadata-import.page.error.addFile": "Select file first!", + "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!", + + + + + // "auth.errors.invalid-user": "Invalid email address or password.", + "auth.errors.invalid-user": "Dirección de correo electrónico o contraseña no válidos.", + + // "auth.messages.expired": "Your session has expired. Please log in again.", + "auth.messages.expired": "Su sesión ha caducado. Inicie sesión de nuevo.", + + // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.", + "auth.messages.token-refresh-failed": "No se pudo actualizar el token de la sesión. Inicie sesión de nuevo.", + + + + // "bitstream.download.page": "Now downloading {{bitstream}}..." , + "bitstream.download.page": "Descargando {{ bitstream }}...", + + + + // "bitstream.edit.authorizations.link": "Edit bitstream's Policies", + "bitstream.edit.authorizations.link": "Editar las políticas de archivo", + + // "bitstream.edit.authorizations.title": "Edit bitstream's Policies", + "bitstream.edit.authorizations.title": "Editar las políticas de archivo", + + // "bitstream.edit.return": "Back", + "bitstream.edit.return": "atrás", + + // "bitstream.edit.bitstream": "Bitstream: ", + "bitstream.edit.bitstream": "Archivo:", + + // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"Main article\" or \"Experiment data readings\".", + "bitstream.edit.form.description.hint": "Opcionalmente, proporcione una breve descripción del archivo, por ejemplo \"Artículo principal\" o \"Lecturas de datos del experimento\".", + + // "bitstream.edit.form.description.label": "Description", + "bitstream.edit.form.description.label": "Descripción", + + // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. This date cannot be modified on this form. To set an embargo date for a bitstream, go to the Item Status tab, click Authorizations..., create or edit the bitstream's READ policy, and set the Start Date as desired.", + "bitstream.edit.form.embargo.hint": "El primer día a partir del cual se permite el acceso. Esta fecha no se puede modificar en este formulario. Para establecer una fecha de embargo para un archivo, vaya a la pestaña Estado del artículo , haga clic en Autorizaciones... , cree o edite la política READ del archivo y configure la Fecha de inicio como desee.", + + // "bitstream.edit.form.embargo.label": "Embargo until specific date", + "bitstream.edit.form.embargo.label": "Embargo hasta fecha concreta", + + // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.", + "bitstream.edit.form.fileName.hint": "Cambie el nombre de archivo del archivo. Tenga en cuenta que esto cambiará la URL de archivo de visualización, pero los enlaces antiguos seguirán resolviéndose siempre que la ID de secuencia no cambie.", + + // "bitstream.edit.form.fileName.label": "Filename", + "bitstream.edit.form.fileName.label": "Nombre del archivo", + + // "bitstream.edit.form.newFormat.label": "Describe new format", + "bitstream.edit.form.newFormat.label": "Describe el nuevo formato", + + // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"ACMESoft SuperApp version 1.5\").", + "bitstream.edit.form.newFormat.hint": "La aplicación que usó para crear el archivo y el número de versión (por ejemplo, \" ACMESoft SuperApp versión 1.5 \").", + + // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream", + "bitstream.edit.form.primaryBitstream.label": "archivo primario", + + // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, select \"format not in list\" above and describe it under \"Describe new format\".", + "bitstream.edit.form.selectedFormat.hint": "Si el formato no está en la lista anterior, seleccione \"el formato no está en la lista \" arriba y descríbalo en \"Describir el nuevo formato \".", + + // "bitstream.edit.form.selectedFormat.label": "Selected Format", + "bitstream.edit.form.selectedFormat.label": "Formato seleccionado", + + // "bitstream.edit.form.selectedFormat.unknown": "Format not in list", + "bitstream.edit.form.selectedFormat.unknown": "El formato no está en la lista", + + // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format", + "bitstream.edit.notifications.error.format.title": "Se produjo un error al guardar el formato del archivo.", + + // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.", + "bitstream.edit.notifications.saved.content": "Se guardaron sus cambios en este archivo.", + + // "bitstream.edit.notifications.saved.title": "Bitstream saved", + "bitstream.edit.notifications.saved.title": "Archivo guardado", + + // "bitstream.edit.title": "Edit bitstream", + "bitstream.edit.title": "Editar archivo", + + + + // "browse.comcol.by.author": "By Author", + "browse.comcol.by.author": "Por autor", + + // "browse.comcol.by.dateissued": "By Issue Date", + "browse.comcol.by.dateissued": "Por fecha de emisión", + + // "browse.comcol.by.subject": "By Subject", + "browse.comcol.by.subject": "Por tema", + + // "browse.comcol.by.title": "By Title", + "browse.comcol.by.title": "Por titulo", + + // "browse.comcol.head": "Browse", + "browse.comcol.head": "Examinar", + + // "browse.empty": "No items to show.", + "browse.empty": "No hay artículos para mostrar.", + + // "browse.metadata.author": "Author", + "browse.metadata.author": "Autor", + + // "browse.metadata.dateissued": "Issue Date", + "browse.metadata.dateissued": "Fecha de asunto", + + // "browse.metadata.subject": "Subject", + "browse.metadata.subject": "Tema", + + // "browse.metadata.title": "Title", + "browse.metadata.title": "Título", + + // "browse.metadata.author.breadcrumbs": "Browse by Author", + "browse.metadata.author.breadcrumbs": "Buscar por autor", + + // "browse.metadata.dateissued.breadcrumbs": "Browse by Date", + "browse.metadata.dateissued.breadcrumbs": "Examinar por fecha", + + // "browse.metadata.subject.breadcrumbs": "Browse by Subject", + "browse.metadata.subject.breadcrumbs": "Examinar por tema", + + // "browse.metadata.title.breadcrumbs": "Browse by Title", + "browse.metadata.title.breadcrumbs": "Examinar por título", + + // "browse.next.button": "Next", + "browse.next.button": "próximo", + + // "browse.previous.button": "Previous", + "browse.previous.button": "Anterior", + + // "browse.startsWith.choose_start": "(Choose start)", + "browse.startsWith.choose_start": "(Elija inicio)", + + // "browse.startsWith.choose_year": "(Choose year)", + "browse.startsWith.choose_year": "(Elegir año)", + + // "browse.startsWith.choose_year.label": "Choose the issue year", + "browse.startsWith.choose_year.label": "Elija el año de emisión", + + // "browse.startsWith.jump": "Jump to a point in the index:", + "browse.startsWith.jump": "Saltar a un punto del índice:", + + // "browse.startsWith.months.april": "April", + "browse.startsWith.months.april": "abril", + + // "browse.startsWith.months.august": "August", + "browse.startsWith.months.august": "agosto", + + // "browse.startsWith.months.december": "December", + "browse.startsWith.months.december": "diciembre", + + // "browse.startsWith.months.february": "February", + "browse.startsWith.months.february": "febrero", + + // "browse.startsWith.months.january": "January", + "browse.startsWith.months.january": "enero", + + // "browse.startsWith.months.july": "July", + "browse.startsWith.months.july": "julio", + + // "browse.startsWith.months.june": "June", + "browse.startsWith.months.june": "junio", + + // "browse.startsWith.months.march": "March", + "browse.startsWith.months.march": "marcha", + + // "browse.startsWith.months.may": "May", + "browse.startsWith.months.may": "Mayo", + + // "browse.startsWith.months.none": "(Choose month)", + "browse.startsWith.months.none": "(Elija mes)", + + // "browse.startsWith.months.none.label": "Choose the issue month", + "browse.startsWith.months.none.label": "Elija el mes de emisión", + + // "browse.startsWith.months.november": "November", + "browse.startsWith.months.november": "noviembre", + + // "browse.startsWith.months.october": "October", + "browse.startsWith.months.october": "octubre", + + // "browse.startsWith.months.september": "September", + "browse.startsWith.months.september": "septiembre", + + // "browse.startsWith.submit": "Browse", + "browse.startsWith.submit": "Examinar", + + // "browse.startsWith.type_date": "Or type in a date (year-month) and click 'Browse'", + "browse.startsWith.type_date": "O escriba una fecha (año-mes) y haga clic en 'Examinar'", + + // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button", + "browse.startsWith.type_date.label": "O escriba una fecha (año-mes) y haga clic en el botón Examinar", + + // "browse.startsWith.type_text": "Type the first few letters and click on the Browse button", + "browse.startsWith.type_text": "Escriba las primeras letras y haga clic en el botón Examinar", + + // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}", + "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}", + + + // "chips.remove": "Remove chip", + "chips.remove": "Quitar chip", + + + + // "collection.create.head": "Create a Collection", + "collection.create.head": "Crear una colección", + + // "collection.create.notifications.success": "Successfully created the Collection", + "collection.create.notifications.success": "Creó con éxito la colección", + + // "collection.create.sub-head": "Create a Collection for Community {{ parent }}", + "collection.create.sub-head": "Crea una colección para la comunidad {{ parent }}", + + // "collection.curate.header": "Curate Collection: {{collection}}", + "collection.curate.header": "Colección seleccionada: {{ collection }}", + + // "collection.delete.cancel": "Cancel", + "collection.delete.cancel": "Cancelar", + + // "collection.delete.confirm": "Confirm", + "collection.delete.confirm": "Confirmar", + + // "collection.delete.processing": "Deleting", + "collection.delete.processing": "Eliminando", + + // "collection.delete.head": "Delete Collection", + "collection.delete.head": "Eliminar colección", + + // "collection.delete.notification.fail": "Collection could not be deleted", + "collection.delete.notification.fail": "No se pudo borrar la colección", + + // "collection.delete.notification.success": "Successfully deleted collection", + "collection.delete.notification.success": "Colección eliminada correctamente", + + // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"", + "collection.delete.text": "¿Estás seguro de que quieres eliminar la colección \"{{ dso }} \"?", + + + + // "collection.edit.delete": "Delete this collection", + "collection.edit.delete": "Eliminar esta colección", + + // "collection.edit.head": "Edit Collection", + "collection.edit.head": "Editar colección", + + // "collection.edit.breadcrumbs": "Edit Collection", + "collection.edit.breadcrumbs": "Editar colección", + + + + // "collection.edit.tabs.mapper.head": "Item Mapper", + "collection.edit.tabs.mapper.head": "Asignador de artículos", + + // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper", + "collection.edit.tabs.item-mapper.title": "Edición de colección: mapeador de artículos", + + // "collection.edit.item-mapper.cancel": "Cancel", + "collection.edit.item-mapper.cancel": "Cancelar", + + // "collection.edit.item-mapper.collection": "Collection: \"{{name}}\"", + "collection.edit.item-mapper.collection": "Colección: \"{{ name }}\"", + + // "collection.edit.item-mapper.confirm": "Map selected items", + "collection.edit.item-mapper.confirm": "Asignar artículos seleccionados", + + // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.", + "collection.edit.item-mapper.description": "Esta es la herramienta de asignación de artículos que permite a los administradores de colecciones asignar artículos de otras colecciones a esta colección. Puede buscar artículos de otras colecciones y mapearlos, o explorar la lista de artículos mapeados actualmente.", + + // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections", + "collection.edit.item-mapper.head": "Asignador de artículos: asigna artículos de otras colecciones", + + // "collection.edit.item-mapper.no-search": "Please enter a query to search", + "collection.edit.item-mapper.no-search": "Ingrese una consulta para buscar", + + // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.", + "collection.edit.item-mapper.notifications.map.error.content": "Se produjeron errores en la asignación de {{ amount }} artículos.", + + // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors", + "collection.edit.item-mapper.notifications.map.error.head": "Errores de mapeo", + + // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.", + "collection.edit.item-mapper.notifications.map.success.content": "{{ amount }} artículos asignados correctamente.", + + // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed", + "collection.edit.item-mapper.notifications.map.success.head": "Mapeo completado", + + // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.", + "collection.edit.item-mapper.notifications.unmap.error.content": "Se produjeron errores al eliminar las asignaciones de {{ amount }} artículos.", + + // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors", + "collection.edit.item-mapper.notifications.unmap.error.head": "Eliminar errores de mapeo", + + // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.", + "collection.edit.item-mapper.notifications.unmap.success.content": "Se eliminaron correctamente las asignaciones de {{ amount }} artículos.", + + // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", + "collection.edit.item-mapper.notifications.unmap.success.head": "Eliminar mapeo completado", + + // "collection.edit.item-mapper.remove": "Remove selected item mappings", + "collection.edit.item-mapper.remove": "Eliminar asignaciones de artículos seleccionados", + + // "collection.edit.item-mapper.search-form.placeholder": "Search items...", + "collection.edit.item-mapper.search-form.placeholder": "Buscar artículos...", + + // "collection.edit.item-mapper.tabs.browse": "Browse mapped items", + "collection.edit.item-mapper.tabs.browse": "Examinar artículos mapeados", + + // "collection.edit.item-mapper.tabs.map": "Map new items", + "collection.edit.item-mapper.tabs.map": "Asignar nuevos artículos", + + + // "collection.edit.logo.delete.title": "Delete logo", + "collection.edit.logo.delete.title": "Eliminar logo", + + // "collection.edit.logo.delete-undo.title": "Undo delete", + "collection.edit.logo.delete-undo.title": "Deshacer eliminación", + + // "collection.edit.logo.label": "Collection logo", + "collection.edit.logo.label": "Logotipo de la colección", + + // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.", + "collection.edit.logo.notifications.add.error": "Error al cargar el logotipo de la colección. Verifique el contenido antes de volver a intentarlo.", + + // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.", + "collection.edit.logo.notifications.add.success": "Subir el logotipo de la colección correctamente.", + + // "collection.edit.logo.notifications.delete.success.title": "Logo deleted", + "collection.edit.logo.notifications.delete.success.title": "Logotipo eliminado", + + // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo", + "collection.edit.logo.notifications.delete.success.content": "Se eliminó correctamente el logotipo de la colección.", + + // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo", + "collection.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo", + + // "collection.edit.logo.upload": "Drop a Collection Logo to upload", + "collection.edit.logo.upload": "Suelta un logotipo de colección para cargar", + + + + // "collection.edit.notifications.success": "Successfully edited the Collection", + "collection.edit.notifications.success": "Editó con éxito la colección", + + // "collection.edit.return": "Back", + "collection.edit.return": "atrás", + + + + // "collection.edit.tabs.curate.head": "Curate", + "collection.edit.tabs.curate.head": "Cura", + + // "collection.edit.tabs.curate.title": "Collection Edit - Curate", + "collection.edit.tabs.curate.title": "Edición de colección - Curate", + + // "collection.edit.tabs.authorizations.head": "Authorizations", + "collection.edit.tabs.authorizations.head": "Autorizaciones", + + // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations", + "collection.edit.tabs.authorizations.title": "Edición de colección: autorizaciones", + + // "collection.edit.tabs.metadata.head": "Edit Metadata", + "collection.edit.tabs.metadata.head": "Editar metadatos", + + // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata", + "collection.edit.tabs.metadata.title": "Edición de colección: metadatos", + + // "collection.edit.tabs.roles.head": "Assign Roles", + "collection.edit.tabs.roles.head": "Asignar roles", + + // "collection.edit.tabs.roles.title": "Collection Edit - Roles", + "collection.edit.tabs.roles.title": "Edición de colección: funciones", + + // "collection.edit.tabs.source.external": "This collection harvests its content from an external source", + "collection.edit.tabs.source.external": "Esta colección recolecta su contenido de una fuente externa", + + // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.", + "collection.edit.tabs.source.form.errors.oaiSource.required": "Debe proporcionar un ID de conjunto de la colección de destino.", + + // "collection.edit.tabs.source.form.harvestType": "Content being harvested", + "collection.edit.tabs.source.form.harvestType": "Contenido que se está recolectando", + + // "collection.edit.tabs.source.form.head": "Configure an external source", + "collection.edit.tabs.source.form.head": "Configurar una fuente externa", + + // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format", + "collection.edit.tabs.source.form.metadataConfigId": "Formato de metadatos", + + // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id", + "collection.edit.tabs.source.form.oaiSetId": "ID de conjunto específico de OAI", + + // "collection.edit.tabs.source.form.oaiSource": "OAI Provider", + "collection.edit.tabs.source.form.oaiSource": "Proveedor OAI", + + // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)", + "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Recolectar metadatos y archivos (requiere soporte ORE)", + + // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)", + "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Recolectar metadatos y referencias a archivos (requiere soporte ORE)", + + // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only", + "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Recolectar solo metadatos", + + // "collection.edit.tabs.source.head": "Content Source", + "collection.edit.tabs.source.head": "Fuente de contenido", + + // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + "collection.edit.tabs.source.notifications.discarded.content": "Tus cambios fueron descartados. ", + + // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded", + "collection.edit.tabs.source.notifications.discarded.title": "Cambiado descartado", + + // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", + "collection.edit.tabs.source.notifications.invalid.content": "Tus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.", + + // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid", + "collection.edit.tabs.source.notifications.invalid.title": "Metadatos inválidos", + + // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.", + "collection.edit.tabs.source.notifications.saved.content": "Se guardaron sus cambios en la fuente del contenido de esta colección.", + + // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved", + "collection.edit.tabs.source.notifications.saved.title": "Fuente de contenido guardada", + + // "collection.edit.tabs.source.title": "Collection Edit - Content Source", + "collection.edit.tabs.source.title": "Edición de colección: fuente de contenido", + + + + // "collection.edit.template.add-button": "Add", + "collection.edit.template.add-button": "Agregar", + + // "collection.edit.template.breadcrumbs": "Item template", + "collection.edit.template.breadcrumbs": "Plantilla de artículo", + + // "collection.edit.template.cancel": "Cancel", + "collection.edit.template.cancel": "Cancelar", + + // "collection.edit.template.delete-button": "Delete", + "collection.edit.template.delete-button": "Borrar", + + // "collection.edit.template.edit-button": "Edit", + "collection.edit.template.edit-button": "Editar", + + // "collection.edit.template.error": "An error occurred retrieving the template item", + "collection.edit.template.error": "Se produjo un error al recuperar el artículo de la plantilla.", + + // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"", + "collection.edit.template.head": "Editar artículo de plantilla para la colección \"{{ collection }} \"", + + // "collection.edit.template.label": "Template item", + "collection.edit.template.label": "Artículo de plantilla", + + // "collection.edit.template.loading": "Loading template item...", + "collection.edit.template.loading": "Cargando artículo de plantilla...", + + // "collection.edit.template.notifications.delete.error": "Failed to delete the item template", + "collection.edit.template.notifications.delete.error": "No se pudo eliminar la plantilla del artículo.", + + // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template", + "collection.edit.template.notifications.delete.success": "Se eliminó correctamente la plantilla del artículo.", + + // "collection.edit.template.title": "Edit Template Item", + "collection.edit.template.title": "Editar artículo de plantilla", + + + + // "collection.form.abstract": "Short Description", + "collection.form.abstract": "Breve descripción", + + // "collection.form.description": "Introductory text (HTML)", + "collection.form.description": "Texto introductorio (HTML)", + + // "collection.form.errors.title.required": "Please enter a collection name", + "collection.form.errors.title.required": "Ingrese un nombre de colección", + + // "collection.form.license": "License", + "collection.form.license": "Licencia", + + // "collection.form.provenance": "Provenance", + "collection.form.provenance": "Procedencia", + + // "collection.form.rights": "Copyright text (HTML)", + "collection.form.rights": "Texto de copyright (HTML)", + + // "collection.form.tableofcontents": "News (HTML)", + "collection.form.tableofcontents": "Noticias (HTML)", + + // "collection.form.title": "Name", + "collection.form.title": "Nombre", + + + + // "collection.listelement.badge": "Collection", + "collection.listelement.badge": "Colección", + + + + // "collection.page.browse.recent.head": "Recent Submissions", + "collection.page.browse.recent.head": "Envíos recientes", + + // "collection.page.browse.recent.empty": "No items to show", + "collection.page.browse.recent.empty": "No hay artículos para mostrar", + + // "collection.page.edit": "Edit this collection", + "collection.page.edit": "Editar esta colección", + + // "collection.page.handle": "Permanent URI for this collection", + "collection.page.handle": "URI permanente para esta colección", + + // "collection.page.license": "License", + "collection.page.license": "Licencia", + + // "collection.page.news": "News", + "collection.page.news": "Noticias", + + + + // "collection.select.confirm": "Confirm selected", + "collection.select.confirm": "Confirmar seleccionado", + + // "collection.select.empty": "No collections to show", + "collection.select.empty": "No hay colecciones para mostrar", + + // "collection.select.table.title": "Title", + "collection.select.table.title": "Título", + + + + // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.", + "collection.source.update.notifications.error.content": "La configuración proporcionada se ha probado y no funcionó.", + + // "collection.source.update.notifications.error.title": "Server Error", + "collection.source.update.notifications.error.title": "Error del Servidor", + + + + // "communityList.breadcrumbs": "Community List", + "communityList.breadcrumbs": "Lista de la comunidad", + + // "communityList.tabTitle": "Community List", + "communityList.tabTitle": "Lista de la comunidad", + + // "communityList.title": "List of Communities", + "communityList.title": "Lista de comunidades", + + // "communityList.showMore": "Show More", + "communityList.showMore": "Mostrar más", + + + + // "community.create.head": "Create a Community", + "community.create.head": "Crea una comunidad", + + // "community.create.notifications.success": "Successfully created the Community", + "community.create.notifications.success": "Creó con éxito la comunidad", + + // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}", + "community.create.sub-head": "Cree una subcomunidad para la comunidad {{ parent }}", + + // "community.curate.header": "Curate Community: {{community}}", + "community.curate.header": "Comunidad seleccionada: {{ community }}", + + // "community.delete.cancel": "Cancel", + "community.delete.cancel": "Cancelar", + + // "community.delete.confirm": "Confirm", + "community.delete.confirm": "Confirmar", + + // "community.delete.processing": "Deleting...", + "community.delete.processing": "Eliminando...", + + // "community.delete.head": "Delete Community", + "community.delete.head": "Eliminar comunidad", + + // "community.delete.notification.fail": "Community could not be deleted", + "community.delete.notification.fail": "No se pudo eliminar la comunidad", + + // "community.delete.notification.success": "Successfully deleted community", + "community.delete.notification.success": "Comunidad eliminada con éxito", + + // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"", + "community.delete.text": "¿Estás seguro de que deseas eliminar la comunidad \"{{ dso }} \"?", + + // "community.edit.delete": "Delete this community", + "community.edit.delete": "Eliminar esta comunidad", + + // "community.edit.head": "Edit Community", + "community.edit.head": "Editar comunidad", + + // "community.edit.breadcrumbs": "Edit Community", + "community.edit.breadcrumbs": "Editar comunidad", + + + // "community.edit.logo.delete.title": "Delete logo", + "community.edit.logo.delete.title": "Eliminar logo", + + // "community.edit.logo.delete-undo.title": "Undo delete", + "community.edit.logo.delete-undo.title": "Deshacer eliminación", + + // "community.edit.logo.label": "Community logo", + "community.edit.logo.label": "Logotipo de la comunidad", + + // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.", + "community.edit.logo.notifications.add.error": "Error al cargar el logotipo de la comunidad. Verifique el contenido antes de volver a intentarlo.", + + // "community.edit.logo.notifications.add.success": "Upload Community logo successful.", + "community.edit.logo.notifications.add.success": "Subir el logotipo de la comunidad correctamente.", + + // "community.edit.logo.notifications.delete.success.title": "Logo deleted", + "community.edit.logo.notifications.delete.success.title": "Logotipo eliminado", + + // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo", + "community.edit.logo.notifications.delete.success.content": "Se eliminó correctamente el logotipo de la comunidad.", + + // "community.edit.logo.notifications.delete.error.title": "Error deleting logo", + "community.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo", + + // "community.edit.logo.upload": "Drop a Community Logo to upload", + "community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar", + + + + // "community.edit.notifications.success": "Successfully edited the Community", + "community.edit.notifications.success": "Editó con éxito la comunidad", + + // "community.edit.notifications.unauthorized": "You do not have privileges to make this change", + "community.edit.notifications.unauthorized": "No tienes privilegios para realizar este cambio", + + // "community.edit.notifications.error": "An error occured while editing the Community", + "community.edit.notifications.error": "Se produjo un error al editar la comunidad.", + + // "community.edit.return": "Back", + "community.edit.return": "atrás", + + + + // "community.edit.tabs.curate.head": "Curate", + "community.edit.tabs.curate.head": "Cura", + + // "community.edit.tabs.curate.title": "Community Edit - Curate", + "community.edit.tabs.curate.title": "Edición de la comunidad - Curate", + + // "community.edit.tabs.metadata.head": "Edit Metadata", + "community.edit.tabs.metadata.head": "Editar metadatos", + + // "community.edit.tabs.metadata.title": "Community Edit - Metadata", + "community.edit.tabs.metadata.title": "Edición de la comunidad: metadatos", + + // "community.edit.tabs.roles.head": "Assign Roles", + "community.edit.tabs.roles.head": "Asignar roles", + + // "community.edit.tabs.roles.title": "Community Edit - Roles", + "community.edit.tabs.roles.title": "Edición de la comunidad: funciones", + + // "community.edit.tabs.authorizations.head": "Authorizations", + "community.edit.tabs.authorizations.head": "Autorizaciones", + + // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations", + "community.edit.tabs.authorizations.title": "Edición de la comunidad: autorizaciones", + + + + // "community.listelement.badge": "Community", + "community.listelement.badge": "Comunidad", + + + + // "comcol-role.edit.no-group": "None", + "comcol-role.edit.no-group": "Ninguno", + + // "comcol-role.edit.create": "Create", + "comcol-role.edit.create": "Crear", + + // "comcol-role.edit.restrict": "Restrict", + "comcol-role.edit.restrict": "Restringir", + + // "comcol-role.edit.delete": "Delete", + "comcol-role.edit.delete": "Borrar", + + + // "comcol-role.edit.community-admin.name": "Administrators", + "comcol-role.edit.community-admin.name": "Administradores", + + // "comcol-role.edit.collection-admin.name": "Administrators", + "comcol-role.edit.collection-admin.name": "Administradores", + + + // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", + "comcol-role.edit.community-admin.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).", + + // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).", + "comcol-role.edit.collection-admin.description": "Los administradores de la colección deciden quién puede enviar artículos a la colección, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones a esta colección (sujeto a autorización para esa colección).", + + + // "comcol-role.edit.submitters.name": "Submitters", + "comcol-role.edit.submitters.name": "Remitentes", + + // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.", + "comcol-role.edit.submitters.description": "Los E-People y Grupos que tienen permiso para enviar nuevos artículos a esta colección.", + + + // "comcol-role.edit.item_read.name": "Default item read access", + "comcol-role.edit.item_read.name": "Acceso de lectura de artículo predeterminado", + + // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.", + "comcol-role.edit.item_read.description": "E-People y Grupos que pueden leer nuevos artículos enviados a esta colección. Los cambios en este rol no son retroactivos. Los artículos existentes en el sistema aún serán visibles para aquellos que tenían acceso de lectura en el momento de su adición.", + + // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.", + "comcol-role.edit.item_read.anonymous-group": "La lectura predeterminada para los artículos entrantes está configurada actualmente como Anónimo.", + + + // "comcol-role.edit.bitstream_read.name": "Default bitstream read access", + "comcol-role.edit.bitstream_read.name": "Acceso de lectura de archivo predeterminado", + + // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).", + "comcol-role.edit.bitstream_read.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).", + + // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.", + "comcol-role.edit.bitstream_read.anonymous-group": "La lectura predeterminada para los archivos entrantes se establece actualmente en Anónimo.", + + + // "comcol-role.edit.editor.name": "Editors", + "comcol-role.edit.editor.name": "Editores", + + // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.", + "comcol-role.edit.editor.description": "Los editores pueden editar los metadatos de los envíos entrantes y luego aceptarlos o rechazarlos.", + + + // "comcol-role.edit.finaleditor.name": "Final editors", + "comcol-role.edit.finaleditor.name": "Editores finales", + + // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.", + "comcol-role.edit.finaleditor.description": "Los editores finales pueden editar los metadatos de los envíos entrantes, pero no podrán rechazarlos.", + + + // "comcol-role.edit.reviewer.name": "Reviewers", + "comcol-role.edit.reviewer.name": "Revisores", + + // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.", + "comcol-role.edit.reviewer.description": "Los revisores pueden aceptar o rechazar envíos entrantes. Sin embargo, no pueden editar los metadatos del envío.", + + + + // "community.form.abstract": "Short Description", + "community.form.abstract": "Breve descripción", + + // "community.form.description": "Introductory text (HTML)", + "community.form.description": "Texto introductorio (HTML)", + + // "community.form.errors.title.required": "Please enter a community name", + "community.form.errors.title.required": "Ingrese un nombre de comunidad", + + // "community.form.rights": "Copyright text (HTML)", + "community.form.rights": "Texto de copyright (HTML)", + + // "community.form.tableofcontents": "News (HTML)", + "community.form.tableofcontents": "Noticias (HTML)", + + // "community.form.title": "Name", + "community.form.title": "Nombre", + + // "community.page.edit": "Edit this community", + "community.page.edit": "Editar esta comunidad", + + // "community.page.handle": "Permanent URI for this community", + "community.page.handle": "URI permanente para esta comunidad", + + // "community.page.license": "License", + "community.page.license": "Licencia", + + // "community.page.news": "News", + "community.page.news": "Noticias", + + // "community.all-lists.head": "Subcommunities and Collections", + "community.all-lists.head": "Subcomunidades y colecciones", + + // "community.sub-collection-list.head": "Collections of this Community", + "community.sub-collection-list.head": "Colecciones de esta comunidad", + + // "community.sub-community-list.head": "Communities of this Community", + "community.sub-community-list.head": "Comunidades de esta comunidad", + + + + // "cookies.consent.accept-all": "Accept all", + "cookies.consent.accept-all": "Aceptar todo", + + // "cookies.consent.accept-selected": "Accept selected", + "cookies.consent.accept-selected": "Aceptar seleccionado", + + // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)", + "cookies.consent.app.opt-out.description": "Esta aplicación se carga de forma predeterminada (pero puede optar por no participar)", + + // "cookies.consent.app.opt-out.title": "(opt-out)", + "cookies.consent.app.opt-out.title": "(optar por no)", + + // "cookies.consent.app.purpose": "purpose", + "cookies.consent.app.purpose": "objetivo", + + // "cookies.consent.app.required.description": "This application is always required", + "cookies.consent.app.required.description": "Esta aplicación siempre es necesaria", + + // "cookies.consent.app.required.title": "(always required)", + "cookies.consent.app.required.title": "(siempre requerido)", + + // "cookies.consent.update": "There were changes since your last visit, please update your consent.", + "cookies.consent.update": "Hubo cambios desde su última visita, actualice su consentimiento.", + + // "cookies.consent.close": "Close", + "cookies.consent.close": "Cerrar", + + // "cookies.consent.decline": "Decline", + "cookies.consent.decline": "Disminución", + + // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: Authentication, Preferences, Acknowledgement and Statistics.
To learn more, please read our {privacyPolicy}.", + "cookies.consent.content-notice.description": "Recopilamos y procesamos su información personal para los siguientes propósitos: Autenticación, Preferencias, Reconocimiento y Estadísticas .
Para obtener más información, lea nuestra {privacyPolicy}.", + + // "cookies.consent.content-notice.learnMore": "Customize", + "cookies.consent.content-notice.learnMore": "Personalizar", + + // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.", + "cookies.consent.content-modal.description": "Aquí puede ver y personalizar la información que recopilamos sobre usted.", + + // "cookies.consent.content-modal.privacy-policy.name": "privacy policy", + "cookies.consent.content-modal.privacy-policy.name": "política de privacidad", + + // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.", + "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.", + + // "cookies.consent.content-modal.title": "Information that we collect", + "cookies.consent.content-modal.title": "Información que recopilamos", + + + + // "cookies.consent.app.title.authentication": "Authentication", + "cookies.consent.app.title.authentication": "Autenticación", + + // "cookies.consent.app.description.authentication": "Required for signing you in", + "cookies.consent.app.description.authentication": "Requerido para iniciar sesión", + + + // "cookies.consent.app.title.preferences": "Preferences", + "cookies.consent.app.title.preferences": "Preferencias", + + // "cookies.consent.app.description.preferences": "Required for saving your preferences", + "cookies.consent.app.description.preferences": "Requerido para guardar sus preferencias", + + + + // "cookies.consent.app.title.acknowledgement": "Acknowledgement", + "cookies.consent.app.title.acknowledgement": "Reconocimiento", + + // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents", + "cookies.consent.app.description.acknowledgement": "Requerido para guardar sus reconocimientos y consentimientos", + + + + // "cookies.consent.app.title.google-analytics": "Google Analytics", + "cookies.consent.app.title.google-analytics": "Google analitico", + + // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data", + "cookies.consent.app.description.google-analytics": "Nos permite rastrear datos estadísticos", + + + + // "cookies.consent.purpose.functional": "Functional", + "cookies.consent.purpose.functional": "Funcional", + + // "cookies.consent.purpose.statistical": "Statistical", + "cookies.consent.purpose.statistical": "Estadístico", + + + // "curation-task.task.checklinks.label": "Check Links in Metadata", + "curation-task.task.checklinks.label": "Comprobar enlaces en metadatos", + + // "curation-task.task.noop.label": "NOOP", + "curation-task.task.noop.label": "NOOP", + + // "curation-task.task.profileformats.label": "Profile Bitstream Formats", + "curation-task.task.profileformats.label": "Formatos de archivo de perfil", + + // "curation-task.task.requiredmetadata.label": "Check for Required Metadata", + "curation-task.task.requiredmetadata.label": "Verifique los metadatos requeridos", + + // "curation-task.task.translate.label": "Microsoft Translator", + "curation-task.task.translate.label": "Traductor de Microsoft", + + // "curation-task.task.vscan.label": "Virus Scan", + "curation-task.task.vscan.label": "Búsqueda de virus", + + + + // "curation.form.task-select.label": "Task:", + "curation.form.task-select.label": "Tarea:", + + // "curation.form.submit": "Start", + "curation.form.submit": "Comienzo", + + // "curation.form.submit.success.head": "The curation task has been started successfully", + "curation.form.submit.success.head": "La tarea de conservación se ha iniciado con éxito.", + + // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.", + "curation.form.submit.success.content": "Serás redirigido a la página de proceso correspondiente.", + + // "curation.form.submit.error.head": "Running the curation task failed", + "curation.form.submit.error.head": "Error al ejecutar la tarea de conservación", + + // "curation.form.submit.error.content": "An error occured when trying to start the curation task.", + "curation.form.submit.error.content": "Se produjo un error al intentar iniciar la tarea de conservación.", + + // "curation.form.handle.label": "Handle:", + "curation.form.handle.label": "Resolver:", + + // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)", + "curation.form.handle.hint": "Sugerencia: ingrese [your-handle-prefix] / 0 para ejecutar una tarea en todo el sitio (no todas las tareas pueden admitir esta capacidad)", + + + + // "dso.name.untitled": "Untitled", + "dso.name.untitled": "Intitulado", + + + + // "dso-selector.create.collection.head": "New collection", + "dso-selector.create.collection.head": "Nueva colección", + + // "dso-selector.create.collection.sub-level": "Create a new collection in", + "dso-selector.create.collection.sub-level": "Crea una nueva colección en", + + // "dso-selector.create.community.head": "New community", + "dso-selector.create.community.head": "Nueva comunidad", + + // "dso-selector.create.community.sub-level": "Create a new community in", + "dso-selector.create.community.sub-level": "Crea una nueva comunidad en", + + // "dso-selector.create.community.top-level": "Create a new top-level community", + "dso-selector.create.community.top-level": "Crea una nueva comunidad de alto nivel", + + // "dso-selector.create.item.head": "New item", + "dso-selector.create.item.head": "Nuevo artículo", + + // "dso-selector.create.item.sub-level": "Create a new item in", + "dso-selector.create.item.sub-level": "Crea un nuevo artículo en", + + // "dso-selector.create.submission.head": "New submission", + "dso-selector.create.submission.head": "Nuevo envío", + + // "dso-selector.edit.collection.head": "Edit collection", + "dso-selector.edit.collection.head": "Editar colección", + + // "dso-selector.edit.community.head": "Edit community", + "dso-selector.edit.community.head": "Editar comunidad", + + // "dso-selector.edit.item.head": "Edit item", + "dso-selector.edit.item.head": "Editar artículo", + + // "dso-selector.error.title": "An error occurred searching for a {{ type }}", + "dso-selector.error.title": "Se produjo un error al buscar un {{ type }}", + + // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", + "dso-selector.export-metadata.dspaceobject.head": "Exportar metadatos de", + + // "dso-selector.no-results": "No {{ type }} found", + "dso-selector.no-results": "No se encontró {{ type }}", + + // "dso-selector.placeholder": "Search for a {{ type }}", + "dso-selector.placeholder": "Busque un {{ type }}", + + + + // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", + "confirmation-modal.export-metadata.header": "Exportar metadatos para {{ dsoName }}", + + // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}", + "confirmation-modal.export-metadata.info": "¿Está seguro de que desea exportar metadatos para {{ dsoName }}?", + + // "confirmation-modal.export-metadata.cancel": "Cancel", + "confirmation-modal.export-metadata.cancel": "Cancelar", + + // "confirmation-modal.export-metadata.confirm": "Export", + "confirmation-modal.export-metadata.confirm": "Exportar", + + // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"", + "confirmation-modal.delete-eperson.header": "Eliminar EPerson \"{{ dsoName }} \"", + + // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"", + "confirmation-modal.delete-eperson.info": "¿Está seguro de que desea eliminar EPerson \"{{ dsoName }} \"?", + + // "confirmation-modal.delete-eperson.cancel": "Cancel", + "confirmation-modal.delete-eperson.cancel": "Cancelar", + + // "confirmation-modal.delete-eperson.confirm": "Delete", + "confirmation-modal.delete-eperson.confirm": "Borrar", + + + // "error.bitstream": "Error fetching bitstream", + "error.bitstream": "Error al obtener el archivo", + + // "error.browse-by": "Error fetching items", + "error.browse-by": "Error al obtener artículos", + + // "error.collection": "Error fetching collection", + "error.collection": "Error al recuperar la colección", + + // "error.collections": "Error fetching collections", + "error.collections": "Error al obtener colecciones", + + // "error.community": "Error fetching community", + "error.community": "Error al recuperar la comunidad", + + // "error.identifier": "No item found for the identifier", + "error.identifier": "No se encontró ningún artículo para el identificador", + + // "error.default": "Error", + "error.default": "Error", + + // "error.item": "Error fetching item", + "error.item": "Error al obtener el artículo", + + // "error.items": "Error fetching items", + "error.items": "Error al obtener artículos", + + // "error.objects": "Error fetching objects", + "error.objects": "Error al recuperar objetos", + + // "error.recent-submissions": "Error fetching recent submissions", + "error.recent-submissions": "Error al obtener envíos recientes", + + // "error.search-results": "Error fetching search results", + "error.search-results": "Error al obtener los resultados de la búsqueda", + + // "error.sub-collections": "Error fetching sub-collections", + "error.sub-collections": "Error al obtener subcolecciones", + + // "error.sub-communities": "Error fetching sub-communities", + "error.sub-communities": "Error al obtener subcomunidades", + + // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below :

", + "error.submission.sections.init-form-error": "Se produjo un error durante la inicialización de la sección, verifique la configuración del formulario de entrada. ", + + // "error.top-level-communities": "Error fetching top-level communities", + "error.top-level-communities": "Error al obtener las comunidades de nivel superior", + + // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.", + "error.validation.license.notgranted": "Debe otorgar esta licencia para completar su envío. Si no puede otorgar esta licencia en este momento, puede guardar su trabajo y regresar más tarde o eliminar el envío.", + + // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.", + "error.validation.pattern": "Esta entrada está restringida por el patrón actual: {{ pattern }}.", + + // "error.validation.filerequired": "The file upload is mandatory", + "error.validation.filerequired": "La carga del archivo es obligatoria", + + + + // "file-section.error.header": "Error obtaining files for this item", + "file-section.error.header": "Error al obtener archivos para este artículo", + + + + // "footer.copyright": "copyright © 2002-{{ year }}", + "footer.copyright": "copyright © 2002 - {{ year }}", + + // "footer.link.dspace": "DSpace software", + "footer.link.dspace": "Software DSpace", + + // "footer.link.lyrasis": "LYRASIS", + "footer.link.lyrasis": "LYRASIS", + + // "footer.link.cookies": "Cookie settings", + "footer.link.cookies": "Configuración de cookies", + + // "footer.link.privacy-policy": "Privacy policy", + "footer.link.privacy-policy": "Política de privacidad", + + // "footer.link.end-user-agreement":"End User Agreement", + "footer.link.end-user-agreement": "Acuerdo de usuario final", + + + + // "forgot-email.form.header": "Forgot Password", + "forgot-email.form.header": "Has olvidado tu contraseña", + + // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.", + "forgot-email.form.info": "Ingrese Registre una cuenta para suscribirse a colecciones para recibir actualizaciones por correo electrónico y envíe nuevos artículos a DSpace.", + + // "forgot-email.form.email": "Email Address *", + "forgot-email.form.email": "Dirección de correo electrónico *", + + // "forgot-email.form.email.error.required": "Please fill in an email address", + "forgot-email.form.email.error.required": "Por favor ingrese una dirección de correo electrónico", + + // "forgot-email.form.email.error.pattern": "Please fill in a valid email address", + "forgot-email.form.email.error.pattern": "Por favor ingrese una dirección de correo electrónico válida", + + // "forgot-email.form.email.hint": "This address will be verified and used as your login name.", + "forgot-email.form.email.hint": "Esta dirección será verificada y utilizada como su nombre de inicio de sesión.", + + // "forgot-email.form.submit": "Save", + "forgot-email.form.submit": "Guardar", + + // "forgot-email.form.success.head": "Verification email sent", + "forgot-email.form.success.head": "El mensaje de verificación ha sido enviado", + + // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", + "forgot-email.form.success.content": "Se envió un correo electrónico a {{ email }} que contiene una URL especial y más instrucciones.", + + // "forgot-email.form.error.head": "Error when trying to register email", + "forgot-email.form.error.head": "Error al intentar registrar el correo electrónico", + + // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}", + "forgot-email.form.error.content": "Se produjo un error al registrar la siguiente dirección de correo electrónico: {{ email }}", + + + + // "forgot-password.title": "Forgot Password", + "forgot-password.title": "Has olvidado tu contraseña", + + // "forgot-password.form.head": "Forgot Password", + "forgot-password.form.head": "Has olvidado tu contraseña", + + // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", + "forgot-password.form.info": "Ingrese una nueva contraseña en el cuadro a continuación y confírmela escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.", + + // "forgot-password.form.card.security": "Security", + "forgot-password.form.card.security": "Seguridad", + + // "forgot-password.form.identification.header": "Identify", + "forgot-password.form.identification.header": "Identificar", + + // "forgot-password.form.identification.email": "Email address: ", + "forgot-password.form.identification.email": "Dirección de correo electrónico:", + + // "forgot-password.form.label.password": "Password", + "forgot-password.form.label.password": "Contraseña", + + // "forgot-password.form.label.passwordrepeat": "Retype to confirm", + "forgot-password.form.label.passwordrepeat": "Rescriba para confirmar", + + // "forgot-password.form.error.empty-password": "Please enter a password in the box below.", + "forgot-password.form.error.empty-password": "Ingrese una contraseña en el cuadro a continuación.", + + // "forgot-password.form.error.matching-passwords": "The passwords do not match.", + "forgot-password.form.error.matching-passwords": "Las contraseñas no coinciden.", + + // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.", + "forgot-password.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.", + + // "forgot-password.form.notification.error.title": "Error when trying to submit new password", + "forgot-password.form.notification.error.title": "Error al intentar enviar una nueva contraseña", + + // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.", + "forgot-password.form.notification.success.content": "El restablecimiento de la contraseña fue exitoso. Ha iniciado sesión como el usuario creado.", + + // "forgot-password.form.notification.success.title": "Password reset completed", + "forgot-password.form.notification.success.title": "Se completó el restablecimiento de la contraseña", + + // "forgot-password.form.submit": "Submit password", + "forgot-password.form.submit": "Enviar contraseña", + + + + // "form.add": "Add more", + "form.add": "Añadir más", + + // "form.add-help": "Click here to add the current entry and to add another one", + "form.add-help": "Haga clic aquí para agregar la entrada actual y para agregar otra", + + // "form.cancel": "Cancel", + "form.cancel": "Cancelar", + + // "form.clear": "Clear", + "form.clear": "Claro", + + // "form.clear-help": "Click here to remove the selected value", + "form.clear-help": "Haga clic aquí para eliminar el valor seleccionado", + + // "form.discard": "Discard", + "form.discard": "Descarte", + + // "form.drag": "Drag", + "form.drag": "Arrastrar", + + // "form.edit": "Edit", + "form.edit": "Editar", + + // "form.edit-help": "Click here to edit the selected value", + "form.edit-help": "Haga clic aquí para editar el valor seleccionado", + + // "form.first-name": "First name", + "form.first-name": "Nombre de pila", + + // "form.group-collapse": "Collapse", + "form.group-collapse": "Colapso", + + // "form.group-collapse-help": "Click here to collapse", + "form.group-collapse-help": "Haga clic aquí para colapsar", + + // "form.group-expand": "Expand", + "form.group-expand": "Expandir", + + // "form.group-expand-help": "Click here to expand and add more elements", + "form.group-expand-help": "Haga clic aquí para expandir y agregar más artículos", + + // "form.last-name": "Last name", + "form.last-name": "Apellido", + + // "form.loading": "Loading...", + "form.loading": "Cargando...", + + // "form.lookup": "Lookup", + "form.lookup": "Buscar", + + // "form.lookup-help": "Click here to look up an existing relation", + "form.lookup-help": "Haga clic aquí para buscar una relación existente", + + // "form.no-results": "No results found", + "form.no-results": "No se han encontrado resultados", + + // "form.no-value": "No value entered", + "form.no-value": "No se ingresó ningún valor", + + // "form.other-information": {}, + "form.other-information": {}, + + // "form.remove": "Remove", + "form.remove": "Eliminar", + + // "form.save": "Save", + "form.save": "Guardar", + + // "form.save-help": "Save changes", + "form.save-help": "Guardar cambios", + + // "form.search": "Search", + "form.search": "Buscar", + + // "form.search-help": "Click here to look for an existing correspondence", + "form.search-help": "Haga clic aquí para buscar una correspondencia existente", + + // "form.submit": "Save", + "form.submit": "Guardar", + + // "form.repeatable.sort.tip": "Drop the item in the new position", + "form.repeatable.sort.tip": "Suelta el artículo en la nueva posición", + + + // "home.description": "", + "home.description": "", + + // "home.breadcrumbs": "Home", + "home.breadcrumbs": "Hogar", + + // "home.search-form.placeholder": "Search the repository ...", + "home.search-form.placeholder": "Buscar en el repositorio ...", + + // "home.title": "Home", + "home.title": "Hogar", + + // "home.top-level-communities.head": "Communities in DSpace", + "home.top-level-communities.head": "Comunidades en DSpace", + + // "home.top-level-communities.help": "Select a community to browse its collections.", + "home.top-level-communities.help": "Seleccione una comunidad para explorar sus colecciones.", + + + + // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement", + "info.end-user-agreement.accept": "He leído y acepto el Acuerdo de usuario final.", + + // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement", + "info.end-user-agreement.accept.error": "Se produjo un error al aceptar el Acuerdo de usuario final.", + + // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement", + "info.end-user-agreement.accept.success": "Se actualizó correctamente el Acuerdo de usuario final.", + + // "info.end-user-agreement.breadcrumbs": "End User Agreement", + "info.end-user-agreement.breadcrumbs": "Acuerdo de usuario final", + + // "info.end-user-agreement.buttons.cancel": "Cancel", + "info.end-user-agreement.buttons.cancel": "Cancelar", + + // "info.end-user-agreement.buttons.save": "Save", + "info.end-user-agreement.buttons.save": "Guardar", + + // "info.end-user-agreement.head": "End User Agreement", + "info.end-user-agreement.head": "Acuerdo de usuario final", + + // "info.end-user-agreement.title": "End User Agreement", + "info.end-user-agreement.title": "Acuerdo de usuario final", + + // "info.privacy.breadcrumbs": "Privacy Statement", + "info.privacy.breadcrumbs": "Declaracion de privacidad", + + // "info.privacy.head": "Privacy Statement", + "info.privacy.head": "Declaracion de privacidad", + + // "info.privacy.title": "Privacy Statement", + "info.privacy.title": "Declaracion de privacidad", + + + + // "item.alerts.private": "This item is private", + "item.alerts.private": "Este artículo es privado", + + // "item.alerts.withdrawn": "This item has been withdrawn", + "item.alerts.withdrawn": "Este artículo ha sido retirado", + + + + // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.", + "item.edit.authorizations.heading": "Con este editor puede ver y modificar las políticas de un artículo, además de modificar las políticas de los componentes individuales del artículo: paquetes y archivos. Brevemente, un artículo es un contenedor de paquetes y los paquetes son contenedores de archivos. Los contenedores suelen tener políticas AGREGAR/ELIMINAR/LEER/ESCRIBIR, mientras que los archivos solo tienen políticas LEER/ESCRIBIR.", + + // "item.edit.authorizations.title": "Edit item's Policies", + "item.edit.authorizations.title": "Editar las políticas del artículo", + + + + // "item.badge.private": "Private", + "item.badge.private": "Privado", + + // "item.badge.withdrawn": "Withdrawn", + "item.badge.withdrawn": "Retirado", + + + + // "item.bitstreams.upload.bundle": "Bundle", + "item.bitstreams.upload.bundle": "Manojo", + + // "item.bitstreams.upload.bundle.placeholder": "Select a bundle", + "item.bitstreams.upload.bundle.placeholder": "Seleccione un paquete", + + // "item.bitstreams.upload.bundle.new": "Create bundle", + "item.bitstreams.upload.bundle.new": "Crear paquete", + + // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.", + "item.bitstreams.upload.bundles.empty": "Este artículo no contiene ningún paquete para cargar un archivo.", + + // "item.bitstreams.upload.cancel": "Cancel", + "item.bitstreams.upload.cancel": "Cancelar", + + // "item.bitstreams.upload.drop-message": "Drop a file to upload", + "item.bitstreams.upload.drop-message": "Suelta un archivo para subir", + + // "item.bitstreams.upload.item": "Item: ", + "item.bitstreams.upload.item": "Artículo:", + + // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.", + "item.bitstreams.upload.notifications.bundle.created.content": "Nuevo paquete creado con éxito.", + + // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle", + "item.bitstreams.upload.notifications.bundle.created.title": "Paquete creado", + + // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.", + "item.bitstreams.upload.notifications.upload.failed": "Subida fallida. Verifique el contenido antes de volver a intentarlo.", + + // "item.bitstreams.upload.title": "Upload bitstream", + "item.bitstreams.upload.title": "Subir archivo", + + + + // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload", + "item.edit.bitstreams.bundle.edit.buttons.upload": "Subir", + + // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.", + "item.edit.bitstreams.bundle.displaying": "Actualmente se muestran {{ amount }} archivos de {{ total }}.", + + // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})", + "item.edit.bitstreams.bundle.load.all": "Cargar todo ({{ total }})", + + // "item.edit.bitstreams.bundle.load.more": "Load more", + "item.edit.bitstreams.bundle.load.more": "Carga más", + + // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}", + "item.edit.bitstreams.bundle.name": "PAQUETE: {{ name }}", + + // "item.edit.bitstreams.discard-button": "Discard", + "item.edit.bitstreams.discard-button": "Descarte", + + // "item.edit.bitstreams.edit.buttons.download": "Download", + "item.edit.bitstreams.edit.buttons.download": "Descargar", + + // "item.edit.bitstreams.edit.buttons.drag": "Drag", + "item.edit.bitstreams.edit.buttons.drag": "Arrastrar", + + // "item.edit.bitstreams.edit.buttons.edit": "Edit", + "item.edit.bitstreams.edit.buttons.edit": "Editar", + + // "item.edit.bitstreams.edit.buttons.remove": "Remove", + "item.edit.bitstreams.edit.buttons.remove": "Eliminar", + + // "item.edit.bitstreams.edit.buttons.undo": "Undo changes", + "item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios", + + // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.", + "item.edit.bitstreams.empty": "Este artículo no contiene ningún archivo. Haga clic en el botón de carga para crear uno.", + + // "item.edit.bitstreams.headers.actions": "Actions", + "item.edit.bitstreams.headers.actions": "Comportamiento", + + // "item.edit.bitstreams.headers.bundle": "Bundle", + "item.edit.bitstreams.headers.bundle": "Manojo", + + // "item.edit.bitstreams.headers.description": "Description", + "item.edit.bitstreams.headers.description": "Descripción", + + // "item.edit.bitstreams.headers.format": "Format", + "item.edit.bitstreams.headers.format": "Formato", + + // "item.edit.bitstreams.headers.name": "Name", + "item.edit.bitstreams.headers.name": "Nombre", + + // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + "item.edit.bitstreams.notifications.discarded.content": "Tus cambios fueron descartados. ", + + // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded", + "item.edit.bitstreams.notifications.discarded.title": "Cambios descartados", + + // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams", + "item.edit.bitstreams.notifications.move.failed.title": "Error al mover archivos", + + // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.", + "item.edit.bitstreams.notifications.move.saved.content": "Se han guardado los cambios de movimiento en los archivos y paquetes de este artículo.", + + // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved", + "item.edit.bitstreams.notifications.move.saved.title": "Mover cambios guardados", + + // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "item.edit.bitstreams.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ", + + // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated", + "item.edit.bitstreams.notifications.outdated.title": "Cambios desactualizados", + + // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream", + "item.edit.bitstreams.notifications.remove.failed.title": "Error al eliminar archivo", + + // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.", + "item.edit.bitstreams.notifications.remove.saved.content": "Se han guardado los cambios de eliminación de los archivos de este artículo.", + + // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved", + "item.edit.bitstreams.notifications.remove.saved.title": "Se guardaron los cambios de eliminación", + + // "item.edit.bitstreams.reinstate-button": "Undo", + "item.edit.bitstreams.reinstate-button": "Deshacer", + + // "item.edit.bitstreams.save-button": "Save", + "item.edit.bitstreams.save-button": "Guardar", + + // "item.edit.bitstreams.upload-button": "Upload", + "item.edit.bitstreams.upload-button": "Subir", + + + + // "item.edit.delete.cancel": "Cancel", + "item.edit.delete.cancel": "Cancelar", + + // "item.edit.delete.confirm": "Delete", + "item.edit.delete.confirm": "Borrar", + + // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.", + "item.edit.delete.description": "¿Estás seguro de que este artículo debería eliminarse por completo? Precaución: en la actualidad, no se dejaría ninguna lápida.", + + // "item.edit.delete.error": "An error occurred while deleting the item", + "item.edit.delete.error": "Se produjo un error al eliminar el artículo.", + + // "item.edit.delete.header": "Delete item: {{ id }}", + "item.edit.delete.header": "Eliminar artículo: {{ id }}", + + // "item.edit.delete.success": "The item has been deleted", + "item.edit.delete.success": "El artículo ha sido eliminado", + + // "item.edit.head": "Edit Item", + "item.edit.head": "Editar artículo", + + // "item.edit.breadcrumbs": "Edit Item", + "item.edit.breadcrumbs": "Editar artículo", + + // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab", + "item.edit.tabs.disabled.tooltip": "No tienes autorización para acceder a esta pestaña", + + + // "item.edit.tabs.mapper.head": "Collection Mapper", + "item.edit.tabs.mapper.head": "Mapeador de colecciones", + + // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper", + "item.edit.tabs.item-mapper.title": "Edición de artículos - Mapeador de colecciones", + + // "item.edit.item-mapper.buttons.add": "Map item to selected collections", + "item.edit.item-mapper.buttons.add": "Asignar artículo a colecciones seleccionadas", + + // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections", + "item.edit.item-mapper.buttons.remove": "Eliminar la asignación de artículos para las colecciones seleccionadas", + + // "item.edit.item-mapper.cancel": "Cancel", + "item.edit.item-mapper.cancel": "Cancelar", + + // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.", + "item.edit.item-mapper.description": "Esta es la herramienta de asignación de artículos que permite a los administradores asignar este artículo a otras colecciones. Puede buscar colecciones y mapearlas, o explorar la lista de colecciones a las que el artículo está mapeado actualmente.", + + // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections", + "item.edit.item-mapper.head": "Asignador de artículos: asigna artículos a colecciones", + + // "item.edit.item-mapper.item": "Item: \"{{name}}\"", + "item.edit.item-mapper.item": "Artículo: \"{{ name }}\"", + + // "item.edit.item-mapper.no-search": "Please enter a query to search", + "item.edit.item-mapper.no-search": "Ingrese una consulta para buscar", + + // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.", + "item.edit.item-mapper.notifications.add.error.content": "Se produjeron errores al mapear el artículo a {{ amount }} colecciones.", + + // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors", + "item.edit.item-mapper.notifications.add.error.head": "Errores de mapeo", + + // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.", + "item.edit.item-mapper.notifications.add.success.content": "Se asignó correctamente el artículo a {{ amount }} colecciones.", + + // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed", + "item.edit.item-mapper.notifications.add.success.head": "Mapeo completado", + + // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.", + "item.edit.item-mapper.notifications.remove.error.content": "Se produjeron errores para la eliminación de la asignación a {{ amount }} colecciones.", + + // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors", + "item.edit.item-mapper.notifications.remove.error.head": "Eliminación de errores de mapeo", + + // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.", + "item.edit.item-mapper.notifications.remove.success.content": "Se eliminó correctamente la asignación del artículo a {{ amount }} colecciones.", + + // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed", + "item.edit.item-mapper.notifications.remove.success.head": "Eliminación del mapeo completada", + + // "item.edit.item-mapper.search-form.placeholder": "Search collections...", + "item.edit.item-mapper.search-form.placeholder": "Buscar colecciones...", + + // "item.edit.item-mapper.tabs.browse": "Browse mapped collections", + "item.edit.item-mapper.tabs.browse": "Examinar colecciones mapeadas", + + // "item.edit.item-mapper.tabs.map": "Map new collections", + "item.edit.item-mapper.tabs.map": "Mapear nuevas colecciones", + + + + // "item.edit.metadata.add-button": "Add", + "item.edit.metadata.add-button": "Agregar", + + // "item.edit.metadata.discard-button": "Discard", + "item.edit.metadata.discard-button": "Descarte", + + // "item.edit.metadata.edit.buttons.edit": "Edit", + "item.edit.metadata.edit.buttons.edit": "Editar", + + // "item.edit.metadata.edit.buttons.remove": "Remove", + "item.edit.metadata.edit.buttons.remove": "Eliminar", + + // "item.edit.metadata.edit.buttons.undo": "Undo changes", + "item.edit.metadata.edit.buttons.undo": "Deshacer cambios", + + // "item.edit.metadata.edit.buttons.unedit": "Stop editing", + "item.edit.metadata.edit.buttons.unedit": "Dejar de editar", + + // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.", + "item.edit.metadata.empty": "Actualmente, el artículo no contiene metadatos. Haga clic en Agregar para comenzar a agregar un valor de metadatos.", + + // "item.edit.metadata.headers.edit": "Edit", + "item.edit.metadata.headers.edit": "Editar", + + // "item.edit.metadata.headers.field": "Field", + "item.edit.metadata.headers.field": "Campo", + + // "item.edit.metadata.headers.language": "Lang", + "item.edit.metadata.headers.language": "Lang", + + // "item.edit.metadata.headers.value": "Value", + "item.edit.metadata.headers.value": "Valor", + + // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", + "item.edit.metadata.metadatafield.invalid": "Elija un campo de metadatos válido", + + // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + "item.edit.metadata.notifications.discarded.content": "Tus cambios fueron descartados. ", + + // "item.edit.metadata.notifications.discarded.title": "Changed discarded", + "item.edit.metadata.notifications.discarded.title": "Cambiado descartado", + + // "item.edit.metadata.notifications.error.title": "An error occurred", + "item.edit.metadata.notifications.error.title": "Ocurrió un error", + + // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", + "item.edit.metadata.notifications.invalid.content": "Tus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.", + + // "item.edit.metadata.notifications.invalid.title": "Metadata invalid", + "item.edit.metadata.notifications.invalid.title": "Metadatos inválidos", + + // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "item.edit.metadata.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ", + + // "item.edit.metadata.notifications.outdated.title": "Changed outdated", + "item.edit.metadata.notifications.outdated.title": "Cambiado desactualizado", + + // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.", + "item.edit.metadata.notifications.saved.content": "Se guardaron sus cambios en los metadatos de este artículo.", + + // "item.edit.metadata.notifications.saved.title": "Metadata saved", + "item.edit.metadata.notifications.saved.title": "Metadatos guardados", + + // "item.edit.metadata.reinstate-button": "Undo", + "item.edit.metadata.reinstate-button": "Deshacer", + + // "item.edit.metadata.save-button": "Save", + "item.edit.metadata.save-button": "Guardar", + + + + // "item.edit.modify.overview.field": "Field", + "item.edit.modify.overview.field": "Campo", + + // "item.edit.modify.overview.language": "Language", + "item.edit.modify.overview.language": "Idioma", + + // "item.edit.modify.overview.value": "Value", + "item.edit.modify.overview.value": "Valor", + + + + // "item.edit.move.cancel": "Back", + "item.edit.move.cancel": "atrás", + + // "item.edit.move.save-button": "Save", + "item.edit.move.save-button": "Guardar", + + // "item.edit.move.discard-button": "Discard", + "item.edit.move.discard-button": "Descarte", + + // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.", + "item.edit.move.description": "Seleccione la colección a la que desea mover este artículo. Para reducir la lista de colecciones mostradas, puede ingresar una consulta de búsqueda en el cuadro.", + + // "item.edit.move.error": "An error occurred when attempting to move the item", + "item.edit.move.error": "Se produjo un error al intentar mover el artículo.", + + // "item.edit.move.head": "Move item: {{id}}", + "item.edit.move.head": "Mover artículo: {{ id }}", + + // "item.edit.move.inheritpolicies.checkbox": "Inherit policies", + "item.edit.move.inheritpolicies.checkbox": "Heredar políticas", + + // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection", + "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino", + + // "item.edit.move.move": "Move", + "item.edit.move.move": "Moverse", + + // "item.edit.move.processing": "Moving...", + "item.edit.move.processing": "Moviente...", + + // "item.edit.move.search.placeholder": "Enter a search query to look for collections", + "item.edit.move.search.placeholder": "Ingrese una consulta de búsqueda para buscar colecciones", + + // "item.edit.move.success": "The item has been moved successfully", + "item.edit.move.success": "El artículo se ha movido correctamente.", + + // "item.edit.move.title": "Move item", + "item.edit.move.title": "Mover artículo", + + + + // "item.edit.private.cancel": "Cancel", + "item.edit.private.cancel": "Cancelar", + + // "item.edit.private.confirm": "Make it Private", + "item.edit.private.confirm": "Hacerlo privado", + + // "item.edit.private.description": "Are you sure this item should be made private in the archive?", + "item.edit.private.description": "¿Estás seguro de que este artículo debe ser privado en el archivo?", + + // "item.edit.private.error": "An error occurred while making the item private", + "item.edit.private.error": "Se produjo un error al convertir el artículo en privado.", + + // "item.edit.private.header": "Make item private: {{ id }}", + "item.edit.private.header": "Hacer que el artículo sea privado: {{ id }}", + + // "item.edit.private.success": "The item is now private", + "item.edit.private.success": "El artículo ahora es privado", + + + + // "item.edit.public.cancel": "Cancel", + "item.edit.public.cancel": "Cancelar", + + // "item.edit.public.confirm": "Make it Public", + "item.edit.public.confirm": "Hágalo público", + + // "item.edit.public.description": "Are you sure this item should be made public in the archive?", + "item.edit.public.description": "¿Estás seguro de que este artículo debe hacerse público en el archivo?", + + // "item.edit.public.error": "An error occurred while making the item public", + "item.edit.public.error": "Se produjo un error al hacer público el artículo.", + + // "item.edit.public.header": "Make item public: {{ id }}", + "item.edit.public.header": "Hacer público el artículo: {{ id }}", + + // "item.edit.public.success": "The item is now public", + "item.edit.public.success": "El artículo ahora es público", + + + + // "item.edit.reinstate.cancel": "Cancel", + "item.edit.reinstate.cancel": "Cancelar", + + // "item.edit.reinstate.confirm": "Reinstate", + "item.edit.reinstate.confirm": "Reintegrar", + + // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?", + "item.edit.reinstate.description": "¿Está seguro de que este artículo debe restablecerse en el archivo?", + + // "item.edit.reinstate.error": "An error occurred while reinstating the item", + "item.edit.reinstate.error": "Ocurrió un error al reinstalar el artículo", + + // "item.edit.reinstate.header": "Reinstate item: {{ id }}", + "item.edit.reinstate.header": "Restablecer artículo: {{ id }}", + + // "item.edit.reinstate.success": "The item was reinstated successfully", + "item.edit.reinstate.success": "El artículo se restableció correctamente", + + + + // "item.edit.relationships.discard-button": "Discard", + "item.edit.relationships.discard-button": "Descarte", + + // "item.edit.relationships.edit.buttons.add": "Add", + "item.edit.relationships.edit.buttons.add": "Agregar", + + // "item.edit.relationships.edit.buttons.remove": "Remove", + "item.edit.relationships.edit.buttons.remove": "Eliminar", + + // "item.edit.relationships.edit.buttons.undo": "Undo changes", + "item.edit.relationships.edit.buttons.undo": "Deshacer cambios", + + // "item.edit.relationships.no-relationships": "No relationships", + "item.edit.relationships.no-relationships": "Sin relaciones", + + // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + "item.edit.relationships.notifications.discarded.content": "Tus cambios fueron descartados. ", + + // "item.edit.relationships.notifications.discarded.title": "Changes discarded", + "item.edit.relationships.notifications.discarded.title": "Cambios descartados", + + // "item.edit.relationships.notifications.failed.title": "Error editing relationships", + "item.edit.relationships.notifications.failed.title": "Error al editar las relaciones", + + // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "item.edit.relationships.notifications.outdated.content": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ", + + // "item.edit.relationships.notifications.outdated.title": "Changes outdated", + "item.edit.relationships.notifications.outdated.title": "Cambios desactualizados", + + // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.", + "item.edit.relationships.notifications.saved.content": "Se guardaron sus cambios en las relaciones de este artículo.", + + // "item.edit.relationships.notifications.saved.title": "Relationships saved", + "item.edit.relationships.notifications.saved.title": "Relaciones guardadas", + + // "item.edit.relationships.reinstate-button": "Undo", + "item.edit.relationships.reinstate-button": "Deshacer", + + // "item.edit.relationships.save-button": "Save", + "item.edit.relationships.save-button": "Guardar", + + // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item", + "item.edit.relationships.no-entity-type": "Agregue metadatos 'dspace.entity.type' para habilitar las relaciones para este artículo", + + + // "item.edit.return": "Back", + "item.edit.return": "atrás", + + + // "item.edit.tabs.bitstreams.head": "Bitstreams", + "item.edit.tabs.bitstreams.head": "Archivos", + + // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams", + "item.edit.tabs.bitstreams.title": "Edición de artículos: archivos", + + // "item.edit.tabs.curate.head": "Curate", + "item.edit.tabs.curate.head": "Cura", + + // "item.edit.tabs.curate.title": "Item Edit - Curate", + "item.edit.tabs.curate.title": "Edición de artículo: seleccionar", + + // "item.edit.tabs.metadata.head": "Metadata", + "item.edit.tabs.metadata.head": "Metadatos", + + // "item.edit.tabs.metadata.title": "Item Edit - Metadata", + "item.edit.tabs.metadata.title": "Edición de artículos: metadatos", + + // "item.edit.tabs.relationships.head": "Relationships", + "item.edit.tabs.relationships.head": "Relaciones", + + // "item.edit.tabs.relationships.title": "Item Edit - Relationships", + "item.edit.tabs.relationships.title": "Edición de artículo: relaciones", + + // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...", + "item.edit.tabs.status.buttons.authorizations.button": "Autorizaciones...", + + // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies", + "item.edit.tabs.status.buttons.authorizations.label": "Editar las políticas de autorización del artículo", + + // "item.edit.tabs.status.buttons.delete.button": "Permanently delete", + "item.edit.tabs.status.buttons.delete.button": "Borrar permanentemente", + + // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item", + "item.edit.tabs.status.buttons.delete.label": "Eliminar completamente el artículo", + + // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections", + "item.edit.tabs.status.buttons.mappedCollections.button": "Colecciones mapeadas", + + // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections", + "item.edit.tabs.status.buttons.mappedCollections.label": "Administrar colecciones mapeadas", + + // "item.edit.tabs.status.buttons.move.button": "Move...", + "item.edit.tabs.status.buttons.move.button": "Moverse...", + + // "item.edit.tabs.status.buttons.move.label": "Move item to another collection", + "item.edit.tabs.status.buttons.move.label": "Mover artículo a otra colección", + + // "item.edit.tabs.status.buttons.private.button": "Make it private...", + "item.edit.tabs.status.buttons.private.button": "Hacerlo privado...", + + // "item.edit.tabs.status.buttons.private.label": "Make item private", + "item.edit.tabs.status.buttons.private.label": "Hacer que el artículo sea privado", + + // "item.edit.tabs.status.buttons.public.button": "Make it public...", + "item.edit.tabs.status.buttons.public.button": "Hacerlo público...", + + // "item.edit.tabs.status.buttons.public.label": "Make item public", + "item.edit.tabs.status.buttons.public.label": "Hacer público el artículo", + + // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", + "item.edit.tabs.status.buttons.reinstate.button": "Reintegrar...", + + // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository", + "item.edit.tabs.status.buttons.reinstate.label": "Restablecer el artículo en el repositorio", + + // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action", + "item.edit.tabs.status.buttons.unauthorized": "No estás autorizado para realizar esta acción.", + + // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...", + "item.edit.tabs.status.buttons.withdraw.button": "Retirar...", + + // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository", + "item.edit.tabs.status.buttons.withdraw.label": "Retirar artículo del repositorio", + + // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.", + "item.edit.tabs.status.description": "Bienvenido a la página de administración de artículos. Desde aquí puede retirar, restablecer, mover o eliminar el artículo. También puede actualizar o agregar nuevos metadatos / archivos en las otras pestañas.", + + // "item.edit.tabs.status.head": "Status", + "item.edit.tabs.status.head": "Estado", + + // "item.edit.tabs.status.labels.handle": "Handle", + "item.edit.tabs.status.labels.handle": "Resolver", + + // "item.edit.tabs.status.labels.id": "Item Internal ID", + "item.edit.tabs.status.labels.id": "ID interno del artículo", + + // "item.edit.tabs.status.labels.itemPage": "Item Page", + "item.edit.tabs.status.labels.itemPage": "Página del artículo", + + // "item.edit.tabs.status.labels.lastModified": "Last Modified", + "item.edit.tabs.status.labels.lastModified": "Última modificación", + + // "item.edit.tabs.status.title": "Item Edit - Status", + "item.edit.tabs.status.title": "Edición de artículo: estado", + + // "item.edit.tabs.versionhistory.head": "Version History", + "item.edit.tabs.versionhistory.head": "Historial de versiones", + + // "item.edit.tabs.versionhistory.title": "Item Edit - Version History", + "item.edit.tabs.versionhistory.title": "Edición de artículos: historial de versiones", + + // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.", + "item.edit.tabs.versionhistory.under-construction": "Aún no es posible editar o agregar nuevas versiones en esta interfaz de usuario.", + + // "item.edit.tabs.view.head": "View Item", + "item.edit.tabs.view.head": "Ver artículo", + + // "item.edit.tabs.view.title": "Item Edit - View", + "item.edit.tabs.view.title": "Edición de artículo - Ver", + + + + // "item.edit.withdraw.cancel": "Cancel", + "item.edit.withdraw.cancel": "Cancelar", + + // "item.edit.withdraw.confirm": "Withdraw", + "item.edit.withdraw.confirm": "Retirar", + + // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?", + "item.edit.withdraw.description": "¿Está seguro de que este artículo debe retirarse del archivo?", + + // "item.edit.withdraw.error": "An error occurred while withdrawing the item", + "item.edit.withdraw.error": "Ocurrió un error al retirar el artículo", + + // "item.edit.withdraw.header": "Withdraw item: {{ id }}", + "item.edit.withdraw.header": "Retirar artículo: {{ id }}", + + // "item.edit.withdraw.success": "The item was withdrawn successfully", + "item.edit.withdraw.success": "El artículo se retiró con éxito", + + + + // "item.listelement.badge": "Item", + "item.listelement.badge": "Artículo", + + // "item.page.description": "Description", + "item.page.description": "Descripción", + + // "item.page.journal-issn": "Journal ISSN", + "item.page.journal-issn": "Revista ISSN", + + // "item.page.journal-title": "Journal Title", + "item.page.journal-title": "Título de la revista", + + // "item.page.publisher": "Publisher", + "item.page.publisher": "Editor", + + // "item.page.titleprefix": "Item: ", + "item.page.titleprefix": "Artículo:", + + // "item.page.volume-title": "Volume Title", + "item.page.volume-title": "Título del volumen", + + // "item.search.results.head": "Item Search Results", + "item.search.results.head": "Resultados de la búsqueda de artículos", + + // "item.search.title": "Item Search", + "item.search.title": "Búsqueda de artículos", + + + + // "item.page.abstract": "Abstract", + "item.page.abstract": "Abstracto", + + // "item.page.author": "Authors", + "item.page.author": "Autores", + + // "item.page.citation": "Citation", + "item.page.citation": "Citación", + + // "item.page.collections": "Collections", + "item.page.collections": "Colecciones", + + // "item.page.collections.loading": "Loading...", + "item.page.collections.loading": "Cargando...", + + // "item.page.collections.load-more": "Load more", + "item.page.collections.load-more": "Cargar más", + + // "item.page.date": "Date", + "item.page.date": "Fecha", + + // "item.page.edit": "Edit this item", + "item.page.edit": "Editar este artículo", + + // "item.page.files": "Files", + "item.page.files": "Archivos", + + // "item.page.filesection.description": "Description:", + "item.page.filesection.description": "Descripción:", + + // "item.page.filesection.download": "Download", + "item.page.filesection.download": "Descargar", + + // "item.page.filesection.format": "Format:", + "item.page.filesection.format": "Formato:", + + // "item.page.filesection.name": "Name:", + "item.page.filesection.name": "Nombre:", + + // "item.page.filesection.size": "Size:", + "item.page.filesection.size": "Tamaño:", + + // "item.page.journal.search.title": "Articles in this journal", + "item.page.journal.search.title": "Artículos de esta revista", + + // "item.page.link.full": "Full item page", + "item.page.link.full": "Página completa del artículo", + + // "item.page.link.simple": "Simple item page", + "item.page.link.simple": "Página de artículo simple", + + // "item.page.person.search.title": "Articles by this author", + "item.page.person.search.title": "Artículos de este autor", + + // "item.page.related-items.view-more": "Show {{ amount }} more", + "item.page.related-items.view-more": "Mostrar {{ amount }} más", + + // "item.page.related-items.view-less": "Hide last {{ amount }}", + "item.page.related-items.view-less": "Ocultar la última {{ amount }}", + + // "item.page.relationships.isAuthorOfPublication": "Publications", + "item.page.relationships.isAuthorOfPublication": "Publicaciones", + + // "item.page.relationships.isJournalOfPublication": "Publications", + "item.page.relationships.isJournalOfPublication": "Publicaciones", + + // "item.page.relationships.isOrgUnitOfPerson": "Authors", + "item.page.relationships.isOrgUnitOfPerson": "Autores", + + // "item.page.relationships.isOrgUnitOfProject": "Research Projects", + "item.page.relationships.isOrgUnitOfProject": "Proyectos de investigación", + + // "item.page.subject": "Keywords", + "item.page.subject": "Palabras clave", + + // "item.page.uri": "URI", + "item.page.uri": "URI", + + // "item.page.bitstreams.view-more": "Show more", + "item.page.bitstreams.view-more": "Mostrar más", + + // "item.page.bitstreams.collapse": "Collapse", + "item.page.bitstreams.collapse": "Colapso", + + // "item.page.filesection.original.bundle" : "Original bundle", + "item.page.filesection.original.bundle": "Paquete original", + + // "item.page.filesection.license.bundle" : "License bundle", + "item.page.filesection.license.bundle": "Paquete de licencias", + + // "item.page.return": "Back", + "item.page.return": "atrás", + + // "item.preview.dc.identifier.uri": "Identifier:", + "item.preview.dc.identifier.uri": "Identificador:", + + // "item.preview.dc.contributor.author": "Authors:", + "item.preview.dc.contributor.author": "Autores:", + + // "item.preview.dc.date.issued": "Published date:", + "item.preview.dc.date.issued": "Fecha de Publicación:", + + // "item.preview.dc.description.abstract": "Abstract:", + "item.preview.dc.description.abstract": "Abstracto:", + + // "item.preview.dc.identifier.other": "Other identifier:", + "item.preview.dc.identifier.other": "Otro identificador:", + + // "item.preview.dc.language.iso": "Language:", + "item.preview.dc.language.iso": "Idioma:", + + // "item.preview.dc.subject": "Subjects:", + "item.preview.dc.subject": "Asignaturas:", + + // "item.preview.dc.title": "Title:", + "item.preview.dc.title": "Título:", + + // "item.preview.person.familyName": "Surname:", + "item.preview.person.familyName": "Apellido:", + + // "item.preview.person.givenName": "Name:", + "item.preview.person.givenName": "Nombre:", + + // "item.preview.person.identifier.orcid": "ORCID:", + "item.preview.person.identifier.orcid": "ORCID:", + + // "item.preview.project.funder.name": "Funder:", + "item.preview.project.funder.name": "Financiador:", + + // "item.preview.project.funder.identifier": "Funder Identifier:", + "item.preview.project.funder.identifier": "Identificador del financiador:", + + // "item.preview.oaire.awardNumber": "Funding ID:", + "item.preview.oaire.awardNumber": "ID de financiación:", + + // "item.preview.dc.title.alternative": "Acronym:", + "item.preview.dc.title.alternative": "Acrónimo:", + + // "item.preview.dc.coverage.spatial": "Jurisdiction:", + "item.preview.dc.coverage.spatial": "Jurisdicción:", + + // "item.preview.oaire.fundingStream": "Funding Stream:", + "item.preview.oaire.fundingStream": "Corriente de financiación:", + + + + // "item.select.confirm": "Confirm selected", + "item.select.confirm": "Confirmar seleccionado", + + // "item.select.empty": "No items to show", + "item.select.empty": "No hay artículos para mostrar", + + // "item.select.table.author": "Author", + "item.select.table.author": "Autor", + + // "item.select.table.collection": "Collection", + "item.select.table.collection": "Colección", + + // "item.select.table.title": "Title", + "item.select.table.title": "Título", + + + // "item.version.history.empty": "There are no other versions for this item yet.", + "item.version.history.empty": "Aún no hay otras versiones para este artículo.", + + // "item.version.history.head": "Version History", + "item.version.history.head": "Historial de versiones", + + // "item.version.history.return": "Back", + "item.version.history.return": "atrás", + + // "item.version.history.selected": "Selected version", + "item.version.history.selected": "Versión seleccionada", + + // "item.version.history.table.version": "Version", + "item.version.history.table.version": "Versión", + + // "item.version.history.table.item": "Item", + "item.version.history.table.item": "Artículo", + + // "item.version.history.table.editor": "Editor", + "item.version.history.table.editor": "Editor", + + // "item.version.history.table.date": "Date", + "item.version.history.table.date": "Fecha", + + // "item.version.history.table.summary": "Summary", + "item.version.history.table.summary": "Resumen", + + + + // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", + "item.version.notice": "Esta no es la última versión de este artículo. La última versión se puede encontrar aquí .", + + + + // "journal.listelement.badge": "Journal", + "journal.listelement.badge": "diario", + + // "journal.page.description": "Description", + "journal.page.description": "Descripción", + + // "journal.page.edit": "Edit this item", + "journal.page.edit": "Editar este artículo", + + // "journal.page.editor": "Editor-in-Chief", + "journal.page.editor": "Editor en jefe", + + // "journal.page.issn": "ISSN", + "journal.page.issn": "ISSN", + + // "journal.page.publisher": "Publisher", + "journal.page.publisher": "Editor", + + // "journal.page.titleprefix": "Journal: ", + "journal.page.titleprefix": "Diario:", + + // "journal.search.results.head": "Journal Search Results", + "journal.search.results.head": "Resultados de la búsqueda de revistas", + + // "journal.search.title": "Journal Search", + "journal.search.title": "Búsqueda de revistas", + + + + // "journalissue.listelement.badge": "Journal Issue", + "journalissue.listelement.badge": "Número de la revista", + + // "journalissue.page.description": "Description", + "journalissue.page.description": "Descripción", + + // "journalissue.page.edit": "Edit this item", + "journalissue.page.edit": "Editar este artículo", + + // "journalissue.page.issuedate": "Issue Date", + "journalissue.page.issuedate": "Fecha de asunto", + + // "journalissue.page.journal-issn": "Journal ISSN", + "journalissue.page.journal-issn": "Revista ISSN", + + // "journalissue.page.journal-title": "Journal Title", + "journalissue.page.journal-title": "Título de la revista", + + // "journalissue.page.keyword": "Keywords", + "journalissue.page.keyword": "Palabras clave", + + // "journalissue.page.number": "Number", + "journalissue.page.number": "Número", + + // "journalissue.page.titleprefix": "Journal Issue: ", + "journalissue.page.titleprefix": "Número de la revista:", + + + + // "journalvolume.listelement.badge": "Journal Volume", + "journalvolume.listelement.badge": "Volumen de la revista", + + // "journalvolume.page.description": "Description", + "journalvolume.page.description": "Descripción", + + // "journalvolume.page.edit": "Edit this item", + "journalvolume.page.edit": "Editar este artículo", + + // "journalvolume.page.issuedate": "Issue Date", + "journalvolume.page.issuedate": "Fecha de asunto", + + // "journalvolume.page.titleprefix": "Journal Volume: ", + "journalvolume.page.titleprefix": "Volumen de la revista:", + + // "journalvolume.page.volume": "Volume", + "journalvolume.page.volume": "Volumen", + + + + // "loading.bitstream": "Loading bitstream...", + "loading.bitstream": "Cargando archivo...", + + // "loading.bitstreams": "Loading bitstreams...", + "loading.bitstreams": "Cargando archivos...", + + // "loading.browse-by": "Loading items...", + "loading.browse-by": "Cargando artículos...", + + // "loading.browse-by-page": "Loading page...", + "loading.browse-by-page": "Cargando página...", + + // "loading.collection": "Loading collection...", + "loading.collection": "Cargando colección...", + + // "loading.collections": "Loading collections...", + "loading.collections": "Cargando colecciones...", + + // "loading.content-source": "Loading content source...", + "loading.content-source": "Cargando fuente de contenido...", + + // "loading.community": "Loading community...", + "loading.community": "Cargando comunidad...", + + // "loading.default": "Loading...", + "loading.default": "Cargando...", + + // "loading.item": "Loading item...", + "loading.item": "Cargando artículo...", + + // "loading.items": "Loading items...", + "loading.items": "Cargando artículos...", + + // "loading.mydspace-results": "Loading items...", + "loading.mydspace-results": "Cargando artículos...", + + // "loading.objects": "Loading...", + "loading.objects": "Cargando...", + + // "loading.recent-submissions": "Loading recent submissions...", + "loading.recent-submissions": "Cargando envíos recientes...", + + // "loading.search-results": "Loading search results...", + "loading.search-results": "Cargando resultados de búsqueda...", + + // "loading.sub-collections": "Loading sub-collections...", + "loading.sub-collections": "Cargando subcolecciones...", + + // "loading.sub-communities": "Loading sub-communities...", + "loading.sub-communities": "Cargando subcomunidades...", + + // "loading.top-level-communities": "Loading top-level communities...", + "loading.top-level-communities": "Cargando comunidades de nivel superior...", + + + + // "login.form.email": "Email address", + "login.form.email": "Correo electrónico", + + // "login.form.forgot-password": "Have you forgotten your password?", + "login.form.forgot-password": "¿Has olvidado tu contraseña?", + + // "login.form.header": "Please log in to DSpace", + "login.form.header": "Inicie sesión en DSpace", + + // "login.form.new-user": "New user? Click here to register.", + "login.form.new-user": "¿Nuevo Usuario? Registrarse", + + // "login.form.or-divider": "or", + "login.form.or-divider": "o", + + // "login.form.password": "Password", + "login.form.password": "Contraseña", + + // "login.form.shibboleth": "Log in with Shibboleth", + "login.form.shibboleth": "Iniciar sesión con Shibboleth", + + // "login.form.submit": "Log in", + "login.form.submit": "Iniciar sesión", + + // "login.title": "Login", + "login.title": "Acceso", + + // "login.breadcrumbs": "Login", + "login.breadcrumbs": "Acceso", + + + + // "logout.form.header": "Log out from DSpace", + "logout.form.header": "Cerrar sesión en DSpace", + + // "logout.form.submit": "Log out", + "logout.form.submit": "Cerrar sesión", + + // "logout.title": "Logout", + "logout.title": "Cerrar sesión", + + + + // "menu.header.admin": "Management", + "menu.header.admin": "Gestión", + + // "menu.header.image.logo": "Repository logo", + "menu.header.image.logo": "Logotipo del repositorio", + + // "menu.header.admin.description": "Management menu", + "menu.header.admin.description": "Menú de gestión", + + + + // "menu.section.access_control": "Access Control", + "menu.section.access_control": "Control de acceso", + + // "menu.section.access_control_authorizations": "Authorizations", + "menu.section.access_control_authorizations": "Autorizaciones", + + // "menu.section.access_control_groups": "Groups", + "menu.section.access_control_groups": "Grupos", + + // "menu.section.access_control_people": "People", + "menu.section.access_control_people": "Gente", + + + + // "menu.section.admin_search": "Admin Search", + "menu.section.admin_search": "Búsqueda de administrador", + + + + // "menu.section.browse_community": "This Community", + "menu.section.browse_community": "Esta comunidad", + + // "menu.section.browse_community_by_author": "By Author", + "menu.section.browse_community_by_author": "Por autor", + + // "menu.section.browse_community_by_issue_date": "By Issue Date", + "menu.section.browse_community_by_issue_date": "Por fecha de emisión", + + // "menu.section.browse_community_by_title": "By Title", + "menu.section.browse_community_by_title": "Por titulo", + + // "menu.section.browse_global": "All of DSpace", + "menu.section.browse_global": "Todo DSpace", + + // "menu.section.browse_global_by_author": "By Author", + "menu.section.browse_global_by_author": "Por autor", + + // "menu.section.browse_global_by_dateissued": "By Issue Date", + "menu.section.browse_global_by_dateissued": "Por fecha de emisión", + + // "menu.section.browse_global_by_subject": "By Subject", + "menu.section.browse_global_by_subject": "Por tema", + + // "menu.section.browse_global_by_title": "By Title", + "menu.section.browse_global_by_title": "Por titulo", + + // "menu.section.browse_global_communities_and_collections": "Communities & Collections", + "menu.section.browse_global_communities_and_collections": "Comunidades", + + + + // "menu.section.control_panel": "Control Panel", + "menu.section.control_panel": "Panel de control", + + // "menu.section.curation_task": "Curation Task", + "menu.section.curation_task": "Tarea de conservación", + + + + // "menu.section.edit": "Edit", + "menu.section.edit": "Editar", + + // "menu.section.edit_collection": "Collection", + "menu.section.edit_collection": "Colección", + + // "menu.section.edit_community": "Community", + "menu.section.edit_community": "Comunidad", + + // "menu.section.edit_item": "Item", + "menu.section.edit_item": "Artículo", + + + + // "menu.section.export": "Export", + "menu.section.export": "Exportar", + + // "menu.section.export_collection": "Collection", + "menu.section.export_collection": "Colección", + + // "menu.section.export_community": "Community", + "menu.section.export_community": "Comunidad", + + // "menu.section.export_item": "Item", + "menu.section.export_item": "Artículo", + + // "menu.section.export_metadata": "Metadata", + "menu.section.export_metadata": "Metadatos", + + + + // "menu.section.icon.access_control": "Access Control menu section", + "menu.section.icon.access_control": "Sección del menú de control de acceso", + + // "menu.section.icon.admin_search": "Admin search menu section", + "menu.section.icon.admin_search": "Sección del menú de búsqueda de administrador", + + // "menu.section.icon.control_panel": "Control Panel menu section", + "menu.section.icon.control_panel": "Sección del menú del panel de control", + + // "menu.section.icon.curation_task": "Curation Task menu section", + "menu.section.icon.curation_task": "Sección del menú de tareas de conservación", + + // "menu.section.icon.edit": "Edit menu section", + "menu.section.icon.edit": "Editar sección del menú", + + // "menu.section.icon.export": "Export menu section", + "menu.section.icon.export": "Exportar sección de menú", + + // "menu.section.icon.find": "Find menu section", + "menu.section.icon.find": "Buscar sección de menú", + + // "menu.section.icon.import": "Import menu section", + "menu.section.icon.import": "Importar sección de menú", + + // "menu.section.icon.new": "New menu section", + "menu.section.icon.new": "Nueva sección de menú", + + // "menu.section.icon.pin": "Pin sidebar", + "menu.section.icon.pin": "Anclar barra lateral", + + // "menu.section.icon.processes": "Processes menu section", + "menu.section.icon.processes": "Sección del menú de procesos", + + // "menu.section.icon.registries": "Registries menu section", + "menu.section.icon.registries": "Sección de menú de registros", + + // "menu.section.icon.statistics_task": "Statistics Task menu section", + "menu.section.icon.statistics_task": "Sección del menú Tarea de estadísticas", + + // "menu.section.icon.unpin": "Unpin sidebar", + "menu.section.icon.unpin": "Desanclar la barra lateral", + + + + // "menu.section.import": "Import", + "menu.section.import": "Importar", + + // "menu.section.import_batch": "Batch Import (ZIP)", + "menu.section.import_batch": "Importación por lotes (ZIP)", + + // "menu.section.import_metadata": "Metadata", + "menu.section.import_metadata": "Metadatos", + + + + // "menu.section.new": "New", + "menu.section.new": "Nuevo", + + // "menu.section.new_collection": "Collection", + "menu.section.new_collection": "Colección", + + // "menu.section.new_community": "Community", + "menu.section.new_community": "Comunidad", + + // "menu.section.new_item": "Item", + "menu.section.new_item": "Artículo", + + // "menu.section.new_item_version": "Item Version", + "menu.section.new_item_version": "Versión del artículo", + + // "menu.section.new_process": "Process", + "menu.section.new_process": "Proceso", + + + + // "menu.section.pin": "Pin sidebar", + "menu.section.pin": "Anclar barra lateral", + + // "menu.section.unpin": "Unpin sidebar", + "menu.section.unpin": "Desanclar la barra lateral", + + + + // "menu.section.processes": "Processes", + "menu.section.processes": "Procesos", + + + + // "menu.section.registries": "Registries", + "menu.section.registries": "Registros", + + // "menu.section.registries_format": "Format", + "menu.section.registries_format": "Formato", + + // "menu.section.registries_metadata": "Metadata", + "menu.section.registries_metadata": "Metadatos", + + + + // "menu.section.statistics": "Statistics", + "menu.section.statistics": "Estadísticas", + + // "menu.section.statistics_task": "Statistics Task", + "menu.section.statistics_task": "Tarea de estadísticas", + + + + // "menu.section.toggle.access_control": "Toggle Access Control section", + "menu.section.toggle.access_control": "Alternar sección de control de acceso", + + // "menu.section.toggle.control_panel": "Toggle Control Panel section", + "menu.section.toggle.control_panel": "Alternar la sección del Panel de control", + + // "menu.section.toggle.curation_task": "Toggle Curation Task section", + "menu.section.toggle.curation_task": "Alternar la sección Tarea de conservación", + + // "menu.section.toggle.edit": "Toggle Edit section", + "menu.section.toggle.edit": "Alternar sección de edición", + + // "menu.section.toggle.export": "Toggle Export section", + "menu.section.toggle.export": "Alternar sección de exportación", + + // "menu.section.toggle.find": "Toggle Find section", + "menu.section.toggle.find": "Alternar sección de búsqueda", + + // "menu.section.toggle.import": "Toggle Import section", + "menu.section.toggle.import": "Alternar sección de importación", + + // "menu.section.toggle.new": "Toggle New section", + "menu.section.toggle.new": "Alternar nueva sección", + + // "menu.section.toggle.registries": "Toggle Registries section", + "menu.section.toggle.registries": "Alternar la sección Registros", + + // "menu.section.toggle.statistics_task": "Toggle Statistics Task section", + "menu.section.toggle.statistics_task": "Alternar la sección Tarea de estadísticas", + + + // "menu.section.workflow": "Administer Workflow", + "menu.section.workflow": "Administrar flujo de trabajo", + + + // "mydspace.breadcrumbs": "MyDSpace", + "mydspace.breadcrumbs": "Mi DSpace", + + // "mydspace.description": "", + "mydspace.description": "", + + // "mydspace.general.text-here": "here", + "mydspace.general.text-here": "aquí", + + // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.", + "mydspace.messages.controller-help": "Seleccione esta opción para enviar un mensaje al remitente del artículo.", + + // "mydspace.messages.description-placeholder": "Insert your message here...", + "mydspace.messages.description-placeholder": "Inserta tu mensaje aquí...", + + // "mydspace.messages.hide-msg": "Hide message", + "mydspace.messages.hide-msg": "Ocultar mensaje", + + // "mydspace.messages.mark-as-read": "Mark as read", + "mydspace.messages.mark-as-read": "Marcar como leído", + + // "mydspace.messages.mark-as-unread": "Mark as unread", + "mydspace.messages.mark-as-unread": "marcar como no leído", + + // "mydspace.messages.no-content": "No content.", + "mydspace.messages.no-content": "Sin contenido.", + + // "mydspace.messages.no-messages": "No messages yet.", + "mydspace.messages.no-messages": "Aún no hay mensajes.", + + // "mydspace.messages.send-btn": "Send", + "mydspace.messages.send-btn": "Enviar", + + // "mydspace.messages.show-msg": "Show message", + "mydspace.messages.show-msg": "Mostrar mensaje", + + // "mydspace.messages.subject-placeholder": "Subject...", + "mydspace.messages.subject-placeholder": "Tema...", + + // "mydspace.messages.submitter-help": "Select this option to send a message to controller.", + "mydspace.messages.submitter-help": "Seleccione esta opción para enviar un mensaje al controlador.", + + // "mydspace.messages.title": "Messages", + "mydspace.messages.title": "Mensajes", + + // "mydspace.messages.to": "To", + "mydspace.messages.to": "Para", + + // "mydspace.new-submission": "New submission", + "mydspace.new-submission": "Nuevo envío", + + // "mydspace.new-submission-external": "Import metadata from external source", + "mydspace.new-submission-external": "Importar metadatos de una fuente externa", + + // "mydspace.new-submission-external-short": "Import metadata", + "mydspace.new-submission-external-short": "Importar metadatos", + + // "mydspace.results.head": "Your submissions", + "mydspace.results.head": "Tus presentaciones", + + // "mydspace.results.no-abstract": "No Abstract", + "mydspace.results.no-abstract": "Sin resumen", + + // "mydspace.results.no-authors": "No Authors", + "mydspace.results.no-authors": "Sin autores", + + // "mydspace.results.no-collections": "No Collections", + "mydspace.results.no-collections": "No hay colecciones", + + // "mydspace.results.no-date": "No Date", + "mydspace.results.no-date": "Sin fecha", + + // "mydspace.results.no-files": "No Files", + "mydspace.results.no-files": "Sin archivos", + + // "mydspace.results.no-results": "There were no items to show", + "mydspace.results.no-results": "No había artículos para mostrar", + + // "mydspace.results.no-title": "No title", + "mydspace.results.no-title": "Sin título", + + // "mydspace.results.no-uri": "No Uri", + "mydspace.results.no-uri": "No Uri", + + // "mydspace.search-form.placeholder": "Search in mydspace...", + "mydspace.search-form.placeholder": "Buscar en Mi DSpace...", + + // "mydspace.show.workflow": "All tasks", + "mydspace.show.workflow": "Todas las tareas", + + // "mydspace.show.workspace": "Your Submissions", + "mydspace.show.workspace": "Tus envíos", + + // "mydspace.status.archived": "Archived", + "mydspace.status.archived": "Archivado", + + // "mydspace.status.validation": "Validation", + "mydspace.status.validation": "Validación", + + // "mydspace.status.waiting-for-controller": "Waiting for controller", + "mydspace.status.waiting-for-controller": "Esperando controlador", + + // "mydspace.status.workflow": "Workflow", + "mydspace.status.workflow": "Flujo de trabajo", + + // "mydspace.status.workspace": "Workspace", + "mydspace.status.workspace": "Espacio de trabajo", + + // "mydspace.title": "MyDSpace", + "mydspace.title": "Mi DSpace", + + // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", + "mydspace.upload.upload-failed": "Error al crear un nuevo espacio de trabajo. Verifique el contenido cargado antes de volver a intentarlo.", + + // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.", + "mydspace.upload.upload-failed-manyentries": "Archivo no procesable. Se detectaron demasiadas entradas, pero solo se permitió una para el archivo.", + + // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.", + "mydspace.upload.upload-failed-moreonefile": "Solicitud no procesable. Solo se permite un archivo.", + + // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.", + "mydspace.upload.upload-multiple-successful": "Se crearon {{ qty }} nuevos artículos del espacio de trabajo.", + + // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.", + "mydspace.upload.upload-successful": "Se creó un nuevo artículo de espacio de trabajo. Haga clic en {{ here }} para editarlo.", + + // "mydspace.view-btn": "View", + "mydspace.view-btn": "Vista", + + + + // "nav.browse.header": "All of DSpace", + "nav.browse.header": "Todo DSpace", + + // "nav.community-browse.header": "By Community", + "nav.community-browse.header": "Por comunidad", + + // "nav.language": "Language switch", + "nav.language": "Cambio de idioma", + + // "nav.login": "Log In", + "nav.login": "Iniciar sesión", + + // "nav.logout": "User profile menu and Log Out", + "nav.logout": "Menú de perfil de usuario y cierre de sesión", + + // "nav.main.description": "Main navigation bar", + "nav.main.description": "Barra de navegación principal", + + // "nav.mydspace": "MyDSpace", + "nav.mydspace": "Mi DSpace", + + // "nav.profile": "Profile", + "nav.profile": "Perfil", + + // "nav.search": "Search", + "nav.search": "Buscar", + + // "nav.statistics.header": "Statistics", + "nav.statistics.header": "Estadísticas", + + // "nav.stop-impersonating": "Stop impersonating EPerson", + "nav.stop-impersonating": "Deja de hacerse pasar por EPerson", + + // "nav.toggle" : "Toggle navigation", + "nav.toggle": "Alternar navegación", + + // "nav.user.description" : "User profile bar", + "nav.user.description": "Barra de perfil de usuario", + + + + // "orgunit.listelement.badge": "Organizational Unit", + "orgunit.listelement.badge": "Unidad organizacional", + + // "orgunit.page.city": "City", + "orgunit.page.city": "Ciudad", + + // "orgunit.page.country": "Country", + "orgunit.page.country": "País", + + // "orgunit.page.dateestablished": "Date established", + "orgunit.page.dateestablished": "Fecha Establecida", + + // "orgunit.page.description": "Description", + "orgunit.page.description": "Descripción", + + // "orgunit.page.edit": "Edit this item", + "orgunit.page.edit": "Editar este artículo", + + // "orgunit.page.id": "ID", + "orgunit.page.id": "IDENTIFICACIÓN", + + // "orgunit.page.titleprefix": "Organizational Unit: ", + "orgunit.page.titleprefix": "Unidad organizacional:", + + + + // "pagination.options.description": "Pagination options", + "pagination.options.description": "Opciones de paginación", + + // "pagination.results-per-page": "Results Per Page", + "pagination.results-per-page": "Resultados por página", + + // "pagination.showing.detail": "{{ range }} of {{ total }}", + "pagination.showing.detail": "{{ range }} de {{ total }}", + + // "pagination.showing.label": "Now showing ", + "pagination.showing.label": "Mostrando", + + // "pagination.sort-direction": "Sort Options", + "pagination.sort-direction": "Opciones de clasificación", + + + + // "person.listelement.badge": "Person", + "person.listelement.badge": "Persona", + + // "person.listelement.no-title": "No name found", + "person.listelement.no-title": "No se encontró ningún nombre", + + // "person.page.birthdate": "Birth Date", + "person.page.birthdate": "Fecha de nacimiento", + + // "person.page.edit": "Edit this item", + "person.page.edit": "Editar este artículo", + + // "person.page.email": "Email Address", + "person.page.email": "Dirección de correo electrónico", + + // "person.page.firstname": "First Name", + "person.page.firstname": "Primer nombre", + + // "person.page.jobtitle": "Job Title", + "person.page.jobtitle": "Título profesional", + + // "person.page.lastname": "Last Name", + "person.page.lastname": "Apellido", + + // "person.page.link.full": "Show all metadata", + "person.page.link.full": "Mostrar todos los metadatos", + + // "person.page.orcid": "ORCID", + "person.page.orcid": "ORCID", + + // "person.page.staffid": "Staff ID", + "person.page.staffid": "Identificación del personal", + + // "person.page.titleprefix": "Person: ", + "person.page.titleprefix": "Persona:", + + // "person.search.results.head": "Person Search Results", + "person.search.results.head": "Resultados de búsqueda de personas", + + // "person.search.title": "Person Search", + "person.search.title": "Búsqueda de personas", + + + + // "process.new.select-parameters": "Parameters", + "process.new.select-parameters": "Parámetros", + + // "process.new.cancel": "Cancel", + "process.new.cancel": "Cancelar", + + // "process.new.submit": "Save", + "process.new.submit": "Guardar", + + // "process.new.select-script": "Script", + "process.new.select-script": "Texto", + + // "process.new.select-script.placeholder": "Choose a script...", + "process.new.select-script.placeholder": "Elija un guión...", + + // "process.new.select-script.required": "Script is required", + "process.new.select-script.required": "Se requiere script", + + // "process.new.parameter.file.upload-button": "Select file...", + "process.new.parameter.file.upload-button": "Seleccione Archivo...", + + // "process.new.parameter.file.required": "Please select a file", + "process.new.parameter.file.required": "Por favor seleccione un archivo", + + // "process.new.parameter.string.required": "Parameter value is required", + "process.new.parameter.string.required": "Se requiere el valor del parámetro", + + // "process.new.parameter.type.value": "value", + "process.new.parameter.type.value": "valor", + + // "process.new.parameter.type.file": "file", + "process.new.parameter.type.file": "expediente", + + // "process.new.parameter.required.missing": "The following parameters are required but still missing:", + "process.new.parameter.required.missing": "Los siguientes parámetros son obligatorios pero aún faltan:", + + // "process.new.notification.success.title": "Success", + "process.new.notification.success.title": "Éxito", + + // "process.new.notification.success.content": "The process was successfully created", + "process.new.notification.success.content": "El proceso fue creado con éxito", + + // "process.new.notification.error.title": "Error", + "process.new.notification.error.title": "Error", + + // "process.new.notification.error.content": "An error occurred while creating this process", + "process.new.notification.error.content": "Se produjo un error al crear este proceso.", + + // "process.new.header": "Create a new process", + "process.new.header": "Crea un nuevo proceso", + + // "process.new.title": "Create a new process", + "process.new.title": "Crea un nuevo proceso", + + // "process.new.breadcrumbs": "Create a new process", + "process.new.breadcrumbs": "Crea un nuevo proceso", + + + + // "process.detail.arguments" : "Arguments", + "process.detail.arguments": "Argumentos", + + // "process.detail.arguments.empty" : "This process doesn't contain any arguments", + "process.detail.arguments.empty": "Este proceso no contiene ningún argumento", + + // "process.detail.back" : "Back", + "process.detail.back": "Volver", + + // "process.detail.output" : "Process Output", + "process.detail.output": "Salida del proceso", + + // "process.detail.logs.button": "Retrieve process output", + "process.detail.logs.button": "Recuperar la salida del proceso", + + // "process.detail.logs.loading": "Retrieving", + "process.detail.logs.loading": "Recuperando", + + // "process.detail.logs.none": "This process has no output", + "process.detail.logs.none": "Este proceso no tiene salida", + + // "process.detail.output-files" : "Output Files", + "process.detail.output-files": "Archivos de salida", + + // "process.detail.output-files.empty" : "This process doesn't contain any output files", + "process.detail.output-files.empty": "Este proceso no contiene ningún archivo de salida", + + // "process.detail.script" : "Script", + "process.detail.script": "Secuencia de comandos", + + // "process.detail.title" : "Process: {{ id }} - {{ name }}", + "process.detail.title": "Proceso: {{ id }} - {{ name }}", + + // "process.detail.start-time" : "Start time", + "process.detail.start-time": "Hora de inicio", + + // "process.detail.end-time" : "Finish time", + "process.detail.end-time": "Hora de finalización", + + // "process.detail.status" : "Status", + "process.detail.status": "Estado", + + // "process.detail.create" : "Create similar process", + "process.detail.create": "Crear un proceso similar", + + + + // "process.overview.table.finish" : "Finish time", + "process.overview.table.finish": "Hora de finalización", + + // "process.overview.table.id" : "Process ID", + "process.overview.table.id": "ID de proceso", + + // "process.overview.table.name" : "Name", + "process.overview.table.name": "Nombre", + + // "process.overview.table.start" : "Start time", + "process.overview.table.start": "Hora de inicio", + + // "process.overview.table.status" : "Status", + "process.overview.table.status": "Estado", + + // "process.overview.table.user" : "User", + "process.overview.table.user": "Usuario", + + // "process.overview.title": "Processes Overview", + "process.overview.title": "Resumen de procesos", + + // "process.overview.breadcrumbs": "Processes Overview", + "process.overview.breadcrumbs": "Resumen de procesos", + + // "process.overview.new": "New", + "process.overview.new": "Nuevo", + + + // "profile.breadcrumbs": "Update Profile", + "profile.breadcrumbs": "Actualización del perfil", + + // "profile.card.identify": "Identify", + "profile.card.identify": "Identificar", + + // "profile.card.security": "Security", + "profile.card.security": "Seguridad", + + // "profile.form.submit": "Save", + "profile.form.submit": "Guardar", + + // "profile.groups.head": "Authorization groups you belong to", + "profile.groups.head": "Grupos de autorización a los que pertenece", + + // "profile.head": "Update Profile", + "profile.head": "Actualización del perfil", + + // "profile.metadata.form.error.firstname.required": "First Name is required", + "profile.metadata.form.error.firstname.required": "Se requiere el primer nombre", + + // "profile.metadata.form.error.lastname.required": "Last Name is required", + "profile.metadata.form.error.lastname.required": "Se requiere apellido", + + // "profile.metadata.form.label.email": "Email Address", + "profile.metadata.form.label.email": "Dirección de correo electrónico", + + // "profile.metadata.form.label.firstname": "First Name", + "profile.metadata.form.label.firstname": "Primer nombre", + + // "profile.metadata.form.label.language": "Language", + "profile.metadata.form.label.language": "Idioma", + + // "profile.metadata.form.label.lastname": "Last Name", + "profile.metadata.form.label.lastname": "Apellido", + + // "profile.metadata.form.label.phone": "Contact Telephone", + "profile.metadata.form.label.phone": "Teléfono de contacto", + + // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.", + "profile.metadata.form.notifications.success.content": "Se guardaron sus cambios en el perfil.", + + // "profile.metadata.form.notifications.success.title": "Profile saved", + "profile.metadata.form.notifications.success.title": "Perfil guardado", + + // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.", + "profile.notifications.warning.no-changes.content": "No se realizaron cambios en el perfil.", + + // "profile.notifications.warning.no-changes.title": "No changes", + "profile.notifications.warning.no-changes.title": "Sin cambios", + + // "profile.security.form.error.matching-passwords": "The passwords do not match.", + "profile.security.form.error.matching-passwords": "Las contraseñas no coinciden.", + + // "profile.security.form.error.password-length": "The password should be at least 6 characters long.", + "profile.security.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.", + + // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", + "profile.security.form.info": "Opcionalmente, puede ingresar una nueva contraseña en el cuadro a continuación y confirmarla escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.", + + // "profile.security.form.label.password": "Password", + "profile.security.form.label.password": "Contraseña", + + // "profile.security.form.label.passwordrepeat": "Retype to confirm", + "profile.security.form.label.passwordrepeat": "Rescriba para confirmar", + + // "profile.security.form.notifications.success.content": "Your changes to the password were saved.", + "profile.security.form.notifications.success.content": "Se guardaron sus cambios a la contraseña.", + + // "profile.security.form.notifications.success.title": "Password saved", + "profile.security.form.notifications.success.title": "Contraseña guardada", + + // "profile.security.form.notifications.error.title": "Error changing passwords", + "profile.security.form.notifications.error.title": "Error al cambiar las contraseñas", + + // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.", + "profile.security.form.notifications.error.not-long-enough": "La contraseña debe tener al menos 6 caracteres.", + + // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.", + "profile.security.form.notifications.error.not-same": "Las contraseñas proporcionadas no son las mismas.", + + // "profile.title": "Update Profile", + "profile.title": "Actualización del perfil", + + + + // "project.listelement.badge": "Research Project", + "project.listelement.badge": "Proyecto de investigación", + + // "project.page.contributor": "Contributors", + "project.page.contributor": "Colaboradores", + + // "project.page.description": "Description", + "project.page.description": "Descripción", + + // "project.page.edit": "Edit this item", + "project.page.edit": "Editar este artículo", + + // "project.page.expectedcompletion": "Expected Completion", + "project.page.expectedcompletion": "Finalización prevista", + + // "project.page.funder": "Funders", + "project.page.funder": "Financiadores", + + // "project.page.id": "ID", + "project.page.id": "IDENTIFICACIÓN", + + // "project.page.keyword": "Keywords", + "project.page.keyword": "Palabras clave", + + // "project.page.status": "Status", + "project.page.status": "Estado", + + // "project.page.titleprefix": "Research Project: ", + "project.page.titleprefix": "Proyecto de investigación:", + + // "project.search.results.head": "Project Search Results", + "project.search.results.head": "Resultados de búsqueda de proyectos", + + + + // "publication.listelement.badge": "Publication", + "publication.listelement.badge": "Publicación", + + // "publication.page.description": "Description", + "publication.page.description": "Descripción", + + // "publication.page.edit": "Edit this item", + "publication.page.edit": "Editar este artículo", + + // "publication.page.journal-issn": "Journal ISSN", + "publication.page.journal-issn": "Revista ISSN", + + // "publication.page.journal-title": "Journal Title", + "publication.page.journal-title": "Título de la revista", + + // "publication.page.publisher": "Publisher", + "publication.page.publisher": "Editor", + + // "publication.page.titleprefix": "Publication: ", + "publication.page.titleprefix": "Publicación:", + + // "publication.page.volume-title": "Volume Title", + "publication.page.volume-title": "Título del volumen", + + // "publication.search.results.head": "Publication Search Results", + "publication.search.results.head": "Resultados de la búsqueda de publicaciones", + + // "publication.search.title": "Publication Search", + "publication.search.title": "Búsqueda de publicaciones", + + + // "media-viewer.next": "Next", + "media-viewer.next": "próximo", + + // "media-viewer.previous": "Previous", + "media-viewer.previous": "Anterior", + + // "media-viewer.playlist": "Playlist", + "media-viewer.playlist": "Lista de reproducción", + + + // "register-email.title": "New user registration", + "register-email.title": "Registro de nuevo usuario", + + // "register-page.create-profile.header": "Create Profile", + "register-page.create-profile.header": "Crear perfil", + + // "register-page.create-profile.identification.header": "Identify", + "register-page.create-profile.identification.header": "Identificar", + + // "register-page.create-profile.identification.email": "Email Address", + "register-page.create-profile.identification.email": "Dirección de correo electrónico", + + // "register-page.create-profile.identification.first-name": "First Name *", + "register-page.create-profile.identification.first-name": "Primer nombre *", + + // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name", + "register-page.create-profile.identification.first-name.error": "Por favor ingrese un nombre", + + // "register-page.create-profile.identification.last-name": "Last Name *", + "register-page.create-profile.identification.last-name": "Apellido *", + + // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name", + "register-page.create-profile.identification.last-name.error": "Por favor ingrese un apellido", + + // "register-page.create-profile.identification.contact": "Contact Telephone", + "register-page.create-profile.identification.contact": "Teléfono de contacto", + + // "register-page.create-profile.identification.language": "Language", + "register-page.create-profile.identification.language": "Idioma", + + // "register-page.create-profile.security.header": "Security", + "register-page.create-profile.security.header": "Seguridad", + + // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.", + "register-page.create-profile.security.info": "Ingrese una contraseña en el cuadro a continuación y confírmela escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.", + + // "register-page.create-profile.security.label.password": "Password *", + "register-page.create-profile.security.label.password": "Contraseña *", + + // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *", + "register-page.create-profile.security.label.passwordrepeat": "Rescriba para confirmar *", + + // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.", + "register-page.create-profile.security.error.empty-password": "Ingrese una contraseña en el cuadro a continuación.", + + // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.", + "register-page.create-profile.security.error.matching-passwords": "Las contraseñas no coinciden.", + + // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.", + "register-page.create-profile.security.error.password-length": "La contraseña debe tener al menos 6 caracteres.", + + // "register-page.create-profile.submit": "Complete Registration", + "register-page.create-profile.submit": "Registro completo", + + // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.", + "register-page.create-profile.submit.error.content": "Se produjo un error al registrar un nuevo usuario.", + + // "register-page.create-profile.submit.error.head": "Registration failed", + "register-page.create-profile.submit.error.head": "Registro fallido", + + // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.", + "register-page.create-profile.submit.success.content": "El registro fue exitoso. Ha iniciado sesión como el usuario creado.", + + // "register-page.create-profile.submit.success.head": "Registration completed", + "register-page.create-profile.submit.success.head": "Registro completado", + + + // "register-page.registration.header": "New user registration", + "register-page.registration.header": "Registro de nuevo usuario", + + // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.", + "register-page.registration.info": "Registre una cuenta para suscribirse a colecciones para recibir actualizaciones por correo electrónico y envíe nuevos artículos a DSpace.", + + // "register-page.registration.email": "Email Address *", + "register-page.registration.email": "Dirección de correo electrónico *", + + // "register-page.registration.email.error.required": "Please fill in an email address", + "register-page.registration.email.error.required": "Por favor ingrese una dirección de correo electrónico", + + // "register-page.registration.email.error.pattern": "Please fill in a valid email address", + "register-page.registration.email.error.pattern": "Por favor ingrese una dirección de correo electrónico válida", + + // "register-page.registration.email.hint": "This address will be verified and used as your login name.", + "register-page.registration.email.hint": "Esta dirección será verificada y utilizada como su nombre de inicio de sesión.", + + // "register-page.registration.submit": "Register", + "register-page.registration.submit": "Registrarse", + + // "register-page.registration.success.head": "Verification email sent", + "register-page.registration.success.head": "El mensaje de verificación ha sido enviado", + + // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", + "register-page.registration.success.content": "Se envió un correo electrónico a {{ email }} que contiene una URL especial y más instrucciones.", + + // "register-page.registration.error.head": "Error when trying to register email", + "register-page.registration.error.head": "Error al intentar registrar el correo electrónico", + + // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}", + "register-page.registration.error.content": "Se produjo un error al registrar la siguiente dirección de correo electrónico: {{ email }}", + + + + // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items", + "relationships.add.error.relationship-type.content": "No se pudo encontrar una coincidencia adecuada para el tipo de relación {{ type }} entre los dos artículos", + + // "relationships.add.error.server.content": "The server returned an error", + "relationships.add.error.server.content": "El servidor devolvió un error", + + // "relationships.add.error.title": "Unable to add relationship", + "relationships.add.error.title": "No se puede agregar una relación", + + // "relationships.isAuthorOf": "Authors", + "relationships.isAuthorOf": "Autores", + + // "relationships.isAuthorOf.Person": "Authors (persons)", + "relationships.isAuthorOf.Person": "Autores (personas)", + + // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)", + "relationships.isAuthorOf.OrgUnit": "Autores (unidades organizativas)", + + // "relationships.isIssueOf": "Journal Issues", + "relationships.isIssueOf": "Problemas de la revista", + + // "relationships.isJournalIssueOf": "Journal Issue", + "relationships.isJournalIssueOf": "Número de la revista", + + // "relationships.isJournalOf": "Journals", + "relationships.isJournalOf": "Revistas", + + // "relationships.isOrgUnitOf": "Organizational Units", + "relationships.isOrgUnitOf": "Unidades organizativas", + + // "relationships.isPersonOf": "Authors", + "relationships.isPersonOf": "Autores", + + // "relationships.isProjectOf": "Research Projects", + "relationships.isProjectOf": "Proyectos de investigación", + + // "relationships.isPublicationOf": "Publications", + "relationships.isPublicationOf": "Publicaciones", + + // "relationships.isPublicationOfJournalIssue": "Articles", + "relationships.isPublicationOfJournalIssue": "Artículos", + + // "relationships.isSingleJournalOf": "Journal", + "relationships.isSingleJournalOf": "diario", + + // "relationships.isSingleVolumeOf": "Journal Volume", + "relationships.isSingleVolumeOf": "Volumen de la revista", + + // "relationships.isVolumeOf": "Journal Volumes", + "relationships.isVolumeOf": "Volúmenes de revistas", + + // "relationships.isContributorOf": "Contributors", + "relationships.isContributorOf": "Colaboradores", + + // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)", + "relationships.isContributorOf.OrgUnit": "Colaborador (Unidad organizativa)", + + // "relationships.isContributorOf.Person": "Contributor", + "relationships.isContributorOf.Person": "Contribuyente", + + // "relationships.isFundingAgencyOf.OrgUnit": "Funder", + "relationships.isFundingAgencyOf.OrgUnit": "Financiador", + + + // "repository.image.logo": "Repository logo", + "repository.image.logo": "Logotipo del repositorio", + + // "repository.title.prefix": "DSpace Angular :: ", + "repository.title.prefix": "DSpace Angular ::", + + // "repository.title.prefixDSpace": "DSpace Angular ::", + "repository.title.prefixDSpace": "DSpace Angular ::", + + + // "resource-policies.add.button": "Add", + "resource-policies.add.button": "Agregar", + + // "resource-policies.add.for.": "Add a new policy", + "resource-policies.add.for.": "Agregar una nueva política", + + // "resource-policies.add.for.bitstream": "Add a new Bitstream policy", + "resource-policies.add.for.bitstream": "Agregar una nueva política de Archivo", + + // "resource-policies.add.for.bundle": "Add a new Bundle policy", + "resource-policies.add.for.bundle": "Agregar una nueva política de paquete", + + // "resource-policies.add.for.item": "Add a new Item policy", + "resource-policies.add.for.item": "Agregar una nueva política de artículos", + + // "resource-policies.add.for.community": "Add a new Community policy", + "resource-policies.add.for.community": "Agregar una nueva política comunitaria", + + // "resource-policies.add.for.collection": "Add a new Collection policy", + "resource-policies.add.for.collection": "Agregar una nueva política de colección", + + // "resource-policies.create.page.heading": "Create new resource policy for ", + "resource-policies.create.page.heading": "Crear una nueva política de recursos para", + + // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.", + "resource-policies.create.page.failure.content": "Se produjo un error al crear la política de recursos.", + + // "resource-policies.create.page.success.content": "Operation successful", + "resource-policies.create.page.success.content": "Operación exitosa", + + // "resource-policies.create.page.title": "Create new resource policy", + "resource-policies.create.page.title": "Crear nueva política de recursos", + + // "resource-policies.delete.btn": "Delete selected", + "resource-policies.delete.btn": "Eliminar seleccionado", + + // "resource-policies.delete.btn.title": "Delete selected resource policies", + "resource-policies.delete.btn.title": "Eliminar las políticas de recursos seleccionadas", + + // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.", + "resource-policies.delete.failure.content": "Se produjo un error al eliminar las políticas de recursos seleccionadas.", + + // "resource-policies.delete.success.content": "Operation successful", + "resource-policies.delete.success.content": "Operación exitosa", + + // "resource-policies.edit.page.heading": "Edit resource policy ", + "resource-policies.edit.page.heading": "Editar la política de recursos", + + // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.", + "resource-policies.edit.page.failure.content": "Se produjo un error al editar la política de recursos.", + + // "resource-policies.edit.page.success.content": "Operation successful", + "resource-policies.edit.page.success.content": "Operación exitosa", + + // "resource-policies.edit.page.title": "Edit resource policy", + "resource-policies.edit.page.title": "Editar la política de recursos", + + // "resource-policies.form.action-type.label": "Select the action type", + "resource-policies.form.action-type.label": "Seleccione el tipo de acción", + + // "resource-policies.form.action-type.required": "You must select the resource policy action.", + "resource-policies.form.action-type.required": "Debe seleccionar la acción de la política de recursos.", + + // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission", + "resource-policies.form.eperson-group-list.label": "La persona o grupo al que se le otorgará el permiso", + + // "resource-policies.form.eperson-group-list.select.btn": "Select", + "resource-policies.form.eperson-group-list.select.btn": "Seleccione", + + // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson", + "resource-policies.form.eperson-group-list.tab.eperson": "Buscar una ePerson", + + // "resource-policies.form.eperson-group-list.tab.group": "Search for a group", + "resource-policies.form.eperson-group-list.tab.group": "Buscar un grupo", + + // "resource-policies.form.eperson-group-list.table.headers.action": "Action", + "resource-policies.form.eperson-group-list.table.headers.action": "Acción", + + // "resource-policies.form.eperson-group-list.table.headers.id": "ID", + "resource-policies.form.eperson-group-list.table.headers.id": "IDENTIFICACIÓN", + + // "resource-policies.form.eperson-group-list.table.headers.name": "Name", + "resource-policies.form.eperson-group-list.table.headers.name": "Nombre", + + // "resource-policies.form.date.end.label": "End Date", + "resource-policies.form.date.end.label": "Fecha final", + + // "resource-policies.form.date.start.label": "Start Date", + "resource-policies.form.date.start.label": "Fecha de inicio", + + // "resource-policies.form.description.label": "Description", + "resource-policies.form.description.label": "Descripción", + + // "resource-policies.form.name.label": "Name", + "resource-policies.form.name.label": "Nombre", + + // "resource-policies.form.policy-type.label": "Select the policy type", + "resource-policies.form.policy-type.label": "Seleccione el tipo de póliza", + + // "resource-policies.form.policy-type.required": "You must select the resource policy type.", + "resource-policies.form.policy-type.required": "Debe seleccionar el tipo de política de recursos.", + + // "resource-policies.table.headers.action": "Action", + "resource-policies.table.headers.action": "Acción", + + // "resource-policies.table.headers.date.end": "End Date", + "resource-policies.table.headers.date.end": "Fecha final", + + // "resource-policies.table.headers.date.start": "Start Date", + "resource-policies.table.headers.date.start": "Fecha de inicio", + + // "resource-policies.table.headers.edit": "Edit", + "resource-policies.table.headers.edit": "Editar", + + // "resource-policies.table.headers.edit.group": "Edit group", + "resource-policies.table.headers.edit.group": "Editar grupo", + + // "resource-policies.table.headers.edit.policy": "Edit policy", + "resource-policies.table.headers.edit.policy": "Editar política", + + // "resource-policies.table.headers.eperson": "EPerson", + "resource-policies.table.headers.eperson": "Epersona", + + // "resource-policies.table.headers.group": "Group", + "resource-policies.table.headers.group": "Grupo", + + // "resource-policies.table.headers.id": "ID", + "resource-policies.table.headers.id": "IDENTIFICACIÓN", + + // "resource-policies.table.headers.name": "Name", + "resource-policies.table.headers.name": "Nombre", + + // "resource-policies.table.headers.policyType": "type", + "resource-policies.table.headers.policyType": "escribe", + + // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream", + "resource-policies.table.headers.title.for.bitstream": "Políticas para Archivo", + + // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle", + "resource-policies.table.headers.title.for.bundle": "Políticas para el paquete", + + // "resource-policies.table.headers.title.for.item": "Policies for Item", + "resource-policies.table.headers.title.for.item": "Políticas para el artículo", + + // "resource-policies.table.headers.title.for.community": "Policies for Community", + "resource-policies.table.headers.title.for.community": "Políticas para la comunidad", + + // "resource-policies.table.headers.title.for.collection": "Policies for Collection", + "resource-policies.table.headers.title.for.collection": "Políticas de cobranza", + + + + // "search.description": "", + "search.description": "", + + // "search.switch-configuration.title": "Show", + "search.switch-configuration.title": "Show", + + // "search.title": "Search", + "search.title": "Buscar", + + // "search.breadcrumbs": "Search", + "search.breadcrumbs": "Buscar", + + // "search.search-form.placeholder": "Search the repository ...", + "search.search-form.placeholder": "Buscar en el repositorio ...", + + + // "search.filters.applied.f.author": "Author", + "search.filters.applied.f.author": "Autor", + + // "search.filters.applied.f.dateIssued.max": "End date", + "search.filters.applied.f.dateIssued.max": "Fecha final", + + // "search.filters.applied.f.dateIssued.min": "Start date", + "search.filters.applied.f.dateIssued.min": "Fecha de inicio", + + // "search.filters.applied.f.dateSubmitted": "Date submitted", + "search.filters.applied.f.dateSubmitted": "Fecha Enviado", + + // "search.filters.applied.f.discoverable": "Private", + "search.filters.applied.f.discoverable": "Privado", + + // "search.filters.applied.f.entityType": "Item Type", + "search.filters.applied.f.entityType": "Tipo de artículo", + + // "search.filters.applied.f.has_content_in_original_bundle": "Has files", + "search.filters.applied.f.has_content_in_original_bundle": "Tiene archivos", + + // "search.filters.applied.f.itemtype": "Type", + "search.filters.applied.f.itemtype": "Escribe", + + // "search.filters.applied.f.namedresourcetype": "Status", + "search.filters.applied.f.namedresourcetype": "Estado", + + // "search.filters.applied.f.subject": "Subject", + "search.filters.applied.f.subject": "Tema", + + // "search.filters.applied.f.submitter": "Submitter", + "search.filters.applied.f.submitter": "Remitente", + + // "search.filters.applied.f.jobTitle": "Job Title", + "search.filters.applied.f.jobTitle": "Título profesional", + + // "search.filters.applied.f.birthDate.max": "End birth date", + "search.filters.applied.f.birthDate.max": "Fecha final de nacimiento", + + // "search.filters.applied.f.birthDate.min": "Start birth date", + "search.filters.applied.f.birthDate.min": "Fecha de inicio de nacimiento", + + // "search.filters.applied.f.withdrawn": "Withdrawn", + "search.filters.applied.f.withdrawn": "Retirado", + + + + // "search.filters.filter.author.head": "Author", + "search.filters.filter.author.head": "Autor", + + // "search.filters.filter.author.placeholder": "Author name", + "search.filters.filter.author.placeholder": "Nombre del autor", + + // "search.filters.filter.author.label": "Search author name", + "search.filters.filter.author.label": "Buscar el nombre del autor", + + // "search.filters.filter.birthDate.head": "Birth Date", + "search.filters.filter.birthDate.head": "Fecha de nacimiento", + + // "search.filters.filter.birthDate.placeholder": "Birth Date", + "search.filters.filter.birthDate.placeholder": "Fecha de nacimiento", + + // "search.filters.filter.birthDate.label": "Search birth date", + "search.filters.filter.birthDate.label": "Buscar fecha de nacimiento", + + // "search.filters.filter.collapse": "Collapse filter", + "search.filters.filter.collapse": "Colapsar filtro", + + // "search.filters.filter.creativeDatePublished.head": "Date Published", + "search.filters.filter.creativeDatePublished.head": "Fecha de publicación", + + // "search.filters.filter.creativeDatePublished.placeholder": "Date Published", + "search.filters.filter.creativeDatePublished.placeholder": "Fecha de publicación", + + // "search.filters.filter.creativeDatePublished.label": "Search date published", + "search.filters.filter.creativeDatePublished.label": "Fecha de búsqueda publicada", + + // "search.filters.filter.creativeWorkEditor.head": "Editor", + "search.filters.filter.creativeWorkEditor.head": "Editor", + + // "search.filters.filter.creativeWorkEditor.placeholder": "Editor", + "search.filters.filter.creativeWorkEditor.placeholder": "Editor", + + // "search.filters.filter.creativeWorkEditor.label": "Search editor", + "search.filters.filter.creativeWorkEditor.label": "Editor de búsqueda", + + // "search.filters.filter.creativeWorkKeywords.head": "Subject", + "search.filters.filter.creativeWorkKeywords.head": "Tema", + + // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject", + "search.filters.filter.creativeWorkKeywords.placeholder": "Tema", + + // "search.filters.filter.creativeWorkKeywords.label": "Search subject", + "search.filters.filter.creativeWorkKeywords.label": "Asunto de búsqueda", + + // "search.filters.filter.creativeWorkPublisher.head": "Publisher", + "search.filters.filter.creativeWorkPublisher.head": "Editor", + + // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher", + "search.filters.filter.creativeWorkPublisher.placeholder": "Editor", + + // "search.filters.filter.creativeWorkPublisher.label": "Search publisher", + "search.filters.filter.creativeWorkPublisher.label": "Editor de búsqueda", + + // "search.filters.filter.dateIssued.head": "Date", + "search.filters.filter.dateIssued.head": "Fecha", + + // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date", + "search.filters.filter.dateIssued.max.placeholder": "Fecha máxima", + + // "search.filters.filter.dateIssued.max.label": "End", + "search.filters.filter.dateIssued.max.label": "Fin", + + // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date", + "search.filters.filter.dateIssued.min.placeholder": "Fecha mínima", + + // "search.filters.filter.dateIssued.min.label": "Start", + "search.filters.filter.dateIssued.min.label": "Comienzo", + + // "search.filters.filter.dateSubmitted.head": "Date submitted", + "search.filters.filter.dateSubmitted.head": "Fecha Enviado", + + // "search.filters.filter.dateSubmitted.placeholder": "Date submitted", + "search.filters.filter.dateSubmitted.placeholder": "Fecha Enviado", + + // "search.filters.filter.dateSubmitted.label": "Search date submitted", + "search.filters.filter.dateSubmitted.label": "Fecha de búsqueda enviada", + + // "search.filters.filter.discoverable.head": "Private", + "search.filters.filter.discoverable.head": "Privado", + + // "search.filters.filter.withdrawn.head": "Withdrawn", + "search.filters.filter.withdrawn.head": "Retirado", + + // "search.filters.filter.entityType.head": "Item Type", + "search.filters.filter.entityType.head": "Tipo de artículo", + + // "search.filters.filter.entityType.placeholder": "Item Type", + "search.filters.filter.entityType.placeholder": "Tipo de artículo", + + // "search.filters.filter.entityType.label": "Search item type", + "search.filters.filter.entityType.label": "Tipo de artículo de búsqueda", + + // "search.filters.filter.expand": "Expand filter", + "search.filters.filter.expand": "Expandir filtro", + + // "search.filters.filter.has_content_in_original_bundle.head": "Has files", + "search.filters.filter.has_content_in_original_bundle.head": "Tiene archivos", + + // "search.filters.filter.itemtype.head": "Type", + "search.filters.filter.itemtype.head": "Escribe", + + // "search.filters.filter.itemtype.placeholder": "Type", + "search.filters.filter.itemtype.placeholder": "Escribe", + + // "search.filters.filter.itemtype.label": "Search type", + "search.filters.filter.itemtype.label": "Tipo de búsqueda", + + // "search.filters.filter.jobTitle.head": "Job Title", + "search.filters.filter.jobTitle.head": "Título profesional", + + // "search.filters.filter.jobTitle.placeholder": "Job Title", + "search.filters.filter.jobTitle.placeholder": "Título profesional", + + // "search.filters.filter.jobTitle.label": "Search job title", + "search.filters.filter.jobTitle.label": "Buscar puesto de trabajo", + + // "search.filters.filter.knowsLanguage.head": "Known language", + "search.filters.filter.knowsLanguage.head": "Idioma conocido", + + // "search.filters.filter.knowsLanguage.placeholder": "Known language", + "search.filters.filter.knowsLanguage.placeholder": "Idioma conocido", + + // "search.filters.filter.knowsLanguage.label": "Search known language", + "search.filters.filter.knowsLanguage.label": "Buscar idioma conocido", + + // "search.filters.filter.namedresourcetype.head": "Status", + "search.filters.filter.namedresourcetype.head": "Estado", + + // "search.filters.filter.namedresourcetype.placeholder": "Status", + "search.filters.filter.namedresourcetype.placeholder": "Estado", + + // "search.filters.filter.namedresourcetype.label": "Search status", + "search.filters.filter.namedresourcetype.label": "Estado de búsqueda", + + // "search.filters.filter.objectpeople.head": "People", + "search.filters.filter.objectpeople.head": "Gente", + + // "search.filters.filter.objectpeople.placeholder": "People", + "search.filters.filter.objectpeople.placeholder": "Gente", + + // "search.filters.filter.objectpeople.label": "Search people", + "search.filters.filter.objectpeople.label": "Busca gente", + + // "search.filters.filter.organizationAddressCountry.head": "Country", + "search.filters.filter.organizationAddressCountry.head": "País", + + // "search.filters.filter.organizationAddressCountry.placeholder": "Country", + "search.filters.filter.organizationAddressCountry.placeholder": "País", + + // "search.filters.filter.organizationAddressCountry.label": "Search country", + "search.filters.filter.organizationAddressCountry.label": "País de búsqueda", + + // "search.filters.filter.organizationAddressLocality.head": "City", + "search.filters.filter.organizationAddressLocality.head": "Ciudad", + + // "search.filters.filter.organizationAddressLocality.placeholder": "City", + "search.filters.filter.organizationAddressLocality.placeholder": "Ciudad", + + // "search.filters.filter.organizationAddressLocality.label": "Search city", + "search.filters.filter.organizationAddressLocality.label": "Buscar ciudad", + + // "search.filters.filter.organizationFoundingDate.head": "Date Founded", + "search.filters.filter.organizationFoundingDate.head": "Fecha de fundación", + + // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded", + "search.filters.filter.organizationFoundingDate.placeholder": "Fecha de fundación", + + // "search.filters.filter.organizationFoundingDate.label": "Search date founded", + "search.filters.filter.organizationFoundingDate.label": "Fecha de búsqueda fundada", + + // "search.filters.filter.scope.head": "Scope", + "search.filters.filter.scope.head": "Alcance", + + // "search.filters.filter.scope.placeholder": "Scope filter", + "search.filters.filter.scope.placeholder": "Filtro de alcance", + + // "search.filters.filter.scope.label": "Search scope filter", + "search.filters.filter.scope.label": "Filtro de alcance de búsqueda", + + // "search.filters.filter.show-less": "Collapse", + "search.filters.filter.show-less": "Colapso", + + // "search.filters.filter.show-more": "Show more", + "search.filters.filter.show-more": "Mostrar más", + + // "search.filters.filter.subject.head": "Subject", + "search.filters.filter.subject.head": "Tema", + + // "search.filters.filter.subject.placeholder": "Subject", + "search.filters.filter.subject.placeholder": "Tema", + + // "search.filters.filter.subject.label": "Search subject", + "search.filters.filter.subject.label": "Asunto de búsqueda", + + // "search.filters.filter.submitter.head": "Submitter", + "search.filters.filter.submitter.head": "Remitente", + + // "search.filters.filter.submitter.placeholder": "Submitter", + "search.filters.filter.submitter.placeholder": "Remitente", + + // "search.filters.filter.submitter.label": "Search submitter", + "search.filters.filter.submitter.label": "Remitente de búsqueda", + + + + // "search.filters.entityType.JournalIssue": "Journal Issue", + "search.filters.entityType.JournalIssue": "Número de la revista", + + // "search.filters.entityType.JournalVolume": "Journal Volume", + "search.filters.entityType.JournalVolume": "Volumen de la revista", + + // "search.filters.entityType.OrgUnit": "Organizational Unit", + "search.filters.entityType.OrgUnit": "Unidad organizacional", + + // "search.filters.has_content_in_original_bundle.true": "Yes", + "search.filters.has_content_in_original_bundle.true": "sí", + + // "search.filters.has_content_in_original_bundle.false": "No", + "search.filters.has_content_in_original_bundle.false": "No", + + // "search.filters.discoverable.true": "No", + "search.filters.discoverable.true": "No", + + // "search.filters.discoverable.false": "Yes", + "search.filters.discoverable.false": "sí", + + // "search.filters.withdrawn.true": "Yes", + "search.filters.withdrawn.true": "sí", + + // "search.filters.withdrawn.false": "No", + "search.filters.withdrawn.false": "No", + + + // "search.filters.head": "Filters", + "search.filters.head": "Filtros", + + // "search.filters.reset": "Reset filters", + "search.filters.reset": "Restablecer filtros", + + // "search.filters.search.submit": "Submit", + "search.filters.search.submit": "Enviar", + + + + // "search.form.search": "Search", + "search.form.search": "Buscar", + + // "search.form.search_dspace": "All repository", + "search.form.search_dspace": "Todo el repositorio", + + + + // "search.results.head": "Search Results", + "search.results.head": "Resultados de la búsqueda", + + // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting", + "search.results.no-results": "Su búsqueda no produjo resultados. ¿Tiene problemas para encontrar lo que busca? Intenta poner", + + // "search.results.no-results-link": "quotes around it", + "search.results.no-results-link": "citas a su alrededor", + + // "search.results.empty": "Your search returned no results.", + "search.results.empty": "Su búsqueda no produjo resultados.", + + + // "default.search.results.head": "Search Results", + "default.search.results.head": "Resultados de la búsqueda", + + + // "search.sidebar.close": "Back to results", + "search.sidebar.close": "Volver a resultados", + + // "search.sidebar.filters.title": "Filters", + "search.sidebar.filters.title": "Filtros", + + // "search.sidebar.open": "Search Tools", + "search.sidebar.open": "Herramientas de búsqueda", + + // "search.sidebar.results": "results", + "search.sidebar.results": "resultados", + + // "search.sidebar.settings.rpp": "Results per page", + "search.sidebar.settings.rpp": "resultados por página", + + // "search.sidebar.settings.sort-by": "Sort By", + "search.sidebar.settings.sort-by": "Ordenar por", + + // "search.sidebar.settings.title": "Settings", + "search.sidebar.settings.title": "Ajustes", + + + + // "search.view-switch.show-detail": "Show detail", + "search.view-switch.show-detail": "Mostrar detalle", + + // "search.view-switch.show-grid": "Show as grid", + "search.view-switch.show-grid": "Mostrar como cuadrícula", + + // "search.view-switch.show-list": "Show as list", + "search.view-switch.show-list": "Mostrar como lista", + + + + // "sorting.ASC": "Ascending", + "sorting.ASC": "Ascendente", + + // "sorting.DESC": "Descending", + "sorting.DESC": "Descendente", + + // "sorting.dc.title.ASC": "Title Ascending", + "sorting.dc.title.ASC": "Título Ascendente", + + // "sorting.dc.title.DESC": "Title Descending", + "sorting.dc.title.DESC": "Título Descendente", + + // "sorting.score.ASC": "Least Relevant", + "sorting.score.ASC": "Menos relevante", + + // "sorting.score.DESC": "Most Relevant", + "sorting.score.DESC": "Lo más relevante", + + // "sorting.dc.date.issued.ASC": "Date Issued Ascending", + "sorting.dc.date.issued.ASC": "Fecha de emisión Ascendente", + + // "sorting.dc.date.issued.DESC": "Date Issued Descending", + "sorting.dc.date.issued.DESC": "Fecha de emisión Descendente", + + // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending", + "sorting.dc.date.accessioned.ASC": "Fecha de adhesión Ascendente", + + // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending", + "sorting.dc.date.accessioned.DESC": "Fecha de adhesión Descendente", + + // "sorting.lastModified.ASC": "Last modified Ascending", + "sorting.lastModified.ASC": "Última modificación Ascendente", + + // "sorting.lastModified.DESC": "Last modified Descending", + "sorting.lastModified.DESC": "Última modificación Descendente", + + + // "statistics.title": "Statistics", + "statistics.title": "Estadísticas", + + // "statistics.header": "Statistics for {{ scope }}", + "statistics.header": "Estadísticas de {{ scope }}", + + // "statistics.breadcrumbs": "Statistics", + "statistics.breadcrumbs": "Estadísticas", + + // "statistics.page.no-data": "No data available", + "statistics.page.no-data": "Datos no disponibles", + + // "statistics.table.no-data": "No data available", + "statistics.table.no-data": "Datos no disponibles", + + // "statistics.table.title.TotalVisits": "Total visits", + "statistics.table.title.TotalVisits": "Visitas totales", + + // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month", + "statistics.table.title.TotalVisitsPerMonth": "Visitas totales por mes", + + // "statistics.table.title.TotalDownloads": "File Visits", + "statistics.table.title.TotalDownloads": "Visitas de archivo", + + // "statistics.table.title.TopCountries": "Top country views", + "statistics.table.title.TopCountries": "Vistas principales del país", + + // "statistics.table.title.TopCities": "Top city views", + "statistics.table.title.TopCities": "Mejores vistas de la ciudad", + + // "statistics.table.header.views": "Views", + "statistics.table.header.views": "Puntos de vista", + + + + // "submission.edit.breadcrumbs": "Edit Submission", + "submission.edit.breadcrumbs": "Editar envío", + + // "submission.edit.title": "Edit Submission", + "submission.edit.title": "Editar envío", + + // "submission.general.cancel": "Cancel", + "submission.general.cancel": "Cancelar", + + // "submission.general.cannot_submit": "You have not the privilege to make a new submission.", + "submission.general.cannot_submit": "No tiene el privilegio de realizar un nuevo envío.", + + // "submission.general.deposit": "Deposit", + "submission.general.deposit": "Depositar", + + // "submission.general.discard.confirm.cancel": "Cancel", + "submission.general.discard.confirm.cancel": "Cancelar", + + // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?", + "submission.general.discard.confirm.info": "Esta operación no se puede deshacer. ", + + // "submission.general.discard.confirm.submit": "Yes, I'm sure", + "submission.general.discard.confirm.submit": "Sí estoy seguro", + + // "submission.general.discard.confirm.title": "Discard submission", + "submission.general.discard.confirm.title": "Descartar envío", + + // "submission.general.discard.submit": "Discard", + "submission.general.discard.submit": "Descarte", + + // "submission.general.info.saved": "Saved", + "submission.general.info.saved": "Salvado", + + // "submission.general.info.pending-changes": "Unsaved changes", + "submission.general.info.pending-changes": "Cambios no guardados", + + // "submission.general.save": "Save", + "submission.general.save": "Guardar", + + // "submission.general.save-later": "Save for later", + "submission.general.save-later": "Guardar para más adelante", + + + // "submission.import-external.page.title": "Import metadata from an external source", + "submission.import-external.page.title": "Importar metadatos de una fuente externa", + + // "submission.import-external.title": "Import metadata from an external source", + "submission.import-external.title": "Importar metadatos de una fuente externa", + + // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", + "submission.import-external.page.hint": "Ingrese una consulta arriba para buscar artículos de la web para importarlos a DSpace.", + + // "submission.import-external.back-to-my-dspace": "Back to MyDSpace", + "submission.import-external.back-to-my-dspace": "Volver a Mi DSpace", + + // "submission.import-external.search.placeholder": "Search the external source", + "submission.import-external.search.placeholder": "Buscar la fuente externa", + + // "submission.import-external.search.button": "Search", + "submission.import-external.search.button": "Buscar", + + // "submission.import-external.search.button.hint": "Write some words to search", + "submission.import-external.search.button.hint": "Escribe algunas palabras para buscar", + + // "submission.import-external.search.source.hint": "Pick an external source", + "submission.import-external.search.source.hint": "Elija una fuente externa", + + // "submission.import-external.source.arxiv": "arXiv", + "submission.import-external.source.arxiv": "arXiv", + + // "submission.import-external.source.loading": "Loading ...", + "submission.import-external.source.loading": "Cargando ...", + + // "submission.import-external.source.sherpaJournal": "SHERPA Journals", + "submission.import-external.source.sherpaJournal": "Revistas SHERPA", + + // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN", + "submission.import-external.source.sherpaJournalIssn": "Revistas SHERPA por ISSN", + + // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers", + "submission.import-external.source.sherpaPublisher": "Editores SHERPA", + + // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API", + "submission.import-external.source.openAIREFunding": "Financiamiento de la API de OpenAIRE", + + // "submission.import-external.source.orcid": "ORCID", + "submission.import-external.source.orcid": "ORCID", + + // "submission.import-external.source.pubmed": "Pubmed", + "submission.import-external.source.pubmed": "Pubmed", + + // "submission.import-external.source.lcname": "Library of Congress Names", + "submission.import-external.source.lcname": "Nombres de la Biblioteca del Congreso", + + // "submission.import-external.preview.title": "Item Preview", + "submission.import-external.preview.title": "Vista previa del artículo", + + // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.", + "submission.import-external.preview.subtitle": "Los siguientes metadatos se importaron de una fuente externa. Se completará previamente cuando inicie el envío.", + + // "submission.import-external.preview.button.import": "Start submission", + "submission.import-external.preview.button.import": "Iniciar envío", + + // "submission.import-external.preview.error.import.title": "Submission error", + "submission.import-external.preview.error.import.title": "Error de envío", + + // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.", + "submission.import-external.preview.error.import.body": "Se produce un error durante el proceso de importación de la entrada de fuente externa.", + + // "submission.sections.describe.relationship-lookup.close": "Close", + "submission.sections.describe.relationship-lookup.close": "Cerrar", + + // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection", + "submission.sections.describe.relationship-lookup.external-source.added": "Entrada local agregada con éxito a la selección", + + // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importar autor remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importar diario remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar problema de diario remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar volumen de diario remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Proyecto", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "¡Nueva entidad agregada!", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Proyecto", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Financiamiento de la API de OpenAIRE", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importar autor remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Autor local agregado exitosamente a la selección", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Autor externo importado y agregado exitosamente a la selección", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority", + "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoridad", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry", + "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importar como una nueva entrada de autoridad local", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel", + "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancelar", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to", + "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Seleccione una colección para importar nuevas entradas", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities", + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entidades", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity", + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importar como una nueva entidad local", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importar desde LC Name", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importando desde ORCID", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importar desde Sherpa Journal", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importar desde Sherpa Publisher", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importar desde PubMed", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importando desde arXiv", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import", + "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importar diario remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Revista local agregada con éxito a la selección", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Revista externa importada y agregada con éxito a la selección", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importar problema de diario remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Se agregó con éxito la edición de la revista local a la selección.", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Se importó con éxito y se agregó una edición de diario externo a la selección.", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importar volumen de diario remoto", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Se agregó con éxito el volumen de la revista local a la selección.", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Se importó y agregó con éxito un volumen de diario externo a la selección", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", + "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione una coincidencia local:", + + // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", + "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todo", + + // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page", + "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deseleccionar página", + + // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...", + "submission.sections.describe.relationship-lookup.search-tab.loading": "Cargando...", + + // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query", + "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Consulta de busqueda", + + // "submission.sections.describe.relationship-lookup.search-tab.search": "Go", + "submission.sections.describe.relationship-lookup.search-tab.search": "Ir", + + // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...", + "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Buscar...", + + // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all", + "submission.sections.describe.relationship-lookup.search-tab.select-all": "Seleccionar todo", + + // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page", + "submission.sections.describe.relationship-lookup.search-tab.select-page": "Seleccionar página", + + // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items", + "submission.sections.describe.relationship-lookup.selected": "Artículos {{ size }} seleccionados", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistas locales ({{ count }})", + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Proyectos locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicaciones locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades organizativas locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Paquetes de datos locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Archivos de datos locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Problemas de revistas locales ({{ count }})", + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Problemas de revistas locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volúmenes de revistas locales ({{ count }})", + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volúmenes de revistas locales ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Editores Sherpa ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Nombres LC ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Búsqueda de agencias de financiación", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Búsqueda de financiación", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Búsqueda de unidades organizativas", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Financiamiento de la API de OpenAIRE", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Proyectos", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Financiador del Proyecto", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API", + "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamiento de la API de OpenAIRE", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project", + "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Proyecto", + + // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects", + "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Proyectos", + + // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project", + "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador del Proyecto", + + + + + // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...", + "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Buscar...", + + // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})", + "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selección actual ({{ count }})", + + // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues", + "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Problemas de la revista", + // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues", + "submission.sections.describe.relationship-lookup.title.JournalIssue": "Problemas de la revista", + + // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes", + "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volúmenes de revistas", + // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes", + "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volúmenes de revistas", + + // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals", + "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistas", + + // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors", + "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autores", + + // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency", + "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agencia fundadora", + // "submission.sections.describe.relationship-lookup.title.Project": "Projects", + "submission.sections.describe.relationship-lookup.title.Project": "Proyectos", + + // "submission.sections.describe.relationship-lookup.title.Publication": "Publications", + "submission.sections.describe.relationship-lookup.title.Publication": "Publicaciones", + + // "submission.sections.describe.relationship-lookup.title.Person": "Authors", + "submission.sections.describe.relationship-lookup.title.Person": "Autores", + + // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units", + "submission.sections.describe.relationship-lookup.title.OrgUnit": "Unidades organizativas", + + // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages", + "submission.sections.describe.relationship-lookup.title.DataPackage": "Paquetes de datos", + + // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files", + "submission.sections.describe.relationship-lookup.title.DataFile": "Archivos de información", + + // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency", + "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agencia fundadora", + + // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding", + "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Fondos", + + // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit", + "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unidad organizativa matriz", + + // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown", + "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable", + + // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings", + "submission.sections.describe.relationship-lookup.selection-tab.settings": "Ajustes", + + // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.", + "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Su selección está actualmente vacía.", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors", + "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores seleccionados", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals", + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas seleccionadas", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume", + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volumen de la revista seleccionada", + // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects", + "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Proyectos seleccionados", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications", + "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicaciones Seleccionadas", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors", + "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores seleccionados", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units", + "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades organizativas seleccionadas", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages", + "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Paquetes de datos seleccionados", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files", + "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Archivos de datos seleccionados", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals", + "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas seleccionadas", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue", + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Problema seleccionado", + // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume", + "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volumen de la revista seleccionada", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency", + "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agencia de financiación seleccionada", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding", + "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financiamiento seleccionado", + // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue", + "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Problema seleccionado", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit", + "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Unidad organizativa seleccionada", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados de la búsqueda", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados de la búsqueda", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados de la búsqueda", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados de la búsqueda", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados de la búsqueda", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados de la búsqueda", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultados de la búsqueda", + + // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.", + "submission.sections.describe.relationship-lookup.name-variant.notification.content": "¿Le gustaría guardar \"{{ value }}\" como una variante de nombre para esta persona para que usted y otros puedan reutilizarlo para envíos futuros? Si no lo hace, aún puede usarlo para este envío.", + + // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant", + "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar una nueva variante de nombre", + + // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission", + "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Usar solo para este envío", + + // "submission.sections.ccLicense.type": "License Type", + "submission.sections.ccLicense.type": "Tipo de licencia", + + // "submission.sections.ccLicense.select": "Select a license type…", + "submission.sections.ccLicense.select": "Seleccione un tipo de licencia...", + + // "submission.sections.ccLicense.change": "Change your license type…", + "submission.sections.ccLicense.change": "Cambie su tipo de licencia...", + + // "submission.sections.ccLicense.none": "No licenses available", + "submission.sections.ccLicense.none": "No hay licencias disponibles", + + // "submission.sections.ccLicense.option.select": "Select an option…", + "submission.sections.ccLicense.option.select": "Seleccione una opción…", + + // "submission.sections.ccLicense.link": "You’ve selected the following license:", + "submission.sections.ccLicense.link": "Ha seleccionado la siguiente licencia:", + + // "submission.sections.ccLicense.confirmation": "I grant the license above", + "submission.sections.ccLicense.confirmation": "Otorgo la licencia de arriba", + + // "submission.sections.general.add-more": "Add more", + "submission.sections.general.add-more": "Añadir más", + + // "submission.sections.general.collection": "Collection", + "submission.sections.general.collection": "Colección", + + // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.", + "submission.sections.general.deposit_error_notice": "Hubo un problema al enviar el artículo. Vuelve a intentarlo más tarde.", + + // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.", + "submission.sections.general.deposit_success_notice": "Presentación depositada con éxito.", + + // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.", + "submission.sections.general.discard_error_notice": "Hubo un problema al descartar el artículo. Vuelve a intentarlo más tarde.", + + // "submission.sections.general.discard_success_notice": "Submission discarded successfully.", + "submission.sections.general.discard_success_notice": "Envío descartado con éxito.", + + // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the {{sectionId}} section.", + "submission.sections.general.metadata-extracted": "Se extrajeron y agregaron nuevos metadatos a la sección {{ sectionId }} .", + + // "submission.sections.general.metadata-extracted-new-section": "New {{sectionId}} section has been added to submission.", + "submission.sections.general.metadata-extracted-new-section": "Se ha añadido una nueva sección {{ sectionId }} al envío.", + + // "submission.sections.general.no-collection": "No collection found", + "submission.sections.general.no-collection": "No se encontró ninguna colección", + + // "submission.sections.general.no-sections": "No options available", + "submission.sections.general.no-sections": "No hay opciones disponibles", + + // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.", + "submission.sections.general.save_error_notice": "Hubo un problema al guardar el artículo. Vuelve a intentarlo más tarde.", + + // "submission.sections.general.save_success_notice": "Submission saved successfully.", + "submission.sections.general.save_success_notice": "Envío guardado con éxito.", + + // "submission.sections.general.search-collection": "Search for a collection", + "submission.sections.general.search-collection": "Buscar una colección", + + // "submission.sections.general.sections_not_valid": "There are incomplete sections.", + "submission.sections.general.sections_not_valid": "Hay secciones incompletas.", + + + + // "submission.sections.submit.progressbar.CClicense": "Creative commons license", + "submission.sections.submit.progressbar.CClicense": "Licencia Creative Commons", + + // "submission.sections.submit.progressbar.describe.recycle": "Recycle", + "submission.sections.submit.progressbar.describe.recycle": "Reciclar", + + // "submission.sections.submit.progressbar.describe.stepcustom": "Describe", + "submission.sections.submit.progressbar.describe.stepcustom": "Describir", + + // "submission.sections.submit.progressbar.describe.stepone": "Describe", + "submission.sections.submit.progressbar.describe.stepone": "Describir", + + // "submission.sections.submit.progressbar.describe.steptwo": "Describe", + "submission.sections.submit.progressbar.describe.steptwo": "Describir", + + // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates", + "submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados", + + // "submission.sections.submit.progressbar.license": "Deposit license", + "submission.sections.submit.progressbar.license": "Licencia de depósito", + + // "submission.sections.submit.progressbar.upload": "Upload files", + "submission.sections.submit.progressbar.upload": "Subir archivos", + + + + // "submission.sections.status.errors.title": "Errors", + "submission.sections.status.errors.title": "Errores", + + // "submission.sections.status.valid.title": "Valid", + "submission.sections.status.valid.title": "Válido", + + // "submission.sections.status.warnings.title": "Warnings", + "submission.sections.status.warnings.title": "Advertencias", + + // "submission.sections.toggle.open": "Open section", + "submission.sections.toggle.open": "Sección abierta", + + // "submission.sections.toggle.close": "Close section", + "submission.sections.toggle.close": "Cerrar sección", + + // "submission.sections.upload.delete.confirm.cancel": "Cancel", + "submission.sections.upload.delete.confirm.cancel": "Cancelar", + + // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?", + "submission.sections.upload.delete.confirm.info": "Esta operación no se puede deshacer. ", + + // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure", + "submission.sections.upload.delete.confirm.submit": "Sí estoy seguro", + + // "submission.sections.upload.delete.confirm.title": "Delete bitstream", + "submission.sections.upload.delete.confirm.title": "Eliminar archivo", + + // "submission.sections.upload.delete.submit": "Delete", + "submission.sections.upload.delete.submit": "Borrar", + + // "submission.sections.upload.download.title": "Download bitstream", + "submission.sections.upload.download.title": "Descarga archivo", + + // "submission.sections.upload.drop-message": "Drop files to attach them to the item", + "submission.sections.upload.drop-message": "Suelta archivos para adjuntarlos al artículo", + + // "submission.sections.upload.edit.title": "Edit bitstream", + "submission.sections.upload.edit.title": "Editar archivo", + + // "submission.sections.upload.form.access-condition-label": "Access condition type", + "submission.sections.upload.form.access-condition-label": "Tipo de condición de acceso", + + // "submission.sections.upload.form.date-required": "Date is required.", + "submission.sections.upload.form.date-required": "Se requiere fecha.", + + // "submission.sections.upload.form.from-label": "Grant access from", + "submission.sections.upload.form.from-label": "Otorgar acceso desde", + + // "submission.sections.upload.form.from-placeholder": "From", + "submission.sections.upload.form.from-placeholder": "De", + + // "submission.sections.upload.form.group-label": "Group", + "submission.sections.upload.form.group-label": "Grupo", + + // "submission.sections.upload.form.group-required": "Group is required.", + "submission.sections.upload.form.group-required": "Se requiere grupo.", + + // "submission.sections.upload.form.until-label": "Grant access until", + "submission.sections.upload.form.until-label": "Conceder acceso hasta", + + // "submission.sections.upload.form.until-placeholder": "Until", + "submission.sections.upload.form.until-placeholder": "Hasta que", + + // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):", + "submission.sections.upload.header.policy.default.nolist": "Se podrá acceder a los archivos cargados en la colección {{ collectionName }} de acuerdo con los siguientes grupos:", + + // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):", + "submission.sections.upload.header.policy.default.withlist": "Tenga en cuenta que los archivos cargados en la colección {{ collectionName }} serán accesibles, además de lo que se decida explícitamente para el archivo único, con los siguientes grupos:", + + // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files just dragging & dropping them everywhere in the page", + "submission.sections.upload.info": "Aquí encontrará todos los archivos que se encuentran actualmente en el artículo. ", + + // "submission.sections.upload.no-entry": "No", + "submission.sections.upload.no-entry": "No", + + // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.", + "submission.sections.upload.no-file-uploaded": "Aún no se ha subido ningún archivo.", + + // "submission.sections.upload.save-metadata": "Save metadata", + "submission.sections.upload.save-metadata": "Guardar metadatos", + + // "submission.sections.upload.undo": "Cancel", + "submission.sections.upload.undo": "Cancelar", + + // "submission.sections.upload.upload-failed": "Upload failed", + "submission.sections.upload.upload-failed": "Subida fallida", + + // "submission.sections.upload.upload-successful": "Upload successful", + "submission.sections.upload.upload-successful": "Subida exitosa", + + + + // "submission.submit.breadcrumbs": "New submission", + "submission.submit.breadcrumbs": "Nuevo envío", + + // "submission.submit.title": "New submission", + "submission.submit.title": "Nuevo envío", + + + + // "submission.workflow.generic.delete": "Delete", + "submission.workflow.generic.delete": "Borrar", + + // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\". You will then be asked to confirm it.", + "submission.workflow.generic.delete-help": "Si desea descartar este artículo, seleccione \"Eliminar\". Luego se le pedirá que lo confirme.", + + // "submission.workflow.generic.edit": "Edit", + "submission.workflow.generic.edit": "Editar", + + // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.", + "submission.workflow.generic.edit-help": "Seleccione esta opción para cambiar los metadatos del artículo.", + + // "submission.workflow.generic.view": "View", + "submission.workflow.generic.view": "Vista", + + // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.", + "submission.workflow.generic.view-help": "Seleccione esta opción para ver los metadatos del artículo.", + + + + // "submission.workflow.tasks.claimed.approve": "Approve", + "submission.workflow.tasks.claimed.approve": "Aprobar", + + // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".", + "submission.workflow.tasks.claimed.approve_help": "Si ha revisado el artículo y es adecuado para su inclusión en la colección, seleccione \"Aprobar \".", + + // "submission.workflow.tasks.claimed.edit": "Edit", + "submission.workflow.tasks.claimed.edit": "Editar", + + // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", + "submission.workflow.tasks.claimed.edit_help": "Seleccione esta opción para cambiar los metadatos del artículo.", + + // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.", + "submission.workflow.tasks.claimed.reject.reason.info": "Ingrese su motivo para rechazar el envío en el cuadro a continuación, indicando si el remitente puede solucionar un problema y volver a enviarlo.", + + // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject", + "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe el motivo del rechazo.", + + // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item", + "submission.workflow.tasks.claimed.reject.reason.submit": "Rechazar artículo", + + // "submission.workflow.tasks.claimed.reject.reason.title": "Reason", + "submission.workflow.tasks.claimed.reject.reason.title": "Razón", + + // "submission.workflow.tasks.claimed.reject.submit": "Reject", + "submission.workflow.tasks.claimed.reject.submit": "Rechazar", + + // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is not suitable for inclusion in the collection, select \"Reject\". You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.", + "submission.workflow.tasks.claimed.reject_help": "Si ha revisado el artículo y ha encontrado que no es adecuado para su inclusión en la colección, seleccione \"Rechazar\". Luego, se le pedirá que ingrese un mensaje que indique por qué el artículo no es adecuado y si el remitente debe cambiar algo y volver a enviarlo.", + + // "submission.workflow.tasks.claimed.return": "Return to pool", + "submission.workflow.tasks.claimed.return": "Volver a la piscina", + + // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.", + "submission.workflow.tasks.claimed.return_help": "Devuelva la tarea al grupo para que otro usuario pueda realizarla.", + + + + // "submission.workflow.tasks.generic.error": "Error occurred during operation...", + "submission.workflow.tasks.generic.error": "Ocurrió un error durante la operación...", + + // "submission.workflow.tasks.generic.processing": "Processing...", + "submission.workflow.tasks.generic.processing": "Procesando...", + + // "submission.workflow.tasks.generic.submitter": "Submitter", + "submission.workflow.tasks.generic.submitter": "Remitente", + + // "submission.workflow.tasks.generic.success": "Operation successful", + "submission.workflow.tasks.generic.success": "Operación exitosa", + + + + // "submission.workflow.tasks.pool.claim": "Claim", + "submission.workflow.tasks.pool.claim": "Afirmar", + + // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.", + "submission.workflow.tasks.pool.claim_help": "Asigne esta tarea a usted mismo.", + + // "submission.workflow.tasks.pool.hide-detail": "Hide detail", + "submission.workflow.tasks.pool.hide-detail": "Ocultar detalle", + + // "submission.workflow.tasks.pool.show-detail": "Show detail", + "submission.workflow.tasks.pool.show-detail": "Mostrar detalle", + + + + // "thumbnail.default.alt": "Thumbnail Image", + "thumbnail.default.alt": "Imagen en miniatura", + + // "thumbnail.default.placeholder": "No Thumbnail Available", + "thumbnail.default.placeholder": "No hay miniatura disponible", + + // "thumbnail.project.alt": "Project Logo", + "thumbnail.project.alt": "Logotipo del proyecto", + + // "thumbnail.project.placeholder": "Project Placeholder Image", + "thumbnail.project.placeholder": "Imagen de marcador de posición del proyecto", + + // "thumbnail.orgunit.alt": "OrgUnit Logo", + "thumbnail.orgunit.alt": "Logotipo de OrgUnit", + + // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image", + "thumbnail.orgunit.placeholder": "Imagen de marcador de posición de unidad organizativa", + + // "thumbnail.person.alt": "Profile Picture", + "thumbnail.person.alt": "Foto de perfil", + + // "thumbnail.person.placeholder": "No Profile Picture Available", + "thumbnail.person.placeholder": "No hay imagen de perfil disponible", + + + + // "title": "DSpace", + "title": "DSpace", + + + + // "vocabulary-treeview.header": "Hierarchical tree view", + "vocabulary-treeview.header": "Vista de árbol jerárquico", + + // "vocabulary-treeview.load-more": "Load more", + "vocabulary-treeview.load-more": "Carga más", + + // "vocabulary-treeview.search.form.reset": "Reset", + "vocabulary-treeview.search.form.reset": "Reiniciar", + + // "vocabulary-treeview.search.form.search": "Search", + "vocabulary-treeview.search.form.search": "Buscar", + + // "vocabulary-treeview.search.no-result": "There were no items to show", + "vocabulary-treeview.search.no-result": "No había artículos para mostrar", + + // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index", + "vocabulary-treeview.tree.description.nsi": "El índice científico noruego", + + // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories", + "vocabulary-treeview.tree.description.srsc": "Categorías de temas de investigación", + + + + // "uploader.browse": "browse", + "uploader.browse": "examinar", + + // "uploader.drag-message": "Drag & Drop your files here", + "uploader.drag-message": "Arrastrar", + + // "uploader.delete.btn-title": "Delete", + "uploader.delete.btn-title": "Borrar", + + // "uploader.or": ", or ", + "uploader.or": ", o ", + + // "uploader.processing": "Processing", + "uploader.processing": "Procesando", + + // "uploader.queue-length": "Queue length", + "uploader.queue-length": "Longitud de la cola", + + // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata", + "virtual-metadata.delete-item.info": "Seleccione los tipos para los que desea guardar los metadatos virtuales como metadatos reales", + + // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation", + "virtual-metadata.delete-item.modal-head": "Los metadatos virtuales de esta relación", + + // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata", + "virtual-metadata.delete-relationship.modal-head": "Seleccione los artículos para los que desea guardar los metadatos virtuales como metadatos reales", + + + + // "workflowAdmin.search.results.head": "Administer Workflow", + "workflowAdmin.search.results.head": "Administrar flujo de trabajo", + + + + // "workflow-item.edit.breadcrumbs": "Edit workflowitem", + "workflow-item.edit.breadcrumbs": "Editar artículo de flujo de trabajo", + + // "workflow-item.edit.title": "Edit workflowitem", + "workflow-item.edit.title": "Editar artículo de flujo de trabajo", + + // "workflow-item.delete.notification.success.title": "Deleted", + "workflow-item.delete.notification.success.title": "Eliminado", + + // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted", + "workflow-item.delete.notification.success.content": "Este artículo de flujo de trabajo se eliminó correctamente", + + // "workflow-item.delete.notification.error.title": "Something went wrong", + "workflow-item.delete.notification.error.title": "Algo salió mal", + + // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted", + "workflow-item.delete.notification.error.content": "No se pudo eliminar el artículo del flujo de trabajo", + + // "workflow-item.delete.title": "Delete workflow item", + "workflow-item.delete.title": "Eliminar artículo de flujo de trabajo", + + // "workflow-item.delete.header": "Delete workflow item", + "workflow-item.delete.header": "Eliminar artículo de flujo de trabajo", + + // "workflow-item.delete.button.cancel": "Cancel", + "workflow-item.delete.button.cancel": "Cancelar", + + // "workflow-item.delete.button.confirm": "Delete", + "workflow-item.delete.button.confirm": "Borrar", + + + // "workflow-item.send-back.notification.success.title": "Sent back to submitter", + "workflow-item.send-back.notification.success.title": "Enviado al remitente", + + // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter", + "workflow-item.send-back.notification.success.content": "Este artículo de flujo de trabajo se envió correctamente al remitente.", + + // "workflow-item.send-back.notification.error.title": "Something went wrong", + "workflow-item.send-back.notification.error.title": "Algo salió mal", + + // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter", + "workflow-item.send-back.notification.error.content": "El artículo del flujo de trabajo no se pudo devolver al remitente.", + + // "workflow-item.send-back.title": "Send workflow item back to submitter", + "workflow-item.send-back.title": "Enviar el artículo del flujo de trabajo al remitente", + + // "workflow-item.send-back.header": "Send workflow item back to submitter", + "workflow-item.send-back.header": "Enviar el artículo del flujo de trabajo al remitente", + + // "workflow-item.send-back.button.cancel": "Cancel", + "workflow-item.send-back.button.cancel": "Cancelar", + + // "workflow-item.send-back.button.confirm": "Send back", + "workflow-item.send-back.button.confirm": "Enviar de vuelta", + + // "workflow-item.view.breadcrumbs": "Workflow View", + "workflow-item.view.breadcrumbs": "Vista de flujo de trabajo", + + + // "idle-modal.header": "Session will expire soon", + "idle-modal.header": "La sesión caducará pronto", + + // "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?", + "idle-modal.info": "Por razones de seguridad, las sesiones de usuario caducan después de {{ timeToExpire }} minutos de inactividad. Tu sesión caducará pronto. ¿Le gustaría extenderla o cerrar la sesión?", + + // "idle-modal.log-out": "Log out", + "idle-modal.log-out": "Cerrar sesión", + + // "idle-modal.extend-session": "Extend session" + "idle-modal.extend-session": "Extender sesión", +} From 72d1235b2c6b935601ef7a9287ed227734d94edf Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Tue, 12 Oct 2021 09:50:56 +0200 Subject: [PATCH 121/161] 83707: Add spinners to in progress buttons --- .../collection-source-controls.component.html | 23 +++++++++++++++---- .../collection-source-controls.component.scss | 3 +++ .../collection-source-controls.component.ts | 20 +++++++++++++++- src/app/core/shared/content-source.model.ts | 3 +-- src/assets/i18n/en.json5 | 3 +++ 5 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.scss diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html index 7a0f07adda..7dc93e8adf 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html @@ -18,21 +18,36 @@ {{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}
- - + - + +
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.scss b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.scss new file mode 100644 index 0000000000..98f634e66b --- /dev/null +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.scss @@ -0,0 +1,3 @@ +.spinner-button { + margin-bottom: calc((var(--bs-line-height-base) * 1rem - var(--bs-font-size-base)) / 2); +} \ No newline at end of file diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts index ca6e1e9cd8..abc5fe3083 100644 --- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts @@ -22,12 +22,14 @@ import { TranslateService } from '@ngx-translate/core'; import { HttpClient } from '@angular/common/http'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer'; +import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; /** * Component that contains the controls to run, reset and test the harvest */ @Component({ selector: 'ds-collection-source-controls', + styleUrls: ['./collection-source-controls.component.scss'], templateUrl: './collection-source-controls.component.html', }) export class CollectionSourceControlsComponent implements OnDestroy { @@ -50,6 +52,10 @@ export class CollectionSourceControlsComponent implements OnDestroy { contentSource$: Observable; private subs: Subscription[] = []; + testConfigRunning$ = new BehaviorSubject(false); + importRunning$ = new BehaviorSubject(false); + reImportRunning$ = new BehaviorSubject(false); + constructor(private scriptDataService: ScriptDataService, private processDataService: ProcessDataService, private requestService: RequestService, @@ -75,6 +81,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { * @param contentSource - The content source to be tested */ testConfiguration(contentSource) { + this.testConfigRunning$.next(true); this.subs.push(this.scriptDataService.invoke('harvest', [ {name: '-g', value: null}, {name: '-a', value: contentSource.oaiSource}, @@ -85,6 +92,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { if (rd.hasFailed) { // show a notification when the script invocation fails this.notificationsService.error(this.translateService.get('collection.source.controls.test.submit.error')); + this.testConfigRunning$.next(false); } }), // filter out responses that aren't successful since the pinging of the process only needs to happen when the invocation was successful. @@ -104,6 +112,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) { this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed')); + this.testConfigRunning$.next(false); } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => { @@ -114,6 +123,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output); }); }); + this.testConfigRunning$.next(false); } } )); @@ -123,6 +133,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { * Start the harvest for the current collection */ importNow() { + this.importRunning$.next(true); this.subs.push(this.scriptDataService.invoke('harvest', [ {name: '-r', value: null}, {name: '-c', value: this.collection.uuid}, @@ -132,6 +143,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { tap((rd) => { if (rd.hasFailed) { this.notificationsService.error(this.translateService.get('collection.source.controls.import.submit.error')); + this.importRunning$.next(false); } else { this.notificationsService.success(this.translateService.get('collection.source.controls.import.submit.success')); } @@ -153,10 +165,12 @@ export class CollectionSourceControlsComponent implements OnDestroy { } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) { this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed')); + this.importRunning$.next(false); } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed')); - this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); + this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); + this.importRunning$.next(false); } } )); @@ -166,6 +180,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { * Reset and reimport the current collection */ resetAndReimport() { + this.reImportRunning$.next(true); this.subs.push(this.scriptDataService.invoke('harvest', [ {name: '-o', value: null}, {name: '-c', value: this.collection.uuid}, @@ -175,6 +190,7 @@ export class CollectionSourceControlsComponent implements OnDestroy { tap((rd) => { if (rd.hasFailed) { this.notificationsService.error(this.translateService.get('collection.source.controls.reset.submit.error')); + this.reImportRunning$.next(false); } else { this.notificationsService.success(this.translateService.get('collection.source.controls.reset.submit.success')); } @@ -196,10 +212,12 @@ export class CollectionSourceControlsComponent implements OnDestroy { } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) { this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed')); + this.reImportRunning$.next(false); } if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) { this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed')); this.requestService.setStaleByHrefSubstring(this.collection._links.self.href); + this.reImportRunning$.next(false); } } )); diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts index cb78c85a7c..40cf43ad0c 100644 --- a/src/app/core/shared/content-source.model.ts +++ b/src/app/core/shared/content-source.model.ts @@ -1,4 +1,4 @@ -import { autoserializeAs, deserializeAs, deserialize, serializeAs } from 'cerialize'; +import { autoserializeAs, deserialize, deserializeAs, serializeAs } from 'cerialize'; import { HALLink } from './hal-link.model'; import { MetadataConfig } from './metadata-config.model'; import { CacheableObject } from '../cache/object-cache.reducer'; @@ -6,7 +6,6 @@ import { typedObject } from '../cache/builders/build-decorators'; import { CONTENT_SOURCE } from './content-source.resource-type'; import { excludeFromEquals } from '../utilities/equals.decorators'; import { ResourceType } from './resource-type'; -import { IDToUUIDSerializer } from '../cache/id-to-uuid-serializer'; import { ContentSourceSetSerializer } from './content-source-set-serializer'; /** diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 052f0ecc2b..ebf849f1a7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -886,9 +886,11 @@ "collection.source.controls.test.failed": "The script to test the settings has failed", "collection.source.controls.test.completed": "The script to test the settings has successfully finished", "collection.source.controls.test.submit": "Test configuration", + "collection.source.controls.test.running": "Testing configuration...", "collection.source.controls.import.submit.success": "The import has been successfully initiated", "collection.source.controls.import.submit.error": "Something went wrong with initiating the import", "collection.source.controls.import.submit": "Import now", + "collection.source.controls.import.running": "Importing...", "collection.source.controls.import.failed": "An error occurred during the import", "collection.source.controls.import.completed": "The import completed", "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated", @@ -896,6 +898,7 @@ "collection.source.controls.reset.failed": "An error occurred during the reset and reimport", "collection.source.controls.reset.completed": "The reset and reimport completed", "collection.source.controls.reset.submit": "Reset and reimport", + "collection.source.controls.reset.running": "Resetting and reimporting...", "collection.source.controls.harvest.status": "Harvest status:", "collection.source.controls.harvest.start": "Harvest start time:", "collection.source.controls.harvest.last": "Last time harvested:", From 93e0828135036306b9eea06f02fb48344a3e9daf Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 12 Oct 2021 16:23:47 +0200 Subject: [PATCH 122/161] [CST-4591] Hide none item type entry from available entities in the collection form --- .../collection-form/collection-form.component.ts | 5 ++++- .../shared/item-relationships/item-type.resource-type.ts | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts index c4c8635991..a802a7bdc1 100644 --- a/src/app/collection-page/collection-form/collection-form.component.ts +++ b/src/app/collection-page/collection-form/collection-form.component.ts @@ -23,6 +23,7 @@ import { ItemType } from '../../core/shared/item-relationships/item-type.model'; import { MetadataValue } from '../../core/shared/metadata.models'; import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators'; import { collectionFormEntityTypeSelectionConfig, collectionFormModels, } from './collection-form.models'; +import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type'; /** * Form used for creating and editing collections @@ -80,7 +81,9 @@ export class CollectionFormComponent extends ComColFormComponent imp // retrieve all entity types to populate the dropdowns selection entities$.subscribe((entityTypes: ItemType[]) => { - entityTypes.forEach((type: ItemType, index: number) => { + entityTypes + .filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE) + .forEach((type: ItemType, index: number) => { this.entityTypeSelection.add({ disabled: false, label: type.label, diff --git a/src/app/core/shared/item-relationships/item-type.resource-type.ts b/src/app/core/shared/item-relationships/item-type.resource-type.ts index 616dc23b73..e820bc22f4 100644 --- a/src/app/core/shared/item-relationships/item-type.resource-type.ts +++ b/src/app/core/shared/item-relationships/item-type.resource-type.ts @@ -6,5 +6,9 @@ import { ResourceType } from '../resource-type'; * Needs to be in a separate file to prevent circular * dependencies in webpack. */ - export const ITEM_TYPE = new ResourceType('entitytype'); + +/** + * The unset entity type + */ +export const NONE_ENTITY_TYPE = 'none'; From b4a249245a67363d167bc70ca05473777fbb4ad0 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 13 Oct 2021 09:07:28 +0200 Subject: [PATCH 123/161] [CST-4510] make entity type not mandatory in the collection form --- .../collection-form/collection-form.models.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/app/collection-page/collection-form/collection-form.models.ts b/src/app/collection-page/collection-form/collection-form.models.ts index dc26b787c4..37e9d8a9a0 100644 --- a/src/app/collection-page/collection-form/collection-form.models.ts +++ b/src/app/collection-page/collection-form/collection-form.models.ts @@ -4,14 +4,7 @@ import { DynamicSelectModelConfig } from '@ng-dynamic-forms/core/lib/model/selec export const collectionFormEntityTypeSelectionConfig: DynamicSelectModelConfig = { id: 'entityType', name: 'dspace.entity.type', - required: true, - disabled: false, - validators: { - required: null - }, - errorMessages: { - required: 'collection.form.errors.entityType.required' - }, + disabled: false }; /** From 363e9b2dcb0e19315ada345d082d0025f2d87a14 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 13 Oct 2021 09:08:06 +0200 Subject: [PATCH 124/161] [CST-4510] Fix i18n labels --- src/assets/i18n/en.json5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 75d66e7a3f..c555aab010 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2409,6 +2409,7 @@ "nav.user.description" : "User profile bar", + "none.listelement.badge": "Untyped", "orgunit.listelement.badge": "Organizational Unit", @@ -3241,7 +3242,7 @@ "submission.import-external.title.Publication": "Import a publication from an external source", - "submission.import-external.title.unset": "Import metadata from an external source", + "submission.import-external.title.none": "Import metadata from an external source", "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", @@ -3748,7 +3749,6 @@ "vocabulary-treeview.tree.description.srsc": "Research Subject Categories", - "unset.listelement.badge": "Untyped", "uploader.browse": "browse", From 36be741eb387df1543c7f751cd04abbcb03de87d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 13 Oct 2021 09:22:55 +0200 Subject: [PATCH 125/161] [CST-4510] Remove check for entity type param in the import from external source page --- .../submission-import-external.component.html | 9 +-------- .../submission-import-external.component.ts | 3 ++- src/assets/i18n/en.json5 | 2 -- 3 files changed, 3 insertions(+), 11 deletions(-) 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 36905cf7a4..8c13a697a5 100644 --- a/src/app/submission/import-external/submission-import-external.component.html +++ b/src/app/submission/import-external/submission-import-external.component.html @@ -3,7 +3,6 @@
@@ -36,13 +35,7 @@
-
-
- -

{{'submission.import-external.page.noentity' | 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 0fddaa6fe0..1bc25aae78 100644 --- a/src/app/submission/import-external/submission-import-external.component.ts +++ b/src/app/submission/import-external/submission-import-external.component.ts @@ -20,6 +20,7 @@ import { fadeIn } from '../../shared/animations/fade'; import { PageInfo } from '../../core/shared/page-info.model'; import { hasValue, isNotEmpty } from '../../shared/empty.util'; import { getFinishedRemoteData } from '../../core/shared/operators'; +import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type'; /** * This component allows to submit a new workspaceitem importing the data from an external source. @@ -127,7 +128,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy { ]).pipe( take(1) ).subscribe(([entity, sourceId, query]: [string, string, string]) => { - this.reload$.next({entity: entity, query: query, sourceId: sourceId}); + this.reload$.next({entity: entity || NONE_ENTITY_TYPE, query: query, sourceId: sourceId}); this.selectLabel(entity); this.retrieveExternalSources(); })); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index c555aab010..de6199ff4f 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3246,8 +3246,6 @@ "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.", - "submission.import-external.page.noentity": "An entity type must be selected in order to use this page. Select it using the 'Import metadata from an external source' button in 'MyDspace' page.", - "submission.import-external.back-to-my-dspace": "Back to MyDSpace", "submission.import-external.search.placeholder": "Search the external source", From 7505a5a208f925890f53ed8b80bc2bcbf577c988 Mon Sep 17 00:00:00 2001 From: Vasilii Fedorov Date: Wed, 13 Oct 2021 11:36:58 +0200 Subject: [PATCH 126/161] Make 'FileSectionComponent' themeable --- src/app/item-page/item-page.module.ts | 2 ++ .../themed-file-section.component.ts | 28 +++++++++++++++++++ .../publication/publication.component.html | 2 +- .../untyped-item/untyped-item.component.html | 2 +- .../file-section/file-section.component.html | 1 + .../file-section/file-section.component.ts | 13 +++++++++ src/themes/custom/theme.module.ts | 2 ++ 7 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts create mode 100644 src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.html create mode 100644 src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts index 1c6cd83e9c..b69294944a 100644 --- a/src/app/item-page/item-page.module.ts +++ b/src/app/item-page/item-page.module.ts @@ -31,6 +31,7 @@ import { MediaViewerComponent } from './media-viewer/media-viewer.component'; import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component'; import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/media-viewer-image.component'; import { NgxGalleryModule } from '@kolkov/ngx-gallery'; +import { ThemedFileSectionComponent} from './simple/field-components/file-section/themed-file-section.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator @@ -39,6 +40,7 @@ const ENTRY_COMPONENTS = [ ]; const DECLARATIONS = [ + ThemedFileSectionComponent, ItemPageComponent, ThemedItemPageComponent, FullItemPageComponent, diff --git a/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts new file mode 100644 index 0000000000..ba5a9e87c0 --- /dev/null +++ b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts @@ -0,0 +1,28 @@ +import { ThemedComponent } from '../../../../shared/theme-support/themed.component'; +import { FileSectionComponent } from './file-section.component'; +import {Component, Input} from '@angular/core'; +import {Item} from '../../../../core/shared/item.model'; + +@Component({ + selector: 'ds-themed-item-page-file-section', + templateUrl: '../../../../shared/theme-support/themed.component.html', +}) +export class ThemedFileSectionComponent extends ThemedComponent { + + @Input() item: Item; + + protected inAndOutputNames: (keyof FileSectionComponent & keyof this)[] = ['item']; + + protected getComponentName(): string { + return 'FileSectionComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../../../../themes/${themeName}/app/item-page/simple/field-components/file-section/file-section.component`); + } + + protected importUnthemedComponent(): Promise { + return import(`./file-section.component`); + } + +} diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 9e61f00e48..ba8ce6e25d 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -16,7 +16,7 @@ - + - + Date: Wed, 13 Oct 2021 23:13:39 +0200 Subject: [PATCH 127/161] [CST-4634] Change email validator in order to show error also on focus --- .../eperson-form/eperson-form.component.ts | 200 ++++++++++-------- .../validators/email-taken.validator.ts | 20 +- src/app/app.module.ts | 19 +- 3 files changed, 135 insertions(+), 104 deletions(-) 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 f4eeaf468a..aa5ecdff37 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,5 +1,5 @@ -import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'; -import { FormGroup, Validators } from '@angular/forms'; +import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'; +import { FormGroup } from '@angular/forms'; import { DynamicCheckboxModel, DynamicFormControlModel, @@ -8,7 +8,7 @@ import { } from '@ng-dynamic-forms/core'; import { TranslateService } from '@ngx-translate/core'; import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs'; -import { switchMap, take } from 'rxjs/operators'; +import { debounceTime, switchMap, take } from 'rxjs/operators'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { RemoteData } from '../../../core/data/remote-data'; import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; @@ -37,7 +37,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator'; @Component({ selector: 'ds-eperson-form', - templateUrl: './eperson-form.component.html' + templateUrl: './eperson-form.component.html', }) /** * A form used for creating and editing EPeople @@ -162,7 +162,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy { */ isImpersonated = false; - constructor(public epersonService: EPersonDataService, + /** + * Subscription to email field value change + */ + emailValueChangeSubscribe: Subscription; + + constructor(protected changeDetectorRef: ChangeDetectorRef, + public epersonService: EPersonDataService, public groupsDataService: GroupDataService, private formBuilderService: FormBuilderService, private translateService: TranslateService, @@ -225,8 +231,8 @@ export class EPersonFormComponent implements OnInit, OnDestroy { }, required: true, errorMessages: { - emailTaken: 'error.validation.emailTaken', - pattern: 'error.validation.NotValidEmail' + emailTaken: 'error.validation.emailTaken', + pattern: 'error.validation.NotValidEmail' }, hint: emailHint }); @@ -266,15 +272,18 @@ export class EPersonFormComponent implements OnInit, OnDestroy { canLogIn: eperson != null ? eperson.canLogIn : true, requireCertificate: eperson != null ? eperson.requireCertificate : false }); - })); - if (!!this.formGroup.controls.email) { - this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService)); - } + if (eperson === null && !!this.formGroup.controls.email) { + this.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(this.epersonService)); + this.emailValueChangeSubscribe = this.email.valueChanges.pipe(debounceTime(300)).subscribe(() => { + this.changeDetectorRef.detectChanges(); + }); + } + })); const activeEPerson$ = this.epersonService.getActiveEPerson(); - this.groups = activeEPerson$.pipe( + this.groups = activeEPerson$.pipe( switchMap((eperson) => { return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, { currentPage: 1, @@ -353,10 +362,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy { getFirstCompletedRemoteData() ).subscribe((rd: RemoteData) => { if (rd.hasSucceeded) { - this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', {name: ePersonToCreate.name})); + this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: ePersonToCreate.name })); this.submitForm.emit(ePersonToCreate); } else { - this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', {name: ePersonToCreate.name})); + this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', { name: ePersonToCreate.name })); this.cancelForm.emit(); } }); @@ -392,10 +401,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy { const response = this.epersonService.updateEPerson(editedEperson); response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData) => { if (rd.hasSucceeded) { - this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', {name: editedEperson.name})); + this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: editedEperson.name })); this.submitForm.emit(editedEperson); } else { - this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', {name: editedEperson.name})); + this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', { name: editedEperson.name })); this.cancelForm.emit(); } }); @@ -405,6 +414,87 @@ export class EPersonFormComponent implements OnInit, OnDestroy { } } + /** + * Event triggered when the user changes page + * @param event + */ + onPageChange(event) { + this.updateGroups({ + currentPage: event, + elementsPerPage: this.config.pageSize + }); + } + + /** + * Start impersonating the EPerson + */ + impersonate() { + this.authService.impersonate(this.epersonInitial.id); + this.isImpersonated = true; + } + + /** + * Deletes the EPerson from the Repository. The EPerson will be the only that this form is showing. + * It'll either show a success or error message depending on whether the delete was successful or not. + */ + delete() { + this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => { + const modalRef = this.modalService.open(ConfirmationModalComponent); + modalRef.componentInstance.dso = eperson; + modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header'; + modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info'; + modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel'; + modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-eperson.confirm'; + modalRef.componentInstance.brandColor = 'danger'; + modalRef.componentInstance.confirmIcon = 'fas fa-trash'; + modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => { + if (confirm) { + if (hasValue(eperson.id)) { + this.epersonService.deleteEPerson(eperson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData) => { + if (restResponse.hasSucceeded) { + this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: eperson.name })); + this.submitForm.emit(); + } else { + this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + eperson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage); + } + this.cancelForm.emit(); + }); + } + } + }); + }); + } + + /** + * Stop impersonating the EPerson + */ + stopImpersonating() { + this.authService.stopImpersonatingAndRefresh(); + this.isImpersonated = false; + } + + /** + * Cancel the current edit when component is destroyed & unsub all subscriptions + */ + ngOnDestroy(): void { + this.onCancel(); + this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + this.paginationService.clearPagination(this.config.id); + if (hasValue(this.emailValueChangeSubscribe)) { + this.emailValueChangeSubscribe.unsubscribe(); + } + } + + /** + * This method will ensure that the page gets reset and that the cache is cleared + */ + reset() { + this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => { + this.requestService.removeByHrefSubstring(eperson.self); + }); + this.initialisePage(); + } + /** * Checks for the given ePerson if there is already an ePerson in the system with that email * and shows notification if this is the case @@ -427,17 +517,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy { })); } - /** - * Event triggered when the user changes page - * @param event - */ - onPageChange(event) { - this.updateGroups({ - currentPage: event, - elementsPerPage: this.config.pageSize - }); - } - /** * Update the list of groups by fetching it from the rest api or cache */ @@ -446,71 +525,4 @@ export class EPersonFormComponent implements OnInit, OnDestroy { this.groups = this.groupsDataService.findAllByHref(eperson._links.groups.href, options); })); } - - /** - * Start impersonating the EPerson - */ - impersonate() { - this.authService.impersonate(this.epersonInitial.id); - this.isImpersonated = true; - } - - /** - * Deletes the EPerson from the Repository. The EPerson will be the only that this form is showing. - * It'll either show a success or error message depending on whether the delete was successful or not. - */ - delete() { - this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => { - const modalRef = this.modalService.open(ConfirmationModalComponent); - modalRef.componentInstance.dso = eperson; - modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header'; - modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info'; - modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel'; - modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-eperson.confirm'; - modalRef.componentInstance.brandColor = 'danger'; - modalRef.componentInstance.confirmIcon = 'fas fa-trash'; - modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => { - if (confirm) { - if (hasValue(eperson.id)) { - this.epersonService.deleteEPerson(eperson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData) => { - if (restResponse.hasSucceeded) { - this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: eperson.name })); - this.submitForm.emit(); - } else { - this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + eperson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage); - } - this.cancelForm.emit(); - }); - }} - }); - }); - } - - /** - * Stop impersonating the EPerson - */ - stopImpersonating() { - this.authService.stopImpersonatingAndRefresh(); - this.isImpersonated = false; - } - - /** - * Cancel the current edit when component is destroyed & unsub all subscriptions - */ - ngOnDestroy(): void { - this.onCancel(); - this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); - this.paginationService.clearPagination(this.config.id); - } - - - /** - * This method will ensure that the page gets reset and that the cache is cleared - */ - reset() { - this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => { - this.requestService.removeByHrefSubstring(eperson.self); - }); - this.initialisePage(); - } } diff --git a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts index 8e5303c00c..5153abae7c 100644 --- a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts +++ b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts @@ -11,13 +11,15 @@ export class ValidateEmailNotTaken { * This method will create the validator with the ePersonDataService requested from component * @param ePersonDataService the service with DI in the component that this validator is being utilized. */ - static createValidator(ePersonDataService: EPersonDataService) { - return (control: AbstractControl): Promise | Observable => { - return ePersonDataService.getEPersonByEmail(control.value) - .pipe( - getFirstSucceededRemoteData(), - map(res => { return !!res.payload ? { emailTaken: true } : null; }) - ); - }; - } + static createValidator(ePersonDataService: EPersonDataService) { + return (control: AbstractControl): Promise | Observable => { + return ePersonDataService.getEPersonByEmail(control.value) + .pipe( + getFirstSucceededRemoteData(), + map(res => { + return !!res.payload ? { emailTaken: true } : null; + }) + ); + }; + } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 131e6c6b58..e2cb10691b 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -7,7 +7,11 @@ import { EffectsModule } from '@ngrx/effects'; import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store'; import { MetaReducer, Store, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store'; import { StoreDevtoolsModule } from '@ngrx/store-devtools'; -import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core'; +import { + DYNAMIC_ERROR_MESSAGES_MATCHER, + DYNAMIC_MATCHER_PROVIDERS, + DynamicErrorMessagesMatcher +} from '@ng-dynamic-forms/core'; import { TranslateModule } from '@ngx-translate/core'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; @@ -52,6 +56,7 @@ import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; import { UUIDService } from './core/shared/uuid.service'; import { CookieService } from './core/services/cookie.service'; +import { AbstractControl } from '@angular/forms'; export function getBase() { return environment.ui.nameSpace; @@ -61,6 +66,14 @@ export function getMetaReducers(): MetaReducer[] { return environment.debug ? [...appMetaReducers, ...debugMetaReducers] : appMetaReducers; } +/** + * Condition for displaying error messages on email form field + */ +export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher = + (control: AbstractControl, model: any, hasFocus: boolean) => { + return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus); + }; + const IMPORTS = [ CommonModule, SharedModule, @@ -146,6 +159,10 @@ const PROVIDERS = [ multi: true, deps: [ CookieService, UUIDService ] }, + { + provide: DYNAMIC_ERROR_MESSAGES_MATCHER, + useValue: ValidateEmailErrorStateMatcher + }, ...DYNAMIC_MATCHER_PROVIDERS, ]; From a745468b0ca1aade5a0b2add8213eb6d37330028 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 14 Oct 2021 11:25:03 +0200 Subject: [PATCH 128/161] 83635: Keep bitstream param on link --- src/app/app-routing-paths.ts | 9 +++++++-- .../file-download-link.component.html | 2 +- .../file-download-link.component.spec.ts | 10 +++++----- .../file-download-link.component.ts | 16 +++++++++++++--- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts index 3fa56698f7..db6b22a023 100644 --- a/src/app/app-routing-paths.ts +++ b/src/app/app-routing-paths.ts @@ -22,9 +22,14 @@ export function getBitstreamModuleRoute() { export function getBitstreamDownloadRoute(bitstream): string { return new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(); } -export function getBitstreamRequestACopyRoute(item, bitstream): string { +export function getBitstreamRequestACopyRoute(item, bitstream): { routerLink: string, queryParams: any } { const url = new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(); - return `${url}?bitstream=${bitstream.uuid}`; + return { + routerLink: url, + queryParams: { + bitstream: bitstream.uuid + } + }; } export const ADMIN_MODULE_PATH = 'admin'; diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html index 0135f74745..0155c40b0a 100644 --- a/src/app/shared/file-download-link/file-download-link.component.html +++ b/src/app/shared/file-download-link/file-download-link.component.html @@ -1,4 +1,4 @@ - + diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts index 8b39b93dc6..bf80dfcdd9 100644 --- a/src/app/shared/file-download-link/file-download-link.component.spec.ts +++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts @@ -11,7 +11,7 @@ import { Item } from '../../core/shared/item.model'; import { getItemModuleRoute } from '../../item-page/item-page-routing-paths'; import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub'; -describe('FileDownloadLinkComponent', () => { +fdescribe('FileDownloadLinkComponent', () => { let component: FileDownloadLinkComponent; let fixture: ComponentFixture; @@ -66,7 +66,7 @@ describe('FileDownloadLinkComponent', () => { fixture.detectChanges(); }); it('should return the bitstreamPath based on the input bitstream', () => { - expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()})); + expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} }})); expect(component.canDownload$).toBeObservable(cold('--a', {a: true})); }); @@ -99,7 +99,7 @@ describe('FileDownloadLinkComponent', () => { fixture.detectChanges(); }); it('should return the bitstreamPath based on the input bitstream', () => { - expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: `${new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString()}?bitstream=${bitstream.uuid}`})); + expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } }})); expect(component.canDownload$).toBeObservable(cold('--a', {a: false})); }); @@ -107,7 +107,7 @@ describe('FileDownloadLinkComponent', () => { scheduler.flush(); fixture.detectChanges(); const link = fixture.debugElement.query(By.css('a')); - expect(link.injector.get(RouterLinkDirectiveStub).routerLink).toContain(`${new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString()}?bitstream=${bitstream.uuid}`); + expect(link.injector.get(RouterLinkDirectiveStub).routerLink).toContain(new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString()); const lock = fixture.debugElement.query(By.css('.fa-lock')).nativeElement; expect(lock).toBeTruthy(); }); @@ -127,7 +127,7 @@ describe('FileDownloadLinkComponent', () => { fixture.detectChanges(); }); it('should return the bitstreamPath based on the input bitstream', () => { - expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString()})); + expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} }})); expect(component.canDownload$).toBeObservable(cold('--a', {a: false})); }); diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts index 40d871109a..a79a71b634 100644 --- a/src/app/shared/file-download-link/file-download-link.component.ts +++ b/src/app/shared/file-download-link/file-download-link.component.ts @@ -39,7 +39,10 @@ export class FileDownloadLinkComponent implements OnInit { @Input() enableRequestACopy = true; - bitstreamPath$: Observable; + bitstreamPath$: Observable<{ + routerLink: string, + queryParams: any, + }>; canDownload$: Observable; @@ -56,7 +59,7 @@ export class FileDownloadLinkComponent implements OnInit { map(([canDownload, canRequestACopy]) => this.getBitstreamPath(canDownload, canRequestACopy)) ); } else { - this.bitstreamPath$ = observableOf(getBitstreamDownloadRoute(this.bitstream)); + this.bitstreamPath$ = observableOf(this.getBitstreamDownloadPath()); this.canDownload$ = observableOf(true); } } @@ -65,6 +68,13 @@ export class FileDownloadLinkComponent implements OnInit { if (!canDownload && canRequestACopy && hasValue(this.item)) { return getBitstreamRequestACopyRoute(this.item, this.bitstream); } - return getBitstreamDownloadRoute(this.bitstream); + return this.getBitstreamDownloadPath(); + } + + getBitstreamDownloadPath() { + return { + routerLink: getBitstreamDownloadRoute(this.bitstream), + queryParams: {} + }; } } From f20776fb8f0af8683badec8e7566abca072ced16 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 14 Oct 2021 15:44:42 +0200 Subject: [PATCH 129/161] [CST-4510] Remove unused label --- src/assets/i18n/en.json5 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 9cb752ec04..ff51dec16c 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -870,8 +870,6 @@ "collection.form.entityType": "Entity Type", - "collection.form.errors.entityType.required": "Please choose an entity type for this collection", - "collection.listelement.badge": "Collection", From d08807544fea352ea0c03c612feae15244e8c865 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 14 Oct 2021 15:44:59 +0200 Subject: [PATCH 130/161] [CST-4510] Fix LGTM issue --- .../collection-form/collection-form.component.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts index a802a7bdc1..7835ccc8e5 100644 --- a/src/app/collection-page/collection-form/collection-form.component.ts +++ b/src/app/collection-page/collection-form/collection-form.component.ts @@ -6,9 +6,7 @@ import { DynamicFormControlModel, DynamicFormOptionConfig, DynamicFormService, - DynamicInputModel, - DynamicSelectModel, - DynamicTextAreaModel + DynamicSelectModel } from '@ng-dynamic-forms/core'; import { Collection } from '../../core/shared/collection.model'; @@ -52,7 +50,7 @@ export class CollectionFormComponent extends ComColFormComponent imp /** * The dynamic form fields used for creating/editing a collection - * @type {(DynamicInputModel | DynamicTextAreaModel)[]} + * @type {DynamicFormControlModel[]} */ formModel: DynamicFormControlModel[]; From 478c95f6d47fe88d3754cabe48b54bd8388eb771 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 14 Oct 2021 15:45:05 +0200 Subject: [PATCH 131/161] 83635: Item request - processed message --- .../grant-deny-request-copy.component.html | 34 ++++++++++++------- .../grant-deny-request-copy.component.spec.ts | 23 +++++++++++-- src/assets/i18n/en.json5 | 4 +++ 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html index abd013f9a1..37b275d8f8 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html @@ -1,21 +1,29 @@

{{'grant-deny-request-copy.header' | translate}}

-

-

{{'grant-deny-request-copy.intro2' | translate}}

+ diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts index 3a0817b3b0..cfefd94219 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts @@ -7,7 +7,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { AuthService } from '../../core/auth/auth.service'; import { ItemDataService } from '../../core/data/item-data.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { of as observableOf } from 'rxjs'; +import { BehaviorSubject, of as observableOf } from 'rxjs'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ @@ -17,8 +17,10 @@ import { Item } from '../../core/shared/item.model'; import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy.component'; import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths'; +import { By } from '@angular/platform-browser'; +import { RemoteData } from '../../core/data/remote-data'; -describe('GrantDenyRequestCopyComponent', () => { +fdescribe('GrantDenyRequestCopyComponent', () => { let component: GrantDenyRequestCopyComponent; let fixture: ComponentFixture; @@ -120,4 +122,21 @@ describe('GrantDenyRequestCopyComponent', () => { done(); }); }); + + describe('processed message', () => { + it('should not be displayed when decisionDate is undefined', () => { + const message = fixture.debugElement.query(By.css('.processed-message')); + expect(message).toBeNull(); + }); + + it('should be displayed when decisionDate is defined', () => { + component.itemRequestRD$ = createSuccessfulRemoteDataObject$(Object.assign(new ItemRequest(), itemRequest, { + decisionDate: 'defined-date' + })); + fixture.detectChanges(); + + const message = fixture.debugElement.query(By.css('.processed-message')); + expect(message).not.toBeNull(); + }); + }); }); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index fb3c27883b..f984656e5f 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1467,10 +1467,14 @@ "grant-deny-request-copy.header": "Document copy request", + "grant-deny-request-copy.home-page": "Take me to the home page", + "grant-deny-request-copy.intro1": "If you are one of the authors of the document {{ name }}, then please use one of the options below to respond to the user's request.", "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.", + "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.", + "grant-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>", From 13dd4dfc05179733fd0fec24262c5bbe8dd102d9 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 14 Oct 2021 15:48:50 +0200 Subject: [PATCH 132/161] 83635: Remove fdescribe and unused imports --- .../grant-deny-request-copy.component.spec.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts index cfefd94219..5c37a86f24 100644 --- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts +++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts @@ -7,7 +7,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { AuthService } from '../../core/auth/auth.service'; import { ItemDataService } from '../../core/data/item-data.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { BehaviorSubject, of as observableOf } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ @@ -18,9 +18,8 @@ import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy.compone import { getItemPageRoute } from '../../item-page/item-page-routing-paths'; import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths'; import { By } from '@angular/platform-browser'; -import { RemoteData } from '../../core/data/remote-data'; -fdescribe('GrantDenyRequestCopyComponent', () => { +describe('GrantDenyRequestCopyComponent', () => { let component: GrantDenyRequestCopyComponent; let fixture: ComponentFixture; From bd02bcd0deaa48d93a3e19c0c69b2cab0b597cce Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 14 Oct 2021 16:02:20 +0200 Subject: [PATCH 133/161] [CST-4634] Remove impersonate button from eperson creation form --- .../eperson-form/eperson-form.component.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 aa5ecdff37..723939df77 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 @@ -299,7 +299,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy { ); this.canImpersonate$ = activeEPerson$.pipe( - switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, hasValue(eperson) ? eperson.self : undefined)) + switchMap((eperson) => { + if (hasValue(eperson)) { + return this.authorizationService.isAuthorized(FeatureID.LoginOnBehalfOf, eperson.self); + } else { + return observableOf(false); + } + }) ); this.canDelete$ = activeEPerson$.pipe( switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined)) From 4d277991ef7b679d91038f08886cdcdff9381b49 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 15 Oct 2021 10:25:30 +0200 Subject: [PATCH 134/161] [CST-4510] Address feedback --- .../submission-import-external.component.ts | 8 ++++---- src/assets/i18n/en.json5 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 1bc25aae78..9b89dc71cc 100644 --- a/src/app/submission/import-external/submission-import-external.component.ts +++ b/src/app/submission/import-external/submission-import-external.component.ts @@ -180,20 +180,20 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy { * Retrieve external source entries. */ private retrieveExternalSources(): void { -/* if (hasValue(this.retrieveExternalSourcesSub)) { + if (hasValue(this.retrieveExternalSourcesSub)) { this.retrieveExternalSourcesSub.unsubscribe(); - }*/ + } this.retrieveExternalSourcesSub = this.reload$.pipe( filter((sourceQueryObject: ExternalSourceData) => isNotEmpty(sourceQueryObject.sourceId) && isNotEmpty(sourceQueryObject.query)), switchMap((sourceQueryObject: ExternalSourceData) => { const query = sourceQueryObject.query; this.routeData = sourceQueryObject; return this.searchConfigService.paginatedSearchOptions.pipe( - tap((v) => this.isLoading$.next(true)), + tap(() => this.isLoading$.next(true)), filter((searchOptions) => searchOptions.query === query), mergeMap((searchOptions) => this.externalService.getExternalSourceEntries(this.routeData.sourceId, searchOptions).pipe( getFinishedRemoteData(), - )), + )) ); } ), diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index ff51dec16c..0d5c53309b 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2435,7 +2435,7 @@ "nav.user.description" : "User profile bar", - "none.listelement.badge": "Untyped", + "none.listelement.badge": "Item", "orgunit.listelement.badge": "Organizational Unit", From 850970e204c84f772da509dab610d38944c523a5 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 15 Oct 2021 13:05:24 +0200 Subject: [PATCH 135/161] [CST-4499] Version history - Code refactoring (WIP) and "Edit workspace item" button --- .../core/data/version-history-data.service.ts | 2 +- .../submission/workspaceitem-data.service.ts | 8 ++++-- .../versioned-item.component.html | 1 - .../versioned-item.component.ts | 10 +++++-- .../item-versions-shared.service.ts | 11 ++++++-- .../item-versions.component.html | 16 +++++++++-- .../item-versions/item-versions.component.ts | 28 +++++++++++++++++++ src/assets/i18n/en.json5 | 2 ++ 8 files changed, 67 insertions(+), 11 deletions(-) diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 66a166d764..86c678335c 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -170,7 +170,7 @@ export class VersionHistoryDataService extends DataService { */ hasDraftVersion$(versionHref: string): Observable { return this.versionDataService.findByHref(versionHref, true, true, followLink('versionhistory')).pipe( - take(1), + getFirstCompletedRemoteData(), switchMap((res) => { if (res.hasSucceeded && !res.hasNoContent) { return of(res).pipe( diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts index 8ed2aa2788..2813398bb5 100644 --- a/src/app/core/submission/workspaceitem-data.service.ts +++ b/src/app/core/submission/workspaceitem-data.service.ts @@ -43,14 +43,18 @@ export class WorkspaceitemDataService extends DataService { * Return the WorkspaceItem object found through the UUID of an item * * @param uuid The uuid of the item + * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's + * no valid cached version. Defaults to true + * @param reRequestOnStale Whether or not the request should automatically be re- + * requested after the response becomes stale * @param options The {@link FindListOptions} object * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved */ - public findByItem(uuid: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig[]): Observable> { + public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig[]): Observable> { const findListOptions = new FindListOptions(); findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))]; const href$ = this.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow); - return this.findByHref(href$, false, true, ...linksToFollow); + return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); } } diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html index eed81441ab..e69de29bb2 100644 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html @@ -1 +0,0 @@ -

versioned-item works!

diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts index ecf7a1119c..5eabf49610 100644 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts @@ -4,7 +4,7 @@ import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item- import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; import { RemoteData } from '../../../../core/data/remote-data'; import { Version } from '../../../../core/shared/version.model'; -import { switchMap } from 'rxjs/operators'; +import { switchMap, tap } from 'rxjs/operators'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service'; import { TranslateService } from '@ngx-translate/core'; @@ -58,11 +58,15 @@ export class VersionedItemComponent extends ItemComponent { // On createVersionEvent emitted create new version and notify activeModal.componentInstance.createVersionEvent.pipe( - switchMap((summary: string) => this.itemVersionShared.createNewVersionAndNotify(item, summary)), + switchMap((summary: string) => this.versionHistoryService.createVersion(item._links.self.href, summary)), + getFirstCompletedRemoteData(), + // show success/failure notification + tap((res: RemoteData) => { this.itemVersionShared.notifyCreateNewVersion(res); }), getFirstSucceededRemoteDataPayload(), + // get workspace item switchMap((newVersion: Version) => this.itemService.findByHref(newVersion._links.item.href)), getFirstSucceededRemoteDataPayload(), - switchMap((newVersionItem: Item) => this.workspaceitemDataService.findByItem(newVersionItem.uuid)), + switchMap((newVersionItem: Item) => this.workspaceitemDataService.findByItem(newVersionItem.uuid, true, false)), getFirstSucceededRemoteDataPayload(), ).subscribe((wsItem) => { const wsiId = wsItem.id; diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.ts b/src/app/shared/item/item-versions/item-versions-shared.service.ts index 352d15c7bd..0b5b247beb 100644 --- a/src/app/shared/item/item-versions/item-versions-shared.service.ts +++ b/src/app/shared/item/item-versions/item-versions-shared.service.ts @@ -35,13 +35,20 @@ export class ItemVersionsSharedService { return this.versionHistoryService.createVersion(item._links.self.href, summary).pipe( switchMap((postResult: RemoteData) => { const newVersionNumber = postResult?.payload?.version; - this.notifyCreateNewVersion(postResult.hasSucceeded, postResult.statusCode, newVersionNumber); + this.notifyCreateNewVersionBak(postResult.hasSucceeded, postResult.statusCode, newVersionNumber); return of(postResult); }) ); } - private notifyCreateNewVersion(success: boolean, statusCode: number, newVersionNumber: number) { + public notifyCreateNewVersion(newVersionRD: RemoteData) { + const newVersionNumber = newVersionRD?.payload?.version; + newVersionRD.hasSucceeded ? + this.notificationsService.success(null, this.translateService.get(ItemVersionsSharedService.msg('success'), {version: newVersionNumber})) : + this.notificationsService.error(null, this.translateService.get(ItemVersionsSharedService.msg(newVersionRD?.statusCode === 422 ? 'inProgress' : 'failure'))); + } + + private notifyCreateNewVersionBak(success: boolean, statusCode: number, newVersionNumber: number) { // TODO delete this success ? this.notificationsService.success(null, this.translateService.get(ItemVersionsSharedService.msg('success'), {version: newVersionNumber})) : this.notificationsService.error(null, this.translateService.get(ItemVersionsSharedService.msg(statusCode === 422 ? 'inProgress' : 'failure'))); diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 2a00606a8d..7e8a376962 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -25,8 +25,20 @@
- {{version.version}} - * +
+
+ {{version.version}} + * +
+
+ + + +
+
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts index f078640269..a1367c180a 100644 --- a/src/app/shared/item/item-versions/item-versions.component.ts +++ b/src/app/shared/item/item-versions/item-versions.component.ts @@ -45,6 +45,8 @@ import { Router } from '@angular/router'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { ItemVersionsSharedService } from './item-versions-shared.service'; +import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; +import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; @Component({ selector: 'ds-item-versions', @@ -170,6 +172,7 @@ export class ItemVersionsComponent implements OnInit { private router: Router, private itemVersionShared: ItemVersionsSharedService, private authorizationService: AuthorizationDataService, + private workspaceItemDataService: WorkspaceitemDataService, ) { } @@ -379,6 +382,30 @@ export class ItemVersionsComponent implements OnInit { }); } + /** + * Get the ID of the workspace item, if present, otherwise return undefined + * @param versionItem the item for which retrieve the workspace item id + */ + getDraftId(versionItem): Observable { + return versionItem.pipe( + getFirstSucceededRemoteDataPayload(), + map((item: Item) => item.uuid), + switchMap((itemUuid: string) => this.workspaceItemDataService.findByItem(itemUuid, true)), + getFirstCompletedRemoteData(), + map((res: RemoteData) => res?.payload?.id ), + ); + } + + /** + * redirect to the edit page of the workspace item + * @param id$ the id of the workspace item + */ + editWorkspaceItem(id$: Observable) { + id$.subscribe((id) => { + this.router.navigateByUrl('workspaceitems/' + id + '/edit'); + }); + } + /** * Initialize all observables */ @@ -399,6 +426,7 @@ export class ItemVersionsComponent implements OnInit { getFirstSucceededRemoteDataPayload(), map((res) => Boolean(res?.draftVersion)), ); + this.createVersionTitle$ = this.hasDraftVersion$.pipe( take(1), switchMap((res) => of(res ? 'item.version.history.table.action.hasDraft' : 'item.version.history.table.action.newVersion')) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 7a7b4102dd..bbaa570e8b 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1981,6 +1981,8 @@ "item.version.history.table.summary": "Summary", + "item.version.history.table.workspaceItem": "Workspace item", + "item.version.history.table.actions": "Action", From 096a1d842762f6eeb14a242025d117b7394a9bdb Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 15 Oct 2021 17:34:04 +0200 Subject: [PATCH 136/161] [CST-4510] Close collection modal once entity is imported --- .../external-source-entry-import-modal.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index 9a0b49e3f6..e1c2bcc3d4 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -232,6 +232,7 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { indexableObject: item }); this.notificationsService.success(this.translateService.get(this.labelPrefix + this.label + '.added.new-entity')); + this.modalRef.close(); this.importedObject.emit(searchResult); }); } From 7b24e3bc8e06781d0bb3694a124725c8674a3d5b Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 15 Oct 2021 19:04:14 +0200 Subject: [PATCH 137/161] [CST-4510] Fix issue with multiple selection in the collection-dropdown.component --- .../collection-dropdown.component.html | 28 ++++++++++--------- .../collection-dropdown.component.spec.ts | 7 ++--- .../collection-dropdown.component.ts | 16 ++++++----- ...nal-source-entry-import-modal.component.ts | 4 +-- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html index ccb9cde10d..831c70ad11 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.html +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html @@ -18,21 +18,23 @@ [scrollWindow]="false" (scrolled)="onScrollDown()"> - - - + + diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts index 94cb7c857d..2dc1ee433c 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts @@ -108,9 +108,6 @@ describe('CollectionDropdownComponent', () => { const paginatedCollection = buildPaginatedList(new PageInfo(), collections); const paginatedCollectionRD$ = createSuccessfulRemoteDataObject$(paginatedCollection); - const paginatedEmptyCollection = buildPaginatedList(new PageInfo(), []); - const paginatedEmptyCollectionRD$ = createSuccessfulRemoteDataObject$(paginatedEmptyCollection); - const paginatedOneElementCollection = buildPaginatedList(new PageInfo(), [collections[0]]); const paginatedOneElementCollectionRD$ = createSuccessfulRemoteDataObject$(paginatedOneElementCollection); @@ -203,10 +200,10 @@ describe('CollectionDropdownComponent', () => { }); it('should change loader status', () => { - spyOn(component.isLoadingList, 'next').and.callThrough(); + spyOn(component.isLoading, 'next').and.callThrough(); component.hideShowLoader(true); - expect(component.isLoadingList.next).toHaveBeenCalledWith(true); + expect(component.isLoading.next).toHaveBeenCalledWith(true); }); it('reset pagination fields', () => { diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts index 9826c554bb..d7a341d9b6 100644 --- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts +++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts @@ -87,10 +87,10 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { /** * A boolean representing if the loader is visible or not */ - isLoadingList: BehaviorSubject = new BehaviorSubject(false); + isLoading: BehaviorSubject = new BehaviorSubject(false); /** - * A numeric representig current page + * A numeric representing current page */ currentPage: number; @@ -100,7 +100,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { hasNextPage: boolean; /** - * Current seach query used to filter collection list + * Current search query used to filter collection list */ currentQuery: string; @@ -145,6 +145,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { * Initialize collection list */ ngOnInit() { + this.isLoading.next(false); this.subs.push(this.searchField.valueChanges.pipe( debounceTime(500), distinctUntilChanged(), @@ -173,7 +174,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { } /** - * Method used from infitity scroll for retrive more data on scroll down + * Method used from infinity scroll for retrieve more data on scroll down */ onScrollDown() { if ( this.hasNextPage ) { @@ -188,6 +189,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { * the selected [CollectionListEntry] */ onSelect(event: CollectionListEntry) { + this.isLoading.next(true); this.selectionChange.emit(event); } @@ -197,13 +199,13 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { * @param page page number */ populateCollectionList(query: string, page: number) { - this.isLoadingList.next(true); + this.isLoading.next(true); // Set the pagination info const findOptions: FindListOptions = { elementsPerPage: 10, currentPage: page }; - let searchListService$: Observable>> = null; + let searchListService$: Observable>>; if (this.entityType) { searchListService$ = this.collectionDataService .getAuthorizedCollectionByEntityType( @@ -279,7 +281,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy { * @param hideShow true for show, false otherwise */ hideShowLoader(hideShow: boolean) { - this.isLoadingList.next(hideShow); + this.isLoading.next(hideShow); } /** diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts index e1c2bcc3d4..d586520b64 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts @@ -18,7 +18,7 @@ import { ListableObject } from '../../../../../../object-collection/shared/lista import { ItemDataService } from '../../../../../../../core/data/item-data.service'; import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model'; import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../../core/shared/operators'; -import { mergeMap, take } from 'rxjs/operators'; +import { switchMap, take } from 'rxjs/operators'; import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model'; import { NotificationsService } from '../../../../../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; @@ -219,7 +219,7 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { this.modalRef.componentInstance.entityType = this.relatedEntityType.label; this.modalRef.componentInstance.selectedEvent.pipe( - mergeMap((collectionListEntry: CollectionListEntry) => { + switchMap((collectionListEntry: CollectionListEntry) => { return this.itemService.importExternalSourceEntry(this.externalSourceEntry, collectionListEntry.collection.id).pipe( getFirstSucceededRemoteData(), getRemoteDataPayload(), From e4d468b17c7e920c2a0e004dccf0ff7eaf2beb9d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 15 Oct 2021 19:13:15 +0200 Subject: [PATCH 138/161] [CST-4499] Version history - Changes to version history table --- src/app/core/data/item-data.service.ts | 10 ++ src/app/core/data/version-data.service.ts | 4 +- .../core/data/version-history-data.service.ts | 8 ++ .../submission/workflowitem-data.service.ts | 25 +++- .../versioned-item.component.ts | 6 +- .../item-versions-shared.service.spec.ts | 4 + .../item-versions.component.html | 134 +++++++++++------- .../item-versions.component.spec.ts | 19 ++- .../item-versions/item-versions.component.ts | 44 ++++-- src/assets/i18n/en.json5 | 3 + 10 files changed, 189 insertions(+), 68 deletions(-) diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index 7a0116fe86..c31b6b3c97 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -59,6 +59,7 @@ export class ItemDataService extends DataService { * Get the endpoint for browsing items * (When options.sort.field is empty, the default field to browse by will be 'dc.date.issued') * @param {FindListOptions} options + * @param linkPath * @returns {Observable} */ public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable { @@ -287,4 +288,13 @@ export class ItemDataService extends DataService { switchMap((url: string) => this.halService.getEndpoint('bitstreams', `${url}/${itemId}`)) ); } + + /** + * Invalidate the cache of the item + * @param itemUUID + */ + invalidateItemCache(itemUUID: string) { + this.requestService.setStaleByHrefSubstring('item/' + itemUUID); + } + } diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts index 1c6bc9e702..f310b9a530 100644 --- a/src/app/core/data/version-data.service.ts +++ b/src/app/core/data/version-data.service.ts @@ -11,7 +11,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { HttpClient } from '@angular/common/http'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; import { FindListOptions } from './request.models'; -import { Observable, of } from 'rxjs'; +import { EMPTY, Observable } from 'rxjs'; import { dataService } from '../cache/builders/build-decorators'; import { VERSION } from '../shared/version.resource-type'; import { VersionHistory } from '../shared/version-history.model'; @@ -55,7 +55,7 @@ export class VersionDataService extends DataService { getFirstSucceededRemoteDataPayload(), switchMap((res) => res.versionhistory), getFirstSucceededRemoteDataPayload(), - ) : of(null); + ) : EMPTY; } /** diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index 86c678335c..ef537b72aa 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -196,6 +196,10 @@ export class VersionHistoryDataService extends DataService { ); } + /** + * Get the item of the latest version from any version in the version history + * @param version + */ getVersionHistoryFromVersion$(version: Version): Observable { return this.versionDataService.getHistoryIdFromVersion$(version).pipe( take(1), @@ -204,6 +208,10 @@ export class VersionHistoryDataService extends DataService { ); } + /** + * Invalidate the cache of the version history + * @param versionHistoryID + */ invalidateVersionHistoryCache(versionHistoryID: string) { this.requestService.setStaleByHrefSubstring('versioning/versionhistories/' + versionHistoryID); } diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts index 099cfa8627..384d477110 100644 --- a/src/app/core/submission/workflowitem-data.service.ts +++ b/src/app/core/submission/workflowitem-data.service.ts @@ -9,7 +9,7 @@ import { DataService } from '../data/data.service'; import { RequestService } from '../data/request.service'; import { WorkflowItem } from './models/workflowitem.model'; import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { DeleteByIDRequest } from '../data/request.models'; +import { DeleteByIDRequest, FindListOptions } from '../data/request.models'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { ObjectCacheService } from '../cache/object-cache.service'; import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service'; @@ -19,6 +19,9 @@ import { hasValue } from '../../shared/empty.util'; import { RemoteData } from '../data/remote-data'; import { NoContent } from '../shared/NoContent.model'; import { getFirstCompletedRemoteData } from '../shared/operators'; +import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { WorkspaceItem } from './models/workspaceitem.model'; +import { RequestParam } from '../cache/models/request-param.model'; /** * A service that provides methods to make REST requests with workflow items endpoint. @@ -27,6 +30,7 @@ import { getFirstCompletedRemoteData } from '../shared/operators'; @dataService(WorkflowItem.type) export class WorkflowItemDataService extends DataService { protected linkPath = 'workflowitems'; + protected searchByItemLinkPath = 'item'; protected responseMsToLive = 10 * 1000; constructor( @@ -86,4 +90,23 @@ export class WorkflowItemDataService extends DataService { return this.rdbService.buildFromRequestUUID(requestId); } + + /** + * Return the WorkflowItem object found through the UUID of an item + * + * @param uuid The uuid of the item + * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's + * no valid cached version. Defaults to true + * @param reRequestOnStale Whether or not the request should automatically be re- + * requested after the response becomes stale + * @param options The {@link FindListOptions} object + * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved + */ + public findByItem(uuid: string, useCachedVersionIfAvailable = false, reRequestOnStale = true, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig[]): Observable> { + const findListOptions = new FindListOptions(); + findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))]; + const href$ = this.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow); + return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + } + } diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts index 5eabf49610..45c15177e7 100644 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts +++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts @@ -31,7 +31,7 @@ export class VersionedItemComponent extends ItemComponent { private versionService: VersionDataService, private itemVersionShared: ItemVersionsSharedService, private router: Router, - private workspaceitemDataService: WorkspaceitemDataService, + private workspaceItemDataService: WorkspaceitemDataService, private searchService: SearchService, private itemService: ItemDataService, ) { @@ -62,11 +62,11 @@ export class VersionedItemComponent extends ItemComponent { getFirstCompletedRemoteData(), // show success/failure notification tap((res: RemoteData) => { this.itemVersionShared.notifyCreateNewVersion(res); }), - getFirstSucceededRemoteDataPayload(), // get workspace item + getFirstSucceededRemoteDataPayload(), switchMap((newVersion: Version) => this.itemService.findByHref(newVersion._links.item.href)), getFirstSucceededRemoteDataPayload(), - switchMap((newVersionItem: Item) => this.workspaceitemDataService.findByItem(newVersionItem.uuid, true, false)), + switchMap((newVersionItem: Item) => this.workspaceItemDataService.findByItem(newVersionItem.uuid, true, false)), getFirstSucceededRemoteDataPayload(), ).subscribe((wsItem) => { const wsiId = wsItem.id; diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts index e9aa2cc18a..2cf88dc3eb 100644 --- a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts +++ b/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts @@ -7,6 +7,8 @@ import { AuthService } from '../../../core/auth/auth.service'; import { NotificationsService } from '../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; +import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; +import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service'; describe('ItemVersionsSharedService', () => { let service: ItemVersionsSharedService; @@ -20,6 +22,8 @@ describe('ItemVersionsSharedService', () => { { provide: AuthService, useValue: {} }, { provide: NotificationsService, useValue: {} }, { provide: TranslateService, useValue: {} }, + { provide: WorkspaceitemDataService, useValue: {} }, + { provide: WorkflowItemDataService, useValue: {} }, ], }); service = TestBed.inject(ItemVersionsSharedService); diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/shared/item/item-versions/item-versions.component.html index 7e8a376962..70954d7949 100644 --- a/src/app/shared/item/item-versions/item-versions.component.html +++ b/src/app/shared/item/item-versions/item-versions.component.html @@ -19,26 +19,72 @@ {{"item.version.history.table.editor" | translate}} {{"item.version.history.table.date" | translate}} {{"item.version.history.table.summary" | translate}}{{"item.version.history.table.actions" | translate}}
-
-
- {{version.version}} - * -
-
- - - -
-
+ + + + +
+ + + + {{version.version}} + + + {{version.version}} + + * + + + {{ "item.version.history.table.workspaceItem" | translate }} + + + + {{ "item.version.history.table.workflowItem" | translate }} + + +
+ +
+ +
+ + + + + + + + + + +
+ +
+ + + 		@@ -49,14 +95,25 @@ {{version?.created | date : 'yyyy-MM-dd HH:mm:ss'}} - - {{version?.summary}} - - - - -
+
+ + {{version?.summary}} + + + +
+ +
+ + + + - - - - - - - - - - - -
+ +