From 48ad0fc8ae67f0d0aae5d586efadb52aa3316f04 Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Fri, 31 Dec 2021 11:03:47 +0530 Subject: [PATCH 001/758] [DSC-337] boxes flagged as minor appears in tabs even when are the only available. --- .../cris-layout-metadata-box.component.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html index 9464101311f..f7b031ee659 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html @@ -1,10 +1,12 @@
-
+
+
+
From d5e41e559c52113466e69bd031514f49478af04f Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Tue, 4 Jan 2022 12:16:23 +0530 Subject: [PATCH 002/758] [DSC-337] hide the tab when it's all the box have minor. --- .../cris-layout-metadata-box.component.html | 14 ++++----- src/app/cris-layout/cris-layout.component.ts | 29 +++++++++++++++++-- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html index f7b031ee659..9464101311f 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.html @@ -1,12 +1,10 @@
-
-
-
+
diff --git a/src/app/cris-layout/cris-layout.component.ts b/src/app/cris-layout/cris-layout.component.ts index ac1ba0198f7..e952f634a53 100644 --- a/src/app/cris-layout/cris-layout.component.ts +++ b/src/app/cris-layout/cris-layout.component.ts @@ -76,7 +76,7 @@ export class CrisLayoutComponent implements OnInit { */ getLeadingTabs(): Observable { return this.tabs$.pipe( - map((tabs: CrisLayoutTab[]) => tabs.filter(tab => tab.leading)), + map((tabs: CrisLayoutTab[]) => tabs.filter(tab => this.checkForMinor(tab,tab.leading))), ); } @@ -85,7 +85,7 @@ export class CrisLayoutComponent implements OnInit { */ getLoaderTabs(): Observable { return this.tabs$.pipe( - map((tabs: CrisLayoutTab[]) => tabs.filter(tab => !tab.leading)), + map((tabs: CrisLayoutTab[]) => tabs.filter(tab => this.checkForMinor(tab,!tab.leading))), ); } @@ -98,4 +98,29 @@ export class CrisLayoutComponent implements OnInit { ); } + /** + * + * @param tab Contains a tab data which has rows, cells and boxes + * @param isLeading Contains a boolean + * @returns Boolean based on cells has minor or not + */ + checkForMinor(tab: CrisLayoutTab,isLeading: boolean): boolean { + if (isLeading) { + let isMinor = true; + for (const row of tab.rows) { + rowLoop: + for (const cell of row.cells) { + for (const box of cell.boxes) { + if (!box.minor) { + isMinor = false; + break rowLoop; + } + } + } + } + return !isMinor; + } + return false; + } + } From f03d3fecf293a1ba55c30161f62ddd99067501c6 Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Tue, 4 Jan 2022 16:40:22 +0530 Subject: [PATCH 003/758] [DSC-337] code refactor. --- src/app/cris-layout/cris-layout.component.ts | 30 +++++++------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/src/app/cris-layout/cris-layout.component.ts b/src/app/cris-layout/cris-layout.component.ts index e952f634a53..26d751132d7 100644 --- a/src/app/cris-layout/cris-layout.component.ts +++ b/src/app/cris-layout/cris-layout.component.ts @@ -76,7 +76,7 @@ export class CrisLayoutComponent implements OnInit { */ getLeadingTabs(): Observable { return this.tabs$.pipe( - map((tabs: CrisLayoutTab[]) => tabs.filter(tab => this.checkForMinor(tab,tab.leading))), + map((tabs: CrisLayoutTab[]) => tabs.filter(tab => tab.leading).filter(tab => this.checkForMinor(tab))), ); } @@ -85,7 +85,7 @@ export class CrisLayoutComponent implements OnInit { */ getLoaderTabs(): Observable { return this.tabs$.pipe( - map((tabs: CrisLayoutTab[]) => tabs.filter(tab => this.checkForMinor(tab,!tab.leading))), + map((tabs: CrisLayoutTab[]) => tabs.filter(tab => !tab.leading ).filter(tab => this.checkForMinor(tab))), ); } @@ -99,28 +99,20 @@ export class CrisLayoutComponent implements OnInit { } /** - * * @param tab Contains a tab data which has rows, cells and boxes - * @param isLeading Contains a boolean * @returns Boolean based on cells has minor or not */ - checkForMinor(tab: CrisLayoutTab,isLeading: boolean): boolean { - if (isLeading) { - let isMinor = true; - for (const row of tab.rows) { - rowLoop: - for (const cell of row.cells) { - for (const box of cell.boxes) { - if (!box.minor) { - isMinor = false; - break rowLoop; - } - } + checkForMinor(tab: CrisLayoutTab): boolean { + for (const row of tab.rows) { + for (const cell of row.cells) { + for (const box of cell.boxes) { + if (!box.minor) { + return true; } } - return !isMinor; - } - return false; + } } + return false; +} } From fd834463ea4edb4ed41f56cc8345439a2c69ddc5 Mon Sep 17 00:00:00 2001 From: mushrankhan-kencor <83634419+mushrankhan-kencor@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:02:04 +0530 Subject: [PATCH 004/758] [DSC-337] test case added for minor element. --- .../cris-layout/cris-layout.component.spec.ts | 13 +- src/app/shared/testing/layout-tab.mocks.ts | 140 ++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/src/app/cris-layout/cris-layout.component.spec.ts b/src/app/cris-layout/cris-layout.component.spec.ts index d7ec238dab6..af5cfa1aeda 100644 --- a/src/app/cris-layout/cris-layout.component.spec.ts +++ b/src/app/cris-layout/cris-layout.component.spec.ts @@ -39,7 +39,7 @@ const tabDataServiceMock: any = jasmine.createSpyObj('TabDataService', { // to FIX // tslint:disable-next-line:prefer-const -describe('CrisLayoutComponent', () => { +fdescribe('CrisLayoutComponent', () => { let component: CrisLayoutComponent; let fixture: ComponentFixture; @@ -153,6 +153,17 @@ describe('CrisLayoutComponent', () => { }); + it('it should not return a tab if box cointain a minor as true', () => { + tabDataServiceMock.findByItem.and.returnValue(observableOf(bothTabs)); + component.tabs$ = observableOf(bothTabs); + component.leadingTabs$ = observableOf(leadingTabs); + component.loaderTabs$ = observableOf(loaderTabs); + component.getLeadingTabs(); + fixture.detectChanges(); + const loaderTabsData = fixture.debugElement.queryAll(By.css('ds-cris-layout-loader')); + expect(loaderTabsData.length).toBe(1); + }); + }); }); diff --git a/src/app/shared/testing/layout-tab.mocks.ts b/src/app/shared/testing/layout-tab.mocks.ts index 9e618cda241..2fb1a852ec0 100644 --- a/src/app/shared/testing/layout-tab.mocks.ts +++ b/src/app/shared/testing/layout-tab.mocks.ts @@ -347,6 +347,146 @@ export const loaderTabs: CrisLayoutTab[] = [Object.assign(new CrisLayoutTab(), { ] } ] +}), +Object.assign(new CrisLayoutTab(), { + 'id': 3, + 'shortname': 'info', + 'header': 'Profile', + 'entityType': 'Person', + 'priority': 1, + 'security': 0, + 'type': 'tab', + 'leading': false, + 'rows': [ + { + 'style': 'col-md-12', + 'cells': [ + { + 'style': 'col-md-6', + 'boxes': [ + { + 'shortname': 'primary', + 'header': 'Primary Information', + 'entityType': 'Person', + 'collapsed': false, + 'minor': false, + 'style': 'col-md-6', + 'clear': true, + 'container': true, + 'maxColumn': 2, + 'security': 0, + 'boxType': 'METADATA', + 'type': 'box', + 'metadataSecurityFields': [], + 'configuration': { + 'id': 1, + 'rows': [ + { + 'fields': [ + { + 'metadata': 'dc.title', + 'label': 'Name', + 'fieldType': 'metadata' + }, + { + 'metadata': 'person.email', + 'label': 'Email', + 'fieldType': 'metadata', + 'valuesInline': 'true' + } + ] + } + ] + } + }, + { + 'shortname': 'other', + 'header': 'Other Informations', + 'entityType': 'Person', + 'collapsed': false, + 'minor': true, + 'style': 'col-md-6', + 'clear': true, + 'maxColumn': 2, + 'security': 0, + 'boxType': 'METADATA', + 'type': 'box', + 'metadataSecurityFields': [ + 'cris.policy.eperson' + ], + 'configuration': { + 'id': 2, + 'rows': [ + { + 'fields': [ + { + 'metadata': 'person.birthDate', + 'label': 'Birth date', + 'fieldType': 'metadata', + 'labelAsHeading': 'true' + } + ] + } + ] + } + } + ] + }, + { + 'style': 'col-md-6', + 'boxes': [ + { + 'shortname': 'researchoutputs', + 'header': 'Research outputs', + 'entityType': 'Person', + 'collapsed': false, + 'minor': false, + 'style': 'col-md-6', + 'clear': true, + 'maxColumn': 2, + 'security': 0, + 'boxType': 'RELATION', + 'type': 'box', + 'metadataSecurityFields': [], + 'configuration': { + 'id': 3, + 'discovery-configuration': 'RELATION.Person.researchoutputs' + } + } + ] + } + ] + }, + { + 'style': 'col-md-12', + 'cells': [ + { + 'style': 'col-md-12', + 'boxes': [ + { + 'shortname': 'metrics', + 'header': 'Metrics', + 'entityType': 'Person', + 'collapsed': false, + 'minor': false, + 'style': null, + 'clear': true, + 'maxColumn': 2, + 'security': 0, + 'boxType': 'METRICS', + 'type': 'box', + 'metadataSecurityFields': [], + 'configuration': { + 'id': 4, + 'numColumns': 2, + 'metrics': ['views', 'downloads'] + } + } + ] + } + ] + } + ] }) ]; From 3319613fb2d36caa86c077b659040d935842751d Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Mon, 7 Feb 2022 13:37:37 +0530 Subject: [PATCH 005/758] [DSC-337] row added in loaderTabs. --- src/app/shared/testing/layout-tab.mocks.ts | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/app/shared/testing/layout-tab.mocks.ts b/src/app/shared/testing/layout-tab.mocks.ts index 2fb1a852ec0..657142946b5 100644 --- a/src/app/shared/testing/layout-tab.mocks.ts +++ b/src/app/shared/testing/layout-tab.mocks.ts @@ -485,6 +485,54 @@ Object.assign(new CrisLayoutTab(), { ] } ] + }, + { + 'style': 'col-md-12', + 'cells': [ + { + 'style': 'col-md-12', + 'boxes': [ + { + 'shortname': 'metrics', + 'header': 'Metrics', + 'entityType': 'Person', + 'collapsed': false, + 'minor': false, + 'style': null, + 'clear': true, + 'maxColumn': 2, + 'security': 0, + 'boxType': 'METRICS', + 'type': 'box', + 'metadataSecurityFields': [], + 'configuration': { + 'id': 4, + 'numColumns': 2, + 'metrics': ['views', 'downloads'] + } + }, + { + 'shortname': 'metrics', + 'header': 'Metrics', + 'entityType': 'Person', + 'collapsed': false, + 'minor': true, + 'style': null, + 'clear': true, + 'maxColumn': 2, + 'security': 0, + 'boxType': 'METRICS', + 'type': 'box', + 'metadataSecurityFields': [], + 'configuration': { + 'id': 4, + 'numColumns': 2, + 'metrics': ['views', 'downloads'] + } + } + ] + } + ] } ] }) From 6d6253b35498bd3bc8bd0f83ceeecc1193796302 Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Mon, 7 Feb 2022 13:43:12 +0530 Subject: [PATCH 006/758] [DSC-337] remove fdescribe. --- src/app/cris-layout/cris-layout.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cris-layout/cris-layout.component.spec.ts b/src/app/cris-layout/cris-layout.component.spec.ts index af5cfa1aeda..804aa9248fd 100644 --- a/src/app/cris-layout/cris-layout.component.spec.ts +++ b/src/app/cris-layout/cris-layout.component.spec.ts @@ -39,7 +39,7 @@ const tabDataServiceMock: any = jasmine.createSpyObj('TabDataService', { // to FIX // tslint:disable-next-line:prefer-const -fdescribe('CrisLayoutComponent', () => { +describe('CrisLayoutComponent', () => { let component: CrisLayoutComponent; let fixture: ComponentFixture; From ce0b993cfee3e403c1bd5dbe7c5a547918dc4b12 Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Tue, 22 Mar 2022 18:00:21 +0530 Subject: [PATCH 007/758] [DSC-337] check for minor element is move to tab data service. --- src/app/core/layout/tab-data.service.ts | 36 +++++++++++++++++-- src/app/cris-layout/cris-layout.component.ts | 21 ++--------- .../item-page/cris-item-page-tab.resolver.ts | 1 + 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/app/core/layout/tab-data.service.ts b/src/app/core/layout/tab-data.service.ts index 2d19df11056..fa5e57c200a 100644 --- a/src/app/core/layout/tab-data.service.ts +++ b/src/app/core/layout/tab-data.service.ts @@ -19,6 +19,7 @@ import { PaginatedList } from '../data/paginated-list.model'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { FindListOptions } from '../data/request.models'; import { RequestParam } from '../cache/models/request-param.model'; +import { map } from 'rxjs/operators'; /* tslint:disable:max-classes-per-file */ @@ -75,10 +76,41 @@ export class TabDataService { * @param useCachedVersionIfAvailable * @param linkToFollow */ - findByItem(itemUuid: string, useCachedVersionIfAvailable, linkToFollow?: FollowLinkConfig): Observable>> { + findByItem(itemUuid: string, useCachedVersionIfAvailable, excludeMinors?: boolean ,linkToFollow?: FollowLinkConfig): Observable>> { const options = new FindListOptions(); options.searchParams = [new RequestParam('uuid', itemUuid)]; - return this.dataService.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable); + + return this.dataService.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable).pipe(map((data) => { + if (!!data.payload && !!data.payload.page && excludeMinors) { + data.payload.page = this.filterTab(data.payload.page); + } + return data; + })); + } + + /** + * @param tabs + * @returns Tabs which contains non minor element + */ + filterTab(tabs: CrisLayoutTab[]): CrisLayoutTab[] { + return tabs.filter(tab => this.checkForMinor(tab)); + } + + /** + * @param tab Contains a tab data which has rows, cells and boxes + * @returns Boolean based on cells has minor or not + */ + checkForMinor(tab: CrisLayoutTab): boolean { + for (const row of tab.rows) { + for (const cell of row.cells) { + for (const box of cell.boxes) { + if (!box.minor) { + return true; + } + } + } + } + return false; } /** diff --git a/src/app/cris-layout/cris-layout.component.ts b/src/app/cris-layout/cris-layout.component.ts index 1e88fe681a9..8b999950d9d 100644 --- a/src/app/cris-layout/cris-layout.component.ts +++ b/src/app/cris-layout/cris-layout.component.ts @@ -84,7 +84,7 @@ export class CrisLayoutComponent implements OnInit { */ getLeadingTabs(): Observable { return this.tabs$.pipe( - map((tabs: CrisLayoutTab[]) => tabs.filter(tab => tab.leading).filter(tab => this.checkForMinor(tab))), + map((tabs: CrisLayoutTab[]) => tabs.filter(tab => tab.leading)), ); } @@ -93,7 +93,7 @@ export class CrisLayoutComponent implements OnInit { */ getLoaderTabs(): Observable { return this.tabs$.pipe( - map((tabs: CrisLayoutTab[]) => tabs.filter(tab => !tab.leading ).filter(tab => this.checkForMinor(tab))), + map((tabs: CrisLayoutTab[]) => tabs.filter(tab => !tab.leading)), ); } @@ -106,21 +106,4 @@ export class CrisLayoutComponent implements OnInit { ); } - /** - * @param tab Contains a tab data which has rows, cells and boxes - * @returns Boolean based on cells has minor or not - */ - checkForMinor(tab: CrisLayoutTab): boolean { - for (const row of tab.rows) { - for (const cell of row.cells) { - for (const box of cell.boxes) { - if (!box.minor) { - return true; - } - } - } - } - return false; -} - } diff --git a/src/app/item-page/cris-item-page-tab.resolver.ts b/src/app/item-page/cris-item-page-tab.resolver.ts index fc7aaa5f9e0..f1de1265bd6 100644 --- a/src/app/item-page/cris-item-page-tab.resolver.ts +++ b/src/app/item-page/cris-item-page-tab.resolver.ts @@ -44,6 +44,7 @@ export class CrisItemPageTabResolver implements Resolve this.tabService.findByItem( item.uuid, // Item UUID + true, true ).pipe( getFirstCompletedRemoteData(), From f6b38d4b233ee2287f847d0f9cf63d74e66ec2ea Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Tue, 22 Mar 2022 18:11:47 +0530 Subject: [PATCH 008/758] [DSC-337] remove test case for checking minor element from component. --- src/app/cris-layout/cris-layout.component.spec.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/app/cris-layout/cris-layout.component.spec.ts b/src/app/cris-layout/cris-layout.component.spec.ts index 3962f17c7c9..a428fb95e18 100644 --- a/src/app/cris-layout/cris-layout.component.spec.ts +++ b/src/app/cris-layout/cris-layout.component.spec.ts @@ -156,17 +156,6 @@ describe('CrisLayoutComponent', () => { }); - it('it should not return a tab if box cointain a minor as true', () => { - tabDataServiceMock.findByItem.and.returnValue(observableOf(bothTabs)); - component.tabs$ = observableOf(bothTabs); - component.leadingTabs$ = observableOf(leadingTabs); - component.loaderTabs$ = observableOf(loaderTabs); - component.getLeadingTabs(); - fixture.detectChanges(); - const loaderTabsData = fixture.debugElement.queryAll(By.css('ds-cris-layout-loader')); - expect(loaderTabsData.length).toBe(1); - }); - }); }); From e0d6d4067aee1a734be0766bb0ef71e2a8530a50 Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Wed, 23 Mar 2022 12:06:50 +0530 Subject: [PATCH 009/758] [DSC-337] add test cases for filterTab. --- src/app/core/layout/tab-data.service.spec.ts | 9 +++++++++ src/app/core/layout/tab-data.service.ts | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/core/layout/tab-data.service.spec.ts b/src/app/core/layout/tab-data.service.spec.ts index 30995e1f53e..4e755f0c0ab 100644 --- a/src/app/core/layout/tab-data.service.spec.ts +++ b/src/app/core/layout/tab-data.service.spec.ts @@ -16,6 +16,7 @@ import { of } from 'rxjs'; import { FindListOptions } from '../data/request.models'; import { RequestParam } from '../cache/models/request-param.model'; import { createPaginatedList } from '../../shared/testing/utils.test'; +import { bothTabs } from '../../shared/testing/layout-tab.mocks'; describe('TabDataService', () => { let scheduler: TestScheduler; @@ -193,4 +194,12 @@ describe('TabDataService', () => { }); }); + + + fdescribe('filterTab', () => { + it('should return non minor element', () => { + const tabs: CrisLayoutTab[] = service.filterTab(bothTabs); + expect(tabs.length).toBe(2); + }); + }); }); diff --git a/src/app/core/layout/tab-data.service.ts b/src/app/core/layout/tab-data.service.ts index fa5e57c200a..3091160156e 100644 --- a/src/app/core/layout/tab-data.service.ts +++ b/src/app/core/layout/tab-data.service.ts @@ -104,13 +104,13 @@ export class TabDataService { for (const row of tab.rows) { for (const cell of row.cells) { for (const box of cell.boxes) { - if (!box.minor) { - return true; + if (box.minor) { + return false; } } } } - return false; + return true; } /** From 94f07f316dd49fcb93664ba757ea76ed0c04559b Mon Sep 17 00:00:00 2001 From: nikunj59 Date: Thu, 2 Jun 2022 13:16:27 +0530 Subject: [PATCH 010/758] DSC-38 changes for map component should be enhanced in order to give the possibility of exporting the map as png and jpg/jpeg format. --- .../statistics-map.component.html | 14 ++++++- .../statistics-map.component.spec.ts | 29 ++++++++++++++- .../statistics-map.component.ts | 37 ++++++++++++++++++- ...bmission-import-external.component.spec.ts | 2 +- 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html index 83cb9fc6f2c..62934b8924c 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html @@ -1 +1,13 @@ - +
+ + +
+
+ +
diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts index 903b61374fe..e417f76631c 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts @@ -5,6 +5,9 @@ import { UsageReport } from '../../../core/statistics/models/usage-report.model' import { USAGE_REPORT } from '../../../core/statistics/models/usage-report.resource-type'; import { GoogleChartInterface } from 'ng2-google-charts'; +import { ExportService, ExportImageType } from '../../../core/export-service/export.service'; +import { TranslateModule } from '@ngx-translate/core'; +import { By } from '@angular/platform-browser'; describe('StatisticsMapComponent', () => { let component: StatisticsMapComponent; @@ -49,9 +52,17 @@ describe('StatisticsMapComponent', () => { options: { 'title': 'TopCountries' }, }; + const exportServiceMock: any = { + exportAsImage: jasmine.createSpy('exportAsImage'), + exportAsFile: jasmine.createSpy('exportAsFile') + }; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ StatisticsMapComponent ] + imports: [TranslateModule.forRoot()], + declarations: [ StatisticsMapComponent ], + providers: [ + { provide: ExportService, useValue: exportServiceMock } + ], }) .compileComponents(); }); @@ -80,4 +91,20 @@ describe('StatisticsMapComponent', () => { expect(component.geoChart).toEqual(geoChartExpected); }); + it('should download map as png and jpg', () => { + component.report = report; + fixture.detectChanges(); + component.ngOnInit(); + fixture.detectChanges(); + const downloadPngMapBtn = fixture.debugElement.query(By.css('[data-test="download-png-map-btn"]')); + downloadPngMapBtn.triggerEventHandler('click', null); + fixture.detectChanges(); + const node = fixture.debugElement.query(By.css('[data-test="google-chart-ref"]')).nativeElement; + expect(exportServiceMock.exportAsImage).toHaveBeenCalledWith(node, ExportImageType.png, report.reportType, component.isLoading); + + const downloadJpgMapBtn = fixture.debugElement.query(By.css('[data-test="download-jpg-map-btn"]')); + downloadJpgMapBtn.triggerEventHandler('click', null); + fixture.detectChanges(); + expect(exportServiceMock.exportAsImage).toHaveBeenCalledWith(node, ExportImageType.jpeg, report.reportType, component.isSecondLoading); + }); }); diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts index 4bd4bf8a7b5..6f0eead5f1b 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts @@ -1,6 +1,8 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { UsageReport } from '../../../core/statistics/models/usage-report.model'; import { GoogleChartInterface } from 'ng2-google-charts'; +import { ExportImageType, ExportService } from '../../../core/export-service/export.service'; +import { BehaviorSubject } from 'rxjs'; @Component({ @@ -30,6 +32,23 @@ export class StatisticsMapComponent implements OnInit { * Chart Columns needed to be shown in the tooltip */ chartColumns = []; + /** + * Loading utilized for export functions to disable buttons + */ + isLoading: BehaviorSubject = new BehaviorSubject(false); + /** + * Loading utilized for export functions to disable buttons + */ + isSecondLoading: BehaviorSubject = new BehaviorSubject(false); + /** + * Chart ElementRef + */ + @ViewChild('googleChartRef') googleChartRef: ElementRef; + + constructor( + private exportService: ExportService + ) { + } ngOnInit(): void { if ( !!this.report && !!this.report.points && this.report.points.length > 0 ) { @@ -64,6 +83,22 @@ export class StatisticsMapComponent implements OnInit { } + /** + * Download map as image in png version. + */ + downloadPng() { + this.isLoading.next(false); + const node = this.googleChartRef.nativeElement; + this.exportService.exportAsImage(node, ExportImageType.png, this.report.reportType, this.isLoading); + } + /** + * Download map as image in jpeg version. + */ + downloadJpeg() { + this.isSecondLoading.next(false); + const node = this.googleChartRef.nativeElement; + this.exportService.exportAsImage(node, ExportImageType.jpeg, this.report.reportType, this.isSecondLoading); + } } diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index dc53b2e45f3..dfcb85ee347 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -165,7 +165,7 @@ describe('SubmissionImportExternalComponent test suite', () => { ngbModal.open.and.returnValue({componentInstance: { externalSourceEntry: null}}); comp.import(entry); - expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg' }); + expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg', scrollable: true }); expect(comp.modalRef.componentInstance.externalSourceEntry).toEqual(entry); }); From f70fc7b87ac04cd4c591e9f6816d84582194385e Mon Sep 17 00:00:00 2001 From: lotte Date: Mon, 12 Sep 2022 17:42:37 +0200 Subject: [PATCH 011/758] 94233: use actual CSS variables in theme --- .../admin-sidebar-section.component.spec.ts | 2 +- .../admin-sidebar.component.spec.ts | 2 +- .../admin-sidebar/admin-sidebar.component.ts | 4 +- ...le-admin-sidebar-section.component.spec.ts | 2 +- ...andable-admin-sidebar-section.component.ts | 4 +- src/app/app.component.spec.ts | 2 +- src/app/app.component.ts | 21 ++--- src/app/app.reducer.ts | 2 +- src/app/core/core.module.ts | 2 +- src/app/root/root.component.spec.ts | 2 +- src/app/root/root.component.ts | 6 +- src/app/shared/host-window.service.ts | 10 +-- src/app/shared/key-value-pair.model.ts | 4 + ...per.actions.ts => css-variable.actions.ts} | 0 ...per.reducer.ts => css-variable.reducer.ts} | 2 +- .../sass-helper/css-variable.service.spec.ts | 78 +++++++++++++++++++ .../sass-helper/css-variable.service.ts | 71 +++++++++++++++++ .../shared/sass-helper/css-variable.utils.ts | 46 +++++++++++ .../shared/sass-helper/sass-helper.service.ts | 30 ------- 19 files changed, 226 insertions(+), 64 deletions(-) create mode 100644 src/app/shared/key-value-pair.model.ts rename src/app/shared/sass-helper/{sass-helper.actions.ts => css-variable.actions.ts} (100%) rename src/app/shared/sass-helper/{sass-helper.reducer.ts => css-variable.reducer.ts} (85%) create mode 100644 src/app/shared/sass-helper/css-variable.service.spec.ts create mode 100644 src/app/shared/sass-helper/css-variable.service.ts create mode 100644 src/app/shared/sass-helper/css-variable.utils.ts delete mode 100644 src/app/shared/sass-helper/sass-helper.service.ts diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts index 14d5d38199a..1e28b62626c 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MenuService } from '../../../shared/menu/menu.service'; import { MenuServiceStub } from '../../../shared/testing/menu-service.stub'; -import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub'; import { Component } from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts index 65026c1504c..bcc40aae601 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts @@ -6,7 +6,7 @@ import { ScriptDataService } from '../../core/data/processes/script-data.service import { AdminSidebarComponent } from './admin-sidebar.component'; import { MenuService } from '../../shared/menu/menu.service'; import { MenuServiceStub } from '../../shared/testing/menu-service.stub'; -import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../shared/sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub'; import { AuthServiceStub } from '../../shared/testing/auth-service.stub'; import { AuthService } from '../../core/auth/auth.service'; diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts index c81b2e6e93b..777fc4a250f 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts @@ -18,7 +18,7 @@ import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick import { TextMenuItemModel } from '../../shared/menu/menu-item/models/text.model'; import { MenuComponent } from '../../shared/menu/menu.component'; import { MenuService } from '../../shared/menu/menu.service'; -import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../shared/sass-helper/css-variable.service'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { Router, ActivatedRoute } from '@angular/router'; @@ -82,7 +82,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { ngOnInit(): void { this.createMenu(); super.ngOnInit(); - this.sidebarWidth = this.variableService.getVariable('sidebarItemsWidth'); + this.sidebarWidth = this.variableService.getVariable('--ds-sidebar-items-width'); this.authService.isAuthenticated() .subscribe((loggedIn: boolean) => { if (loggedIn) { diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts index b1f3a63c06e..0f0181c3d52 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ExpandableAdminSidebarSectionComponent } from './expandable-admin-sidebar-section.component'; import { MenuService } from '../../../shared/menu/menu.service'; import { MenuServiceStub } from '../../../shared/testing/menu-service.stub'; -import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub'; import { of as observableOf } from 'rxjs'; import { Component } from '@angular/core'; diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts index aaa6a85c518..59f07979bb9 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, Injector, OnInit } from '@angular/core'; import { rotate } from '../../../shared/animations/rotate'; import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sidebar-section.component'; import { slide } from '../../../shared/animations/slide'; -import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service'; import { bgColor } from '../../../shared/animations/bgColor'; import { MenuID } from '../../../shared/menu/initial-menus-state'; import { MenuService } from '../../../shared/menu/menu.service'; @@ -65,7 +65,7 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC */ ngOnInit(): void { super.ngOnInit(); - this.sidebarActiveBg = this.variableService.getVariable('adminSidebarActiveBg'); + this.sidebarActiveBg = this.variableService.getVariable('--ds-admin-sidebar-active-bg'); this.sidebarCollapsed = this.menuService.isMenuCollapsed(this.menuID); this.sidebarPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID); this.expanded = combineLatestObservable(this.active, this.sidebarCollapsed, this.sidebarPreviewCollapsed) diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index a892e34a5ad..dcbf11525ef 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -19,7 +19,7 @@ import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.ser import { AuthServiceMock } from './shared/mocks/auth.service.mock'; import { AuthService } from './core/auth/auth.service'; import { MenuService } from './shared/menu/menu.service'; -import { CSSVariableService } from './shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from './shared/sass-helper/css-variable.service'; import { CSSVariableServiceStub } from './shared/testing/css-variable-service.stub'; import { MenuServiceStub } from './shared/testing/menu-service.stub'; import { HostWindowService } from './shared/host-window.service'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 669411d9aaf..0c38d2bd645 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -31,7 +31,7 @@ import { HostWindowState } from './shared/search/host-window.reducer'; import { NativeWindowRef, NativeWindowService } from './core/services/window.service'; import { isAuthenticationBlocking } from './core/auth/selectors'; import { AuthService } from './core/auth/auth.service'; -import { CSSVariableService } from './shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from './shared/sass-helper/css-variable.service'; import { MenuService } from './shared/menu/menu.service'; import { HostWindowService } from './shared/host-window.service'; import { HeadTagConfig, ThemeConfig } from '../config/theme.model'; @@ -48,6 +48,7 @@ import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service'; import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; import { getDefaultThemeConfig } from '../config/config.util'; import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; +import { getCSSCustomPropIndex } from './shared/sass-helper/css-variable.utils'; @Component({ selector: 'ds-app', @@ -161,7 +162,6 @@ export class AppComponent implements OnInit, AfterViewInit { if (environment.debug) { console.info(environment); } - this.storeCSSVariables(); } ngOnInit() { @@ -181,18 +181,9 @@ export class AppComponent implements OnInit, AfterViewInit { } private storeCSSVariables() { - this.cssService.addCSSVariable('xlMin', '1200px'); - this.cssService.addCSSVariable('mdMin', '768px'); - this.cssService.addCSSVariable('lgMin', '576px'); - this.cssService.addCSSVariable('smMin', '0'); - this.cssService.addCSSVariable('adminSidebarActiveBg', '#0f1b28'); - this.cssService.addCSSVariable('sidebarItemsWidth', '250px'); - this.cssService.addCSSVariable('collapsedSidebarWidth', '53.234px'); - this.cssService.addCSSVariable('totalSidebarWidth', '303.234px'); - // const vars = variables.locals || {}; - // Object.keys(vars).forEach((name: string) => { - // this.cssService.addCSSVariable(name, vars[name]); - // }) + getCSSCustomPropIndex(this.document).forEach(([prop, val]) => { + this.cssService.addCSSVariable(prop, val); + }); } ngAfterViewInit() { @@ -282,6 +273,8 @@ export class AppComponent implements OnInit, AfterViewInit { } // the fact that this callback is used, proves we're on the browser. this.isThemeCSSLoading$.next(false); + + this.storeCSSVariables(); }; head.appendChild(link); } diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index 5bd4f745d96..23d38bae305 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -35,7 +35,7 @@ import { ObjectSelectionListState, objectSelectionReducer } from './shared/object-select/object-select.reducer'; -import { cssVariablesReducer, CSSVariablesState } from './shared/sass-helper/sass-helper.reducer'; +import { cssVariablesReducer, CSSVariablesState } from './shared/sass-helper/css-variable.reducer'; import { hostWindowReducer, HostWindowState } from './shared/search/host-window.reducer'; import { diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 8d8a614a899..2a4c75545ef 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -23,7 +23,7 @@ import { NotificationsService } from '../shared/notifications/notifications.serv import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service'; import { ObjectSelectService } from '../shared/object-select/object-select.service'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; -import { CSSVariableService } from '../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../shared/sass-helper/css-variable.service'; import { SidebarService } from '../shared/sidebar/sidebar.service'; import { UploaderService } from '../shared/uploader/uploader.service'; import { SectionFormOperationsService } from '../submission/sections/form/section-form-operations.service'; diff --git a/src/app/root/root.component.spec.ts b/src/app/root/root.component.spec.ts index 81b22592d6a..2d41b8b610b 100644 --- a/src/app/root/root.component.spec.ts +++ b/src/app/root/root.component.spec.ts @@ -18,7 +18,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { RouterMock } from '../shared/mocks/router.mock'; import { MockActivatedRoute } from '../shared/mocks/active-router.mock'; import { MenuService } from '../shared/menu/menu.service'; -import { CSSVariableService } from '../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../shared/sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../shared/testing/css-variable-service.stub'; import { HostWindowService } from '../shared/host-window.service'; import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub'; diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts index dc44095573f..8584af357e6 100644 --- a/src/app/root/root.component.ts +++ b/src/app/root/root.component.ts @@ -11,7 +11,7 @@ import { MetadataService } from '../core/metadata/metadata.service'; import { HostWindowState } from '../shared/search/host-window.reducer'; import { NativeWindowRef, NativeWindowService } from '../core/services/window.service'; import { AuthService } from '../core/auth/auth.service'; -import { CSSVariableService } from '../shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../shared/sass-helper/css-variable.service'; import { MenuService } from '../shared/menu/menu.service'; import { MenuID } from '../shared/menu/initial-menus-state'; import { HostWindowService } from '../shared/host-window.service'; @@ -65,8 +65,8 @@ export class RootComponent implements OnInit { ngOnInit() { this.sidebarVisible = this.menuService.isMenuVisible(MenuID.ADMIN); - this.collapsedSidebarWidth = this.cssService.getVariable('collapsedSidebarWidth'); - this.totalSidebarWidth = this.cssService.getVariable('totalSidebarWidth'); + this.collapsedSidebarWidth = this.cssService.getVariable('--ds-collapsed-sidebar-width'); + this.totalSidebarWidth = this.cssService.getVariable('--ds-total-sidebar-width'); const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN); this.slideSidebarOver = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()]) diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts index 443dd40b14a..6d13d921e07 100644 --- a/src/app/shared/host-window.service.ts +++ b/src/app/shared/host-window.service.ts @@ -7,7 +7,7 @@ import { createSelector, select, Store } from '@ngrx/store'; import { hasValue } from './empty.util'; import { AppState } from '../app.reducer'; -import { CSSVariableService } from './sass-helper/sass-helper.service'; +import { CSSVariableService } from './sass-helper/css-variable.service'; export enum WidthCategory { XS, @@ -31,10 +31,10 @@ export class HostWindowService { /* See _exposed_variables.scss */ variableService.getAllVariables() .subscribe((variables) => { - this.breakPoints.XL_MIN = parseInt(variables.xlMin, 10); - this.breakPoints.LG_MIN = parseInt(variables.lgMin, 10); - this.breakPoints.MD_MIN = parseInt(variables.mdMin, 10); - this.breakPoints.SM_MIN = parseInt(variables.smMin, 10); + this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10); + this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10); + this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10); + this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10); }); } diff --git a/src/app/shared/key-value-pair.model.ts b/src/app/shared/key-value-pair.model.ts new file mode 100644 index 00000000000..6fb63070ad3 --- /dev/null +++ b/src/app/shared/key-value-pair.model.ts @@ -0,0 +1,4 @@ +export interface KeyValuePair { + key: K; + value: V; +} diff --git a/src/app/shared/sass-helper/sass-helper.actions.ts b/src/app/shared/sass-helper/css-variable.actions.ts similarity index 100% rename from src/app/shared/sass-helper/sass-helper.actions.ts rename to src/app/shared/sass-helper/css-variable.actions.ts diff --git a/src/app/shared/sass-helper/sass-helper.reducer.ts b/src/app/shared/sass-helper/css-variable.reducer.ts similarity index 85% rename from src/app/shared/sass-helper/sass-helper.reducer.ts rename to src/app/shared/sass-helper/css-variable.reducer.ts index 6f080619fa9..a196304c92b 100644 --- a/src/app/shared/sass-helper/sass-helper.reducer.ts +++ b/src/app/shared/sass-helper/css-variable.reducer.ts @@ -1,4 +1,4 @@ -import { CSSVariableAction, CSSVariableActionTypes } from './sass-helper.actions'; +import { CSSVariableAction, CSSVariableActionTypes } from './css-variable.actions'; export interface CSSVariablesState { [name: string]: string; diff --git a/src/app/shared/sass-helper/css-variable.service.spec.ts b/src/app/shared/sass-helper/css-variable.service.spec.ts new file mode 100644 index 00000000000..4fd33591f51 --- /dev/null +++ b/src/app/shared/sass-helper/css-variable.service.spec.ts @@ -0,0 +1,78 @@ +import { TestBed } from '@angular/core/testing'; +import { CSSVariableService } from './css-variable.service'; +import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { getTestScheduler } from 'jasmine-marbles'; +import { buildPaginatedList } from '../../core/data/paginated-list.model'; +import { PageInfo } from '../../core/shared/page-info.model'; +import { KeyValuePair } from '../key-value-pair.model'; + +describe('CSSVariableService', () => { + let store: MockStore; + + let service: CSSVariableService; + let initialState; + const varKey1 = '--test-1'; + const varValue1 = 'test-value-1'; + const varKey2 = '--test-2'; + const varValue2 = 'test-value-2'; + const varKey3 = '--test-3'; + const varValue3 = 'test-value-3'; + const queryInAll = 'test'; + const queryFor3 = '3'; + + function init() { + initialState = { + ['cssVariables']: { + [varKey1]: varValue1, + [varKey2]: varValue2, + [varKey3]: varValue3, + } + }; + } + + beforeEach(() => { + init(); + TestBed.configureTestingModule({ + providers: [ + CSSVariableService, + provideMockStore({ initialState }), + ], + }); + service = TestBed.inject(CSSVariableService as any); + store = TestBed.inject(MockStore as any); + }); + + it('should create', () => { + expect(service).toBeTruthy(); + }); + + fdescribe('searchVariable', () => { + it('should return the right keys and variables in a paginated list for query that returns all 3 results', () => { + const currentPage = 1; + const pageSize = 5; + const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalPages: 1, totalElements: 3 }); + const page: KeyValuePair[] = [{ key: varKey1, value: varValue1 }, { key: varKey2, value: varValue2 }, { key: varKey3, value: varValue3 }]; + const result = buildPaginatedList(pageInfo, page); + getTestScheduler().expectObservable(service.searchVariable(queryInAll, { currentPage, pageSize } as any)).toBe('a', { a: result }); + }); + + it('should return the right keys and variables in a paginated list for query that returns only the 3rd results', () => { + const currentPage = 1; + const pageSize = 5; + const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalPages: 1, totalElements: 1 }); + const page: KeyValuePair[] = [{ key: varKey3, value: varValue3 }]; + const result = buildPaginatedList(pageInfo, page); + getTestScheduler().expectObservable(service.searchVariable(queryFor3, { currentPage, pageSize } as any)).toBe('a', { a: result }); + }); + + it('should return the right keys and variables in a paginated list that\'s not longer than the page size', () => { + const currentPage = 1; + const pageSize = 2; + const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalPages: 2, totalElements: 3 }); + const page: KeyValuePair[] = [{ key: varKey1, value: varValue1 }, { key: varKey2, value: varValue2 }]; + const result = buildPaginatedList(pageInfo, page); + getTestScheduler().expectObservable(service.searchVariable(queryInAll, { currentPage, pageSize } as any)).toBe('a', { a: result }); + }); + }); + +}); diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts new file mode 100644 index 00000000000..3e0ed7f2146 --- /dev/null +++ b/src/app/shared/sass-helper/css-variable.service.ts @@ -0,0 +1,71 @@ +import { Injectable } from '@angular/core'; +import { AppState, keySelector } from '../../app.reducer'; +import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store'; +import { AddCSSVariableAction } from './css-variable.actions'; +import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; +import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model'; +import { Observable } from 'rxjs'; +import { hasValue } from '../empty.util'; +import { KeyValuePair } from '../key-value-pair.model'; +import { PageInfo } from '../../core/shared/page-info.model'; + +@Injectable() +export class CSSVariableService { + constructor( + protected store: Store) { + } + + addCSSVariable(name: string, value: string) { + this.store.dispatch(new AddCSSVariableAction(name, value)); + } + + getVariable(name: string) { + return this.store.pipe(select(themeVariableByNameSelector(name))); + } + + getAllVariables() { + return this.store.pipe(select(themeVariablesSelector)); + } + + searchVariable(query: string, paginationOptions: PaginationComponentOptions): Observable>> { + return this.store.pipe(select(themePaginatedVariablesByQuery(query, paginationOptions))); + } +} + +const themeVariablesSelector = (state: AppState) => state.cssVariables; + +const themeVariableByNameSelector = (name: string): MemoizedSelector => { + return keySelector(name, themeVariablesSelector); +}; + +// Split this up into two memoized selectors so the query search gets cached separately from the pagination, +// since the entire list has to be retrieved every time anyway +const themePaginatedVariablesByQuery = (query: string, pagination: PaginationComponentOptions): MemoizedSelector>> => { + return createSelector(themeVariablesByQuery(query), (pairs) => { + if (hasValue(pairs)) { + const { currentPage, pageSize } = pagination; + const startIndex = (currentPage - 1) * pageSize; + const endIndex = startIndex + pageSize; + const pairsPage = pairs.slice(startIndex, endIndex); + const totalPages = Math.ceil(pairs.length / pageSize); + const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalElements: pairs.length, totalPages }); + return buildPaginatedList(pageInfo, pairsPage); + } else { + return undefined; + } + }); +}; + +const themeVariablesByQuery = (query: string): MemoizedSelector[]> => { + return createSelector(themeVariablesSelector, (state) => { + if (hasValue(state)) { + return Object.keys(state) + .filter((key: string) => key.includes(query)) + .map((key: string) => { + return { key, value: state[key] }; + }); + } else { + return undefined; + } + }); +}; diff --git a/src/app/shared/sass-helper/css-variable.utils.ts b/src/app/shared/sass-helper/css-variable.utils.ts new file mode 100644 index 00000000000..63a93b8bc4b --- /dev/null +++ b/src/app/shared/sass-helper/css-variable.utils.ts @@ -0,0 +1,46 @@ +// Uses code from https://css-tricks.com/how-to-get-all-custom-properties-on-a-page-in-javascript/ + +const isSameDomain = (styleSheet) => { + // Internal style blocks won't have an href value + if (!styleSheet.href) { + return true; + } + + return styleSheet.href.indexOf(window.location.origin) === 0; +}; + +/* + Determine if the given rule is a CSSStyleRule + See: https://developer.mozilla.org/en-US/docs/Web/API/CSSRule#Type_constants +*/ +const isStyleRule = (rule) => rule.type === 1; + +/** + * Get all custom properties on a page + * @return array + * ex; [["--color-accent", "#b9f500"], ["--color-text", "#252525"], ...] + */ +export const getCSSCustomPropIndex = (document: Document) => + // styleSheets is array-like, so we convert it to an array. + // Filter out any stylesheets not on this domain + [...document.styleSheets] + .filter(isSameDomain) + .reduce( + (finalArr, sheet) => + finalArr.concat( + // cssRules is array-like, so we convert it to an array + [...sheet.cssRules].filter(isStyleRule).reduce((propValArr, rule: any) => { + const props = [...rule.style] + .map((propName) => [ + propName.trim(), + rule.style.getPropertyValue(propName).trim() + ]) + // Discard any props that don't start with "--". Custom props are required to. + .filter(([propName]) => propName.indexOf('--') === 0); + + return [...propValArr, ...props]; + }, []) + ), + [] + ); + diff --git a/src/app/shared/sass-helper/sass-helper.service.ts b/src/app/shared/sass-helper/sass-helper.service.ts deleted file mode 100644 index 7cc83dab2d8..00000000000 --- a/src/app/shared/sass-helper/sass-helper.service.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Injectable } from '@angular/core'; -import { AppState, keySelector } from '../../app.reducer'; -import { MemoizedSelector, select, Store } from '@ngrx/store'; -import { AddCSSVariableAction } from './sass-helper.actions'; - -@Injectable() -export class CSSVariableService { - constructor( - protected store: Store) { - } - - addCSSVariable(name: string, value: string) { - this.store.dispatch(new AddCSSVariableAction(name, value)); - } - - getVariable(name: string) { - return this.store.pipe(select(themeVariableByNameSelector(name))); - } - - getAllVariables() { - return this.store.pipe(select(themeVariablesSelector)); - } - -} - -const themeVariablesSelector = (state: AppState) => state.cssVariables; - -const themeVariableByNameSelector = (name: string): MemoizedSelector => { - return keySelector(name, themeVariablesSelector); -}; From e96a9794894e5859980b71516b6399eb908e898b Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 12 Sep 2022 20:29:49 +0200 Subject: [PATCH 012/758] [CST-6317] New COLLECTIONS rendering --- .../cris-layout-collection-box.component.html | 8 +++ .../cris-layout-collection-box.component.scss | 0 ...is-layout-collection-box.component.spec.ts | 62 +++++++++++++++++++ .../cris-layout-collection-box.component.ts | 51 +++++++++++++++ src/app/cris-layout/cris-layout.module.ts | 2 + src/app/cris-layout/enums/layout-box.enum.ts | 1 + src/assets/i18n/en.json5 | 2 + 7 files changed, 126 insertions(+) create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.scss create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html new file mode 100644 index 00000000000..dafa3cecfd3 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html @@ -0,0 +1,8 @@ +
+
+
{{ 'cris-layout.rendering.collections.owning-collection.label' | translate }}
+
+ {{ owningCollectionName$ | async }} +
+
+
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.scss b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts new file mode 100644 index 00000000000..d6fde55ac6c --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts @@ -0,0 +1,62 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CrisLayoutCollectionBoxComponent } from './cris-layout-collection-box.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { CrisLayoutBox } from '../../../../../core/layout/models/box.model'; +import { Item } from '../../../../../core/shared/item.model'; +import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; +import { Collection } from '../../../../../core/shared/collection.model'; + +describe('CrisLayoutCollectionBoxComponent', () => { + let component: CrisLayoutCollectionBoxComponent; + let fixture: ComponentFixture; + + const testBox = Object.assign(new CrisLayoutBox(), { + 'id': 1, + 'shortname': 'collections', + 'header': 'Collections', + 'entityType': 'Publication', + 'collapsed': false, + 'minor': false, + 'style': null, + 'security': 0, + 'boxType': 'COLLECTIONS', + 'maxColumns': null, + 'configuration': null, + 'metadataSecurityFields': [], + 'container': false + }); + + const owningCollection = Object.assign(new Collection(), {uuid: 'test-collection-uuid'}); + + const owningCollection$ = createSuccessfulRemoteDataObject$(owningCollection); + + const testItem = Object.assign(new Item(), { + type: 'item', + owningCollection: owningCollection$, + uuid: 'test-item-uuid', + }); + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ], + declarations: [CrisLayoutCollectionBoxComponent], + providers: [ + { provide: 'boxProvider', useValue: testBox }, + { provide: 'itemProvider', useValue: testItem }, + ], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(CrisLayoutCollectionBoxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts new file mode 100644 index 00000000000..0ae49bc2851 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts @@ -0,0 +1,51 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { CrisLayoutBoxModelComponent } from '../../../../models/cris-layout-box-component.model'; +import { CrisLayoutBox } from '../../../../../core/layout/models/box.model'; +import { Item } from '../../../../../core/shared/item.model'; +import { TranslateService } from '@ngx-translate/core'; +import { RenderCrisLayoutBoxFor } from '../../../../decorators/cris-layout-box.decorator'; +import { LayoutBox } from '../../../../enums/layout-box.enum'; +import { Observable } from 'rxjs'; +import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators'; +import { map, shareReplay } from 'rxjs/operators'; + +@Component({ + selector: 'ds-cris-layout-collection-box', + templateUrl: './cris-layout-collection-box.component.html', + styleUrls: ['./cris-layout-collection-box.component.scss'] +}) +@RenderCrisLayoutBoxFor(LayoutBox.COLLECTIONS) +export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponent implements OnInit { + + owningCollectionName$: Observable; + + owningCollectionId$: Observable; + + constructor( + protected translateService: TranslateService, + @Inject('boxProvider') public boxProvider: CrisLayoutBox, + @Inject('itemProvider') public itemProvider: Item + ) { + super(translateService, boxProvider, itemProvider); + } + + ngOnInit(): void { + super.ngOnInit(); + + const collection$ = this.item.owningCollection.pipe( + getFirstSucceededRemoteDataPayload(), + shareReplay(), + ); + + this.owningCollectionName$ = collection$.pipe( + map((coll) => coll.firstMetadataValue('dc.title')), + ); + + this.owningCollectionId$ = collection$.pipe( + map((coll) => coll.uuid), + ); + + } + + +} diff --git a/src/app/cris-layout/cris-layout.module.ts b/src/app/cris-layout/cris-layout.module.ts index a5070c6efb8..91a9c274f7c 100644 --- a/src/app/cris-layout/cris-layout.module.ts +++ b/src/app/cris-layout/cris-layout.module.ts @@ -48,12 +48,14 @@ import { ComcolModule } from '../shared/comcol/comcol.module'; import { SearchModule } from '../shared/search/search.module'; import { AdvancedAttachmentComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component'; import { FileDownloadButtonComponent } from '../shared/file-download-button/file-download-button.component'; +import { CrisLayoutCollectionBoxComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator CrisLayoutVerticalComponent, CrisLayoutHorizontalComponent, CrisLayoutMetadataBoxComponent, + CrisLayoutCollectionBoxComponent, TextComponent, HeadingComponent, CrisLayoutRelationBoxComponent, diff --git a/src/app/cris-layout/enums/layout-box.enum.ts b/src/app/cris-layout/enums/layout-box.enum.ts index df5673b98cc..143c14ab535 100644 --- a/src/app/cris-layout/enums/layout-box.enum.ts +++ b/src/app/cris-layout/enums/layout-box.enum.ts @@ -12,4 +12,5 @@ export enum LayoutBox { ORCID_AUTHORIZATIONS = 'ORCID_AUTHORIZATIONS', ORCID_SYNC_QUEUE = 'ORCID_SYNC_QUEUE', IIIFVIEWER = 'IIIFVIEWER', + COLLECTIONS = 'COLLECTIONS', } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 79ae633c815..ca43ee5bfd3 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1622,6 +1622,8 @@ "cris-layout.attachment.viewMore": "View More", + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.noop.label": "NOOP", From ac094aa623bfb1d83e540f82ff4a6487287cffd4 Mon Sep 17 00:00:00 2001 From: lotte Date: Tue, 13 Sep 2022 12:22:55 +0200 Subject: [PATCH 013/758] 94233: added typedoc --- .../sass-helper/css-variable.reducer.ts | 8 ++++++-- .../sass-helper/css-variable.service.ts | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/app/shared/sass-helper/css-variable.reducer.ts b/src/app/shared/sass-helper/css-variable.reducer.ts index a196304c92b..a2d150dabfd 100644 --- a/src/app/shared/sass-helper/css-variable.reducer.ts +++ b/src/app/shared/sass-helper/css-variable.reducer.ts @@ -6,12 +6,16 @@ export interface CSSVariablesState { const initialState: CSSVariablesState = Object.create({}); +/** + * Reducer that handles the state of CSS variables in the store + * @param state The current state of the store + * @param action The action to apply onto the current state of the store + */ export function cssVariablesReducer(state = initialState, action: CSSVariableAction): CSSVariablesState { switch (action.type) { case CSSVariableActionTypes.ADD: { const variable = action.payload; - const t = Object.assign({}, state, { [variable.name]: variable.value }); - return t; + return Object.assign({}, state, { [variable.name]: variable.value }); } default: { return state; diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts index 3e0ed7f2146..bdcba8503ef 100644 --- a/src/app/shared/sass-helper/css-variable.service.ts +++ b/src/app/shared/sass-helper/css-variable.service.ts @@ -9,24 +9,44 @@ import { hasValue } from '../empty.util'; import { KeyValuePair } from '../key-value-pair.model'; import { PageInfo } from '../../core/shared/page-info.model'; +/** + * This service deals with adding and retrieving CSS variables to and from the store + */ @Injectable() export class CSSVariableService { constructor( protected store: Store) { } + /** + * Adds a CSS variable to the store + * @param name The name/key of the CSS variable + * @param value The value of the CSS variable + */ addCSSVariable(name: string, value: string) { this.store.dispatch(new AddCSSVariableAction(name, value)); } + /** + * Returns the value of a specific CSS key + * @param name The name/key of the CSS value + */ getVariable(name: string) { return this.store.pipe(select(themeVariableByNameSelector(name))); } + /** + * Returns the CSSVariablesState of the store containing all variables + */ getAllVariables() { return this.store.pipe(select(themeVariablesSelector)); } + /** + * Method to find CSS variables by their partially supplying their key. Case sensitive. Returns a paginated list of KeyValuePairs with CSS variables that match the query. + * @param query The query to look for in the keys + * @param paginationOptions The pagination options for the requested page + */ searchVariable(query: string, paginationOptions: PaginationComponentOptions): Observable>> { return this.store.pipe(select(themePaginatedVariablesByQuery(query, paginationOptions))); } From 8d2636455fb59e1c62842383e6c42f9e0da3df17 Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Wed, 14 Sep 2022 18:22:04 +0530 Subject: [PATCH 014/758] [DSC-740] New COLLECTIONS rendering type to show item's collection with CRIS layout --- .../cris-layout-collection-box.component.html | 33 ++++-- ...is-layout-collection-box.component.spec.ts | 89 ++++++++++++++ .../cris-layout-collection-box.component.ts | 112 +++++++++++++++--- src/assets/i18n/en.json5 | 6 + src/config/default-app-config.ts | 4 + src/config/layout-config.interfaces.ts | 6 + src/environments/environment.test.ts | 4 + 7 files changed, 233 insertions(+), 21 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html index dafa3cecfd3..9ec7d7007b7 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html @@ -1,8 +1,27 @@ -
-
-
{{ 'cris-layout.rendering.collections.owning-collection.label' | translate }}
-
- {{ owningCollectionName$ | async }} +
+
+
{{ 'cris-layout.rendering.collections.owning-collection.label' | translate }}
+
+ {{ (owningCollection$ | async).firstMetadataValue('dc.title') }} +
-
-
+
+
{{ 'cris-layout.rendering.collections.mapped-collection.label' | translate }}
+
+ + {{ mappedCollection.firstMetadataValue('dc.title') }} + +
+ {{'cris-layout.rendering.collections.loading' | translate}} +
+ + + {{'cris-layout.rendering.collections.load-more' | translate}} + +
+
+
\ No newline at end of file diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts index d6fde55ac6c..bf0c80e19d0 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.spec.ts @@ -6,11 +6,21 @@ import { CrisLayoutBox } from '../../../../../core/layout/models/box.model'; import { Item } from '../../../../../core/shared/item.model'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; import { Collection } from '../../../../../core/shared/collection.model'; +import { CollectionDataService } from '../../../../../core/data/collection-data.service'; +import { buildPaginatedList, PaginatedList } from '../../../../../core/data/paginated-list.model'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { By } from '@angular/platform-browser'; +import { of as observableOf } from 'rxjs'; describe('CrisLayoutCollectionBoxComponent', () => { let component: CrisLayoutCollectionBoxComponent; let fixture: ComponentFixture; + const createMockCollection = (id: string) => Object.assign(new Collection(), { + id: id, + name: `collection-${id}`, + }); + const testBox = Object.assign(new CrisLayoutBox(), { 'id': 1, 'shortname': 'collections', @@ -26,6 +36,9 @@ describe('CrisLayoutCollectionBoxComponent', () => { 'metadataSecurityFields': [], 'container': false }); + let collectionDataService; + let mockCollection1: Collection; + let mockPage1: PaginatedList; const owningCollection = Object.assign(new Collection(), {uuid: 'test-collection-uuid'}); @@ -37,7 +50,14 @@ describe('CrisLayoutCollectionBoxComponent', () => { uuid: 'test-item-uuid', }); + mockCollection1 = createMockCollection('c1'); + beforeEach(async () => { + collectionDataService = jasmine.createSpyObj([ + 'findOwningCollectionFor', + 'findMappedCollectionsFor', + ]); + await TestBed.configureTestingModule({ imports: [ TranslateModule.forRoot(), @@ -46,6 +66,7 @@ describe('CrisLayoutCollectionBoxComponent', () => { providers: [ { provide: 'boxProvider', useValue: testBox }, { provide: 'itemProvider', useValue: testItem }, + { provide: CollectionDataService, useValue: collectionDataService }, ], }).compileComponents(); }); @@ -53,10 +74,78 @@ describe('CrisLayoutCollectionBoxComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(CrisLayoutCollectionBoxComponent); component = fixture.componentInstance; + mockPage1 = buildPaginatedList(Object.assign(new PageInfo(), { + currentPage: 1, + elementsPerPage: 2, + totalPages: 0, + totalElements: 0, + }), []); + collectionDataService.findOwningCollectionFor.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection1)); + collectionDataService.findMappedCollectionsFor.and.returnValue(createSuccessfulRemoteDataObject$(mockPage1)); fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should render container', () => { + expect(fixture.debugElement.query(By.css('.container'))).not.toBeNull(); + }); + + describe('without collections', () => { + beforeEach(() => { + component.owningCollection$ = observableOf(null); + fixture.detectChanges(); + }); + + it('should not render container', () => { + expect(fixture.debugElement.query(By.css('.container'))).toBeNull(); + }); + }); + + describe('without owning collections', () => { + beforeEach(() => { + component.owningCollection$ = observableOf(null); + fixture.detectChanges(); + }); + + it('should not render owning collection row', () => { + expect(fixture.debugElement.query(By.css('div[data-test="owningCollection"]'))).toBeNull(); + }); + }); + + describe('with owning collections', () => { + beforeEach(() => { + component.owningCollection$ = observableOf(mockCollection1); + fixture.detectChanges(); + }); + + it('should render owning collection row', () => { + expect(fixture.debugElement.query(By.css('div[data-test="owningCollection"]'))).not.toBeNull(); + }); + }); + + describe('without mapped collections', () => { + beforeEach(() => { + component.mappedCollections$ = observableOf([]); + fixture.detectChanges(); + }); + + it('should not render mapped collections row', () => { + expect(fixture.debugElement.query(By.css('div[data-test="mappedCollections"]'))).toBeNull(); + }); + }); + + describe('with mapped collections', () => { + beforeEach(() => { + component.mappedCollections$ = observableOf([mockCollection1]); + fixture.detectChanges(); + }); + + it('should render mapped collection row', () => { + expect(fixture.debugElement.query(By.css('div[data-test="mappedCollections"]'))).not.toBeNull(); + }); + }); + }); diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts index 0ae49bc2851..9389d9659e5 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts @@ -5,9 +5,14 @@ import { Item } from '../../../../../core/shared/item.model'; import { TranslateService } from '@ngx-translate/core'; import { RenderCrisLayoutBoxFor } from '../../../../decorators/cris-layout-box.decorator'; import { LayoutBox } from '../../../../enums/layout-box.enum'; -import { Observable } from 'rxjs'; -import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators'; -import { map, shareReplay } from 'rxjs/operators'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { getFirstSucceededRemoteDataPayload, getAllCompletedRemoteData, getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../../../../../core/shared/operators'; +import { startWith, tap, withLatestFrom, switchMap, scan } from 'rxjs/operators'; +import { Collection } from '../../../../../core/shared/collection.model'; +import { CollectionDataService } from '../../../../../core/data/collection-data.service'; +import { FindListOptions } from '../../../../../core/data/request.models'; +import { PaginatedList } from '../../../../../core/data/paginated-list.model'; +import { environment } from '../../../../../../environments/environment'; @Component({ selector: 'ds-cris-layout-collection-box', @@ -17,14 +22,50 @@ import { map, shareReplay } from 'rxjs/operators'; @RenderCrisLayoutBoxFor(LayoutBox.COLLECTIONS) export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponent implements OnInit { - owningCollectionName$: Observable; + separator = '
'; - owningCollectionId$: Observable; + /** + * Amount of mapped collections that should be fetched at once. + */ + pageSize = 5; + + /** + * Last page of the mapped collections that has been fetched. + */ + lastPage$: BehaviorSubject = new BehaviorSubject(0); + + /** + * Push an event to this observable to fetch the next page of mapped collections. + * Because this observable is a behavior subject, the first page will be requested + * immediately after subscription. + */ + loadMore$: BehaviorSubject = new BehaviorSubject(undefined); + + /** + * Whether or not a page of mapped collections is currently being loaded. + */ + isLoading$: BehaviorSubject = new BehaviorSubject(true); + + /** + * Whether or not more pages of mapped collections are available. + */ + hasMore$: BehaviorSubject = new BehaviorSubject(true); + + /** + * This includes the owning collection + */ + owningCollection$: Observable; + + /** + * This includes the mapped collection + */ + mappedCollections$: Observable; constructor( protected translateService: TranslateService, @Inject('boxProvider') public boxProvider: CrisLayoutBox, - @Inject('itemProvider') public itemProvider: Item + @Inject('itemProvider') public itemProvider: Item, + private cds: CollectionDataService ) { super(translateService, boxProvider, itemProvider); } @@ -32,19 +73,62 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen ngOnInit(): void { super.ngOnInit(); - const collection$ = this.item.owningCollection.pipe( + this.owningCollection$ = this.cds.findOwningCollectionFor(this.item).pipe( getFirstSucceededRemoteDataPayload(), - shareReplay(), + startWith(null as Collection), ); - this.owningCollectionName$ = collection$.pipe( - map((coll) => coll.firstMetadataValue('dc.title')), - ); + this.mappedCollections$ = this.loadMore$.pipe( + // update isLoading$ + tap(() => this.isLoading$.next(true)), - this.owningCollectionId$ = collection$.pipe( - map((coll) => coll.uuid), - ); + // request next batch of mapped collections + withLatestFrom(this.lastPage$), + switchMap(([_, lastPage]: [void, number]) => { + return this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { + elementsPerPage: this.pageSize, + currentPage: lastPage + 1, + })); + }), + + getAllCompletedRemoteData>(), + + // update isLoading$ + tap(() => this.isLoading$.next(false)), + + getAllSucceededRemoteDataPayload(), + + // update hasMore$ + tap((response: PaginatedList) => this.hasMore$.next(response.currentPage < response.totalPages)), + + // update lastPage$ + tap((response: PaginatedList) => this.lastPage$.next(response.currentPage)), + + getPaginatedListPayload(), + + // add current batch to list of collections + scan((prev: Collection[], current: Collection[]) => [...prev, ...current], []), + + startWith([]), + ) as Observable; + } + + handleLoadMore() { + this.loadMore$.next(); + } + + /** + * Returns a string representing the style of field label if exists + */ + get labelStyle(): string { + return environment.crisLayout.collectionsBox.defaultCollectionsLabelColStyle; + } + /** + * Returns a string representing the style of field value if exists + */ + get valueStyle(): string { + return environment.crisLayout.collectionsBox.defaultCollectionsValueColStyle; } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index ca43ee5bfd3..e5503cc0dbc 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1624,6 +1624,12 @@ "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collection", + + "cris-layout.rendering.collections.loading": "Loading...", + + "cris-layout.rendering.collections.load-more": "Load more", + "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.noop.label": "NOOP", diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 6594cebecd3..fc0d21461c3 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -415,6 +415,10 @@ export class DefaultAppConfig implements AppConfig { metadataBox: { defaultMetadataLabelColStyle: 'col-3', defaultMetadataValueColStyle: 'col-9' + }, + collectionsBox: { + defaultCollectionsLabelColStyle: 'col-3 font-weight-bold', + defaultCollectionsValueColStyle: 'col-9' } }; diff --git a/src/config/layout-config.interfaces.ts b/src/config/layout-config.interfaces.ts index 0b15a06aa92..cdc2f43015b 100644 --- a/src/config/layout-config.interfaces.ts +++ b/src/config/layout-config.interfaces.ts @@ -15,6 +15,11 @@ export interface CrisLayoutMetadataBoxConfig extends Config { defaultMetadataValueColStyle: string; } +export interface CrisLayoutCollectionsBoxConfig extends Config { + defaultCollectionsLabelColStyle: string; + defaultCollectionsValueColStyle: string; +} + export interface CrisLayoutTypeConfig { orientation: string; } @@ -34,6 +39,7 @@ export interface CrisLayoutConfig extends Config { crisRef: CrisRefConfig[]; itemPage: CrisItemPageConfig; metadataBox: CrisLayoutMetadataBoxConfig; + collectionsBox: CrisLayoutCollectionsBoxConfig; } export interface LayoutConfig extends Config { diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index a7873fda79d..169f16fbfc9 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -288,6 +288,10 @@ export const environment: BuildConfig = { metadataBox: { defaultMetadataLabelColStyle: 'col-3', defaultMetadataValueColStyle: 'col-9' + }, + collectionsBox: { + defaultCollectionsLabelColStyle: 'col-3 font-weight-bold', + defaultCollectionsValueColStyle: 'col-9' } }, layout: { From 75c3336595a3ea2b864e0dc033762ffd48f8d0ab Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Thu, 15 Sep 2022 19:57:30 +0530 Subject: [PATCH 015/758] [DSC-740] design and functionality fixes --- .../cris-layout-collection-box.component.html | 18 ++--- .../cris-layout-collection-box.component.ts | 68 +++++++++---------- src/assets/i18n/en.json5 | 2 +- src/config/default-app-config.ts | 3 +- src/config/layout-config.interfaces.ts | 2 + src/environments/environment.test.ts | 3 +- 6 files changed, 51 insertions(+), 45 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html index 9ec7d7007b7..38f71cfda7c 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html @@ -5,22 +5,24 @@ {{ (owningCollection$ | async).firstMetadataValue('dc.title') }}
-
+
{{ 'cris-layout.rendering.collections.mapped-collection.label' | translate }}
-
- - {{ mappedCollection.firstMetadataValue('dc.title') }} - +
+
{{'cris-layout.rendering.collections.loading' | translate}}
- - {{'cris-layout.rendering.collections.load-more' | translate}} + {{'cris-layout.rendering.collections.load-more' | translate}}
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts index 9389d9659e5..cf9eddfb112 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts @@ -5,9 +5,9 @@ import { Item } from '../../../../../core/shared/item.model'; import { TranslateService } from '@ngx-translate/core'; import { RenderCrisLayoutBoxFor } from '../../../../decorators/cris-layout-box.decorator'; import { LayoutBox } from '../../../../enums/layout-box.enum'; -import { BehaviorSubject, Observable } from 'rxjs'; +import { BehaviorSubject, Observable, of } from 'rxjs'; import { getFirstSucceededRemoteDataPayload, getAllCompletedRemoteData, getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../../../../../core/shared/operators'; -import { startWith, tap, withLatestFrom, switchMap, scan } from 'rxjs/operators'; +import { shareReplay, tap, switchMap, scan, map } from 'rxjs/operators'; import { Collection } from '../../../../../core/shared/collection.model'; import { CollectionDataService } from '../../../../../core/data/collection-data.service'; import { FindListOptions } from '../../../../../core/data/request.models'; @@ -22,7 +22,7 @@ import { environment } from '../../../../../../environments/environment'; @RenderCrisLayoutBoxFor(LayoutBox.COLLECTIONS) export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponent implements OnInit { - separator = '
'; + isInline = environment.crisLayout.collectionsBox.isInline; /** * Amount of mapped collections that should be fetched at once. @@ -32,14 +32,7 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen /** * Last page of the mapped collections that has been fetched. */ - lastPage$: BehaviorSubject = new BehaviorSubject(0); - - /** - * Push an event to this observable to fetch the next page of mapped collections. - * Because this observable is a behavior subject, the first page will be requested - * immediately after subscription. - */ - loadMore$: BehaviorSubject = new BehaviorSubject(undefined); + lastPage = 0; /** * Whether or not a page of mapped collections is currently being loaded. @@ -73,24 +66,21 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen ngOnInit(): void { super.ngOnInit(); - this.owningCollection$ = this.cds.findOwningCollectionFor(this.item).pipe( + this.owningCollection$ = this.item.owningCollection.pipe( getFirstSucceededRemoteDataPayload(), - startWith(null as Collection), + shareReplay(), ); - this.mappedCollections$ = this.loadMore$.pipe( - // update isLoading$ - tap(() => this.isLoading$.next(true)), - - // request next batch of mapped collections - withLatestFrom(this.lastPage$), - switchMap(([_, lastPage]: [void, number]) => { - return this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { - elementsPerPage: this.pageSize, - currentPage: lastPage + 1, - })); - }), + this.handleLoadMore(); + } + handleLoadMore() { + this.isLoading$.next(true); + const oldMappedCollections$ = this.mappedCollections$; + this.mappedCollections$ = this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { + elementsPerPage: this.pageSize, + currentPage: this.lastPage + 1, + })).pipe( getAllCompletedRemoteData>(), // update isLoading$ @@ -99,22 +89,26 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen getAllSucceededRemoteDataPayload(), // update hasMore$ - tap((response: PaginatedList) => this.hasMore$.next(response.currentPage < response.totalPages)), + tap((response: PaginatedList) => this.hasMore$.next(this.lastPage < response.totalPages)), - // update lastPage$ - tap((response: PaginatedList) => this.lastPage$.next(response.currentPage)), + // update lastPage + tap((response: PaginatedList) => this.lastPage = response.currentPage), getPaginatedListPayload(), // add current batch to list of collections scan((prev: Collection[], current: Collection[]) => [...prev, ...current], []), - startWith([]), - ) as Observable; - } - - handleLoadMore() { - this.loadMore$.next(); + switchMap((collections: Collection[]) => { + if (oldMappedCollections$) { + return oldMappedCollections$.pipe( + map((mappedCollection) => [...mappedCollection, ...collections]) + ); + } else { + return of(collections); + } + }) + ); } /** @@ -131,5 +125,11 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen return environment.crisLayout.collectionsBox.defaultCollectionsValueColStyle; } + /** + * Returns a string representing the style of row if exists + */ + get rowStyle(): string { + return environment.crisLayout.collectionsBox.defaultCollectionsRowStyle; + } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index e5503cc0dbc..ee207485400 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1624,7 +1624,7 @@ "cris-layout.rendering.collections.owning-collection.label": "Owning collection", - "cris-layout.rendering.collections.mapped-collection.label": "Mapped collection", + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", "cris-layout.rendering.collections.loading": "Loading...", diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index fc0d21461c3..3f782fa1990 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -418,7 +418,8 @@ export class DefaultAppConfig implements AppConfig { }, collectionsBox: { defaultCollectionsLabelColStyle: 'col-3 font-weight-bold', - defaultCollectionsValueColStyle: 'col-9' + defaultCollectionsValueColStyle: 'col-9', + isInline: true } }; diff --git a/src/config/layout-config.interfaces.ts b/src/config/layout-config.interfaces.ts index cdc2f43015b..5c91ca190aa 100644 --- a/src/config/layout-config.interfaces.ts +++ b/src/config/layout-config.interfaces.ts @@ -18,6 +18,8 @@ export interface CrisLayoutMetadataBoxConfig extends Config { export interface CrisLayoutCollectionsBoxConfig extends Config { defaultCollectionsLabelColStyle: string; defaultCollectionsValueColStyle: string; + isInline: boolean; + defaultCollectionsRowStyle?: string; } export interface CrisLayoutTypeConfig { diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 169f16fbfc9..fa194c12989 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -291,7 +291,8 @@ export const environment: BuildConfig = { }, collectionsBox: { defaultCollectionsLabelColStyle: 'col-3 font-weight-bold', - defaultCollectionsValueColStyle: 'col-9' + defaultCollectionsValueColStyle: 'col-9', + isInline: true } }, layout: { From 89ba24fc1c1df13cfecdf12ebe59883901980d28 Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 16 Sep 2022 12:40:04 +0200 Subject: [PATCH 016/758] 94233: applied feedback for css variables --- src/app/app.component.ts | 6 +- .../sass-helper/css-variable.actions.ts | 20 +++++- .../sass-helper/css-variable.reducer.ts | 6 ++ .../sass-helper/css-variable.service.ts | 71 ++++++++++++++++++- .../shared/sass-helper/css-variable.utils.ts | 44 +----------- 5 files changed, 96 insertions(+), 51 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0c38d2bd645..32753ce74c3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -48,7 +48,6 @@ import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service'; import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; import { getDefaultThemeConfig } from '../config/config.util'; import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; -import { getCSSCustomPropIndex } from './shared/sass-helper/css-variable.utils'; @Component({ selector: 'ds-app', @@ -181,9 +180,8 @@ export class AppComponent implements OnInit, AfterViewInit { } private storeCSSVariables() { - getCSSCustomPropIndex(this.document).forEach(([prop, val]) => { - this.cssService.addCSSVariable(prop, val); - }); + this.cssService.clearCSSVariables(); + this.cssService.addCSSVariables(this.cssService.getCSSVariablesFromStylesheets(this.document)); } ngAfterViewInit() { diff --git a/src/app/shared/sass-helper/css-variable.actions.ts b/src/app/shared/sass-helper/css-variable.actions.ts index 144904646ea..93225f94262 100644 --- a/src/app/shared/sass-helper/css-variable.actions.ts +++ b/src/app/shared/sass-helper/css-variable.actions.ts @@ -1,5 +1,6 @@ import { Action } from '@ngrx/store'; import { type } from '../ngrx/type'; +import { KeyValuePair } from '../key-value-pair.model'; /** * For each action type in an action group, make a simple @@ -11,6 +12,8 @@ import { type } from '../ngrx/type'; */ export const CSSVariableActionTypes = { ADD: type('dspace/css-variables/ADD'), + ADD_ALL: type('dspace/css-variables/ADD_ALL'), + CLEAR: type('dspace/css-variables/CLEAR'), }; export class AddCSSVariableAction implements Action { @@ -24,5 +27,20 @@ export class AddCSSVariableAction implements Action { this.payload = {name, value}; } } +export class AddAllCSSVariablesAction implements Action { + type = CSSVariableActionTypes.ADD_ALL; + payload: KeyValuePair[]; -export type CSSVariableAction = AddCSSVariableAction; + constructor(variables: KeyValuePair[]) { + this.payload = variables; + } +} + +export class ClearCSSVariablesAction implements Action { + type = CSSVariableActionTypes.CLEAR; + + constructor() { + } +} + +export type CSSVariableAction = AddCSSVariableAction | AddAllCSSVariablesAction | ClearCSSVariablesAction; diff --git a/src/app/shared/sass-helper/css-variable.reducer.ts b/src/app/shared/sass-helper/css-variable.reducer.ts index a2d150dabfd..405cbf5df41 100644 --- a/src/app/shared/sass-helper/css-variable.reducer.ts +++ b/src/app/shared/sass-helper/css-variable.reducer.ts @@ -1,4 +1,5 @@ import { CSSVariableAction, CSSVariableActionTypes } from './css-variable.actions'; +import { KeyValuePair } from '../key-value-pair.model'; export interface CSSVariablesState { [name: string]: string; @@ -16,6 +17,11 @@ export function cssVariablesReducer(state = initialState, action: CSSVariableAct case CSSVariableActionTypes.ADD: { const variable = action.payload; return Object.assign({}, state, { [variable.name]: variable.value }); + } case CSSVariableActionTypes.ADD_ALL: { + const variables = action.payload; + return Object.assign({}, state, ...variables.map(({ key, value }: KeyValuePair) => {return {[key]: value}})); + } case CSSVariableActionTypes.CLEAR: { + return initialState; } default: { return state; diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts index bdcba8503ef..9ba9dfca3c9 100644 --- a/src/app/shared/sass-helper/css-variable.service.ts +++ b/src/app/shared/sass-helper/css-variable.service.ts @@ -1,19 +1,35 @@ import { Injectable } from '@angular/core'; import { AppState, keySelector } from '../../app.reducer'; import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store'; -import { AddCSSVariableAction } from './css-variable.actions'; +import { AddAllCSSVariablesAction, AddCSSVariableAction, ClearCSSVariablesAction } from './css-variable.actions'; import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model'; import { Observable } from 'rxjs'; import { hasValue } from '../empty.util'; import { KeyValuePair } from '../key-value-pair.model'; import { PageInfo } from '../../core/shared/page-info.model'; +import { CSSVariablesState } from './css-variable.reducer'; /** * This service deals with adding and retrieving CSS variables to and from the store */ @Injectable() export class CSSVariableService { + isSameDomain = (styleSheet) => { + // Internal style blocks won't have an href value + if (!styleSheet.href) { + return true; + } + + return styleSheet.href.indexOf(window.location.origin) === 0; + }; + + /* + Determine if the given rule is a CSSStyleRule + See: https://developer.mozilla.org/en-US/docs/Web/API/CSSRule#Type_constants + */ + isStyleRule = (rule) => rule.type === 1; + constructor( protected store: Store) { } @@ -27,18 +43,33 @@ export class CSSVariableService { this.store.dispatch(new AddCSSVariableAction(name, value)); } + /** + * Adds multiples CSS variables to the store + * @param variables The key-value pairs with the CSS variables to be added + */ + addCSSVariables(variables: KeyValuePair[]) { + this.store.dispatch(new AddAllCSSVariablesAction(variables)); + } + + /** + * Clears all CSS variables ƒrom the store + */ + clearCSSVariables() { + this.store.dispatch(new ClearCSSVariablesAction()); + } + /** * Returns the value of a specific CSS key * @param name The name/key of the CSS value */ - getVariable(name: string) { + getVariable(name: string): Observable { return this.store.pipe(select(themeVariableByNameSelector(name))); } /** * Returns the CSSVariablesState of the store containing all variables */ - getAllVariables() { + getAllVariables(): Observable { return this.store.pipe(select(themeVariablesSelector)); } @@ -50,6 +81,40 @@ export class CSSVariableService { searchVariable(query: string, paginationOptions: PaginationComponentOptions): Observable>> { return this.store.pipe(select(themePaginatedVariablesByQuery(query, paginationOptions))); } + + /** + * Get all custom properties on a page + * @return array> + * ex; [{key: "--color-accent", value: "#b9f500"}, {key: "--color-text", value: "#252525"}, ...] + */ + getCSSVariablesFromStylesheets(document: Document): KeyValuePair[] + { + // styleSheets is array-like, so we convert it to an array. + // Filter out any stylesheets not on this domain + return [...document.styleSheets] + .filter(this.isSameDomain) + .reduce( + (finalArr, sheet) => + finalArr.concat( + // cssRules is array-like, so we convert it to an array + [...sheet.cssRules].filter(this.isStyleRule).reduce((propValArr, rule: any) => { + const props = [...rule.style] + .map((propName) => { + return { + key: propName.trim(), + value: rule.style.getPropertyValue(propName).trim() + } as KeyValuePair; + } + ) + // Discard any props that don't start with "--". Custom props are required to. + .filter(({ key }: KeyValuePair) => key.indexOf('--') === 0); + + return [...propValArr, ...props]; + }, []) + ), + [] + ); + } } const themeVariablesSelector = (state: AppState) => state.cssVariables; diff --git a/src/app/shared/sass-helper/css-variable.utils.ts b/src/app/shared/sass-helper/css-variable.utils.ts index 63a93b8bc4b..05e3074f98a 100644 --- a/src/app/shared/sass-helper/css-variable.utils.ts +++ b/src/app/shared/sass-helper/css-variable.utils.ts @@ -1,46 +1,4 @@ // Uses code from https://css-tricks.com/how-to-get-all-custom-properties-on-a-page-in-javascript/ -const isSameDomain = (styleSheet) => { - // Internal style blocks won't have an href value - if (!styleSheet.href) { - return true; - } - - return styleSheet.href.indexOf(window.location.origin) === 0; -}; - -/* - Determine if the given rule is a CSSStyleRule - See: https://developer.mozilla.org/en-US/docs/Web/API/CSSRule#Type_constants -*/ -const isStyleRule = (rule) => rule.type === 1; - -/** - * Get all custom properties on a page - * @return array - * ex; [["--color-accent", "#b9f500"], ["--color-text", "#252525"], ...] - */ -export const getCSSCustomPropIndex = (document: Document) => - // styleSheets is array-like, so we convert it to an array. - // Filter out any stylesheets not on this domain - [...document.styleSheets] - .filter(isSameDomain) - .reduce( - (finalArr, sheet) => - finalArr.concat( - // cssRules is array-like, so we convert it to an array - [...sheet.cssRules].filter(isStyleRule).reduce((propValArr, rule: any) => { - const props = [...rule.style] - .map((propName) => [ - propName.trim(), - rule.style.getPropertyValue(propName).trim() - ]) - // Discard any props that don't start with "--". Custom props are required to. - .filter(([propName]) => propName.indexOf('--') === 0); - - return [...propValArr, ...props]; - }, []) - ), - [] - ); +import { KeyValuePair } from '../key-value-pair.model'; From 48a5e6bb7de2e1435d6daa5239a8e50b05b6dc0e Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 16 Sep 2022 15:44:21 +0200 Subject: [PATCH 017/758] [DSC-740] Graphical fixes --- .../cris-layout-collection-box.component.html | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html index 38f71cfda7c..e1126d358d7 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html @@ -1,29 +1,31 @@ -
-
-
{{ 'cris-layout.rendering.collections.owning-collection.label' | translate }}
-
- {{ (owningCollection$ | async).firstMetadataValue('dc.title') }} -
+
+
+
{{ 'cris-layout.rendering.collections.owning-collection.label' | translate }}
+
+ {{ (owningCollection$ | async).firstMetadataValue('dc.title') }}
-
-
{{ 'cris-layout.rendering.collections.mapped-collection.label' | translate }}
-
- -
- {{'cris-layout.rendering.collections.loading' | translate}} -
- - {{'cris-layout.rendering.collections.load-more' | translate}} - -
+
+
+
{{ 'cris-layout.rendering.collections.mapped-collection.label' | translate }}
+
+ +
+ {{'cris-layout.rendering.collections.loading' | translate}} +
+ + + {{'cris-layout.rendering.collections.load-more' | translate}} +
-
\ No newline at end of file +
+
From 7cceda1f8173ad6097ab914a9ad123abf1a7c7f3 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 16 Sep 2022 16:18:50 +0200 Subject: [PATCH 018/758] [DSC-740] Refactor WIP --- .../cris-layout-collection-box.component.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts index cf9eddfb112..0fb92ea60c2 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts @@ -13,6 +13,7 @@ import { CollectionDataService } from '../../../../../core/data/collection-data. import { FindListOptions } from '../../../../../core/data/request.models'; import { PaginatedList } from '../../../../../core/data/paginated-list.model'; import { environment } from '../../../../../../environments/environment'; +import { RemoteData } from '../../../../../core/data/remote-data'; @Component({ selector: 'ds-cris-layout-collection-box', @@ -77,10 +78,7 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen handleLoadMore() { this.isLoading$.next(true); const oldMappedCollections$ = this.mappedCollections$; - this.mappedCollections$ = this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { - elementsPerPage: this.pageSize, - currentPage: this.lastPage + 1, - })).pipe( + this.mappedCollections$ = this.mappedCollectionPage(this.lastPage).pipe( getAllCompletedRemoteData>(), // update isLoading$ @@ -111,6 +109,13 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen ); } + mappedCollectionPage(page: number): Observable>> { + return this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { + elementsPerPage: this.pageSize, + currentPage: page, + })); + } + /** * Returns a string representing the style of field label if exists */ From ce67003f26478f2ef225c82e0466642454a0cd6d Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 16 Sep 2022 16:23:11 +0200 Subject: [PATCH 019/758] 94233: fixed tests after CSSVariableService changes --- src/app/shared/sass-helper/css-variable.service.spec.ts | 2 +- src/app/shared/testing/css-variable-service.stub.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/shared/sass-helper/css-variable.service.spec.ts b/src/app/shared/sass-helper/css-variable.service.spec.ts index 4fd33591f51..559384a5d7f 100644 --- a/src/app/shared/sass-helper/css-variable.service.spec.ts +++ b/src/app/shared/sass-helper/css-variable.service.spec.ts @@ -46,7 +46,7 @@ describe('CSSVariableService', () => { expect(service).toBeTruthy(); }); - fdescribe('searchVariable', () => { + describe('searchVariable', () => { it('should return the right keys and variables in a paginated list for query that returns all 3 results', () => { const currentPage = 1; const pageSize = 5; diff --git a/src/app/shared/testing/css-variable-service.stub.ts b/src/app/shared/testing/css-variable-service.stub.ts index 6159d896557..f72e3384553 100644 --- a/src/app/shared/testing/css-variable-service.stub.ts +++ b/src/app/shared/testing/css-variable-service.stub.ts @@ -1,10 +1,10 @@ import { Observable, of as observableOf } from 'rxjs'; const variables = { - smMin: '576px,', - mdMin: '768px,', - lgMin: '992px', - xlMin: '1200px', + '--bs-sm-min': '576px,', + '--bs-md-min': '768px,', + '--bs-lg-min': '992px', + '--bs-xl-min': '1200px', } as any; export class CSSVariableServiceStub { From 70ad345701069b0f1deeed752e8de454b3e1ae8d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 16 Sep 2022 16:34:23 +0200 Subject: [PATCH 020/758] [DSC-740] Refactor WIP --- .../cris-layout-collection-box.component.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts index 0fb92ea60c2..0811360d4fa 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts @@ -78,7 +78,7 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen handleLoadMore() { this.isLoading$.next(true); const oldMappedCollections$ = this.mappedCollections$; - this.mappedCollections$ = this.mappedCollectionPage(this.lastPage).pipe( + this.mappedCollections$ = this.loadMappedCollectionPage(this.lastPage).pipe( getAllCompletedRemoteData>(), // update isLoading$ @@ -109,11 +109,13 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen ); } - mappedCollectionPage(page: number): Observable>> { + loadMappedCollectionPage(page: number): Observable>> { return this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { elementsPerPage: this.pageSize, currentPage: page, - })); + })).pipe( + + ); } /** From 6ec7f63f31200590658ab03a0bf3d5180b4530c7 Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Mon, 19 Sep 2022 20:53:26 +0530 Subject: [PATCH 021/758] [DSC-740] load more mapped collection optimization --- .../cris-layout-collection-box.component.ts | 56 ++++++++----------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts index 0811360d4fa..1f5a2445d9f 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.ts @@ -5,15 +5,16 @@ import { Item } from '../../../../../core/shared/item.model'; import { TranslateService } from '@ngx-translate/core'; import { RenderCrisLayoutBoxFor } from '../../../../decorators/cris-layout-box.decorator'; import { LayoutBox } from '../../../../enums/layout-box.enum'; -import { BehaviorSubject, Observable, of } from 'rxjs'; -import { getFirstSucceededRemoteDataPayload, getAllCompletedRemoteData, getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../../../../../core/shared/operators'; -import { shareReplay, tap, switchMap, scan, map } from 'rxjs/operators'; +import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs'; +import { getFirstSucceededRemoteDataPayload, getPaginatedListPayload, getFirstCompletedRemoteData } from '../../../../../core/shared/operators'; +import { shareReplay, tap, map } from 'rxjs/operators'; import { Collection } from '../../../../../core/shared/collection.model'; import { CollectionDataService } from '../../../../../core/data/collection-data.service'; import { FindListOptions } from '../../../../../core/data/request.models'; import { PaginatedList } from '../../../../../core/data/paginated-list.model'; import { environment } from '../../../../../../environments/environment'; import { RemoteData } from '../../../../../core/data/remote-data'; +import { hasValue } from 'src/app/shared/empty.util'; @Component({ selector: 'ds-cris-layout-collection-box', @@ -53,7 +54,7 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen /** * This includes the mapped collection */ - mappedCollections$: Observable; + mappedCollections$: Observable = of([]); constructor( protected translateService: TranslateService, @@ -77,44 +78,33 @@ export class CrisLayoutCollectionBoxComponent extends CrisLayoutBoxModelComponen handleLoadMore() { this.isLoading$.next(true); - const oldMappedCollections$ = this.mappedCollections$; - this.mappedCollections$ = this.loadMappedCollectionPage(this.lastPage).pipe( - getAllCompletedRemoteData>(), + const newMappedCollections$ = this.loadMappedCollectionPage(); + this.mappedCollections$ = combineLatest([this.mappedCollections$, newMappedCollections$]).pipe( + map(([mappedCollections, newMappedCollections]: [Collection[], Collection[]]) => { + return [...mappedCollections, ...newMappedCollections].filter(collection => hasValue(collection)); + }), + ); + } + + loadMappedCollectionPage(): Observable { + return this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { + elementsPerPage: this.pageSize, + currentPage: this.lastPage + 1, + })).pipe( + getFirstCompletedRemoteData>(), // update isLoading$ tap(() => this.isLoading$.next(false)), - getAllSucceededRemoteDataPayload(), - - // update hasMore$ - tap((response: PaginatedList) => this.hasMore$.next(this.lastPage < response.totalPages)), + getFirstSucceededRemoteDataPayload(), // update lastPage tap((response: PaginatedList) => this.lastPage = response.currentPage), - getPaginatedListPayload(), - - // add current batch to list of collections - scan((prev: Collection[], current: Collection[]) => [...prev, ...current], []), - - switchMap((collections: Collection[]) => { - if (oldMappedCollections$) { - return oldMappedCollections$.pipe( - map((mappedCollection) => [...mappedCollection, ...collections]) - ); - } else { - return of(collections); - } - }) - ); - } - - loadMappedCollectionPage(page: number): Observable>> { - return this.cds.findMappedCollectionsFor(this.item, Object.assign(new FindListOptions(), { - elementsPerPage: this.pageSize, - currentPage: page, - })).pipe( + // update hasMore$ + tap((response: PaginatedList) => this.hasMore$.next(this.lastPage < response.totalPages)), + getPaginatedListPayload(), ); } From 878db5be752595277e68bd71ceb221a416801e63 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Tue, 20 Sep 2022 15:45:04 +0200 Subject: [PATCH 022/758] 94390: Replace DSO page edit buttons with a menu --- .../admin-sidebar-section.component.html | 4 +- .../admin-sidebar-section.component.spec.ts | 104 +++++++--- .../admin-sidebar-section.component.ts | 13 +- ...dable-admin-sidebar-section.component.html | 1 + .../collection-page-routing.module.ts | 7 +- .../collection-page.component.html | 4 +- .../community-page-routing.module.ts | 7 +- .../community-page.component.html | 4 +- .../journal-issue.component.html | 5 +- .../journal-volume.component.html | 4 +- .../item-pages/journal/journal.component.html | 5 +- .../org-unit/org-unit.component.html | 5 +- .../item-pages/person/person.component.html | 5 +- .../item-pages/project/project.component.html | 5 +- .../full/full-item-page.component.html | 5 +- src/app/item-page/item-page-routing.module.ts | 5 +- src/app/item-page/item-page.module.ts | 2 - .../publication/publication.component.html | 4 +- .../untyped-item/untyped-item.component.html | 8 +- .../untyped-item/untyped-item.component.ts | 4 +- .../versioned-item.component.scss | 0 .../versioned-item.component.spec.ts | 95 --------- .../versioned-item.component.ts | 80 -------- .../expandable-navbar-section.component.html | 1 + .../dso-page/dso-edit-menu.resolver.spec.ts | 190 ++++++++++++++++++ .../shared/dso-page/dso-edit-menu.resolver.ts | 164 +++++++++++++++ ...dit-menu-expandable-section.component.html | 18 ++ ...dit-menu-expandable-section.component.scss | 26 +++ ...-menu-expandable-section.component.spec.ts | 75 +++++++ ...-edit-menu-expandable-section.component.ts | 39 ++++ .../dso-edit-menu-section.component.html | 25 +++ .../dso-edit-menu-section.component.scss | 3 + .../dso-edit-menu-section.component.spec.ts | 173 ++++++++++++++++ .../dso-edit-menu-section.component.ts | 51 +++++ .../dso-edit-menu.component.html | 6 + .../dso-edit-menu.component.scss} | 0 .../dso-edit-menu.component.spec.ts | 78 +++++++ .../dso-edit-menu/dso-edit-menu.component.ts | 36 ++++ .../dso-page-edit-button.component.html | 7 - .../dso-page-edit-button.component.scss | 3 - .../dso-page-edit-button.component.spec.ts | 76 ------- .../dso-page-edit-button.component.ts | 43 ---- .../dso-page-version-button.component.html | 8 - .../dso-page-version-button.component.scss | 3 - .../dso-page-version-button.component.spec.ts | 96 --------- .../dso-page-version-button.component.ts | 77 ------- .../dso-versioning-modal.service.spec.ts | 92 +++++++++ .../dso-versioning-modal.service.ts | 98 +++++++++ src/app/shared/menu/initial-menus-state.ts | 14 +- .../menu-item/link-menu-item.component.html | 4 +- .../menu-item/link-menu-item.component.ts | 2 +- .../menu/menu-item/models/altmetric.model.ts | 1 + .../menu/menu-item/models/link.model.ts | 1 + .../menu/menu-item/models/menu-item.model.ts | 1 + .../menu/menu-item/models/onclick.model.ts | 1 + .../menu/menu-item/models/search.model.ts | 1 + .../menu/menu-item/models/text.model.ts | 1 + .../onclick-menu-item.component.html | 4 +- .../menu-item/onclick-menu-item.component.ts | 9 +- .../menu-item/text-menu-item.component.html | 2 +- .../menu-section/menu-section.component.ts | 8 +- src/app/shared/shared.module.ts | 17 +- 62 files changed, 1246 insertions(+), 584 deletions(-) delete mode 100644 src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss delete mode 100644 src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts delete mode 100644 src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu.resolver.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html rename src/app/{item-page/simple/item-types/versioned-item/versioned-item.component.html => shared/dso-page/dso-edit-menu/dso-edit-menu.component.scss} (100%) create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts create mode 100644 src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts delete mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html delete mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss delete mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts delete mode 100644 src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts delete mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html delete mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss delete mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts delete mode 100644 src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts create mode 100644 src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts create mode 100644 src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html index 8706b40ee09..7f1e8716ba5 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html +++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html @@ -1,7 +1,7 @@
{ const menuService = new MenuServiceStub(); const iconString = 'test'; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()], - declarations: [AdminSidebarSectionComponent, TestComponent], - providers: [ - { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com' }, icon: iconString } }, - { provide: MenuService, useValue: menuService }, - { provide: CSSVariableService, useClass: CSSVariableServiceStub }, - ] - }).overrideComponent(AdminSidebarSectionComponent, { - set: { - entryComponents: [TestComponent] - } - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(AdminSidebarSectionComponent); - component = fixture.componentInstance; - spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); - fixture.detectChanges(); - }); + describe('when not disabled', () => { + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()], + declarations: [AdminSidebarSectionComponent, TestComponent], + providers: [ + {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com'}, icon: iconString}}, + {provide: MenuService, useValue: menuService}, + {provide: CSSVariableService, useClass: CSSVariableServiceStub}, + ] + }).overrideComponent(AdminSidebarSectionComponent, { + set: { + entryComponents: [TestComponent] + } + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AdminSidebarSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set the right icon', () => { + const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas')); + expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString); + }); + it('should not contain the disabled class', () => { + const disabled = fixture.debugElement.query(By.css('.disabled')); + expect(disabled).toBeFalsy(); + }); - it('should create', () => { - expect(component).toBeTruthy(); }); + describe('when disabled', () => { - it('should set the right icon', () => { - const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas')); - expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()], + declarations: [AdminSidebarSectionComponent, TestComponent], + providers: [ + {provide: 'sectionDataProvider', useValue: {model: {link: 'google.com', disabled: true}, icon: iconString}}, + {provide: MenuService, useValue: menuService}, + {provide: CSSVariableService, useClass: CSSVariableServiceStub}, + ] + }).overrideComponent(AdminSidebarSectionComponent, { + set: { + entryComponents: [TestComponent] + } + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AdminSidebarSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set the right icon', () => { + const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas')); + expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString); + }); + it('should contain the disabled class', () => { + const disabled = fixture.debugElement.query(By.css('.disabled')); + expect(disabled).toBeTruthy(); + }); }); + }); // declare a test component diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts index 50f9f8a79e2..620681c654d 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts @@ -5,7 +5,7 @@ import { MenuService } from '../../../shared/menu/menu.service'; import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator'; import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model'; import { MenuSection } from '../../../shared/menu/menu.reducer'; -import { isNotEmpty } from '../../../shared/empty.util'; +import { isEmpty } from '../../../shared/empty.util'; import { Router } from '@angular/router'; /** @@ -26,7 +26,12 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement */ menuID: MenuID = MenuID.ADMIN; itemModel; - hasLink: boolean; + + /** + * Boolean to indicate whether this section is disabled + */ + isDisabled: boolean; + constructor( @Inject('sectionDataProvider') menuSection: MenuSection, protected menuService: MenuService, @@ -38,13 +43,13 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement } ngOnInit(): void { - this.hasLink = isNotEmpty(this.itemModel?.link); + this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link); super.ngOnInit(); } navigate(event: any): void { event.preventDefault(); - if (this.hasLink) { + if (this.isDisabled) { this.router.navigate(this.itemModel.link); } } diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html index 734c3d2ef92..259dbd10600 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html @@ -7,6 +7,7 @@ [attr.aria-labelledby]="'sidebarName-' + section.id" [attr.aria-expanded]="expanded | async" [title]="('menu.section.icon.' + section.id) | translate" + [class.disabled]="section.model.disabled" (click)="toggleSection($event)" (keyup.space)="toggleSection($event)" (keyup.enter)="toggleSection($event)" diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts index 5879e523af7..c5759f833fa 100644 --- a/src/app/collection-page/collection-page-routing.module.ts +++ b/src/app/collection-page/collection-page-routing.module.ts @@ -21,6 +21,7 @@ import { CollectionPageAdministratorGuard } from './collection-page-administrato import { MenuItemType } from '../shared/menu/initial-menus-state'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { ThemedCollectionPageComponent } from './themed-collection-page.component'; +import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; @NgModule({ imports: [ @@ -34,7 +35,8 @@ import { ThemedCollectionPageComponent } from './themed-collection-page.componen path: ':id', resolve: { dso: CollectionPageResolver, - breadcrumb: CollectionBreadcrumbResolver + breadcrumb: CollectionBreadcrumbResolver, + menu: DSOEditMenuResolver }, runGuardsAndResolvers: 'always', children: [ @@ -90,7 +92,8 @@ import { ThemedCollectionPageComponent } from './themed-collection-page.componen DSOBreadcrumbsService, LinkService, CreateCollectionPageGuard, - CollectionPageAdministratorGuard + CollectionPageAdministratorGuard, + DSOEditMenuResolver ] }) export class CollectionPageRoutingModule { diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html index 9d598a3b697..b0301691e76 100644 --- a/src/app/collection-page/collection-page.component.html +++ b/src/app/collection-page/collection-page.component.html @@ -34,9 +34,7 @@ [title]="'collection.page.news'"> -
- -
+
diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts index ad1b1fd2f20..ac90f3618c5 100644 --- a/src/app/community-page/community-page-routing.module.ts +++ b/src/app/community-page/community-page-routing.module.ts @@ -14,6 +14,7 @@ import { CommunityPageAdministratorGuard } from './community-page-administrator. import { MenuItemType } from '../shared/menu/initial-menus-state'; import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; import { ThemedCommunityPageComponent } from './themed-community-page.component'; +import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; @NgModule({ imports: [ @@ -27,7 +28,8 @@ import { ThemedCommunityPageComponent } from './themed-community-page.component' path: ':id', resolve: { dso: CommunityPageResolver, - breadcrumb: CommunityBreadcrumbResolver + breadcrumb: CommunityBreadcrumbResolver, + menu: DSOEditMenuResolver }, runGuardsAndResolvers: 'always', children: [ @@ -72,7 +74,8 @@ import { ThemedCommunityPageComponent } from './themed-community-page.component' DSOBreadcrumbsService, LinkService, CreateCommunityPageGuard, - CommunityPageAdministratorGuard + CommunityPageAdministratorGuard, + DSOEditMenuResolver ] }) export class CommunityPageRoutingModule { diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html index cf7282eb4bd..cee13eadd67 100644 --- a/src/app/community-page/community-page.component.html +++ b/src/app/community-page/community-page.component.html @@ -20,9 +20,7 @@ [title]="'community.page.news'"> -
- -
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index 5847be7dd2f..94dc81fc8f4 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -2,9 +2,8 @@

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

-
- -
+ +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index a0a25766efc..b472f4e6486 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -2,9 +2,7 @@

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

-
- -
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index af3ac85959b..9b11409a31c 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -2,9 +2,8 @@

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

-
- -
+ +
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index c9ea8fb5499..21b36de7226 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -2,9 +2,8 @@

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

-
- -
+ +
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index 5c2fd227fdf..c23b5430110 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -2,9 +2,8 @@

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

-
- -
+ +
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index 8f2ff6adcda..b9a1a30225c 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -2,9 +2,8 @@

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

-
- -
+ +
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html index d2655c4ad03..8bb7860aaaf 100644 --- a/src/app/item-page/full/full-item-page.component.html +++ b/src/app/item-page/full/full-item-page.component.html @@ -6,9 +6,8 @@
-
- -
+ +
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index 7d7912bb42b..1c4da9a2672 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -16,6 +16,7 @@ import { ThemedFullItemPageComponent } from './full/themed-full-item-page.compon import { VersionPageComponent } from './version-page/version-page/version-page.component'; import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; +import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; @NgModule({ imports: [ @@ -24,7 +25,8 @@ import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; path: ':id', resolve: { dso: ItemPageResolver, - breadcrumb: ItemBreadcrumbResolver + breadcrumb: ItemBreadcrumbResolver, + menu: DSOEditMenuResolver }, runGuardsAndResolvers: 'always', children: [ @@ -88,6 +90,7 @@ import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths'; LinkService, ItemPageAdministratorGuard, VersionResolver, + DSOEditMenuResolver ] }) diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts index 80cb1f61a28..7ae45ceb442 100644 --- a/src/app/item-page/item-page.module.ts +++ b/src/app/item-page/item-page.module.ts @@ -32,7 +32,6 @@ import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/med import { NgxGalleryModule } from '@kolkov/ngx-gallery'; import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component'; import { VersionPageComponent } from './version-page/version-page/version-page.component'; -import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component'; import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component'; @@ -82,7 +81,6 @@ const DECLARATIONS = [ ], declarations: [ ...DECLARATIONS, - VersionedItemComponent ], exports: [ ...DECLARATIONS 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 bace9fcd0ad..242dbf2a3b3 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 @@ -11,9 +11,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 04794717f1f..c9c88fa0850 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 @@ -11,12 +11,8 @@

-
- - -
+ +
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 3ce33dc90ab..ead62008dee 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 @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { VersionedItemComponent } from '../versioned-item/versioned-item.component'; +import { ItemComponent } from '../shared/item.component'; /** * Component that represents a publication Item page @@ -15,6 +15,6 @@ import { VersionedItemComponent } from '../versioned-item/versioned-item.compone templateUrl: './untyped-item.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class UntypedItemComponent extends VersionedItemComponent { +export class UntypedItemComponent extends ItemComponent { } 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 deleted file mode 100644 index e69de29bb2d..00000000000 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 deleted file mode 100644 index eff51b10199..00000000000 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts +++ /dev/null @@ -1,95 +0,0 @@ -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, mockRouteService } from '../shared/item.component.spec'; -import { RouterTestingModule } from '@angular/router/testing'; -import { Component } from '@angular/core'; -import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { Version } from '../../../../core/shared/version.model'; -import { RouteService } from '../../../../core/services/route.service'; - -const mockItem: Item = Object.assign(new Item(), { - bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), - metadata: new MetadataMap(), - relationships: createRelationshipsObservable(), - _links: { - self: { - href: 'item-href' - }, - version: { - href: 'version-href' - } - } -}); - - -@Component({template: ''}) -class DummyComponent { -} - -describe('VersionedItemComponent', () => { - let component: VersionedItemComponent; - let fixture: ComponentFixture; - - let versionService: VersionDataService; - let versionHistoryService: VersionHistoryDataService; - - const versionServiceSpy = jasmine.createSpyObj('versionService', { - findByHref: createSuccessfulRemoteDataObject$(new Version()), - }); - - const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', { - createVersion: createSuccessfulRemoteDataObject$(new Version()), - }); - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [VersionedItemComponent, DummyComponent], - imports: [RouterTestingModule], - providers: [ - { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy }, - { provide: TranslateService, useValue: {} }, - { provide: VersionDataService, useValue: versionServiceSpy }, - { provide: NotificationsService, useValue: {} }, - { provide: ItemVersionsSharedService, useValue: {} }, - { provide: WorkspaceitemDataService, useValue: {} }, - { provide: SearchService, useValue: {} }, - { provide: ItemDataService, useValue: {} }, - { provide: RouteService, useValue: mockRouteService } - ] - }).compileComponents(); - versionService = TestBed.inject(VersionDataService); - versionHistoryService = TestBed.inject(VersionHistoryDataService); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(VersionedItemComponent); - component = fixture.componentInstance; - component.object = mockItem; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - describe('when onCreateNewVersion() is called', () => { - it('should call versionService.findByHref', () => { - component.onCreateNewVersion(); - expect(versionService.findByHref).toHaveBeenCalledWith('version-href'); - }); - }); - -}); 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 deleted file mode 100644 index cd2eb3a19b4..00000000000 --- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts +++ /dev/null @@ -1,80 +0,0 @@ -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, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Version } from '../../../../core/shared/version.model'; -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'; -import { VersionDataService } from '../../../../core/data/version-data.service'; -import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service'; -import { Router } from '@angular/router'; -import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service'; -import { SearchService } from '../../../../core/shared/search/search.service'; -import { Item } from '../../../../core/shared/item.model'; -import { ItemDataService } from '../../../../core/data/item-data.service'; -import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; -import { RouteService } from '../../../../core/services/route.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, - private router: Router, - private workspaceItemDataService: WorkspaceitemDataService, - private searchService: SearchService, - private itemService: ItemDataService, - protected routeService: RouteService - ) { - super(routeService); - } - - /** - * 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.versionHistoryService.createVersion(item._links.self.href, summary)), - getFirstCompletedRemoteData(), - // show success/failure notification - tap((res: RemoteData) => { this.itemVersionShared.notifyCreateNewVersion(res); }), - // 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); - }); - - } -} 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 d8a517dc554..a77b6bc2530 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 @@ -6,6 +6,7 @@ (mouseenter)="activateSection($event)" (mouseleave)="deactivateSection($event)"> { + + const MENU_STATE = { + id: 'some menu' + }; + + let resolver: DSOEditMenuResolver; + + let dSpaceObjectDataService; + let menuService; + let authorizationService; + let dsoVersioningModalService; + + const route = { + data: { + menu: { + 'statistics': [{ + id: 'statistics-dummy-1', + active: false, + visible: true, + model: null + }] + } + }, + params: {id: 'test-uuid'}, + }; + + const state = { + url: 'test-url' + }; + + const testObject = Object.assign(new Item(), {uuid: 'test-uuid', type: 'item', _links: {self: {href: 'self-link'}}}); + + const dummySections1 = [{ + id: 'dummy-1', + active: false, + visible: true, + model: null + }, + { + id: 'dummy-2', + active: false, + visible: true, + model: null + }]; + + const dummySections2 = [{ + id: 'dummy-3', + active: false, + visible: true, + model: null + }, + { + id: 'dummy-4', + active: false, + visible: true, + model: null + }, + { + id: 'dummy-5', + active: false, + visible: true, + model: null + }]; + + beforeEach(waitForAsync(() => { + menuService = new MenuServiceStub(); + spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE)); + + dSpaceObjectDataService = jasmine.createSpyObj('dSpaceObjectDataService', { + findById: createSuccessfulRemoteDataObject$(testObject) + }); + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: observableOf(true) + }); + dsoVersioningModalService = jasmine.createSpyObj('dsoVersioningModalService', { + isNewVersionButtonDisabled: observableOf(false), + getVersioningTooltipMessage: observableOf('message'), + openCreateVersionModal: {} + }); + + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule], + declarations: [AdminSidebarComponent], + providers: [ + {provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService}, + {provide: MenuService, useValue: menuService}, + {provide: AuthorizationDataService, useValue: authorizationService}, + {provide: DsoVersioningModalService, useValue: dsoVersioningModalService}, + { + provide: NgbModal, useValue: { + open: () => {/*comment*/ + } + } + } + ], + schemas: [NO_ERRORS_SCHEMA] + }); + resolver = TestBed.inject(DSOEditMenuResolver); + + spyOn(menuService, 'addSection'); + })); + + it('should be created', () => { + expect(resolver).toBeTruthy(); + }); + + describe('resolve', () => { + it('should create all menus when a dso is found', (done) => { + spyOn(resolver, 'getDsoMenus').and.returnValue( + [observableOf(dummySections1), observableOf(dummySections2)] + ); + resolver.resolve(route as any, null).subscribe(resolved => { + expect(resolved).toEqual( + { + ...route.data.menu, + [MenuID.DSO_EDIT]: [ + ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'})), + ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-uuid'})) + ] + } + ); + expect(resolver.getDsoMenus).toHaveBeenCalled(); + done(); + }); + }); + it('should return the statistics menu when no dso is found', (done) => { + (dSpaceObjectDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$()); + + resolver.resolve(route as any, null).subscribe(resolved => { + expect(resolved).toEqual( + { + ...route.data.menu + } + ); + done(); + }); + }); + }); + describe('getDsoMenus', () => { + it('should return as first part the item version list ', (done) => { + const result = resolver.getDsoMenus(testObject, route, state); + result[0].subscribe((menuList) => { + expect(menuList.length).toEqual(1); + expect(menuList[0].id).toEqual('version-dso'); + expect(menuList[0].active).toEqual(false); + expect(menuList[0].visible).toEqual(true); + expect(menuList[0].model.type).toEqual(MenuItemType.ONCLICK); + expect(menuList[0].model.text).toEqual('message'); + expect(menuList[0].model.disabled).toEqual(false); + expect(menuList[0].icon).toEqual('code-branch'); + done(); + }); + + }); + it('should return as second part the common list ', (done) => { + const result = resolver.getDsoMenus(testObject, route, state); + result[1].subscribe((menuList) => { + expect(menuList.length).toEqual(1); + expect(menuList[0].id).toEqual('edit-dso'); + expect(menuList[0].active).toEqual(false); + expect(menuList[0].visible).toEqual(true); + expect(menuList[0].model.type).toEqual(MenuItemType.LINK); + expect(menuList[0].model.text).toEqual('item.page.edit'); + expect(menuList[0].model.link).toEqual('test-url/edit/metadata'); + expect(menuList[0].icon).toEqual('pencil-alt'); + done(); + }); + + }); + }); +}); diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts new file mode 100644 index 00000000000..003e61df954 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -0,0 +1,164 @@ +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { combineLatest, Observable, of as observableOf } from 'rxjs'; +import { FeatureID } from '../../core/data/feature-authorization/feature-id'; +import { MenuID, MenuItemType } from '../menu/initial-menus-state'; +import { MenuService } from '../menu/menu.service'; +import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { Injectable } from '@angular/core'; +import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; +import { Item } from '../../core/shared/item.model'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { map, switchMap } from 'rxjs/operators'; +import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; +import { URLCombiner } from '../../core/url-combiner/url-combiner'; +import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; +import { hasValue } from '../empty.util'; +import { MenuSection } from '../menu/menu.reducer'; + +/** + * Creates the menus for the dspace object pages + */ +@Injectable({ + providedIn: 'root' +}) +export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection[] }> { + + constructor( + protected dSpaceObjectDataService: DSpaceObjectDataService, + protected menuService: MenuService, + protected authorizationService: AuthorizationDataService, + protected modalService: NgbModal, + protected dsoVersioningModalService: DsoVersioningModalService, + ) { + } + + /** + * Initialise all dspace object related menus + */ + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ [key: string]: MenuSection[] }> { + const uuid = route.params.id; + return this.dSpaceObjectDataService.findById(uuid, true, false).pipe( + getFirstCompletedRemoteData(), + switchMap((dsoRD) => { + if (dsoRD.hasSucceeded) { + const dso = dsoRD.payload; + return combineLatest(this.getDsoMenus(dso, route, state)).pipe( + map((combinedMenus) => [].concat.apply([], combinedMenus)), + map((menus) => this.addDsoUuidToMenuIDs(menus, dso)), + map((menus) => { + return { + ...route.data?.menu, + [MenuID.DSO_EDIT]: menus + }; + }) + ); + } else { + return observableOf({...route.data?.menu}); + } + }) + ); + } + + /** + * Return all the menus for a dso based on the route and state + */ + getDsoMenus(dso, route, state) { + return [ + this.getItemMenu(dso), + this.getCommonMenu(dso, state) + ]; + } + + /** + * Get the common menus between all dspace objects + */ + protected getCommonMenu(dso, state): Observable { + return combineLatest([ + this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, dso.self), + ]).pipe( + map(([canEditItem]) => { + return [ + { + id: 'edit-dso', + active: false, + visible: canEditItem, + model: { + type: MenuItemType.LINK, + text: this.getDsoType(dso) + '.page.edit', + link: new URLCombiner(state.url, 'edit', 'metadata').toString() + } as LinkMenuItemModel, + icon: 'pencil-alt', + index: 1 + }, + ]; + + }) + ); + } + + /** + * Get item sepcific menus + */ + protected getItemMenu(dso): Observable { + if (dso instanceof Item) { + return combineLatest([ + this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, dso.self), + this.dsoVersioningModalService.isNewVersionButtonDisabled(dso), + this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create') + ]).pipe( + map(([canCreateVersion, disableVersioning, versionTooltip]) => { + return [ + { + id: 'version-dso', + active: false, + visible: canCreateVersion, + model: { + type: MenuItemType.ONCLICK, + text: versionTooltip, + disabled: disableVersioning, + function: () => { + this.dsoVersioningModalService.openCreateVersionModal(dso); + } + } as OnClickMenuItemModel, + icon: 'code-branch', + index: 0 + }, + ]; + }), + ); + } else { + return observableOf([]); + } + } + + /** + * Retrieve the dso or entity type for an object to be used in generic messages + */ + protected getDsoType(dso) { + const renderType = dso.getRenderTypes()[0]; + if (typeof renderType === 'string' || renderType instanceof String) { + return renderType.toLowerCase(); + } else { + return dso.type.toString().toLowerCase(); + } + } + + /** + * Add the dso uuid to all provided menu ids and parent ids + */ + protected addDsoUuidToMenuIDs(menus, dso) { + return menus.map((menu) => { + Object.assign(menu, { + id: menu.id + '-' + dso.uuid + }); + if (hasValue(menu.parentID)) { + Object.assign(menu, { + parentID: menu.parentID + '-' + dso.uuid + }); + } + return menu; + }); + } +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html new file mode 100644 index 00000000000..b330b1e87d5 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html @@ -0,0 +1,18 @@ +
+
+ +
    + + + +
+
+
+ + + + diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss new file mode 100644 index 00000000000..61ec6347f95 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss @@ -0,0 +1,26 @@ +.btn-dark { + background-color: var(--ds-admin-sidebar-bg); +} + +.dso-button-menu { + .dropdown-toggle::after { + display: none; + } +} + +ul.dropdown-menu { + background-color: var(--ds-admin-sidebar-bg); + color: white; + + ::ng-deep a { + color: white; + + &.disabled { + color: $btn-link-disabled-color; + } + } + + .disabled { + color: $btn-link-disabled-color; + } +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts new file mode 100644 index 00000000000..211fd0bdf07 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts @@ -0,0 +1,75 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { MenuServiceStub } from '../../../testing/menu-service.stub'; +import { TranslateModule } from '@ngx-translate/core'; +import { MenuService } from '../../../menu/menu.service'; +import { CSSVariableService } from '../../../sass-helper/sass-helper.service'; +import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub'; +import { Router } from '@angular/router'; +import { RouterStub } from '../../../testing/router.stub'; +import { of as observableOf } from 'rxjs'; +import { Component } from '@angular/core'; +import { DsoEditMenuExpandableSectionComponent } from './dso-edit-menu-expandable-section.component'; +import { MenuItemType } from '../../../menu/initial-menus-state'; +import { By } from '@angular/platform-browser'; + +describe('DsoEditMenuExpandableSectionComponent', () => { + let component: DsoEditMenuExpandableSectionComponent; + let fixture: ComponentFixture; + const menuService = new MenuServiceStub(); + const iconString = 'test'; + + const dummySection = { + id: 'dummy', + active: false, + visible: true, + model: { + type: MenuItemType.TEXT, + disabled: false, + text: 'text' + }, + icon: iconString + }; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [DsoEditMenuExpandableSectionComponent, TestComponent], + providers: [ + {provide: 'sectionDataProvider', useValue: dummySection}, + {provide: MenuService, useValue: menuService}, + {provide: CSSVariableService, useClass: CSSVariableServiceStub}, + {provide: Router, useValue: new RouterStub()}, + ] + }).overrideComponent(DsoEditMenuExpandableSectionComponent, { + set: { + entryComponents: [TestComponent] + } + }) + .compileComponents(); + })); + + beforeEach(() => { + spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([])); + fixture = TestBed.createComponent(DsoEditMenuExpandableSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should show a button with the icon', () => { + const button = fixture.debugElement.query(By.css('.btn-dark')); + expect(button.nativeElement.innerHTML).toContain('fa-' + iconString); + }); +}); + +// declare a test component +@Component({ + selector: 'ds-test-cmp', + template: `` +}) +class TestComponent { +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts new file mode 100644 index 00000000000..e0ad28617b8 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts @@ -0,0 +1,39 @@ +import { Component, Inject, Injector } from '@angular/core'; +import { MenuID } from 'src/app/shared/menu/initial-menus-state'; +import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator'; +import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component'; +import { MenuService } from '../../../menu/menu.service'; +import { MenuSection } from '../../../menu/menu.reducer'; +import { Router } from '@angular/router'; + +/** + * Represents an expandable section in the dso edit menus + */ +@Component({ + /* tslint:disable:component-selector */ + selector: 'ds-dso-edit-menu-expandable-section', + templateUrl: './dso-edit-menu-expandable-section.component.html', + styleUrls: ['./dso-edit-menu-expandable-section.component.scss'], +}) +@rendersSectionForMenu(MenuID.DSO_EDIT, true) +export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent { + + menuID: MenuID = MenuID.DSO_EDIT; + itemModel; + + constructor( + @Inject('sectionDataProvider') menuSection: MenuSection, + protected menuService: MenuService, + protected injector: Injector, + protected router: Router, + ) { + super(menuSection, menuService, injector); + this.itemModel = menuSection.model; + } + + ngOnInit(): void { + this.menuService.activateSection(this.menuID, this.section.id); + super.ngOnInit(); + } + +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html new file mode 100644 index 00000000000..0fc6d19667d --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html @@ -0,0 +1,25 @@ +
+ + + +
+ +
+
+ +
+ +
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss new file mode 100644 index 00000000000..cf0e81c5538 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss @@ -0,0 +1,3 @@ +.btn-dark { + background-color: var(--ds-admin-sidebar-bg); +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts new file mode 100644 index 00000000000..bcfeab8180b --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts @@ -0,0 +1,173 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { MenuServiceStub } from '../../../testing/menu-service.stub'; +import { TranslateModule } from '@ngx-translate/core'; +import { MenuService } from '../../../menu/menu.service'; +import { CSSVariableService } from '../../../sass-helper/sass-helper.service'; +import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub'; +import { Router } from '@angular/router'; +import { RouterStub } from '../../../testing/router.stub'; +import { of as observableOf } from 'rxjs'; +import { Component } from '@angular/core'; +import { MenuItemType } from '../../../menu/initial-menus-state'; +import { By } from '@angular/platform-browser'; +import { DsoEditMenuSectionComponent } from './dso-edit-menu-section.component'; +import { OnClickMenuItemModel } from '../../../menu/menu-item/models/onclick.model'; + +function initAsync(dummySectionText: { visible: boolean; icon: string; active: boolean; model: { disabled: boolean; text: string; type: MenuItemType }; id: string }, menuService: MenuServiceStub) { + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [DsoEditMenuSectionComponent, TestComponent], + providers: [ + {provide: 'sectionDataProvider', useValue: dummySectionText}, + {provide: MenuService, useValue: menuService}, + {provide: CSSVariableService, useClass: CSSVariableServiceStub}, + {provide: Router, useValue: new RouterStub()}, + ] + }).overrideComponent(DsoEditMenuSectionComponent, { + set: { + entryComponents: [TestComponent] + } + }) + .compileComponents(); + })); +} + +describe('DsoEditMenuSectionComponent', () => { + let component: DsoEditMenuSectionComponent; + let fixture: ComponentFixture; + const menuService = new MenuServiceStub(); + const iconString = 'test'; + + const dummySectionText = { + id: 'dummy', + active: false, + visible: true, + model: { + type: MenuItemType.TEXT, + disabled: false, + text: 'text' + }, + icon: iconString + }; + const dummySectionLink = { + id: 'dummy', + active: false, + visible: true, + model: { + type: MenuItemType.LINK, + disabled: false, + text: 'text', + link: 'link' + }, + icon: iconString + }; + + const dummySectionClick = { + id: 'dummy', + active: false, + visible: true, + model: { + type: MenuItemType.ONCLICK, + disabled: false, + text: 'text', + function: () => 'test' + }, + icon: iconString + }; + + describe('text model', () => { + initAsync(dummySectionText, menuService); + beforeEach(() => { + spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([])); + fixture = TestBed.createComponent(DsoEditMenuSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should show a button with the icon', () => { + const button = fixture.debugElement.query(By.css('.btn-dark')); + expect(button.nativeElement.innerHTML).toContain('fa-' + iconString); + }); + describe('when the section model in a disabled link or text', () => { + it('should show just the button', () => { + const textButton = fixture.debugElement.query(By.css('div div button')); + expect(textButton.nativeElement.innerHTML).toContain('fa-' + iconString); + }); + }); + }); + describe('on click model', () => { + initAsync(dummySectionClick, menuService); + beforeEach(() => { + spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([])); + fixture = TestBed.createComponent(DsoEditMenuSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); + }); + + describe('when the section model in an on click menu', () => { + it('should call the activate method when clicking the button', () => { + spyOn(component, 'activate'); + + const button = fixture.debugElement.query(By.css('.btn-dark')); + button.triggerEventHandler('click', null); + + expect(component.activate).toHaveBeenCalled(); + }); + }); + describe('activate', () => { + const mockEvent = jasmine.createSpyObj('event', { + preventDefault: jasmine.createSpy('preventDefault'), + stopPropagation: jasmine.createSpy('stopPropagation'), + }); + it('should call the item model function when not disabled', () => { + spyOn(component.section.model as OnClickMenuItemModel, 'function'); + component.activate(mockEvent); + + expect((component.section.model as OnClickMenuItemModel).function).toHaveBeenCalled(); + }); + it('should call not the item model function when disabled', () => { + spyOn(component.section.model as OnClickMenuItemModel, 'function'); + component.itemModel.disabled = true; + component.activate(mockEvent); + + expect((component.section.model as OnClickMenuItemModel).function).not.toHaveBeenCalled(); + component.itemModel.disabled = false; + }); + }); + + }); + + describe('link model', () => { + initAsync(dummySectionLink, menuService); + beforeEach(() => { + spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([])); + fixture = TestBed.createComponent(DsoEditMenuSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); + }); + + describe('when the section model in a non disabled link', () => { + it('should show a link element with the button in it', () => { + const link = fixture.debugElement.query(By.css('a')); + expect(link.nativeElement.innerHTML).toContain('button'); + }); + }); + + }); +}); + +// declare a test component +@Component({ + selector: 'ds-test-cmp', + template: `` +}) +class TestComponent { +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts new file mode 100644 index 00000000000..63354e97494 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts @@ -0,0 +1,51 @@ +import { Component, Inject, Injector, OnInit } from '@angular/core'; +import { MenuID } from 'src/app/shared/menu/initial-menus-state'; +import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator'; +import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component'; +import { MenuService } from '../../../menu/menu.service'; +import { MenuSection } from '../../../menu/menu.reducer'; +import { isNotEmpty } from '../../../empty.util'; + +/** + * Represents a non-expandable section in the dso edit menus + */ +@Component({ + /* tslint:disable:component-selector */ + selector: 'ds-dso-edit-menu-section', + templateUrl: './dso-edit-menu-section.component.html', + styleUrls: ['./dso-edit-menu-section.component.scss'] +}) +@rendersSectionForMenu(MenuID.DSO_EDIT, false) +export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit { + + menuID: MenuID = MenuID.DSO_EDIT; + itemModel; + hasLink: boolean; + canActivate: boolean; + + constructor( + @Inject('sectionDataProvider') menuSection: MenuSection, + protected menuService: MenuService, + protected injector: Injector, + ) { + super(menuSection, menuService, injector); + this.itemModel = menuSection.model; + } + + ngOnInit(): void { + this.hasLink = isNotEmpty(this.itemModel?.link); + this.canActivate = isNotEmpty(this.itemModel?.function); + super.ngOnInit(); + } + + /** + * Activate the section's model funtion + */ + public activate(event: any) { + event.preventDefault(); + if (!this.itemModel.disabled) { + this.itemModel.function(); + } + event.stopPropagation(); + } +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html new file mode 100644 index 00000000000..9ef6fff1dc2 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html @@ -0,0 +1,6 @@ +
+
+ +
+
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.scss similarity index 100% rename from src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html rename to src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.scss diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts new file mode 100644 index 00000000000..f2fb656eccf --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts @@ -0,0 +1,78 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of as observableOf } from 'rxjs'; +import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute } from '@angular/router'; +import { DsoEditMenuComponent } from './dso-edit-menu.component'; +import { MenuServiceStub } from '../../testing/menu-service.stub'; +import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { AuthService } from '../../../core/auth/auth.service'; +import { AuthServiceStub } from '../../testing/auth-service.stub'; +import { MenuService } from '../../menu/menu.service'; +import { + ExpandableNavbarSectionComponent +} from '../../../navbar/expandable-navbar-section/expandable-navbar-section.component'; +import { MenuItemModel } from '../../menu/menu-item/models/menu-item.model'; + +describe('DsoEditMenuComponent', () => { + let comp: DsoEditMenuComponent; + let fixture: ComponentFixture; + const menuService = new MenuServiceStub(); + let authorizationService: AuthorizationDataService; + + const routeStub = { + children: [] + }; + + const section = { + id: 'edit-dso', + active: false, + visible: true, + model: { + type: null, + disabled: false, + } as MenuItemModel, + icon: 'pencil-alt', + index: 1 + }; + + + beforeEach(waitForAsync(() => { + authorizationService = jasmine.createSpyObj('authorizationService', { + isAuthorized: observableOf(true) + }); + spyOn(menuService, 'getMenuTopSections').and.returnValue(observableOf([section])); + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), RouterTestingModule], + declarations: [DsoEditMenuComponent], + providers: [ + Injector, + {provide: MenuService, useValue: menuService}, + {provide: AuthService, useClass: AuthServiceStub}, + {provide: ActivatedRoute, useValue: routeStub}, + {provide: AuthorizationDataService, useValue: authorizationService}, + ], + schemas: [NO_ERRORS_SCHEMA] + }).overrideComponent(ExpandableNavbarSectionComponent, { + set: { + changeDetection: ChangeDetectionStrategy.Default, + } + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DsoEditMenuComponent); + comp = fixture.componentInstance; + comp.sections = observableOf([]); + fixture.detectChanges(); + }); + + describe('onInit', () => { + it('should create', () => { + expect(comp).toBeTruthy(); + }); + }); +}); + diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts new file mode 100644 index 00000000000..d754e07b328 --- /dev/null +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts @@ -0,0 +1,36 @@ +import { Component, Injector } from '@angular/core'; +import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; +import { MenuID } from '../../menu/initial-menus-state'; +import { MenuComponent } from '../../menu/menu.component'; +import { MenuService } from '../../menu/menu.service'; +import { ActivatedRoute } from '@angular/router'; +import { AuthService } from '../../../core/auth/auth.service'; + +/** + * Component representing the edit menu and other menus on the dspace object pages + */ +@Component({ + selector: 'ds-dso-edit-menu', + styleUrls: ['./dso-edit-menu.component.scss'], + templateUrl: './dso-edit-menu.component.html', +}) +export class DsoEditMenuComponent extends MenuComponent { + /** + * The menu ID of this component is DSO_EDIT + * @type {MenuID.DSO_EDIT} + */ + menuID = MenuID.DSO_EDIT; + + constructor(protected menuService: MenuService, + protected injector: Injector, + public authorizationService: AuthorizationDataService, + public route: ActivatedRoute, + private authService: AuthService, + ) { + super(menuService, injector, authorizationService, route); + } + + ngOnInit(): void { + super.ngOnInit(); + } +} diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html deleted file mode 100644 index d680c140d8e..00000000000 --- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss deleted file mode 100644 index e8b7d689a35..00000000000 --- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.btn-dark { - background-color: var(--ds-admin-sidebar-bg); -} diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts deleted file mode 100644 index 5949a98f711..00000000000 --- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { DsoPageEditButtonComponent } from './dso-page-edit-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: DsoPageEditButtonComponent; - 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: [DsoPageEditButtonComponent], - imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule], - providers: [ - { provide: AuthorizationDataService, useValue: authorizationService } - ] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DsoPageEditButtonComponent); - 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-edit-button/dso-page-edit-button.component.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts deleted file mode 100644 index 1879581d23d..00000000000 --- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts +++ /dev/null @@ -1,43 +0,0 @@ -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'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; - -@Component({ - selector: 'ds-dso-page-edit-button', - templateUrl: './dso-page-edit-button.component.html', - styleUrls: ['./dso-page-edit-button.component.scss'] -}) -/** - * Display a button linking to the edit page of a DSpaceObject - */ -export class DsoPageEditButtonComponent 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/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 deleted file mode 100644 index 0e2e35dcb7d..00000000000 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html +++ /dev/null @@ -1,8 +0,0 @@ - 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 deleted file mode 100644 index e8b7d689a35..00000000000 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.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 deleted file mode 100644 index 9839507d576..00000000000 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts +++ /dev/null @@ -1,96 +0,0 @@ -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 { 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' }, - version: { href: 'test-item-version-selflink' }, - }, - }); - tooltipMsg = of('tooltip-msg'); - - TestBed.configureTestingModule({ - declarations: [DsoPageVersionButtonComponent], - imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule], - providers: [ - { 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.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(() => { - authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(true)); - component.ngOnInit(); - fixture.detectChanges(); - }); - - 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(() => { - authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(false)); - component.ngOnInit(); - fixture.detectChanges(); - }); - - it('should render a button', () => { - const button = fixture.debugElement.query(By.css('button')); - expect(button).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 deleted file mode 100644 index cf07953c757..00000000000 --- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { Observable, of } from 'rxjs'; -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 { map, startWith, switchMap } from 'rxjs/operators'; - -@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 item for which display a button to create a new version - */ - @Input() dso: Item; - - /** - * A message for the tooltip on the button - * Supports i18n keys - */ - @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 - */ - @Output() newVersionEvent = new EventEmitter(); - - /** - * Whether or not the current user is authorized to create a new version of the DSpaceObject - */ - isAuthorized$: Observable; - - disableNewVersionButton$: Observable; - - tooltipMsg$: Observable; - - constructor( - protected authorizationService: AuthorizationDataService, - protected versionHistoryService: VersionHistoryDataService, - ) { - } - - /** - * Creates a new version for the current item - */ - createNewVersion() { - this.newVersionEvent.emit(); - } - - ngOnInit() { - this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.dso.self); - - this.disableNewVersionButton$ = this.versionHistoryService.hasDraftVersion$(this.dso._links.version.href).pipe( - // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null - // (hasDraftVersion is null when a version history does not exist) - map((res) => Boolean(res)), - startWith(true), - ); - - this.tooltipMsg$ = this.disableNewVersionButton$.pipe( - switchMap((hasDraftVersion) => of(hasDraftVersion ? this.tooltipMsgHasDraft : this.tooltipMsgCreate)), - ); - } - -} diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts new file mode 100644 index 00000000000..0a02481d583 --- /dev/null +++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts @@ -0,0 +1,92 @@ +import { DsoVersioningModalService } from './dso-versioning-modal.service'; +import { waitForAsync } from '@angular/core/testing'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { Version } from '../../../core/shared/version.model'; +import { Item } from '../../../core/shared/item.model'; +import { MetadataMap } from '../../../core/shared/metadata.models'; +import { createRelationshipsObservable } from '../../../item-page/simple/item-types/shared/item.component.spec'; +import { buildPaginatedList } from '../../../core/data/paginated-list.model'; +import { PageInfo } from '../../../core/shared/page-info.model'; +import { EMPTY, of as observableOf } from 'rxjs'; + +fdescribe('DsoVersioningModalService', () => { + let service: DsoVersioningModalService; + let modalService; + let versionService; + let versionHistoryService; + let itemVersionShared; + let router; + let workspaceItemDataService; + let itemService; + + const mockItem: Item = Object.assign(new Item(), { + bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), + metadata: new MetadataMap(), + relationships: createRelationshipsObservable(), + _links: { + self: { + href: 'item-href' + }, + version: { + href: 'version-href' + } + } + }); + + beforeEach(waitForAsync(() => { + modalService = jasmine.createSpyObj('modalService', { + open: {componentInstance: {firstVersion: {}, versionNumber: {}, createVersionEvent: EMPTY}} + }); + versionService = jasmine.createSpyObj('versionService', { + findByHref: createSuccessfulRemoteDataObject$(new Version()), + }); + versionHistoryService = jasmine.createSpyObj('versionHistoryService', { + createVersion: createSuccessfulRemoteDataObject$(new Version()), + hasDraftVersion$: observableOf(false) + }); + itemVersionShared = jasmine.createSpyObj('itemVersionShared', ['notifyCreateNewVersion']); + router = jasmine.createSpyObj('router', ['navigateByUrl']); + workspaceItemDataService = jasmine.createSpyObj('workspaceItemDataService', ['findByItem']); + itemService = jasmine.createSpyObj('itemService', ['findByHref']); + + service = new DsoVersioningModalService( + modalService, + versionService, + versionHistoryService, + itemVersionShared, + router, + workspaceItemDataService, + itemService + ); + })); + describe('when onCreateNewVersion() is called', () => { + it('should call versionService.findByHref', () => { + service.openCreateVersionModal(mockItem); + expect(versionService.findByHref).toHaveBeenCalledWith('version-href'); + }); + }); + + describe('isNewVersionButtonDisabled', () => { + it('should call versionHistoryService.hasDraftVersion$', () => { + service.isNewVersionButtonDisabled(mockItem); + expect(versionHistoryService.hasDraftVersion$).toHaveBeenCalledWith(mockItem._links.version.href); + }); + }); + + describe('getVersioningTooltipMessage', () => { + it('should return the create message when isNewVersionButtonDisabled returns false', (done) => { + spyOn(service, 'isNewVersionButtonDisabled').and.returnValue(observableOf(false)); + service.getVersioningTooltipMessage(mockItem, 'draft-message', 'create-message').subscribe((message) => { + expect(message).toEqual('create-message'); + done(); + }); + }); + it('should return the draft message when isNewVersionButtonDisabled returns true', (done) => { + spyOn(service, 'isNewVersionButtonDisabled').and.returnValue(observableOf(true)); + service.getVersioningTooltipMessage(mockItem, 'draft-message', 'create-message').subscribe((message) => { + expect(message).toEqual('draft-message'); + done(); + }); + }); + }); +}); diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts new file mode 100644 index 00000000000..e1b827a50b2 --- /dev/null +++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts @@ -0,0 +1,98 @@ +import { + ItemVersionsSummaryModalComponent +} from '../../item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Version } from '../../../core/shared/version.model'; +import { map, startWith, switchMap, tap } from 'rxjs/operators'; +import { Item } from '../../../core/shared/item.model'; +import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { VersionDataService } from '../../../core/data/version-data.service'; +import { VersionHistoryDataService } from '../../../core/data/version-history-data.service'; +import { ItemVersionsSharedService } from '../../item/item-versions/item-versions-shared.service'; +import { Router } from '@angular/router'; +import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { Injectable } from '@angular/core'; +import { Observable, of } from 'rxjs'; + +/** + * Service to take care of all the functionality related to the version creation modal + */ +@Injectable({ + providedIn: 'root' +}) +export class DsoVersioningModalService { + + constructor( + protected modalService: NgbModal, + protected versionService: VersionDataService, + protected versionHistoryService: VersionHistoryDataService, + protected itemVersionShared: ItemVersionsSharedService, + protected router: Router, + protected workspaceItemDataService: WorkspaceitemDataService, + protected itemService: ItemDataService, + ) { + } + + /** + * Open the create version modal for the provided dso + */ + openCreateVersionModal(dso): void { + + const item = dso; + 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.versionHistoryService.createVersion(item._links.self.href, summary)), + getFirstCompletedRemoteData(), + // show success/failure notification + tap((res: RemoteData) => { + this.itemVersionShared.notifyCreateNewVersion(res); + }), + // 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); + }); + } + + /** + * Checks if the new version button should be disabled for the provided dso + */ + isNewVersionButtonDisabled(dso): Observable { + return this.versionHistoryService.hasDraftVersion$(dso._links.version.href).pipe( + // button is disabled if hasDraftVersion = true, and enabled if hasDraftVersion = false or null + // (hasDraftVersion is null when a version history does not exist) + map((res) => Boolean(res)), + startWith(true), + ); + } + + /** + * Checks and returns the tooltip that needs to be used for the create version button tooltip + */ + getVersioningTooltipMessage(dso, tooltipMsgHasDraft, tooltipMsgCreate): Observable { + return this.isNewVersionButtonDisabled(dso).pipe( + switchMap((hasDraftVersion) => of(hasDraftVersion ? tooltipMsgHasDraft : tooltipMsgCreate)), + ); + } +} diff --git a/src/app/shared/menu/initial-menus-state.ts b/src/app/shared/menu/initial-menus-state.ts index 7b900540b6f..086c7c30fa7 100644 --- a/src/app/shared/menu/initial-menus-state.ts +++ b/src/app/shared/menu/initial-menus-state.ts @@ -5,7 +5,8 @@ import { MenusState } from './menu.reducer'; */ export enum MenuID { ADMIN = 'admin-sidebar', - PUBLIC = 'public' + PUBLIC = 'public', + DSO_EDIT = 'dso-edit' } /** @@ -36,5 +37,14 @@ export const initialMenusState: MenusState = { visible: true, sections: {}, sectionToSubsectionIndex: {} - } + }, + [MenuID.DSO_EDIT]: + { + id: MenuID.DSO_EDIT, + collapsed: true, + previewCollapsed: true, + visible: false, + sections: {}, + sectionToSubsectionIndex: {} + }, }; diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html index b2cc73bcf47..4dacc14cbe6 100644 --- a/src/app/shared/menu/menu-item/link-menu-item.component.html +++ b/src/app/shared/menu/menu-item/link-menu-item.component.html @@ -1,6 +1,6 @@ {}; } diff --git a/src/app/shared/menu/menu-item/models/search.model.ts b/src/app/shared/menu/menu-item/models/search.model.ts index e8eeda5501e..d2f728ba9fb 100644 --- a/src/app/shared/menu/menu-item/models/search.model.ts +++ b/src/app/shared/menu/menu-item/models/search.model.ts @@ -6,6 +6,7 @@ import { MenuItemModel } from './menu-item.model'; */ export class SearchMenuItemModel implements MenuItemModel { type = MenuItemType.SEARCH; + disabled: boolean; placeholder: string; action: string; } diff --git a/src/app/shared/menu/menu-item/models/text.model.ts b/src/app/shared/menu/menu-item/models/text.model.ts index bbaf7804d99..d50ec821adc 100644 --- a/src/app/shared/menu/menu-item/models/text.model.ts +++ b/src/app/shared/menu/menu-item/models/text.model.ts @@ -6,5 +6,6 @@ import { MenuItemModel } from './menu-item.model'; */ export class TextMenuItemModel implements MenuItemModel { type = MenuItemType.TEXT; + disabled: boolean; text: string; } diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html index fd0192ad5fc..5e8aecbd441 100644 --- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html @@ -1,4 +1,5 @@ -{{item.text | translate}} +{{item.text | translate}} diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts index 002bfbc8192..ba47e2ad4a8 100644 --- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts +++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts @@ -14,13 +14,16 @@ import { OnClickMenuItemModel } from './models/onclick.model'; @rendersMenuItemForType(MenuItemType.ONCLICK) export class OnClickMenuItemComponent { item: OnClickMenuItemModel; + constructor(@Inject('itemModelProvider') item: OnClickMenuItemModel) { this.item = item; } public activate(event: any) { - event.preventDefault(); - this.item.function(); - event.stopPropagation(); + if (!this.item.disabled) { + event.preventDefault(); + this.item.function(); + event.stopPropagation(); + } } } diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.html b/src/app/shared/menu/menu-item/text-menu-item.component.html index 7ba353e5e74..11c44204026 100644 --- a/src/app/shared/menu/menu-item/text-menu-item.component.html +++ b/src/app/shared/menu/menu-item/text-menu-item.component.html @@ -1 +1 @@ -{{item.text | translate}} \ No newline at end of file +{{item.text | translate}} diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts index fcd96c65f1d..8c845a58d68 100644 --- a/src/app/shared/menu/menu-section/menu-section.component.ts +++ b/src/app/shared/menu/menu-section/menu-section.component.ts @@ -64,7 +64,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy { */ toggleSection(event: Event) { event.preventDefault(); - this.menuService.toggleActiveSection(this.menuID, this.section.id); + if (!this.section.model?.disabled) { + this.menuService.toggleActiveSection(this.menuID, this.section.id); + } } /** @@ -73,7 +75,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy { */ activateSection(event: Event) { event.preventDefault(); - this.menuService.activateSection(this.menuID, this.section.id); + if (!this.section.model?.disabled) { + this.menuService.activateSection(this.menuID, this.section.id); + } } /** diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 715ee66a99b..0454646c96c 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -157,8 +157,6 @@ import { SidebarSearchListElementComponent } from './object-list/sidebar-search- import { CollectionSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component'; 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'; @@ -177,6 +175,13 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { DsSelectComponent } from './ds-select/ds-select.component'; import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'; +import { + DsoEditMenuSectionComponent +} from './dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component'; +import { DsoEditMenuComponent } from './dso-page/dso-edit-menu/dso-edit-menu.component'; +import { + DsoEditMenuExpandableSectionComponent +} from './dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -402,18 +407,20 @@ const ENTRY_COMPONENTS = [ OnClickMenuItemComponent, TextMenuItemComponent, ScopeSelectorModalComponent, + DsoEditMenuSectionComponent, + DsoEditMenuExpandableSectionComponent, ]; const SHARED_ITEM_PAGE_COMPONENTS = [ MetadataFieldWrapperComponent, MetadataValuesComponent, - DsoPageEditButtonComponent, - DsoPageVersionButtonComponent, ItemAlertsComponent, GenericItemPageFieldComponent, MetadataRepresentationListComponent, RelatedItemsComponent, - + DsoEditMenuSectionComponent, + DsoEditMenuComponent, + DsoEditMenuExpandableSectionComponent, ]; const PROVIDERS = [ From 96ba1c931992340dbc5e611e26a9acf9b736ad2b Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Wed, 21 Sep 2022 14:28:53 +0200 Subject: [PATCH 023/758] 94390: Implement feedback --- .../admin-sidebar-section.component.ts | 2 +- src/app/collection-page/collection-page-routing.module.ts | 1 - src/app/community-page/community-page-routing.module.ts | 1 - src/app/item-page/item-page-routing.module.ts | 1 - .../dso-edit-menu-expandable-section.component.scss | 4 ++-- .../dso-page/dso-edit-menu/dso-edit-menu.component.ts | 6 +----- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts index 620681c654d..97b16c05225 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts @@ -49,7 +49,7 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement navigate(event: any): void { event.preventDefault(); - if (this.isDisabled) { + if (!this.isDisabled) { this.router.navigate(this.itemModel.link); } } diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts index c5759f833fa..3101347990e 100644 --- a/src/app/collection-page/collection-page-routing.module.ts +++ b/src/app/collection-page/collection-page-routing.module.ts @@ -93,7 +93,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; LinkService, CreateCollectionPageGuard, CollectionPageAdministratorGuard, - DSOEditMenuResolver ] }) export class CollectionPageRoutingModule { diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts index ac90f3618c5..2c97c99081e 100644 --- a/src/app/community-page/community-page-routing.module.ts +++ b/src/app/community-page/community-page-routing.module.ts @@ -75,7 +75,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; LinkService, CreateCommunityPageGuard, CommunityPageAdministratorGuard, - DSOEditMenuResolver ] }) export class CommunityPageRoutingModule { diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index 1c4da9a2672..069936ebd37 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -90,7 +90,6 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; LinkService, ItemPageAdministratorGuard, VersionResolver, - DSOEditMenuResolver ] }) diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss index 61ec6347f95..ad6166398ca 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss @@ -16,11 +16,11 @@ ul.dropdown-menu { color: white; &.disabled { - color: $btn-link-disabled-color; + color: var(--bs-btn-link-disabled-color); } } .disabled { - color: $btn-link-disabled-color; + color: var(--bs-btn-link-disabled-color); } } diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts index d754e07b328..f222966ed85 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts @@ -24,13 +24,9 @@ export class DsoEditMenuComponent extends MenuComponent { constructor(protected menuService: MenuService, protected injector: Injector, public authorizationService: AuthorizationDataService, - public route: ActivatedRoute, - private authService: AuthService, + public route: ActivatedRoute ) { super(menuService, injector, authorizationService, route); } - ngOnInit(): void { - super.ngOnInit(); - } } From a92060c45ac9b2caca449a0a9f75fadde8997543 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 22 Sep 2022 12:15:34 +0200 Subject: [PATCH 024/758] 94390: Add comment to array flattening --- src/app/shared/dso-page/dso-edit-menu.resolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 003e61df954..d4615843585 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -45,6 +45,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection if (dsoRD.hasSucceeded) { const dso = dsoRD.payload; return combineLatest(this.getDsoMenus(dso, route, state)).pipe( + // Menu sections are retrieved as an array of arrays and flattened into a single array map((combinedMenus) => [].concat.apply([], combinedMenus)), map((menus) => this.addDsoUuidToMenuIDs(menus, dso)), map((menus) => { From b7c1e76b7f70894660843285d48324226d220a91 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 22 Sep 2022 16:10:43 +0200 Subject: [PATCH 025/758] 94390: Remove fdescribe --- .../dso-versioning-modal.service.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts index 0a02481d583..fc5c1dafc97 100644 --- a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts +++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts @@ -9,7 +9,7 @@ import { buildPaginatedList } from '../../../core/data/paginated-list.model'; import { PageInfo } from '../../../core/shared/page-info.model'; import { EMPTY, of as observableOf } from 'rxjs'; -fdescribe('DsoVersioningModalService', () => { +describe('DsoVersioningModalService', () => { let service: DsoVersioningModalService; let modalService; let versionService; From d68f38e848ec06c02f4d9445fe1c9fdbea764fa8 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 22 Sep 2022 17:07:09 +0200 Subject: [PATCH 026/758] 94233: Fixed tests --- src/app/shared/sass-helper/css-variable.actions.ts | 4 +--- src/app/shared/sass-helper/css-variable.reducer.ts | 2 +- src/app/shared/sass-helper/css-variable.service.ts | 3 +-- src/app/shared/testing/css-variable-service.stub.ts | 13 +++++++++++++ src/modules/app/server-init.service.ts | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/app/shared/sass-helper/css-variable.actions.ts b/src/app/shared/sass-helper/css-variable.actions.ts index 93225f94262..2d58a2978b8 100644 --- a/src/app/shared/sass-helper/css-variable.actions.ts +++ b/src/app/shared/sass-helper/css-variable.actions.ts @@ -1,3 +1,4 @@ +/* eslint-disable max-classes-per-file */ import { Action } from '@ngrx/store'; import { type } from '../ngrx/type'; import { KeyValuePair } from '../key-value-pair.model'; @@ -38,9 +39,6 @@ export class AddAllCSSVariablesAction implements Action { export class ClearCSSVariablesAction implements Action { type = CSSVariableActionTypes.CLEAR; - - constructor() { - } } export type CSSVariableAction = AddCSSVariableAction | AddAllCSSVariablesAction | ClearCSSVariablesAction; diff --git a/src/app/shared/sass-helper/css-variable.reducer.ts b/src/app/shared/sass-helper/css-variable.reducer.ts index 405cbf5df41..449a936b4e2 100644 --- a/src/app/shared/sass-helper/css-variable.reducer.ts +++ b/src/app/shared/sass-helper/css-variable.reducer.ts @@ -19,7 +19,7 @@ export function cssVariablesReducer(state = initialState, action: CSSVariableAct return Object.assign({}, state, { [variable.name]: variable.value }); } case CSSVariableActionTypes.ADD_ALL: { const variables = action.payload; - return Object.assign({}, state, ...variables.map(({ key, value }: KeyValuePair) => {return {[key]: value}})); + return Object.assign({}, state, ...variables.map(({ key, value }: KeyValuePair) => {return {[key]: value};})); } case CSSVariableActionTypes.CLEAR: { return initialState; } diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts index 9ba9dfca3c9..af40c634fd6 100644 --- a/src/app/shared/sass-helper/css-variable.service.ts +++ b/src/app/shared/sass-helper/css-variable.service.ts @@ -87,8 +87,7 @@ export class CSSVariableService { * @return array> * ex; [{key: "--color-accent", value: "#b9f500"}, {key: "--color-text", value: "#252525"}, ...] */ - getCSSVariablesFromStylesheets(document: Document): KeyValuePair[] - { + getCSSVariablesFromStylesheets(document: Document): KeyValuePair[] { // styleSheets is array-like, so we convert it to an array. // Filter out any stylesheets not on this domain return [...document.styleSheets] diff --git a/src/app/shared/testing/css-variable-service.stub.ts b/src/app/shared/testing/css-variable-service.stub.ts index f72e3384553..47be5c0ff47 100644 --- a/src/app/shared/testing/css-variable-service.stub.ts +++ b/src/app/shared/testing/css-variable-service.stub.ts @@ -1,4 +1,5 @@ import { Observable, of as observableOf } from 'rxjs'; +import { KeyValuePair } from '../key-value-pair.model'; const variables = { '--bs-sm-min': '576px,', @@ -19,4 +20,16 @@ export class CSSVariableServiceStub { addCSSVariable(name: string, value: string): void { /**/ } + + addCSSVariables(variables: KeyValuePair[]): void { + /**/ + } + + clearCSSVariables(): void { + /**/ + } + + getCSSVariablesFromStylesheets(document: Document): void { + /**/ + } } diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts index e93c692cd7f..9f6aa65921e 100644 --- a/src/modules/app/server-init.service.ts +++ b/src/modules/app/server-init.service.ts @@ -18,7 +18,7 @@ import { LocaleService } from '../../app/core/locale/locale.service'; import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider'; import { MetadataService } from '../../app/core/metadata/metadata.service'; import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service'; -import { CSSVariableService } from '../../app/shared/sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../sass-helper/css-variable.service'; import { ThemeService } from '../../app/shared/theme-support/theme.service'; import { take } from 'rxjs/operators'; From 97bceffb0272d095f1c1826b2daabca26034c4a4 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 22 Sep 2022 17:14:55 +0200 Subject: [PATCH 027/758] 94233: Fixed lint issue --- src/app/shared/testing/css-variable-service.stub.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/testing/css-variable-service.stub.ts b/src/app/shared/testing/css-variable-service.stub.ts index 47be5c0ff47..2f5c6479457 100644 --- a/src/app/shared/testing/css-variable-service.stub.ts +++ b/src/app/shared/testing/css-variable-service.stub.ts @@ -21,7 +21,7 @@ export class CSSVariableServiceStub { /**/ } - addCSSVariables(variables: KeyValuePair[]): void { + addCSSVariables(variablesToAdd: KeyValuePair[]): void { /**/ } From f7619249630f9df9bf5731eb7793ecbc27551d19 Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 22 Sep 2022 17:16:35 +0200 Subject: [PATCH 028/758] 94233: removed empty file --- src/app/shared/sass-helper/css-variable.utils.ts | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/app/shared/sass-helper/css-variable.utils.ts diff --git a/src/app/shared/sass-helper/css-variable.utils.ts b/src/app/shared/sass-helper/css-variable.utils.ts deleted file mode 100644 index 05e3074f98a..00000000000 --- a/src/app/shared/sass-helper/css-variable.utils.ts +++ /dev/null @@ -1,4 +0,0 @@ -// Uses code from https://css-tricks.com/how-to-get-all-custom-properties-on-a-page-in-javascript/ - -import { KeyValuePair } from '../key-value-pair.model'; - From af982471953836051dd51fb391929f5b3f8c38a3 Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Thu, 22 Sep 2022 18:18:42 +0200 Subject: [PATCH 029/758] add check to ensure document.styleSheets is defined --- src/app/core/core.module.ts | 2 - .../sass-helper/css-variable.service.ts | 60 ++++++++++--------- src/modules/app/server-init.service.ts | 2 - 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index f80a2a020e2..90cefd54c70 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -23,7 +23,6 @@ import { NotificationsService } from '../shared/notifications/notifications.serv import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service'; import { ObjectSelectService } from '../shared/object-select/object-select.service'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; -import { CSSVariableService } from '../shared/sass-helper/css-variable.service'; import { SidebarService } from '../shared/sidebar/sidebar.service'; import { UploaderService } from '../shared/uploader/uploader.service'; import { SectionFormOperationsService } from '../submission/sections/form/section-form-operations.service'; @@ -257,7 +256,6 @@ const PROVIDERS = [ DefaultChangeAnalyzer, ArrayMoveChangeAnalyzer, ObjectSelectService, - CSSVariableService, MenuService, ObjectUpdatesService, SearchService, diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts index af40c634fd6..0190a05036f 100644 --- a/src/app/shared/sass-helper/css-variable.service.ts +++ b/src/app/shared/sass-helper/css-variable.service.ts @@ -5,7 +5,7 @@ import { AddAllCSSVariablesAction, AddCSSVariableAction, ClearCSSVariablesAction import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model'; import { Observable } from 'rxjs'; -import { hasValue } from '../empty.util'; +import { hasValue, isNotEmpty } from '../empty.util'; import { KeyValuePair } from '../key-value-pair.model'; import { PageInfo } from '../../core/shared/page-info.model'; import { CSSVariablesState } from './css-variable.reducer'; @@ -13,7 +13,9 @@ import { CSSVariablesState } from './css-variable.reducer'; /** * This service deals with adding and retrieving CSS variables to and from the store */ -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class CSSVariableService { isSameDomain = (styleSheet) => { // Internal style blocks won't have an href value @@ -88,31 +90,35 @@ export class CSSVariableService { * ex; [{key: "--color-accent", value: "#b9f500"}, {key: "--color-text", value: "#252525"}, ...] */ getCSSVariablesFromStylesheets(document: Document): KeyValuePair[] { - // styleSheets is array-like, so we convert it to an array. - // Filter out any stylesheets not on this domain - return [...document.styleSheets] - .filter(this.isSameDomain) - .reduce( - (finalArr, sheet) => - finalArr.concat( - // cssRules is array-like, so we convert it to an array - [...sheet.cssRules].filter(this.isStyleRule).reduce((propValArr, rule: any) => { - const props = [...rule.style] - .map((propName) => { - return { - key: propName.trim(), - value: rule.style.getPropertyValue(propName).trim() - } as KeyValuePair; - } - ) - // Discard any props that don't start with "--". Custom props are required to. - .filter(({ key }: KeyValuePair) => key.indexOf('--') === 0); - - return [...propValArr, ...props]; - }, []) - ), - [] - ); + if (isNotEmpty(document.styleSheets)) { + // styleSheets is array-like, so we convert it to an array. + // Filter out any stylesheets not on this domain + return [...document.styleSheets] + .filter(this.isSameDomain) + .reduce( + (finalArr, sheet) => + finalArr.concat( + // cssRules is array-like, so we convert it to an array + [...sheet.cssRules].filter(this.isStyleRule).reduce((propValArr, rule: any) => { + const props = [...rule.style] + .map((propName) => { + return { + key: propName.trim(), + value: rule.style.getPropertyValue(propName).trim() + } as KeyValuePair; + } + ) + // Discard any props that don't start with "--". Custom props are required to. + .filter(({ key }: KeyValuePair) => key.indexOf('--') === 0); + + return [...propValArr, ...props]; + }, []) + ), + [] + ); + } else { + return []; + } } } diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts index 9f6aa65921e..903bd91b7ce 100644 --- a/src/modules/app/server-init.service.ts +++ b/src/modules/app/server-init.service.ts @@ -18,7 +18,6 @@ import { LocaleService } from '../../app/core/locale/locale.service'; import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider'; import { MetadataService } from '../../app/core/metadata/metadata.service'; import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service'; -import { CSSVariableService } from '../../sass-helper/css-variable.service'; import { ThemeService } from '../../app/shared/theme-support/theme.service'; import { take } from 'rxjs/operators'; @@ -37,7 +36,6 @@ export class ServerInitService extends InitService { protected angulartics2DSpace: Angulartics2DSpace, protected metadata: MetadataService, protected breadcrumbsService: BreadcrumbsService, - protected cssService: CSSVariableService, protected themeService: ThemeService, ) { super( From 738a85ffc9e464dc787c9bad1fb06b8060c97538 Mon Sep 17 00:00:00 2001 From: myrza1 Date: Fri, 23 Sep 2022 05:23:30 +0600 Subject: [PATCH 030/758] Update kk.json5 Update part 1 --- src/assets/i18n/kk.json5 | 773 +++++++++++++-------------------------- 1 file changed, 263 insertions(+), 510 deletions(-) diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index 56651ceaae4..b78df8ac5e5 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -211,8 +211,7 @@ "admin.registries.bitstream-formats.table.supportLevel.head": "Қолдау деңгейі", // "admin.registries.bitstream-formats.title": "Bitstream Format Registry", - // TODO Source message changed - Revise the translation - "admin.registries.bitstream-formats.title": "DSpace Angular ::Бит ағыны форматтарының тізілімі", + "admin.registries.bitstream-formats.title": "Бит ағыны форматтарының тізілімі", @@ -253,8 +252,7 @@ "admin.registries.metadata.schemas.table.namespace": "Аттар кеңістігі", // "admin.registries.metadata.title": "Metadata Registry", - // TODO Source message changed - Revise the translation - "admin.registries.metadata.title": "DSpace Angular :: Метадеректер тізілімі", + "admin.registries.metadata.title": "Метадеректер тізілімі", @@ -325,15 +323,13 @@ "admin.registries.schema.notification.field.edited": "Сәтті өңделген метадеректер өрісі\"{{field}}\"", // "admin.registries.schema.notification.success": "Success", - "admin.registries.schema.notification.success": "Успех", + "admin.registries.schema.notification.success": "Сәтті", // "admin.registries.schema.return": "Back", - // TODO Source message changed - Revise the translation "admin.registries.schema.return": "Қайтару", // "admin.registries.schema.title": "Metadata Schema Registry", - // TODO Source message changed - Revise the translation - "admin.registries.schema.title": "DSpace Angular:: метадеректер тізбегінің тізілімі", + "admin.registries.schema.title": "Метадеректер тізбегінің тізілімі", @@ -350,12 +346,10 @@ "admin.access-control.epeople.actions.stop-impersonating": "Адам туралы ойлауды доғарыңыз", // "admin.access-control.epeople.breadcrumbs": "EPeople", - // TODO New key - Add a translation - "admin.access-control.epeople.breadcrumbs": "EPeople", + "admin.access-control.epeople.breadcrumbs": "Адамдар", // "admin.access-control.epeople.title": "EPeople", - // TODO Source message changed - Revise the translation - "admin.access-control.epeople.title": "DSpace Angular :: Адамдар", + "admin.access-control.epeople.title": "Адамдар", // "admin.access-control.epeople.head": "EPeople", "admin.access-control.epeople.head": "Адамдар", @@ -398,8 +392,7 @@ "admin.access-control.epeople.table.edit.buttons.edit": "Өңдеу \"{{name}}\"", // "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group", - // TODO New key - Add a translation - "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": "Сіз бұл топты өңдеуге құқығыңыз жоқ", // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"", "admin.access-control.epeople.table.edit.buttons.remove": "Жою\"{{name}}\"", @@ -432,8 +425,7 @@ "admin.access-control.epeople.form.requireCertificate": "Сертификат қажет", // "admin.access-control.epeople.form.return": "Back", - // TODO New key - Add a translation - "admin.access-control.epeople.form.return": "Back", + "admin.access-control.epeople.form.return": "Артқа", // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"", "admin.access-control.epeople.form.notification.created.success": "Сәтті құрылған Эпперсон \"{{name}}\"", @@ -469,8 +461,7 @@ "admin.access-control.epeople.form.table.name": "Аты", // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community", - // TODO New key - Add a translation - "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community", + "admin.access-control.epeople.form.table.collectionOrCommunity": "Жинақ/Қауымдастық", // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups", "admin.access-control.epeople.form.memberOfNoGroups": "Бұл адам ешқандай топтың мүшесі емес", @@ -487,28 +478,22 @@ // "admin.access-control.groups.title": "Groups", - // TODO Source message changed - Revise the translation - "admin.access-control.groups.title": "DSpace Angular :: Топтар", + "admin.access-control.groups.title": "Топтар", // "admin.access-control.groups.breadcrumbs": "Groups", - // TODO New key - Add a translation - "admin.access-control.groups.breadcrumbs": "Groups", + "admin.access-control.groups.breadcrumbs": "Топтар", // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group", - // TODO New key - Add a translation - "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group", + "admin.access-control.groups.singleGroup.breadcrumbs": "Топты өңдеу", // "admin.access-control.groups.title.singleGroup": "Edit Group", - // TODO Source message changed - Revise the translation - "admin.access-control.groups.title.singleGroup": "DSpace Angular:: редакциялау тобы", + "admin.access-control.groups.title.singleGroup": "Топты редакциялау", // "admin.access-control.groups.title.addGroup": "New Group", - // TODO Source message changed - Revise the translation - "admin.access-control.groups.title.addGroup": "DSpace Angular :: Жаңа топ", + "admin.access-control.groups.title.addGroup": "Жаңа топ қосу", // "admin.access-control.groups.addGroup.breadcrumbs": "New Group", - // TODO New key - Add a translation - "admin.access-control.groups.addGroup.breadcrumbs": "New Group", + "admin.access-control.groups.addGroup.breadcrumbs": "Жаңы топ", // "admin.access-control.groups.head": "Groups", "admin.access-control.groups.head": "Топтар", @@ -723,8 +708,7 @@ "admin.access-control.groups.form.subgroups-list.table.name": "Аты", // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community", - // TODO New key - Add a translation - "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community", + "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Жинақ/Қауымдастық", // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add", "admin.access-control.groups.form.subgroups-list.table.edit": "Жою / Қосу", @@ -733,7 +717,6 @@ "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Аты бар кіші топты жою \"{{name}}\"", // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"", - // TODO Source message changed - Revise the translation "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Атауы бар кіші топты қосыңыз \"{{name}}\"", // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group", @@ -764,7 +747,6 @@ "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Топта әлі кіші топтар жоқ.", // "admin.access-control.groups.form.return": "Back", - // TODO Source message changed - Revise the translation "admin.access-control.groups.form.return": "Топтарға оралу", @@ -856,46 +838,37 @@ "admin.metadata-import.page.error.addFile": "Алдымен файлды таңдаңыз!", // "admin.metadata-import.page.validateOnly": "Validate Only", - // TODO New key - Add a translation - "admin.metadata-import.page.validateOnly": "Validate Only", + "admin.metadata-import.page.validateOnly": "Тек Тексеру", // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.", - // TODO New key - Add a translation - "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.", + "admin.metadata-import.page.validateOnly.hint": "Бұл параметрді таңдаған кезде жүктелген CSV файлы тексеріледі. Сіз анықталған өзгерістер туралы есеп аласыз, бірақ ешқандай өзгеріс сақталмайды.", // "auth.errors.invalid-user": "Invalid email address or password.", - // TODO New key - Add a translation - "auth.errors.invalid-user": "Invalid email address or password.", + "auth.errors.invalid-user": "Электрондық пошта мекенжайы немесе пароль дұрыс емес.", // "auth.messages.expired": "Your session has expired. Please log in again.", - // TODO New key - Add a translation - "auth.messages.expired": "Your session has expired. Please log in again.", + "auth.messages.expired": "Сеанстың жарамдылық мерзімі аяқталды. Тағы бір рет кіріңіз.", // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.", - // TODO New key - Add a translation - "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.", + "auth.messages.token-refresh-failed": "Сеанс таңбалауышын жаңарту мүмкін емес. Тағы бір рет кіріңіз.", // "bitstream.download.page": "Now downloading {{bitstream}}..." , - // TODO New key - Add a translation - "bitstream.download.page": "Now downloading {{bitstream}}..." , + "bitstream.download.page": "Қазір жүктеу {{bitstream}}..." , // "bitstream.download.page.back": "Back" , - // TODO New key - Add a translation - "bitstream.download.page.back": "Back" , + "bitstream.download.page.back": "Артқа" , // "bitstream.edit.authorizations.link": "Edit bitstream's Policies", - // TODO New key - Add a translation - "bitstream.edit.authorizations.link": "Edit bitstream's Policies", + "bitstream.edit.authorizations.link": "Бит ағынының саясатын өңдеу", // "bitstream.edit.authorizations.title": "Edit bitstream's Policies", - // TODO New key - Add a translation - "bitstream.edit.authorizations.title": "Edit bitstream's Policies", + "bitstream.edit.authorizations.title": "Бит ағынының саясатын өңдеу", // "bitstream.edit.return": "Back", // TODO New key - Add a translation @@ -944,36 +917,28 @@ "bitstream.edit.notifications.error.format.title": "Бит ағынының форматын сақтау кезінде қате пайда болды", // "bitstream.edit.form.iiifLabel.label": "IIIF Label", - // TODO New key - Add a translation - "bitstream.edit.form.iiifLabel.label": "IIIF Label", + "bitstream.edit.form.iiifLabel.label": "IIIF Жапсырма", // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.", - // TODO New key - Add a translation - "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.", + "bitstream.edit.form.iiifLabel.hint": "Бұл кескінге арналған кенеп жапсырмасы. Егер көрсетілмесе, әдепкі белгі қолданылады.", // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents", - // TODO New key - Add a translation - "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents", + "bitstream.edit.form.iiifToc.label": "IIIF Мазмұны", // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.", - // TODO New key - Add a translation - "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.", + "bitstream.edit.form.iiifToc.hint": "Мұнда мәтін қосу мұны жаңа мазмұн кестесінің басталуына әкеледі.", // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width", - // TODO New key - Add a translation - "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width", + "bitstream.edit.form.iiifWidth.label": "IIIF Кенептің ені", // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.", - // TODO New key - Add a translation - "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.", + "bitstream.edit.form.iiifWidth.hint": "Кенептің ені әдетте кескіннің еніне сәйкес келуі керек.", // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height", - // TODO New key - Add a translation - "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height", + "bitstream.edit.form.iiifHeight.label": "IIIF Кенептің биіктігі", // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.", - // TODO New key - Add a translation - "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.", + "bitstream.edit.form.iiifHeight.hint": "Кенептің биіктігі әдетте кескіннің биіктігіне сәйкес келуі керек.", // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.", @@ -986,85 +951,66 @@ "bitstream.edit.title": "Бит ағынын өзгерту", // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ", - // TODO New key - Add a translation - "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ", + "bitstream-request-a-copy.alert.canDownload1": "Сіз бұл файлға қол жеткізе аласыз. Егер сіз файлды жүктегіңіз келсе, нұқыңыз ", // "bitstream-request-a-copy.alert.canDownload2": "here", - // TODO New key - Add a translation - "bitstream-request-a-copy.alert.canDownload2": "here", + "bitstream-request-a-copy.alert.canDownload2": "мында", // "bitstream-request-a-copy.header": "Request a copy of the file", - // TODO New key - Add a translation - "bitstream-request-a-copy.header": "Request a copy of the file", + "bitstream-request-a-copy.header": "Файлдың көшірмесін сұраңыз", // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ", - // TODO New key - Add a translation - "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ", + "bitstream-request-a-copy.intro": "Келесі элементтің көшірмесін сұрау үшін келесі ақпаратты енгізіңіз: ", // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ", - // TODO New key - Add a translation - "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ", + "bitstream-request-a-copy.intro.bitstream.one": "Келесі файлды сұрау: ", + // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ", - // TODO New key - Add a translation - "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ", + "bitstream-request-a-copy.intro.bitstream.all": "Барлық файлдарды сұрау. ", // "bitstream-request-a-copy.name.label": "Name *", - // TODO New key - Add a translation - "bitstream-request-a-copy.name.label": "Name *", + "bitstream-request-a-copy.name.label": "Аты *", // "bitstream-request-a-copy.name.error": "The name is required", - // TODO New key - Add a translation - "bitstream-request-a-copy.name.error": "The name is required", + "bitstream-request-a-copy.name.error": "Аты міндетті", // "bitstream-request-a-copy.email.label": "Your e-mail address *", - // TODO New key - Add a translation - "bitstream-request-a-copy.email.label": "Your e-mail address *", + "bitstream-request-a-copy.email.label": "Сіздің электрондық пошта мекенжайыңыз *", // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.", - // TODO New key - Add a translation - "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.", + "bitstream-request-a-copy.email.hint": "Бұл электрондық пошта мекенжайы файлды жіберу үшін қолданылады.", // "bitstream-request-a-copy.email.error": "Please enter a valid email address.", - // TODO New key - Add a translation - "bitstream-request-a-copy.email.error": "Please enter a valid email address.", + "bitstream-request-a-copy.email.error": "Жарамды электрондық пошта мекенжайын енгізіңіз.", // "bitstream-request-a-copy.allfiles.label": "Files", - // TODO New key - Add a translation - "bitstream-request-a-copy.allfiles.label": "Files", + "bitstream-request-a-copy.allfiles.label": "Файлдар", // "bitstream-request-a-copy.files-all-false.label": "Only the requested file", - // TODO New key - Add a translation - "bitstream-request-a-copy.files-all-false.label": "Only the requested file", + "bitstream-request-a-copy.files-all-false.label": "Тек сұралған файл", // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access", - // TODO New key - Add a translation - "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access", + "bitstream-request-a-copy.files-all-true.label": "Барлық файлдар (осы элемент) шектеулі қол жетімді", // "bitstream-request-a-copy.message.label": "Message", - // TODO New key - Add a translation - "bitstream-request-a-copy.message.label": "Message", + "bitstream-request-a-copy.message.label": "Хабарлар", // "bitstream-request-a-copy.return": "Back", - // TODO New key - Add a translation - "bitstream-request-a-copy.return": "Back", + "bitstream-request-a-copy.return": "Артқа", // "bitstream-request-a-copy.submit": "Request copy", - // TODO New key - Add a translation - "bitstream-request-a-copy.submit": "Request copy", + "bitstream-request-a-copy.submit": "Көшірмесін сұрау", // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.", - // TODO New key - Add a translation - "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.", + "bitstream-request-a-copy.submit.success": "Өнімге сұраныс сәтті жіберілді.", // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.", - // TODO New key - Add a translation - "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.", + "bitstream-request-a-copy.submit.error": "Өнімге сұраныс жіберумен бір нәрсе дұрыс болмады.", // "browse.back.all-results": "All browse results", - // TODO New key - Add a translation - "browse.back.all-results": "All browse results", + "browse.back.all-results": "Барлық қарау нәтижелері", // "browse.comcol.by.author": "By Author", "browse.comcol.by.author": "Авторы", @@ -1109,20 +1055,16 @@ "browse.metadata.title.breadcrumbs": "Тақырыбы бойынша қарау", // "pagination.next.button": "Next", - // TODO New key - Add a translation - "pagination.next.button": "Next", + "pagination.next.button": "Келесі", // "pagination.previous.button": "Previous", - // TODO New key - Add a translation - "pagination.previous.button": "Previous", + "pagination.previous.button": "Алдыңғысы", // "pagination.next.button.disabled.tooltip": "No more pages of results", - // TODO New key - Add a translation - "pagination.next.button.disabled.tooltip": "No more pages of results", + "pagination.next.button.disabled.tooltip": "Нәтижелері бар беттер жоқ", // "browse.startsWith": ", starting with {{ startsWith }}", - // TODO New key - Add a translation - "browse.startsWith": ", starting with {{ startsWith }}", + "browse.startsWith": ", {{ startsWith }} деп басталуымен", // "browse.startsWith.choose_start": "(Choose start)", "browse.startsWith.choose_start": "(басталуын таңдаңыз)", @@ -1131,12 +1073,10 @@ "browse.startsWith.choose_year": "(Жылды таңдаңыз)", // "browse.startsWith.choose_year.label": "Choose the issue year", - // TODO New key - Add a translation - "browse.startsWith.choose_year.label": "Choose the issue year", + "browse.startsWith.choose_year.label": "Шығарылған жылын таңдаңыз", // "browse.startsWith.jump": "Filter results by year or month", - // TODO Source message changed - Revise the translation - "browse.startsWith.jump": "Индекстегі нүктеге өту:", + "browse.startsWith.jump": "Нәтижелерді жылдар немесе айлар бойынша сүзу", // "browse.startsWith.months.april": "April", "browse.startsWith.months.april": "Сәуір", @@ -1169,8 +1109,7 @@ "browse.startsWith.months.none": "(Айды таңдаңыз)", // "browse.startsWith.months.none.label": "Choose the issue month", - // TODO New key - Add a translation - "browse.startsWith.months.none.label": "Choose the issue month", + "browse.startsWith.months.none.label": "Шығарылған айды таңдаңыз", // "browse.startsWith.months.november": "November", "browse.startsWith.months.november": "Қараша", @@ -1182,28 +1121,22 @@ "browse.startsWith.months.september": "Қыркүйек", // "browse.startsWith.submit": "Browse", - // TODO Source message changed - Revise the translation - "browse.startsWith.submit": "Go", + "browse.startsWith.submit": "Алға", // "browse.startsWith.type_date": "Filter results by date", - // TODO Source message changed - Revise the translation "browse.startsWith.type_date": "Немесе күнді енгізіңіз (жыл-ай):", // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button", - // TODO New key - Add a translation - "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button", + "browse.startsWith.type_date.label": "Немесе күнді (жыл-ай) енгізіп, "шолу"түймесін басыңыз.", // "browse.startsWith.type_text": "Filter results by typing the first few letters", - // TODO Source message changed - Revise the translation "browse.startsWith.type_text": "Немесе алғашқы бірнеше әріптерді енгізіңіз:", // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}", - // TODO Source message changed - Revise the translation "browse.title": "{{collection}} {{field}} {{value}} бойынша қараңыз", // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}", - // TODO New key - Add a translation - "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}", + "browse.title.page": "{{ collection }} -ны {{ field }} {{ value }} бойынша қараңыз", // "chips.remove": "Remove chip", @@ -1321,12 +1254,10 @@ // "collection.edit.logo.delete.title": "Delete logo", - // TODO New key - Add a translation - "collection.edit.logo.delete.title": "Delete logo", + "collection.edit.logo.delete.title": "Логотипті өшіру", // "collection.edit.logo.delete-undo.title": "Undo delete", - // TODO New key - Add a translation - "collection.edit.logo.delete-undo.title": "Undo delete", + "collection.edit.logo.delete-undo.title": "Өшірмеу", // "collection.edit.logo.label": "Collection logo", "collection.edit.logo.label": "Топтама логотипі", @@ -1355,7 +1286,6 @@ "collection.edit.notifications.success": "Сәтті өзгертілген топтама", // "collection.edit.return": "Back", - // TODO Source message changed - Revise the translation "collection.edit.return": "Қайтару", @@ -1559,74 +1489,73 @@ // "collection.source.controls.head": "Harvest Controls", - // TODO New key - Add a translation - "collection.source.controls.head": "Harvest Controls", + "collection.source.controls.head": "Өнім жинауды бақылау құралдары", + // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings", - // TODO New key - Add a translation - "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings", + "collection.source.controls.test.submit.error": "Параметрлерді тексерудің басталуымен бір нәрсе дұрыс болмады", + // "collection.source.controls.test.failed": "The script to test the settings has failed", - // TODO New key - Add a translation - "collection.source.controls.test.failed": "The script to test the settings has failed", + "collection.source.controls.test.failed": "Параметрлерді тексеру үшін сценарий сәтсіз аяқталды", + // "collection.source.controls.test.completed": "The script to test the settings has successfully finished", - // TODO New key - Add a translation - "collection.source.controls.test.completed": "The script to test the settings has successfully finished", + "collection.source.controls.test.completed": "Параметрлерді тексеру сценарийі сәтті аяқталды", + // "collection.source.controls.test.submit": "Test configuration", - // TODO New key - Add a translation - "collection.source.controls.test.submit": "Test configuration", + "collection.source.controls.test.submit": "Сынақ конфигурациясы", + // "collection.source.controls.test.running": "Testing configuration...", - // TODO New key - Add a translation - "collection.source.controls.test.running": "Testing configuration...", + "collection.source.controls.test.running": "Тестілеу конфигурациясы...", + // "collection.source.controls.import.submit.success": "The import has been successfully initiated", - // TODO New key - Add a translation - "collection.source.controls.import.submit.success": "The import has been successfully initiated", + "collection.source.controls.import.submit.success": "Импорт сәтті басталды", + // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import", - // TODO New key - Add a translation - "collection.source.controls.import.submit.error": "Something went wrong with initiating the import", + "collection.source.controls.import.submit.error": "Импортты бастау кезінде бірдеңе дұрыс болмады", + // "collection.source.controls.import.submit": "Import now", - // TODO New key - Add a translation - "collection.source.controls.import.submit": "Import now", + "collection.source.controls.import.submit": "Қазір импорттаңыз", + // "collection.source.controls.import.running": "Importing...", - // TODO New key - Add a translation - "collection.source.controls.import.running": "Importing...", + "collection.source.controls.import.running": "Импорт...", + // "collection.source.controls.import.failed": "An error occurred during the import", - // TODO New key - Add a translation - "collection.source.controls.import.failed": "An error occurred during the import", + "collection.source.controls.import.failed": "Импорттау кезінде қате кетті", + // "collection.source.controls.import.completed": "The import completed", - // TODO New key - Add a translation - "collection.source.controls.import.completed": "The import completed", + "collection.source.controls.import.completed": "Импорт аяқталды", + // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated", - // TODO New key - Add a translation - "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated", + "collection.source.controls.reset.submit.success": "Қалпына келтіру және қайта импорттау сәтті басталды", + // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport", - // TODO New key - Add a translation - "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport", + "collection.source.controls.reset.submit.error": "Қалпына келтіру және қайта импорттау кезінде бір нәрсе дұрыс болмады", + // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport", - // TODO New key - Add a translation - "collection.source.controls.reset.failed": "An error occurred during the reset and reimport", + "collection.source.controls.reset.failed": "Қалпына келтіру және қайта импорттау кезінде қате пайда болды", + // "collection.source.controls.reset.completed": "The reset and reimport completed", - // TODO New key - Add a translation - "collection.source.controls.reset.completed": "The reset and reimport completed", + "collection.source.controls.reset.completed": "Қалпына келтіру және қайта импорттау аяқталды", + // "collection.source.controls.reset.submit": "Reset and reimport", - // TODO New key - Add a translation - "collection.source.controls.reset.submit": "Reset and reimport", + "collection.source.controls.reset.submit": "Қалпына келтіру және қайта импорттау", + // "collection.source.controls.reset.running": "Resetting and reimporting...", - // TODO New key - Add a translation - "collection.source.controls.reset.running": "Resetting and reimporting...", + "collection.source.controls.reset.running": "Қалпына келтіру және қайта импорттау...", + // "collection.source.controls.harvest.status": "Harvest status:", - // TODO New key - Add a translation - "collection.source.controls.harvest.status": "Harvest status:", + "collection.source.controls.harvest.status": "Өнім мәртебесі:", + // "collection.source.controls.harvest.start": "Harvest start time:", - // TODO New key - Add a translation - "collection.source.controls.harvest.start": "Harvest start time:", + "collection.source.controls.harvest.start": "Өнім жинаудың басталу уақыты:", + // "collection.source.controls.harvest.last": "Last time harvested:", - // TODO New key - Add a translation - "collection.source.controls.harvest.last": "Last time harvested:", + "collection.source.controls.harvest.last": "Соңғы рет өнім жиналды:", + // "collection.source.controls.harvest.message": "Harvest info:", - // TODO New key - Add a translation - "collection.source.controls.harvest.message": "Harvest info:", + "collection.source.controls.harvest.message": "Өнім хабары:", + // "collection.source.controls.harvest.no-information": "N/A", - // TODO New key - Add a translation - "collection.source.controls.harvest.no-information": "N/A", + "collection.source.controls.harvest.no-information": "Ақпарат жоқ", // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.", @@ -1775,108 +1704,84 @@ // "comcol-role.edit.no-group": "None", - // TODO New key - Add a translation - "comcol-role.edit.no-group": "None", + "comcol-role.edit.no-group": "Ешкім", // "comcol-role.edit.create": "Create", - // TODO New key - Add a translation - "comcol-role.edit.create": "Create", + "comcol-role.edit.create": "Құру", // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role", - // TODO New key - Add a translation - "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role", + "comcol-role.edit.create.error.title": "'{{ role }}' рөлі үшін топ құру мүмкін емес", // "comcol-role.edit.restrict": "Restrict", - // TODO New key - Add a translation - "comcol-role.edit.restrict": "Restrict", + "comcol-role.edit.restrict": "Шектеу", // "comcol-role.edit.delete": "Delete", - // TODO New key - Add a translation - "comcol-role.edit.delete": "Delete", + "comcol-role.edit.delete": "Жою", // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group", - // TODO New key - Add a translation - "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group", + "comcol-role.edit.delete.error.title": "'{{ role }}' рөл тобын жою мүмкін емес", // "comcol-role.edit.community-admin.name": "Administrators", - // TODO New key - Add a translation - "comcol-role.edit.community-admin.name": "Administrators", + "comcol-role.edit.community-admin.name": "Әкімшілер", // "comcol-role.edit.collection-admin.name": "Administrators", - // TODO New key - Add a translation - "comcol-role.edit.collection-admin.name": "Administrators", + "comcol-role.edit.collection-admin.name": "Әкімшілер", // "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.community-admin.description": "Қауымдастық әкімшілері ішкі қауымдастықтарды немесе коллекцияларды құра алады және оларды басқара алады немесе сол ішкі қауымдастықтарға немесе коллекцияларға басқару тағайындай алады. Сонымен қатар, олар кез-келген кірістірілген коллекцияларға элементтерді кім жібере алатындығын, элементтердің метадеректерін өңдеуді (жібергеннен кейін) және басқа коллекциялардан бар элементтерді қосуды (сәйкестендіруді) шешеді (авторизация жағдайында).", // "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.collection-admin.description": "Коллекция әкімшілері элементтерді коллекцияға кім жібере алатындығын, элементтің метадеректерін өңдей алатындығын (жібергеннен кейін) және басқа коллекциялардан бар элементтерді осы коллекцияға қосуды (сәйкестендіруді) шешеді (осы коллекцияға авторизация берілген жағдайда).", // "comcol-role.edit.submitters.name": "Submitters", - // TODO New key - Add a translation - "comcol-role.edit.submitters.name": "Submitters", + "comcol-role.edit.submitters.name": "Жіберушілер", // "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.submitters.description": "Осы жинаққа жаңа элементтерді жіберуге рұқсаты бар электрондық пайдаланушылар мен топтар.", // "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.name": "Оқуға арналған әдепкі элементке кіру", // "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.description": "Осы жинақта ұсынылған жаңа материалдарды оқи алатын электрондық пайдаланушылар мен топтар. Бұл рөлдегі өзгерістердің кері күші жоқ. Жүйеде бар элементтер оларды қосу кезінде оқуға рұқсаты бар адамдар үшін әлі де қол жетімді болады.", // "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.item_read.anonymous-group": "Қазіргі уақытта кіретін элементтер үшін әдепкі оқу анонимді болып табылады.", // "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.name": "Әдепкі бит ағынын оқуға қол жеткізу", // "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.description": "Қауымдастық әкімшілері ішкі қауымдастықтарды немесе коллекцияларды құра алады және оларды басқара алады немесе сол ішкі қауымдастықтарға немесе коллекцияларға басқару тағайындай алады. Сонымен қатар, олар кез-келген кірістірілген коллекцияларға элементтерді кім жібере алатындығын, элементтердің метадеректерін өңдеуді (жібергеннен кейін) және басқа коллекциялардан бар элементтерді қосуды (сәйкестендіруді) шешеді (авторизация жағдайында).", // "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.bitstream_read.anonymous-group": "Қазіргі уақытта кіріс бит ағыны үшін әдепкі оқу анонимді болып табылады.", // "comcol-role.edit.editor.name": "Editors", - // TODO New key - Add a translation - "comcol-role.edit.editor.name": "Editors", + "comcol-role.edit.editor.name": "Редакторлар", // "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.editor.description": "Редакторлар кіріс материалдардың метадеректерін өңдей алады, содан кейін оларды қабылдай немесе қабылдамай алады.", // "comcol-role.edit.finaleditor.name": "Final editors", - // TODO New key - Add a translation - "comcol-role.edit.finaleditor.name": "Final editors", + "comcol-role.edit.finaleditor.name": "Соңғы редакторлар", // "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.finaleditor.description": "Соңғы редакторлар кіріс материалдардың метадеректерін өңдей алады, бірақ оларды қабылдамай алады.", // "comcol-role.edit.reviewer.name": "Reviewers", - // TODO New key - Add a translation - "comcol-role.edit.reviewer.name": "Reviewers", + "comcol-role.edit.reviewer.name": "Рецензенттер", // "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.", + "comcol-role.edit.reviewer.description": "Рецензенттер келіп түскен материалдарды қабылдауы немесе қабылдамауы мүмкін. Алайда, олар жіберу метадеректерін өңдей алмайды.", @@ -1922,16 +1827,13 @@ // "cookies.consent.accept-all": "Accept all", - // TODO New key - Add a translation - "cookies.consent.accept-all": "Accept all", + "cookies.consent.accept-all": "Мен бәрін қабылдаймын", // "cookies.consent.accept-selected": "Accept selected", - // TODO New key - Add a translation - "cookies.consent.accept-selected": "Accept selected", + "cookies.consent.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.description": "Бұл бағдарлама әдепкі бойынша жүктеледі (бірақ сіз одан бас тарта аласыз)", // "cookies.consent.app.opt-out.title": "(opt-out)", "cookies.consent.app.opt-out.title": "(opt-out)", @@ -1958,8 +1860,7 @@ "cookies.consent.content-notice.description": "Біз сіздің жеке ақпаратыңызды келесі мақсаттарда жинаймыз және өңдейміз: Аутентификация, Параметрлері, Растау және Статистикалар.
Көбірек білу үшін, біздің {privacyPolicy} оқуыңызды өтінеміз.", // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: Authentication, Preferences, Acknowledgement and Statistics.", - // TODO New key - Add a translation - "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: Authentication, Preferences, Acknowledgement and Statistics.", + "cookies.consent.content-notice.description.no-privacy": "Біз сіздің жеке мәліметтеріңізді келесі мақсаттар үшін жинаймыз және өңдейміз: Аутентификация, Қалаулар, Растау және статистикасы.", // "cookies.consent.content-notice.learnMore": "Customize", "cookies.consent.content-notice.learnMore": "Баптау", @@ -2067,34 +1968,27 @@ // "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 }}>", - // TODO New key - Add a translation - "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.message": "Құрметті {{ recipientName }}, \nСіздің сұрауыңызға жауап ретінде Мен сізге құжатқа қатысты сіз сұраған файлдардың көшірмесін жіберу мүмкін емес екенін өкінішпен айтамын: \"{{ itemUrl }}\" ({{ itemName }}), оның авторы мен.\n\nІзгі тілектермен,\N{{ authorName }} <{{ authorEmail }}>", // "deny-request-copy.email.subject": "Request copy of document", - // TODO New key - Add a translation - "deny-request-copy.email.subject": "Request copy of document", + "deny-request-copy.email.subject": "Құжаттың көшірмесін сұрау", // "deny-request-copy.error": "An error occurred", - // TODO New key - Add a translation - "deny-request-copy.error": "An error occurred", + "deny-request-copy.error": "Қате кетті", // "deny-request-copy.header": "Deny document copy request", - // TODO New key - Add a translation - "deny-request-copy.header": "Deny document copy request", + "deny-request-copy.header": "Құжатты көшіру сұрауын қабылдамау", // "deny-request-copy.intro": "This message will be sent to the applicant of the request", - // TODO New key - Add a translation - "deny-request-copy.intro": "This message will be sent to the applicant of the request", + "deny-request-copy.intro": "Бұл хабарлама өтініш берушіге жіберіледі", // "deny-request-copy.success": "Successfully denied item request", - // TODO New key - Add a translation - "deny-request-copy.success": "Successfully denied item request", + "deny-request-copy.success": "Бөлікке сұраныс сәтті қабылданбады", // "dso.name.untitled": "Untitled", - // TODO New key - Add a translation - "dso.name.untitled": "Untitled", + "dso.name.untitled": "Атауы жоқ", @@ -2132,8 +2026,7 @@ "dso-selector.edit.item.head": "Элементті өзгерту", // "dso-selector.error.title": "An error occurred searching for a {{ type }}", - // TODO New key - Add a translation - "dso-selector.error.title": "An error occurred searching for a {{ type }}", + "dso-selector.error.title": "{{ type }} іздеу кезінде қате пайда болды", // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", "dso-selector.export-metadata.dspaceobject.head": "Метадеректерді экспорттау", @@ -2145,36 +2038,28 @@ "dso-selector.placeholder": "{{ type }} іздеу", // "dso-selector.select.collection.head": "Select a collection", - // TODO New key - Add a translation - "dso-selector.select.collection.head": "Select a collection", + "dso-selector.select.collection.head": "Жинақты таңдаңыз", // "dso-selector.set-scope.community.head": "Select a search scope", - // TODO New key - Add a translation - "dso-selector.set-scope.community.head": "Select a search scope", + "dso-selector.set-scope.community.head": "Іздеу аймағын таңдаңыз", // "dso-selector.set-scope.community.button": "Search all of DSpace", - // TODO New key - Add a translation - "dso-selector.set-scope.community.button": "Search all of DSpace", + "dso-selector.set-scope.community.button": "DSpace арқылы іздеу", // "dso-selector.set-scope.community.input-header": "Search for a community or collection", - // TODO New key - Add a translation - "dso-selector.set-scope.community.input-header": "Search for a community or collection", + "dso-selector.set-scope.community.input-header": "Қауымдастық немесе коллекция бойынша іздеу", // "dso-selector.claim.item.head": "Profile tips", - // TODO New key - Add a translation - "dso-selector.claim.item.head": "Profile tips", + "dso-selector.claim.item.head": "Профиль бойынша кеңестер", // "dso-selector.claim.item.body": "These are existing profiles that may be related to you. If you recognize yourself in one of these profiles, select it and on the detail page, among the options, choose to claim it. Otherwise you can create a new profile from scratch using the button below.", - // TODO New key - Add a translation - "dso-selector.claim.item.body": "These are existing profiles that may be related to you. If you recognize yourself in one of these profiles, select it and on the detail page, among the options, choose to claim it. Otherwise you can create a new profile from scratch using the button below.", + "dso-selector.claim.item.body": "Бұл сізге байланысты болуы мүмкін профильдер. Егер сіз осы профильдердің бірінде өзіңізді танитын болсаңыз, опциялар арасында оны және ақпарат бетінде таңдаңыз, оны жариялау үшін таңдаңыз. Әйтпесе, төмендегі батырманы пайдаланып нөлден жаңа профиль жасай аласыз.", // "dso-selector.claim.item.not-mine-label": "None of these are mine", - // TODO New key - Add a translation - "dso-selector.claim.item.not-mine-label": "None of these are mine", + "dso-selector.claim.item.not-mine-label": "Олардың ешқайсысы маған тиесілі емес", // "dso-selector.claim.item.create-from-scratch": "Create a new one", - // TODO New key - Add a translation - "dso-selector.claim.item.create-from-scratch": "Create a new one", + "dso-selector.claim.item.create-from-scratch": "Жаңасын жасаңыз", // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", "confirmation-modal.export-metadata.header": "{{ dsoName }} метадеректерін экспорттау", @@ -2201,20 +2086,16 @@ "confirmation-modal.delete-eperson.confirm": "Жою", // "confirmation-modal.delete-profile.header": "Delete Profile", - // TODO New key - Add a translation - "confirmation-modal.delete-profile.header": "Delete Profile", + "confirmation-modal.delete-profile.header": "Профильді өшіру", // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile", - // TODO New key - Add a translation - "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile", + "confirmation-modal.delete-profile.info": "Сіз өзіңіздің профиліңізді жойғыңыз келетініне сенімдісіз", // "confirmation-modal.delete-profile.cancel": "Cancel", - // TODO New key - Add a translation - "confirmation-modal.delete-profile.cancel": "Cancel", + "confirmation-modal.delete-profile.cancel": "Алып тастау", // "confirmation-modal.delete-profile.confirm": "Delete", - // TODO New key - Add a translation - "confirmation-modal.delete-profile.confirm": "Delete", + "confirmation-modal.delete-profile.confirm": "Жою", // "error.bitstream": "Error fetching bitstream", @@ -2254,8 +2135,7 @@ "error.search-results": "Іздеу нәтижелерін алу қатесі", // "error.invalid-search-query": "Search query is not valid. Please check Solr query syntax best practices for further information about this error.", - // TODO New key - Add a translation - "error.invalid-search-query": "Search query is not valid. Please check Solr query syntax best practices for further information about this error.", + "error.invalid-search-query": "Іздеу сұранысы жарамсыз. Solr query syntax осы қате туралы қосымша ақпарат алу үшін нұсқаулықпен танысыңыз.", // "error.sub-collections": "Error fetching sub-collections", "error.sub-collections":"Ішкі жинақтарды алу қатесі", @@ -2279,25 +2159,20 @@ "error.validation.filerequired": "Файлды жүктеп салу міндетті", // "error.validation.required": "This field is required", - // TODO New key - Add a translation - "error.validation.required": "This field is required", + "error.validation.required": "Бұл өріс міндетті болып табылады", // "error.validation.NotValidEmail": "This E-mail is not a valid email", - // TODO New key - Add a translation - "error.validation.NotValidEmail": "This E-mail is not a valid email", + "error.validation.NotValidEmail": "Бұл электрондық пошта жарамды емес", // "error.validation.emailTaken": "This E-mail is already taken", - // TODO New key - Add a translation - "error.validation.emailTaken": "This E-mail is already taken", + "error.validation.emailTaken": "Бұл электрондық пошта қазірдің өзінде жіберілді", // "error.validation.groupExists": "This group already exists", - // TODO New key - Add a translation - "error.validation.groupExists": "This group already exists", + "error.validation.groupExists": "Бұл топ қазірдің өзінде бар", // "feed.description": "Syndication feed", - // TODO New key - Add a translation - "feed.description": "Syndication feed", + "feed.description": "Синдикация арнасы", // "file-section.error.header": "Error obtaining files for this item", @@ -2324,8 +2199,7 @@ "footer.link.end-user-agreement":"Соңғы пайдаланушы келісімі", // "footer.link.feedback":"Send Feedback", - // TODO New key - Add a translation - "footer.link.feedback":"Send Feedback", + "footer.link.feedback":"Пікір жіберу", @@ -2333,8 +2207,7 @@ "forgot-email.form.header": "Парольді Ұмыттыңыз Ба", // "forgot-email.form.info": "Enter the email address associated with the account.", - // TODO Source message changed - Revise the translation - "forgot-email.form.info": "Электрондық пошта жаңартуларына арналған жинақтарға жазылу және DSpace қызметіне жаңа элементтерді жіберу үшін тіркелгіні тіркеңіз.", + "forgot-email.form.info": "Тіркелгіге қатысты электрондық пошта мекенжайын енгізіңіз.", // "forgot-email.form.email": "Email Address *", "forgot-email.form.email": "Электрондық пошта *", @@ -2346,27 +2219,22 @@ "forgot-email.form.email.error.pattern": "Жарамды электрондық пошта мекенжайын толтырыңыз", // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.", - // TODO Source message changed - Revise the translation "forgot-email.form.email.hint": "Бұл мекенжай тексеріледі және сіздің логин атыңыз ретінде пайдаланылады.", // "forgot-email.form.submit": "Reset password", - // TODO Source message changed - Revise the translation "forgot-email.form.submit": "Жіберу", // "forgot-email.form.success.head": "Password reset email sent", - // TODO Source message changed - Revise the translation "forgot-email.form.success.head": "Растау электрондық поштасы жіберілді", // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", "forgot-email.form.success.content": "Арнайы URL мекенжайы және қосымша нұсқаулары бар электрондық пошта {{ email }} мекенжайына жіберілді.", // "forgot-email.form.error.head": "Error when trying to reset password", - // TODO Source message changed - Revise the translation "forgot-email.form.error.head": "Электрондық поштаны тіркеу кезіндегі қате", // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}", - // TODO New key - Add a translation - "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}", + "forgot-email.form.error.content": "Келесі электрондық пошта мекенжайына байланысты есептік жазбаның құпия сөзін қалпына келтіру кезінде қате пайда болды: {{ email }}", @@ -2503,177 +2371,135 @@ "form.submit": "Жіберу", // "form.repeatable.sort.tip": "Drop the item in the new position", - // TODO New key - Add a translation - "form.repeatable.sort.tip": "Drop the item in the new position", + "form.repeatable.sort.tip": "Элементті жаңа орынға қойыңыз", // "grant-deny-request-copy.deny": "Don't send copy", - // TODO New key - Add a translation - "grant-deny-request-copy.deny": "Don't send copy", + "grant-deny-request-copy.deny": "Көшірмесін жібермеңіз", // "grant-deny-request-copy.email.back": "Back", - // TODO New key - Add a translation - "grant-deny-request-copy.email.back": "Back", + "grant-deny-request-copy.email.back": "Артқа", // "grant-deny-request-copy.email.message": "Message", - // TODO New key - Add a translation - "grant-deny-request-copy.email.message": "Message", + "grant-deny-request-copy.email.message": "Хабарлар", // "grant-deny-request-copy.email.message.empty": "Please enter a message", - // TODO New key - Add a translation - "grant-deny-request-copy.email.message.empty": "Please enter a message", + "grant-deny-request-copy.email.message.empty": "Хабарламаны енгізіңіз", // "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.", - // TODO New key - Add a translation - "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.info": "Сіз бұл сұрауларға жауап бермеу үшін құжатқа кіру шектеулерін қайта қарау үшін осы мүмкіндікті пайдалана аласыз. Егер сіз репозиторий әкімшілерінен осы шектеулерді алып тастауды сұрағыңыз келсе, төмендегі құсбелгіні қойыңыз.", // "grant-deny-request-copy.email.permissions.label": "Change to open access", - // TODO New key - Add a translation - "grant-deny-request-copy.email.permissions.label": "Change to open access", + "grant-deny-request-copy.email.permissions.label": "Ашық қол жетімділікке ауысу", // "grant-deny-request-copy.email.send": "Send", - // TODO New key - Add a translation - "grant-deny-request-copy.email.send": "Send", + "grant-deny-request-copy.email.send": "Жіберу", // "grant-deny-request-copy.email.subject": "Subject", - // TODO New key - Add a translation - "grant-deny-request-copy.email.subject": "Subject", + "grant-deny-request-copy.email.subject": "Тақырыбы", // "grant-deny-request-copy.email.subject.empty": "Please enter a subject", - // TODO New key - Add a translation - "grant-deny-request-copy.email.subject.empty": "Please enter a subject", + "grant-deny-request-copy.email.subject.empty": "Тақырыпты енгізіңіз", // "grant-deny-request-copy.grant": "Send copy", - // TODO New key - Add a translation - "grant-deny-request-copy.grant": "Send copy", + "grant-deny-request-copy.grant": "Көшірмесін жіберу", // "grant-deny-request-copy.header": "Document copy request", - // TODO New key - Add a translation - "grant-deny-request-copy.header": "Document copy request", + "grant-deny-request-copy.header": "Құжатты көшіруге сұрау салу", // "grant-deny-request-copy.home-page": "Take me to the home page", - // TODO New key - Add a translation - "grant-deny-request-copy.home-page": "Take me to the home page", + "grant-deny-request-copy.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.", - // TODO New key - Add a translation - "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.intro1": "Егер Сіз {{ name }} құжат авторларының бірі болсаңыз, пайдаланушының сұрауына жауап беру үшін төмендегі нұсқалардың бірін қолданыңыз.", // "grant-deny-request-copy.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.", - // TODO New key - Add a translation - "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.intro2": "Опцияны таңдағаннан кейін Сізге электрондық пошта арқылы ұсынылған жауап ұсынылады, оны өңдеуге болады.", // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.", - // TODO New key - Add a translation - "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-deny-request-copy.processed": "Бұл сұрау қазірдің өзінде өңделді. Басты бетке оралу үшін төмендегі батырманы пайдалануға болады.", // "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 }}>", - // TODO New key - Add a translation - "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.message": "Құрметті {{ recipientName }},\nСіздің сұрауыңызға жауап ретінде Мен сізге құжатқа қатысты файлдың көшірмесін тіркемеде жібергеніме қуаныштымын: \"{{ itemUrl }}\" ({{ itemName }}), оның авторы мен.\n\nІзгі тілектермен,\N{{ authorName }} <{{ authorEmail }}>", // "grant-request-copy.email.subject": "Request copy of document", - // TODO New key - Add a translation - "grant-request-copy.email.subject": "Request copy of document", + "grant-request-copy.email.subject": "Құжаттың көшірмесін сұрау", // "grant-request-copy.error": "An error occurred", - // TODO New key - Add a translation - "grant-request-copy.error": "An error occurred", + "grant-request-copy.error": "Қате кетті", // "grant-request-copy.header": "Grant document copy request", - // TODO New key - Add a translation - "grant-request-copy.header": "Grant document copy request", + "grant-request-copy.header": "Құжаттың көшірмесін ұсынуға сұрау салу", // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.", - // TODO New key - Add a translation - "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.", + "grant-request-copy.intro": "Бұл хабарлама өтініш берушіге жіберіледі. Сұралған құжат(тар) қоса беріледі.", // "grant-request-copy.success": "Successfully granted item request", - // TODO New key - Add a translation - "grant-request-copy.success": "Successfully granted item request", + "grant-request-copy.success": "Өнімге сәтті сұраныс", // "health.breadcrumbs": "Health", - // TODO New key - Add a translation - "health.breadcrumbs": "Health", + "health.breadcrumbs": "Күйі", // "health-page.heading" : "Health", - // TODO New key - Add a translation - "health-page.heading" : "Health", + "health-page.heading" : "Күйі", // "health-page.info-tab" : "Info", - // TODO New key - Add a translation - "health-page.info-tab" : "Info", + "health-page.info-tab" : "Ақпарат", // "health-page.status-tab" : "Status", - // TODO New key - Add a translation - "health-page.status-tab" : "Status", + "health-page.status-tab" : "Мәртебесі", // "health-page.error.msg": "The health check service is temporarily unavailable", - // TODO New key - Add a translation - "health-page.error.msg": "The health check service is temporarily unavailable", + "health-page.error.msg": "Тексеру қызметі уақытша қол жетімді емес", // "health-page.property.status": "Status code", - // TODO New key - Add a translation - "health-page.property.status": "Status code", + "health-page.property.status": "Күй коды", // "health-page.section.db.title": "Database", - // TODO New key - Add a translation - "health-page.section.db.title": "Database", + "health-page.section.db.title": "Дереккөз", // "health-page.section.geoIp.title": "GeoIp", - // TODO New key - Add a translation "health-page.section.geoIp.title": "GeoIp", // "health-page.section.solrAuthorityCore.title": "Sor: authority core", - // TODO New key - Add a translation - "health-page.section.solrAuthorityCore.title": "Sor: authority core", + "health-page.section.solrAuthorityCore.title": "Sor: биліктің өзегі", // "health-page.section.solrOaiCore.title": "Sor: oai core", - // TODO New key - Add a translation - "health-page.section.solrOaiCore.title": "Sor: oai core", + "health-page.section.solrOaiCore.title": "Sor: oai өзегі", // "health-page.section.solrSearchCore.title": "Sor: search core", - // TODO New key - Add a translation - "health-page.section.solrSearchCore.title": "Sor: search core", + "health-page.section.solrSearchCore.title": "Sor: іздеу өзегі", // "health-page.section.solrStatisticsCore.title": "Sor: statistics core", - // TODO New key - Add a translation - "health-page.section.solrStatisticsCore.title": "Sor: statistics core", + "health-page.section.solrStatisticsCore.title": "Sor: статистиканың өзегі", // "health-page.section-info.app.title": "Application Backend", - // TODO New key - Add a translation - "health-page.section-info.app.title": "Application Backend", + "health-page.section-info.app.title": "Қосымшаның серверлік бөлігі", // "health-page.section-info.java.title": "Java", - // TODO New key - Add a translation "health-page.section-info.java.title": "Java", // "health-page.status": "Status", - // TODO New key - Add a translation - "health-page.status": "Status", + "health-page.status": "Күйі мәртебесі", // "health-page.status.ok.info": "Operational", - // TODO New key - Add a translation - "health-page.status.ok.info": "Operational", + "health-page.status.ok.info": "Жақсы күйде", // "health-page.status.error.info": "Problems detected", - // TODO New key - Add a translation - "health-page.status.error.info": "Problems detected", + "health-page.status.error.info": "Анықталған мәселелер", // "health-page.status.warning.info": "Possible issues detected", - // TODO New key - Add a translation - "health-page.status.warning.info": "Possible issues detected", + "health-page.status.warning.info": "Анықталған мүмкін проблемалар", // "health-page.title": "Health", - // TODO New key - Add a translation - "health-page.title": "Health", + "health-page.title": "Күйі", // "health-page.section.no-issues": "No issues detected", - // TODO New key - Add a translation - "health-page.section.no-issues": "No issues detected", + "health-page.section.no-issues": "Ешқандай проблема табылған жоқ", // "home.description": "", @@ -2683,11 +2509,9 @@ "home.breadcrumbs": "Басты", // "home.search-form.placeholder": "Search the repository ...", - // TODO New key - Add a translation - "home.search-form.placeholder": "Search the repository ...", + "home.search-form.placeholder": "Репозиторидең іздеу ...", // "home.title": "Home", - // TODO Source message changed - Revise the translation "home.title": "Басты", // "home.top-level-communities.head": "Communities in DSpace", @@ -2732,56 +2556,43 @@ "info.privacy.title": "Құпиялылық туралы мәлімдеме", // "info.feedback.breadcrumbs": "Feedback", - // TODO New key - Add a translation - "info.feedback.breadcrumbs": "Feedback", + "info.feedback.breadcrumbs": "Кері байланыс", // "info.feedback.head": "Feedback", - // TODO New key - Add a translation - "info.feedback.head": "Feedback", + "info.feedback.head": "Кері байланыс", // "info.feedback.title": "Feedback", - // TODO New key - Add a translation - "info.feedback.title": "Feedback", + "info.feedback.title": "Кері байланыс", // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!", - // TODO New key - Add a translation - "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!", + "info.feedback.info": "DSpace жүйесі туралы пікіріңізді бөліскеніңіз үшін рахмет. Біз сіздің пікірлеріңізді бағалаймыз!", // "info.feedback.email_help": "This address will be used to follow up on your feedback.", - // TODO New key - Add a translation - "info.feedback.email_help": "This address will be used to follow up on your feedback.", + "info.feedback.email_help": "Бұл мекен-жай сіздің пікірлеріңізді бақылау үшін қолданылады.", // "info.feedback.send": "Send Feedback", - // TODO New key - Add a translation - "info.feedback.send": "Send Feedback", + "info.feedback.send": "Пікір жіберу", // "info.feedback.comments": "Comments", - // TODO New key - Add a translation - "info.feedback.comments": "Comments", + "info.feedback.comments": "Түсініктеме", // "info.feedback.email-label": "Your Email", - // TODO New key - Add a translation - "info.feedback.email-label": "Your Email", + "info.feedback.email-label": "Сіздің пошта", // "info.feedback.create.success" : "Feedback Sent Successfully!", - // TODO New key - Add a translation - "info.feedback.create.success" : "Feedback Sent Successfully!", + "info.feedback.create.success" : "Кері Байланыс Сәтті Жіберілді!", // "info.feedback.error.email.required" : "A valid email address is required", - // TODO New key - Add a translation - "info.feedback.error.email.required" : "A valid email address is required", + "info.feedback.error.email.required" : "Жарамды электрондық пошта мекенжайы қажет", // "info.feedback.error.message.required" : "A comment is required", - // TODO New key - Add a translation - "info.feedback.error.message.required" : "A comment is required", + "info.feedback.error.message.required" : "Түсініктеме қажет", // "info.feedback.page-label" : "Page", - // TODO New key - Add a translation - "info.feedback.page-label" : "Page", + "info.feedback.page-label" : "Бет", // "info.feedback.page_help" : "Tha page related to your feedback", - // TODO New key - Add a translation - "info.feedback.page_help" : "Tha page related to your feedback", + "info.feedback.page_help" : "Сіздің пікіріңізге байланысты бет", @@ -2964,8 +2775,7 @@ "item.edit.breadcrumbs": "Элементті өңдеу", // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab", - // TODO New key - Add a translation - "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab", + "item.edit.tabs.disabled.tooltip": "Бұл қойындыға кіру үшін рұқсат етілмеген", // "item.edit.tabs.mapper.head": "Collection Mapper", @@ -3114,16 +2924,13 @@ // "item.edit.move.cancel": "Back", - // TODO Source message changed - Revise the translation - "item.edit.move.cancel": "Cancel", + "item.edit.move.cancel": "Артқа", // "item.edit.move.save-button": "Save", - // TODO New key - Add a translation - "item.edit.move.save-button": "Save", + "item.edit.move.save-button": "Сақтау", // "item.edit.move.discard-button": "Discard", - // TODO New key - Add a translation - "item.edit.move.discard-button": "Discard", + "item.edit.move.discard-button": "Тастау", // "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": "Осы элементті жылжытқыңыз келетін коллекцияны таңдаңыз. Көрсетілген жинақтардың тізімін тарылту үшін өріске іздеу сұрауын енгізуге болады.", @@ -3161,23 +2968,18 @@ "item.edit.private.cancel":"Болдырмау", // "item.edit.private.confirm": "Make it non-discoverable", - // TODO Source message changed - Revise the translation "item.edit.private.confirm": "Мұны жеке жаса", // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?", - // TODO Source message changed - Revise the translation "item.edit.private.description": "Сіз бұл затты мұрағатта жабу керек екеніне сенімдісіз бе?", // "item.edit.private.error": "An error occurred while making the item non-discoverable", - // TODO Source message changed - Revise the translation "item.edit.private.error": "Элементті жабу кезінде қате пайда болды", // "item.edit.private.header": "Make item non-discoverable: {{ id }}", - // TODO New key - Add a translation - "item.edit.private.header": "Make item non-discoverable: {{ id }}", + "item.edit.private.header": "Элементті табу мүмкін емес: {{ id }}", // "item.edit.private.success": "The item is now non-discoverable", - // TODO Source message changed - Revise the translation "item.edit.private.success": "Тауар қазір жеке", @@ -3186,23 +2988,18 @@ "item.edit.public.cancel": "Болдырмау", // "item.edit.public.confirm": "Make it discoverable", - // TODO Source message changed - Revise the translation "item.edit.public.confirm": "Мұны көпшілікке жария ету", // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?", - // TODO Source message changed - Revise the translation "item.edit.public.description": "Сіз бұл материалды мұрағатта жариялау керек екеніне сенімдісіз бе?", // "item.edit.public.error": "An error occurred while making the item discoverable", - // TODO Source message changed - Revise the translation "item.edit.public.error": "Элементті жариялау кезінде қате пайда болды", // "item.edit.public.header": "Make item discoverable: {{ id }}", - // TODO New key - Add a translation - "item.edit.public.header": "Make item discoverable: {{ id }}", + "item.edit.public.header": "Элементті анықтауға қол жетімді етіңіз: {{ id }}", // "item.edit.public.success": "The item is now discoverable", - // TODO Source message changed - Revise the translation "item.edit.public.success": "Тауар қазір көпшілікке қол жетімді", @@ -3214,7 +3011,6 @@ "item.edit.reinstate.confirm": "Қалпына келтіру", // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?", - // TODO Source message changed - Revise the translation "item.edit.reinstate.description": "Сіз бұл элементті мұрағатта қалпына келтіру керек екеніне сенімдісіз бе?", // "item.edit.reinstate.error": "An error occurred while reinstating the item", @@ -3275,8 +3071,7 @@ // "item.edit.return": "Back", - // TODO New key - Add a translation - "item.edit.return": "Back", + "item.edit.return": "Артқа", // "item.edit.tabs.bitstreams.head": "Bitstreams", @@ -3328,19 +3123,15 @@ "item.edit.tabs.status.buttons.move.label": "Элементті басқа жинаққа жылжытыңыз", // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...", - // TODO Source message changed - Revise the translation "item.edit.tabs.status.buttons.private.button": "Мұны жеке етіңіз...", // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable", - // TODO Source message changed - Revise the translation "item.edit.tabs.status.buttons.private.label": "Затты жеке ету", // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...", - // TODO Source message changed - Revise the translation "item.edit.tabs.status.buttons.public.button": "Мұны көпшілікке жария етіңіз...", // "item.edit.tabs.status.buttons.public.label": "Make item discoverable", - // TODO Source message changed - Revise the translation "item.edit.tabs.status.buttons.public.label": "Өнімді жалпыға қол жетімді ету", // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", @@ -3416,8 +3207,7 @@ "item.edit.withdraw.success": "Тауар сәтті алынды", // "item.orcid.return": "Back", - // TODO New key - Add a translation - "item.orcid.return": "Back", + "item.orcid.return": "Артқа", // "item.listelement.badge": "Item", @@ -3445,16 +3235,13 @@ "item.search.results.head": "Өнімді іздеу нәтижелері", // "item.search.title": "Item Search", - // TODO Source message changed - Revise the translation - "item.search.title": "DSpace Angular :: элементтерді іздеу", + "item.search.title": "Элементтерді іздеу", // "item.truncatable-part.show-more": "Show more", - // TODO New key - Add a translation - "item.truncatable-part.show-more": "Show more", + "item.truncatable-part.show-more": "Толығырақ көрсету", // "item.truncatable-part.show-less": "Collapse", - // TODO New key - Add a translation - "item.truncatable-part.show-less": "Collapse", + "item.truncatable-part.show-less": "Жинақтау", @@ -3471,12 +3258,10 @@ "item.page.collections": "Жинақтар", // "item.page.collections.loading": "Loading...", - // TODO New key - Add a translation - "item.page.collections.loading": "Loading...", + "item.page.collections.loading": "Жүктелуде...", // "item.page.collections.load-more": "Load more", - // TODO New key - Add a translation - "item.page.collections.load-more": "Load more", + "item.page.collections.load-more": "Толығырақ жүктеу", // "item.page.date": "Date", "item.page.date": "Кездесуге", @@ -3512,12 +3297,10 @@ "item.page.link.simple": "Тауардың қарапайым беті", // "item.page.orcid.title": "ORCID", - // TODO New key - Add a translation "item.page.orcid.title": "ORCID", // "item.page.orcid.tooltip": "Open ORCID setting page", - // TODO New key - Add a translation - "item.page.orcid.tooltip": "Open ORCID setting page", + "item.page.orcid.tooltip": "ORCID параметрлері бетін ашыңыз", // "item.page.person.search.title": "Articles by this author", "item.page.person.search.title": "Осы автордың мақалалары", @@ -3559,24 +3342,19 @@ "item.page.filesection.license.bundle" : "Лицензиялық пакет", // "item.page.return": "Back", - // TODO New key - Add a translation - "item.page.return": "Back", + "item.page.return": "Артқа", // "item.page.version.create": "Create new version", - // TODO New key - Add a translation - "item.page.version.create": "Create new version", + "item.page.version.create": "Жаңа нұсқасын жасау", // "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", - // TODO New key - Add a translation - "item.page.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.page.version.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар", // "item.page.claim.button": "Claim", - // TODO New key - Add a translation - "item.page.claim.button": "Claim", + "item.page.claim.button": "Талабы", // "item.page.claim.tooltip": "Claim this item as profile", - // TODO New key - Add a translation - "item.page.claim.tooltip": "Claim this item as profile", + "item.page.claim.tooltip": "Бұл элементті профиль ретінде көрсетіңіз", // "item.preview.dc.identifier.uri": "Identifier:", "item.preview.dc.identifier.uri": "Идентификатор:", @@ -3603,35 +3381,27 @@ "item.preview.dc.title": "Атауы:", // "item.preview.dc.type": "Type:", - // TODO New key - Add a translation - "item.preview.dc.type": "Type:", + "item.preview.dc.type": "Типі:", // "item.preview.oaire.citation.issue" : "Issue", - // TODO New key - Add a translation - "item.preview.oaire.citation.issue" : "Issue", + "item.preview.oaire.citation.issue" : "Шығарылымы", // "item.preview.oaire.citation.volume" : "Volume", - // TODO New key - Add a translation - "item.preview.oaire.citation.volume" : "Volume", + "item.preview.oaire.citation.volume" : "Көлемі", // "item.preview.dc.relation.issn" : "ISSN", - // TODO New key - Add a translation "item.preview.dc.relation.issn" : "ISSN", // "item.preview.dc.identifier.isbn" : "ISBN", - // TODO New key - Add a translation "item.preview.dc.identifier.isbn" : "ISBN", // "item.preview.dc.identifier": "Identifier:", - // TODO New key - Add a translation - "item.preview.dc.identifier": "Identifier:", + "item.preview.dc.identifier": "Идентификатор:", // "item.preview.dc.relation.ispartof" : "Journal or Serie", - // TODO New key - Add a translation - "item.preview.dc.relation.ispartof" : "Journal or Serie", + "item.preview.dc.relation.ispartof" : "Журнал немесе серия", // "item.preview.dc.identifier.doi" : "DOI", - // TODO New key - Add a translation "item.preview.dc.identifier.doi" : "DOI", // "item.preview.person.familyName": "Surname:", @@ -3644,28 +3414,22 @@ "item.preview.person.identifier.orcid": "ORCID:", // "item.preview.project.funder.name": "Funder:", - // TODO New key - Add a translation - "item.preview.project.funder.name": "Funder:", + "item.preview.project.funder.name": "Демеуші:", // "item.preview.project.funder.identifier": "Funder Identifier:", - // TODO New key - Add a translation - "item.preview.project.funder.identifier": "Funder Identifier:", + "item.preview.project.funder.identifier": "Демеуші идентификаторы:", // "item.preview.oaire.awardNumber": "Funding ID:", - // TODO New key - Add a translation - "item.preview.oaire.awardNumber": "Funding ID:", + "item.preview.oaire.awardNumber": "Қаржыландыру сәйкестендіргіші:", // "item.preview.dc.title.alternative": "Acronym:", - // TODO New key - Add a translation - "item.preview.dc.title.alternative": "Acronym:", + "item.preview.dc.title.alternative": "Акроним:", // "item.preview.dc.coverage.spatial": "Jurisdiction:", - // TODO New key - Add a translation - "item.preview.dc.coverage.spatial": "Jurisdiction:", + "item.preview.dc.coverage.spatial": "Юрисдикция:", // "item.preview.oaire.fundingStream": "Funding Stream:", - // TODO New key - Add a translation - "item.preview.oaire.fundingStream": "Funding Stream:", + "item.preview.oaire.fundingStream": "Қаржыландыру ағыны:", @@ -3699,8 +3463,7 @@ "item.version.history.selected": "Таңдалған нұсқа", // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.", - // TODO New key - Add a translation - "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.", + "item.version.history.selected.alert": "Осы кезде сіз элементтің {{version}} нұсқасын қарап шығасыз.", // "item.version.history.table.version": "Version", "item.version.history.table.version": "Нұсқа", @@ -3718,44 +3481,34 @@ "item.version.history.table.summary": "Қысқаша мазмұны", // "item.version.history.table.workspaceItem": "Workspace item", - // TODO New key - Add a translation - "item.version.history.table.workspaceItem": "Workspace item", + "item.version.history.table.workspaceItem": "Жұмыс аймағының элементі", // "item.version.history.table.workflowItem": "Workflow item", - // TODO New key - Add a translation - "item.version.history.table.workflowItem": "Workflow item", + "item.version.history.table.workflowItem": "Жұмыс процесінің элементі", // "item.version.history.table.actions": "Action", - // TODO New key - Add a translation - "item.version.history.table.actions": "Action", + "item.version.history.table.actions": "Әрекет", // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item", - // TODO New key - Add a translation - "item.version.history.table.action.editWorkspaceItem": "Edit workspace item", + "item.version.history.table.action.editWorkspaceItem": "Жұмыс аймағының элементін өңдеу", // "item.version.history.table.action.editSummary": "Edit summary", - // TODO New key - Add a translation - "item.version.history.table.action.editSummary": "Edit summary", + "item.version.history.table.action.editSummary": "Қорытындыны өзгерту", // "item.version.history.table.action.saveSummary": "Save summary edits", - // TODO New key - Add a translation - "item.version.history.table.action.saveSummary": "Save summary edits", + "item.version.history.table.action.saveSummary": "Қорытынды түзетулерді сақтау", // "item.version.history.table.action.discardSummary": "Discard summary edits", - // TODO New key - Add a translation - "item.version.history.table.action.discardSummary": "Discard summary edits", + "item.version.history.table.action.discardSummary": "Қорытынды түзетулерді болдырмау", // "item.version.history.table.action.newVersion": "Create new version from this one", - // TODO New key - Add a translation - "item.version.history.table.action.newVersion": "Create new version from this one", + "item.version.history.table.action.newVersion": "Осыдан жаңа нұсқа жасаңыз", // "item.version.history.table.action.deleteVersion": "Delete version", - // TODO New key - Add a translation - "item.version.history.table.action.deleteVersion": "Delete version", + "item.version.history.table.action.deleteVersion": "Нұсқаны өшіру", // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", - // TODO New key - Add a translation - "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.history.table.action.hasDraft": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған бағынымдар бар", // "item.version.notice": "This is not the latest version of this item. The latest version can be found here.", From 9aca40cc33a3761a24f501d623ba9a814492b5f1 Mon Sep 17 00:00:00 2001 From: myrza1 Date: Mon, 26 Sep 2022 02:23:48 +0600 Subject: [PATCH 031/758] Update kk.json5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit submission.import-external.preview.title.Project төменнен жоғары тоқтадым --- src/assets/i18n/kk.json5 | 744 +++++++++++++-------------------------- 1 file changed, 254 insertions(+), 490 deletions(-) diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index b78df8ac5e5..84d3ba907de 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -2597,7 +2597,6 @@ // "item.alerts.private": "This item is non-discoverable", - // TODO Source message changed - Revise the translation "item.alerts.private": "Бұл элемент жеке", // "item.alerts.withdrawn": "This item has been withdrawn", @@ -4361,7 +4360,7 @@ "person.page.email": "Электрондық мекенжайы", // "person.page.firstname": "First Name", - "person.page.firstname":"Имя", + "person.page.firstname":"Аты", // "person.page.jobtitle": "Job Title", "person.page.jobtitle": "Жұмыс атауы", @@ -4370,8 +4369,7 @@ "person.page.lastname": "Фамилия", // "person.page.name": "Name", - // TODO New key - Add a translation - "person.page.name": "Name", + "person.page.name": "Аты", // "person.page.link.full": "Show all metadata", "person.page.link.full": "Барлық метамәліметті көрсету", @@ -4383,18 +4381,16 @@ "person.page.staffid": "Қызметкерлердің жеке куәлігі", // "person.page.titleprefix": "Person: ", - "person.page.titleprefix":"Адам: ", + "person.page.titleprefix": "Адам: ", // "person.search.results.head": "Person Search Results", "person.search.results.head": "Тұлға іздеу нәтижелері", // "person-relationships.search.results.head": "Person Search Results", - // TODO New key - Add a translation - "person-relationships.search.results.head": "Person Search Results", + "person-relationships.search.results.head": "Тұлға іздеу нәтижелері", // "person.search.title": "Person Search", - // TODO Source message changed - Revise the translation - "person.search.title": "DSpace Angular :: Адамды іздеу", + "person.search.title": "Адамды іздеу", @@ -4731,8 +4727,7 @@ "project.search.results.head": "Жобаны іздеу нәтижелері", // "project-relationships.search.results.head": "Project Search Results", - // TODO New key - Add a translation - "project-relationships.search.results.head": "Project Search Results", + "project-relationships.search.results.head": "Жобаны іздеу нәтижелері", @@ -4764,12 +4759,10 @@ "publication.search.results.head": "Жарияланымдарды іздеу нәтижелері", // "publication-relationships.search.results.head": "Publication Search Results", - // TODO New key - Add a translation - "publication-relationships.search.results.head": "Publication Search Results", + "publication-relationships.search.results.head": "Жарияланымды іздеу нәтижелері", // "publication.search.title": "Publication Search", - // TODO Source message changed - Revise the translation - "publication.search.title": "DSpace Angular :: Жарияланымдарды іздеу", + "publication.search.title": "Жарияланымдарды іздеу", // "media-viewer.next": "Next", @@ -5150,15 +5143,13 @@ "search.switch-configuration.title": "Көрсету", // "search.title": "Search", - // TODO Source message changed - Revise the translation - "search.title": "DSpace Angular :: Іздеу", + "search.title": "Іздеу", // "search.breadcrumbs": "Search", "search.breadcrumbs": "Іздеу", // "search.search-form.placeholder": "Search the repository ...", - // TODO New key - Add a translation - "search.search-form.placeholder": "Search the repository ...", + "search.search-form.placeholder": " Репозиторидең іздеу ...", // "search.filters.applied.f.author": "Author", @@ -5260,8 +5251,7 @@ "search.filters.filter.creativeWorkKeywords.placeholder": "Тақырыбы", // "search.filters.filter.creativeWorkKeywords.label": "Search subject", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkKeywords.label": "Search subject", + "search.filters.filter.creativeWorkKeywords.label": "Іздеу тақырыбы", // "search.filters.filter.creativeWorkPublisher.head": "Publisher", "search.filters.filter.creativeWorkPublisher.head": "Баспагер", @@ -5303,7 +5293,6 @@ "search.filters.filter.dateSubmitted.label": "Search date submitted", // "search.filters.filter.discoverable.head": "Non-discoverable", - // TODO Source message changed - Revise the translation "search.filters.filter.discoverable.head": "Жеке", // "search.filters.filter.withdrawn.head": "Withdrawn", @@ -5479,8 +5468,7 @@ "search.filters.reset": "Сүзгілерді қалпына келтіру", // "search.filters.search.submit": "Submit", - // TODO New key - Add a translation - "search.filters.search.submit": "Submit", + "search.filters.search.submit": "Орындау", @@ -5488,12 +5476,10 @@ "search.form.search":"Іздеу", // "search.form.search_dspace": "All repository", - // TODO Source message changed - Revise the translation - "search.form.search_dspace": "Іздеу кеңістігі", + "search.form.search_dspace": "Бүкіл репозиторий", // "search.form.scope.all": "All of DSpace", - // TODO New key - Add a translation - "search.form.scope.all": "All of DSpace", + "search.form.scope.all": "Бүкіл DSpace", @@ -5836,8 +5822,7 @@ "submission.import-external.preview.title.Person": "Person Preview", // "submission.import-external.preview.title.Project": "Project Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title.Project": "Project Preview", + "submission.import-external.preview.title.Project": "Жобаны алдын ала қарау", // "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": "Төмендегі метадеректер сыртқы көзден импортталды. Сіз жіберуді бастаған кезде ол алдын-ала толтырылады.", @@ -5870,60 +5855,46 @@ "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Журналдың қашықтағы томын импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Жоба", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Қашықтағы элементті импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Қашықтағы оқиғаны импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Қашықтағы өнімді импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Қашықтағы жабдықты импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Қашықтағы ұйымдастыру бөлімшесінің импорты", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Қашықтағы қорды импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Қашықтағы пайдаланушыны импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Патентті қашықтан импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Қашықтағы жобаны импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Қашықтағы жарияланымды импорттау", // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!", - // TODO New key - Add a translation - "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": "Жаңа Нысан Қосылды!", // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Жоба", // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API", - // TODO New key - Add a translation - "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": "Демеуші OpenAIRE API", // "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": "Қашықтағы авторды импорттау", @@ -6019,8 +5990,7 @@ "submission.sections.describe.relationship-lookup.search-tab.search": "Бару", // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...", + "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Іздеу...", // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all", "submission.sections.describe.relationship-lookup.search-tab.select-all": "Барлығын таңдау", @@ -6036,6 +6006,7 @@ // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})", "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Жергілікті журналдар ({{ count }})", + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})", "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Жергілікті жобалар ({{ count }})", @@ -6059,11 +6030,13 @@ // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})", "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Жергілікті журнал мәселелері ({{ 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": "Жергілікті журнал мәселелері ({{ 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": "Жергілікті журнал томдары ({{ 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": "Жергілікті журнал томдары ({{ count }})", @@ -6071,7 +6044,7 @@ "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal":"Sherpa журналдары ({{ count }})", // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})", - "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "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 }})", @@ -6095,50 +6068,44 @@ "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Ұйымдастырушылық бірліктерді іздеу", // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Демеуші OpenAIRE API", // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Жобалар", // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Жоба демеушісі", // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API", + "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Демеуші OpenAIRE API", // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project", + "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Жоба", // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects", + "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Жобалар", // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project", + "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Жоба демеушісі", // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...", + "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Іздеу...", // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})", "submission.sections.describe.relationship-lookup.selection-tab.tab-title":"Ағымдағы таңдау ({{ count }})", // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues", "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Журналдың шығарылымдары", + // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues", "submission.sections.describe.relationship-lookup.title.JournalIssue":"Журналдың шығарылымдары", // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes", "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication":"Журнал томдары", + // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes", "submission.sections.describe.relationship-lookup.title.JournalVolume": "Журнал томдары", @@ -6150,6 +6117,7 @@ // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency", "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Қаржыландыру агенттігі", + // "submission.sections.describe.relationship-lookup.title.Project": "Projects", "submission.sections.describe.relationship-lookup.title.Project": "Жобалар", @@ -6194,6 +6162,7 @@ // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume", "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Журналдың таңдалған көлемі", + // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects", "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Таңдаулы жобалар", @@ -6217,6 +6186,7 @@ // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue", "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Таңдалған сұрақ", + // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume", "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume":"Журналдың таңдалған көлемі", @@ -6225,6 +6195,7 @@ // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding", "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Таңдалған қаржыландыру", + // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue", "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Таңдалған шығарылым", @@ -6304,8 +6275,7 @@ "submission.sections.general.add-more": "Тағы қосу", // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.
Please fill out all required fields to complete the deposit.", - // TODO New key - Add a translation - "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.
Please fill out all required fields to complete the deposit.", + "submission.sections.general.cannot_deposit": "Пішіндегі қателіктерге байланысты Депозит аяқталуы мүмкін емес.
Депозитті аяқтау үшін барлық қажетті өрістерді толтырыңыз.", // "submission.sections.general.collection": "Collection", "submission.sections.general.collection": "Жинақ", @@ -6373,67 +6343,53 @@ "submission.sections.submit.progressbar.license": "Депозиттік лицензия", // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies", + "submission.sections.submit.progressbar.sherpapolicy": "Sherpa саясаттары", // "submission.sections.submit.progressbar.upload": "Upload files", "submission.sections.submit.progressbar.upload": "Файлдарды жүктеу", // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information", + "submission.sections.submit.progressbar.sherpaPolicies": "Баспагердің ашық қол жеткізу саясаты туралы ақпарат", // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.", - // TODO New key - Add a translation - "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.", + "submission.sections.sherpa-policy.title-empty": "Баспагердің саясаты туралы ақпарат жоқ. Егер сіздің жұмысыңыз ISSN-мен байланысты болса, баспагердің кез-келген тиісті ашық кіру саясатымен танысу үшін оны жоғарыда енгізіңіз.", // "submission.sections.status.errors.title": "Errors", "submission.sections.status.errors.title": "Қателер", // "submission.sections.status.valid.title": "Valid", - // TODO New key - Add a translation - "submission.sections.status.valid.title": "Valid", + "submission.sections.status.valid.title": "Жарамды", // "submission.sections.status.warnings.title": "Warnings", - // TODO New key - Add a translation - "submission.sections.status.warnings.title": "Warnings", + "submission.sections.status.warnings.title": "Ескертулер", // "submission.sections.status.errors.aria": "has errors", - // TODO New key - Add a translation - "submission.sections.status.errors.aria": "has errors", + "submission.sections.status.errors.aria": "қателер бар", // "submission.sections.status.valid.aria": "is valid", - // TODO New key - Add a translation - "submission.sections.status.valid.aria": "is valid", + "submission.sections.status.valid.aria": "жарамды болып табылады", // "submission.sections.status.warnings.aria": "has warnings", - // TODO New key - Add a translation - "submission.sections.status.warnings.aria": "has warnings", + "submission.sections.status.warnings.aria": "ескертулер бар", // "submission.sections.status.info.title": "Additional Information", - // TODO New key - Add a translation - "submission.sections.status.info.title": "Additional Information", + "submission.sections.status.info.title": "Қосымша ақпарат", // "submission.sections.status.info.aria": "Additional Information", - // TODO New key - Add a translation - "submission.sections.status.info.aria": "Additional Information", + "submission.sections.status.info.aria": "Қосымша ақпарат", // "submission.sections.toggle.open": "Open section", - // TODO New key - Add a translation - "submission.sections.toggle.open": "Open section", + "submission.sections.toggle.open": "Бөлімді ашу", // "submission.sections.toggle.close": "Close section", - // TODO New key - Add a translation - "submission.sections.toggle.close": "Close section", + "submission.sections.toggle.close": "Бөлімді жабу", // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section", - // TODO New key - Add a translation - "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section", + "submission.sections.toggle.aria.open": "Бөлімді ашу {{sectionHeader}}", // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section", - // TODO New key - Add a translation - "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section", + "submission.sections.toggle.aria.close": "Бөлімді кішірейту {{sectionHeader}}", // "submission.sections.upload.delete.confirm.cancel": "Cancel", "submission.sections.upload.delete.confirm.cancel": "Болдырмау", @@ -6463,26 +6419,22 @@ "submission.sections.upload.form.access-condition-label": "Кіру шартының түрі", // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited", - // TODO New key - Add a translation - "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited", + "submission.sections.upload.form.access-condition-hint": "Элементті сақтағаннан кейін бит ағынына қолданылатын кіру шартын таңдаңыз", // "submission.sections.upload.form.date-required": "Date is required.", "submission.sections.upload.form.date-required": "Күні міндетті.", // "submission.sections.upload.form.date-required-from": "Grant access from date is required.", - // TODO New key - Add a translation - "submission.sections.upload.form.date-required-from": "Grant access from date is required.", + "submission.sections.upload.form.date-required-from": "Күннен бастап қол жеткізуді қамтамасыз ету қажет.", // "submission.sections.upload.form.date-required-until": "Grant access until date is required.", - // TODO New key - Add a translation - "submission.sections.upload.form.date-required-until": "Grant access until date is required.", + "submission.sections.upload.form.date-required-until": "Күн қажет болғанша қол жеткізіңіз.", // "submission.sections.upload.form.from-label": "Grant access from", "submission.sections.upload.form.from-label": "Қатынауды ұсыну бірі", // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied", - // TODO New key - Add a translation - "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied", + "submission.sections.upload.form.from-hint": "Тиісті кіру шарты қолданылатын күнді таңдаңыз", // "submission.sections.upload.form.from-placeholder": "From", "submission.sections.upload.form.from-placeholder": "Кімнен", @@ -6497,11 +6449,10 @@ "submission.sections.upload.form.until-label": "Рұқсат беруге болғанша", // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied", - // TODO New key - Add a translation - "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied", + "submission.sections.upload.form.until-hint": "Тиісті кіру шарты қолданылатын күнді таңдаңыз", // "submission.sections.upload.form.until-placeholder": "Until", - "submission.sections.upload.form.until-placeholder":"Әзірге", + "submission.sections.upload.form.until-placeholder": "Әзірге", // "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": "{{collectionName}} жинағына жүктелген файлдар келесі топқа (топтарға) сәйкес қол жетімді болады:", @@ -6531,85 +6482,65 @@ "submission.sections.upload.upload-successful": "Жүктеу сәтті өтті", // "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse. When unchecked, the item will only be available via a direct link and will never appear in search/browse.", - // TODO New key - Add a translation - "submission.sections.accesses.form.discoverable-description": "When checked, this item will be discoverable in search/browse. When unchecked, the item will only be available via a direct link and will never appear in search/browse.", + "submission.sections.accesses.form.discoverable-description": "Егер бұл құсбелгі қойылса, бұл элемент іздеу/қарау үшін қол жетімді болады. Егер құсбелгі алынып тасталса, элемент тек тікелей сілтеме арқылы қол жетімді болады және іздеу/қарау кезінде ешқашан пайда болмайды.", // "submission.sections.accesses.form.discoverable-label": "Discoverable", - // TODO New key - Add a translation - "submission.sections.accesses.form.discoverable-label": "Discoverable", + "submission.sections.accesses.form.discoverable-label": "Анықталатын", // "submission.sections.accesses.form.access-condition-label": "Access condition type", - // TODO New key - Add a translation - "submission.sections.accesses.form.access-condition-label": "Access condition type", + "submission.sections.accesses.form.access-condition-label": "Кіру шартының түрі", // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited", - // TODO New key - Add a translation - "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited", + "submission.sections.accesses.form.access-condition-hint": "Депозитке салынғаннан кейін өнімге қолданылатын қол жеткізу шартын таңдаңыз", // "submission.sections.accesses.form.date-required": "Date is required.", - // TODO New key - Add a translation - "submission.sections.accesses.form.date-required": "Date is required.", + "submission.sections.accesses.form.date-required": "Күні міндетті.", // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.", - // TODO New key - Add a translation - "submission.sections.accesses.form.date-required-from": "Grant access from date is required.", + "submission.sections.accesses.form.date-required-from": "Күннен бастап қол жеткізуді қамтамасыз ету қажет.", // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.", - // TODO New key - Add a translation - "submission.sections.accesses.form.date-required-until": "Grant access until date is required.", + "submission.sections.accesses.form.date-required-until": "Күн қажет болғанша қол жеткізіңіз.", // "submission.sections.accesses.form.from-label": "Grant access from", - // TODO New key - Add a translation - "submission.sections.accesses.form.from-label": "Grant access from", + "submission.sections.accesses.form.from-label": "Қол жеткізуді қамтамасыз етіңіз", // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied", - // TODO New key - Add a translation - "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied", + "submission.sections.accesses.form.from-hint": "Тиісті кіру шарты қолданылатын күнді таңдаңыз", // "submission.sections.accesses.form.from-placeholder": "From", - // TODO New key - Add a translation - "submission.sections.accesses.form.from-placeholder": "From", + "submission.sections.accesses.form.from-placeholder": "Бастап", // "submission.sections.accesses.form.group-label": "Group", - // TODO New key - Add a translation - "submission.sections.accesses.form.group-label": "Group", + "submission.sections.accesses.form.group-label": "Топ", // "submission.sections.accesses.form.group-required": "Group is required.", - // TODO New key - Add a translation - "submission.sections.accesses.form.group-required": "Group is required.", + "submission.sections.accesses.form.group-required": "Топ қажет.", // "submission.sections.accesses.form.until-label": "Grant access until", - // TODO New key - Add a translation - "submission.sections.accesses.form.until-label": "Grant access until", + "submission.sections.accesses.form.until-label": "Дейін қол жеткізуді қамтамасыз ету", // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied", - // TODO New key - Add a translation - "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied", + "submission.sections.accesses.form.until-hint": "Тиісті кіру шарты қолданылатын күнді таңдаңыз", // "submission.sections.accesses.form.until-placeholder": "Until", - // TODO New key - Add a translation - "submission.sections.accesses.form.until-placeholder": "Until", + "submission.sections.accesses.form.until-placeholder": "Осы уақытқа дейін", // "submission.sections.license.granted-label": "I confirm the license above", - // TODO New key - Add a translation - "submission.sections.license.granted-label": "I confirm the license above", + "submission.sections.license.granted-label": "Мен жоғарыда аталған лицензияны растаймын", // "submission.sections.license.required": "You must accept the license", - // TODO New key - Add a translation - "submission.sections.license.required": "You must accept the license", + "submission.sections.license.required": "Лицензияны қабылдау керек", // "submission.sections.license.notgranted": "You must accept the license", - // TODO New key - Add a translation - "submission.sections.license.notgranted": "You must accept the license", + "submission.sections.license.notgranted": "Лицензияны қабылдау керек", // "submission.sections.sherpa.publication.information": "Publication information", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information": "Publication information", + "submission.sections.sherpa.publication.information": "Жарияланым туралы ақпарат", // "submission.sections.sherpa.publication.information.title": "Title", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information.title": "Title", + "submission.sections.sherpa.publication.information.title": "Атауы", // "submission.sections.sherpa.publication.information.issns": "ISSNs", // TODO New key - Add a translation @@ -6620,102 +6551,78 @@ "submission.sections.sherpa.publication.information.url": "URL", // "submission.sections.sherpa.publication.information.publishers": "Publisher", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information.publishers": "Publisher", + "submission.sections.sherpa.publication.information.publishers": "Баспагер", // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub", + "submission.sections.sherpa.publication.information.romeoPub": "Romeo Баспагер", // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub", + "submission.sections.sherpa.publication.information.zetoPub": "Zeto Баспагер", // "submission.sections.sherpa.publisher.policy": "Publisher Policy", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy": "Publisher Policy", + "submission.sections.sherpa.publisher.policy": "Баспагердің саясаты", // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.", + "submission.sections.sherpa.publisher.policy.description": "Төмендегі ақпарат Шерпа Ромео арқылы табылды. Баспагердің саясатына сүйене отырып, ол сізге эмбарго қажет пе және / немесе қандай файлдарды жүктеуге рұқсат етілгені туралы ұсыныстар береді. Егер сізде сұрақтар туындаса, төменгі деректемедегі кері байланыс нысаны арқылы веб-сайтыңыздың әкімшісіне хабарласыңыз.", // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view", + "submission.sections.sherpa.publisher.policy.openaccess": "Осы журналдың саясатымен рұқсат етілген ашық қол жетімділік жолдары төменде мақалалардың нұсқалары бойынша бөлінген. Толығырақ көру үшін жолды нұқыңыз", // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:", + "submission.sections.sherpa.publisher.policy.more.information": "Қосымша ақпарат алу үшін келесі сілтемелерге өтіңіз:", // "submission.sections.sherpa.publisher.policy.version": "Version", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.version": "Version", + "submission.sections.sherpa.publisher.policy.version": "Нұсқа", // "submission.sections.sherpa.publisher.policy.embargo": "Embargo", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.embargo": "Embargo", + "submission.sections.sherpa.publisher.policy.embargo": "Эмбарго", // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo", + "submission.sections.sherpa.publisher.policy.noembargo": "Эмбарго Жоқ", // "submission.sections.sherpa.publisher.policy.nolocation": "None", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.nolocation": "None", + "submission.sections.sherpa.publisher.policy.nolocation": "Ешкім", // "submission.sections.sherpa.publisher.policy.license": "License", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.license": "License", + "submission.sections.sherpa.publisher.policy.license": "Лицензия", // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites", + "submission.sections.sherpa.publisher.policy.prerequisites": "Алғышарттар", // "submission.sections.sherpa.publisher.policy.location": "Location", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.location": "Location", + "submission.sections.sherpa.publisher.policy.location": "Орналасқан жері", // "submission.sections.sherpa.publisher.policy.conditions": "Conditions", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.conditions": "Conditions", + "submission.sections.sherpa.publisher.policy.conditions": "Шарттары", // "submission.sections.sherpa.publisher.policy.refresh": "Refresh", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.refresh": "Refresh", + "submission.sections.sherpa.publisher.policy.refresh": "Жаңарту", // "submission.sections.sherpa.record.information": "Record Information", - // TODO New key - Add a translation - "submission.sections.sherpa.record.information": "Record Information", + "submission.sections.sherpa.record.information": "Жазуға арналған ақпарат", // "submission.sections.sherpa.record.information.id": "ID", - // TODO New key - Add a translation "submission.sections.sherpa.record.information.id": "ID", // "submission.sections.sherpa.record.information.date.created": "Date Created", - // TODO New key - Add a translation - "submission.sections.sherpa.record.information.date.created": "Date Created", + "submission.sections.sherpa.record.information.date.created": "Құрылған күні", // "submission.sections.sherpa.record.information.date.modified": "Last Modified", - // TODO New key - Add a translation - "submission.sections.sherpa.record.information.date.modified": "Last Modified", + "submission.sections.sherpa.record.information.date.modified": "Соңғы өзгеріс", // "submission.sections.sherpa.record.information.uri": "URI", - // TODO New key - Add a translation "submission.sections.sherpa.record.information.uri": "URI", // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations", - // TODO New key - Add a translation - "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations", + "submission.sections.sherpa.error.message": "Шерпе туралы ақпарат алу кезінде қате пайда болды", // "submission.submit.breadcrumbs": "New submission", - // TODO New key - Add a translation - "submission.submit.breadcrumbs": "New submission", + "submission.submit.breadcrumbs": "Жаңа көрініс", // "submission.submit.title": "New submission", - // TODO Source message changed - Revise the translation - "submission.submit.title":"Бағыну", + "submission.submit.title": "Жаңа көрініс", @@ -6805,45 +6712,35 @@ // "submission.workspace.generic.view": "View", - // TODO New key - Add a translation - "submission.workspace.generic.view": "View", + "submission.workspace.generic.view": "Көрініс", // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.", - // TODO New key - Add a translation - "submission.workspace.generic.view-help": "Select this option to view the item's metadata.", + "submission.workspace.generic.view-help": "Элемент метадеректерін көру үшін осы параметрді таңдаңыз.", // "thumbnail.default.alt": "Thumbnail Image", - // TODO New key - Add a translation - "thumbnail.default.alt": "Thumbnail Image", + "thumbnail.default.alt": "Кішірейтілген сурет", // "thumbnail.default.placeholder": "No Thumbnail Available", - // TODO New key - Add a translation - "thumbnail.default.placeholder": "No Thumbnail Available", + "thumbnail.default.placeholder": "Нобайлар Жоқ", // "thumbnail.project.alt": "Project Logo", - // TODO New key - Add a translation - "thumbnail.project.alt": "Project Logo", + "thumbnail.project.alt": "Жобаның логотипі", // "thumbnail.project.placeholder": "Project Placeholder Image", - // TODO New key - Add a translation - "thumbnail.project.placeholder": "Project Placeholder Image", + "thumbnail.project.placeholder": "Жобаның толтырғыш суреті", // "thumbnail.orgunit.alt": "OrgUnit Logo", - // TODO New key - Add a translation - "thumbnail.orgunit.alt": "OrgUnit Logo", + "thumbnail.orgunit.alt": "Ұйым бөлімшесінің логотипі", // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image", - // TODO New key - Add a translation - "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image", + "thumbnail.orgunit.placeholder": "Мекеме бірлігін толтырушы суреті", // "thumbnail.person.alt": "Profile Picture", - // TODO New key - Add a translation - "thumbnail.person.alt": "Profile Picture", + "thumbnail.person.alt": "Профиль суреті", // "thumbnail.person.placeholder": "No Profile Picture Available", - // TODO New key - Add a translation - "thumbnail.person.placeholder": "No Profile Picture Available", + "thumbnail.person.placeholder": "Профиль Суреті Қол Жетімді Емес", @@ -6882,8 +6779,7 @@ "uploader.drag-message": "Файлдарды осында сүйреңіз", // "uploader.delete.btn-title": "Delete", - // TODO New key - Add a translation - "uploader.delete.btn-title": "Delete", + "uploader.delete.btn-title": "Жою", // "uploader.or": ", or ", "uploader.or": ", немесе ", @@ -6906,25 +6802,21 @@ // "workspace.search.results.head": "Your submissions", - // TODO New key - Add a translation - "workspace.search.results.head": "Your submissions", + "workspace.search.results.head": "Сіздің жазылымдарыңыз", // "workflowAdmin.search.results.head": "Administer Workflow", "workflowAdmin.search.results.head": "Жұмыс процесін басқару", // "workflow.search.results.head": "Workflow tasks", - // TODO New key - Add a translation - "workflow.search.results.head": "Workflow tasks", + "workflow.search.results.head": "Жұмыс процесінің міндеттері", // "workflow-item.edit.breadcrumbs": "Edit workflowitem", - // TODO New key - Add a translation - "workflow-item.edit.breadcrumbs": "Edit workflowitem", + "workflow-item.edit.breadcrumbs": "Жұмыс процесінің элементін өңдеу", // "workflow-item.edit.title": "Edit workflowitem", - // TODO New key - Add a translation - "workflow-item.edit.title": "Edit workflowitem", + "workflow-item.edit.title": "Жұмыс процесінің элементін өңдеу", // "workflow-item.delete.notification.success.title": "Deleted", "workflow-item.delete.notification.success.title":"Жойылды", @@ -6973,525 +6865,397 @@ "workflow-item.send-back.button.cancel": "Алып тастау", // "workflow-item.send-back.button.confirm": "Send back", - // TODO Source message changed - Revise the translation "workflow-item.send-back.button.confirm": "Кері жіберу", // "workflow-item.view.breadcrumbs": "Workflow View", - // TODO New key - Add a translation - "workflow-item.view.breadcrumbs": "Workflow View", + "workflow-item.view.breadcrumbs": "Жұмыс процесін көру", // "workspace-item.view.breadcrumbs": "Workspace View", - // TODO New key - Add a translation - "workspace-item.view.breadcrumbs": "Workspace View", + "workspace-item.view.breadcrumbs": "Жұмыс аймағының түрі", // "workspace-item.view.title": "Workspace View", - // TODO New key - Add a translation - "workspace-item.view.title": "Workspace View", + "workspace-item.view.title": "Жұмыс аймағының түрі", // "idle-modal.header": "Session will expire soon", - // TODO New key - Add a translation - "idle-modal.header": "Session will expire soon", + "idle-modal.header": "Сессия жақында аяқталады", // "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?", - // TODO New key - Add a translation - "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": "Қауіпсіздік мақсатында пайдаланушы сеанстары {{ timeToExpire }} әрекетсіздік минуттары арқылы аяқталады. Сіздің сессияңыз жақында аяқталады. Сіз оны ұзартқыңыз немесе жүйеден шыққыңыз келе ме?", // "idle-modal.log-out": "Log out", - // TODO New key - Add a translation - "idle-modal.log-out": "Log out", + "idle-modal.log-out": "Шығу", // "idle-modal.extend-session": "Extend session", - // TODO New key - Add a translation - "idle-modal.extend-session": "Extend session", + "idle-modal.extend-session": "Сеансты ұзарту", // "researcher.profile.action.processing" : "Processing...", - // TODO New key - Add a translation - "researcher.profile.action.processing" : "Processing...", + "researcher.profile.action.processing" : "Процессте...", // "researcher.profile.associated": "Researcher profile associated", - // TODO New key - Add a translation - "researcher.profile.associated": "Researcher profile associated", + "researcher.profile.associated": "Зерттеушінің байланысты профилі", // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility", - // TODO New key - Add a translation - "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility", + "researcher.profile.change-visibility.fail": "Профиль көрінісі өзгерген кезде күтпеген қате пайда болады", // "researcher.profile.create.new": "Create new", - // TODO New key - Add a translation - "researcher.profile.create.new": "Create new", + "researcher.profile.create.new": "Жаңасың құру", // "researcher.profile.create.success": "Researcher profile created successfully", - // TODO New key - Add a translation - "researcher.profile.create.success": "Researcher profile created successfully", + "researcher.profile.create.success": "Зерттеуші профилі сәтті жасалды", // "researcher.profile.create.fail": "An error occurs during the researcher profile creation", - // TODO New key - Add a translation - "researcher.profile.create.fail": "An error occurs during the researcher profile creation", + "researcher.profile.create.fail": "Зерттеуші профилін құру кезінде қате пайда болады", // "researcher.profile.delete": "Delete", - // TODO New key - Add a translation - "researcher.profile.delete": "Delete", + "researcher.profile.delete": "Жою", // "researcher.profile.expose": "Expose", - // TODO New key - Add a translation - "researcher.profile.expose": "Expose", + "researcher.profile.expose": "Ашу", // "researcher.profile.hide": "Hide", - // TODO New key - Add a translation - "researcher.profile.hide": "Hide", + "researcher.profile.hide": "Жасыру", // "researcher.profile.not.associated": "Researcher profile not yet associated", - // TODO New key - Add a translation - "researcher.profile.not.associated": "Researcher profile not yet associated", + "researcher.profile.not.associated": "Зерттеуші профилі әлі байланысты емес", // "researcher.profile.view": "View", - // TODO New key - Add a translation - "researcher.profile.view": "View", + "researcher.profile.view": "Қөрімдігі", // "researcher.profile.private.visibility" : "PRIVATE", - // TODO New key - Add a translation - "researcher.profile.private.visibility" : "PRIVATE", + "researcher.profile.private.visibility" : "ЖАСЫРЫН", // "researcher.profile.public.visibility" : "PUBLIC", - // TODO New key - Add a translation - "researcher.profile.public.visibility" : "PUBLIC", + "researcher.profile.public.visibility" : "АШЫҚ", // "researcher.profile.status": "Status:", - // TODO New key - Add a translation - "researcher.profile.status": "Status:", + "researcher.profile.status": "Мәртебесі:", // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).", - // TODO New key - Add a translation - "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).", + "researcherprofile.claim.not-authorized": "Сіз бұл өнімді талап етуге құқығыңыз жоқ. Қосымша ақпарат алу үшін әкімшіге хабарласыңыз.", // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later", - // TODO New key - Add a translation - "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later", + "researcherprofile.error.claim.body" : "Профильді толтыру кезінде қате пайда болды, кейінірек қайталап көріңіз", // "researcherprofile.error.claim.title" : "Error", - // TODO New key - Add a translation - "researcherprofile.error.claim.title" : "Error", + "researcherprofile.error.claim.title" : "Қате", // "researcherprofile.success.claim.body" : "Profile claimed with success", - // TODO New key - Add a translation - "researcherprofile.success.claim.body" : "Profile claimed with success", + "researcherprofile.success.claim.body" : "Сәтті мәлімделген Профиль", // "researcherprofile.success.claim.title" : "Success", - // TODO New key - Add a translation - "researcherprofile.success.claim.title" : "Success", + "researcherprofile.success.claim.title" : "Сәтті", // "person.page.orcid.create": "Create an ORCID ID", - // TODO New key - Add a translation - "person.page.orcid.create": "Create an ORCID ID", + "person.page.orcid.create": "ORCID ID құру", // "person.page.orcid.granted-authorizations": "Granted authorizations", - // TODO New key - Add a translation - "person.page.orcid.granted-authorizations": "Granted authorizations", + "person.page.orcid.granted-authorizations": "Рұқсат берілген", // "person.page.orcid.grant-authorizations" : "Grant authorizations", - // TODO New key - Add a translation - "person.page.orcid.grant-authorizations" : "Grant authorizations", + "person.page.orcid.grant-authorizations" : "Рұқсат беру", // "person.page.orcid.link": "Connect to ORCID ID", - // TODO New key - Add a translation - "person.page.orcid.link": "Connect to ORCID ID", + "person.page.orcid.link": "ORCID идентификаторына қосылу", // "person.page.orcid.link.processing": "Linking profile to ORCID...", - // TODO New key - Add a translation - "person.page.orcid.link.processing": "Linking profile to ORCID...", + "person.page.orcid.link.processing": "Профильді ORCID-ке байланыстыру...", // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.", - // TODO New key - Add a translation - "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.", + "person.page.orcid.link.error.message": "Профильді ORCID-ке қосқан кезде бірдеңе дұрыс болмады. Егер мәселе шешілмесе, әкімшіге хабарласыңыз.", // "person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.", - // TODO New key - Add a translation - "person.page.orcid.orcid-not-linked-message": "The ORCID iD of this profile ({{ orcid }}) has not yet been connected to an account on the ORCID registry or the connection is expired.", + "person.page.orcid.orcid-not-linked-message": "Осы профильдің ORCID идентификаторы ({{ orcid }}) әлі ORCID тізіліміндегі есептік жазбаға қосылмаған немесе қосылу мерзімі аяқталған.", // "person.page.orcid.unlink": "Disconnect from ORCID", - // TODO New key - Add a translation - "person.page.orcid.unlink": "Disconnect from ORCID", + "person.page.orcid.unlink": "ORCID өшіру", // "person.page.orcid.unlink.processing": "Processing...", "person.page.orcid.unlink.processing": "Процессте...", // "person.page.orcid.missing-authorizations": "Missing authorizations", - // TODO New key - Add a translation - "person.page.orcid.missing-authorizations": "Missing authorizations", + "person.page.orcid.missing-authorizations": "Рұқсаттары жоқ", // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:", - // TODO New key - Add a translation - "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:", + "person.page.orcid.missing-authorizations-message": "Келесі рұқсаттар жоқ:", // "person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.", - // TODO New key - Add a translation - "person.page.orcid.no-missing-authorizations-message": "Great! This box is empty, so you have granted all access rights to use all functions offers by your institution.", + "person.page.orcid.no-missing-authorizations-message": "Тамаша! Бұл өріс бос, бұл сіздің мекемеңіздің барлық мүмкіндіктерін пайдалану үшін барлық қол жетімділік құқығын береді.", // "person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.", - // TODO New key - Add a translation - "person.page.orcid.no-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.", + "person.page.orcid.no-orcid-message": "ORCID идентификаторы әлі қосылмаған. Төмендегі батырманы басу арқылы сіз бұл Профильді ORCID тіркелгісімен байланыстыра аласыз.", // "person.page.orcid.profile-preferences": "Profile preferences", - // TODO New key - Add a translation - "person.page.orcid.profile-preferences": "Profile preferences", + "person.page.orcid.profile-preferences": "Профиль параметрлері", // "person.page.orcid.funding-preferences": "Funding preferences", - // TODO New key - Add a translation - "person.page.orcid.funding-preferences": "Funding preferences", + "person.page.orcid.funding-preferences": "Қаржыландырудағы артықшылықтар", // "person.page.orcid.publications-preferences": "Publication preferences", - // TODO New key - Add a translation - "person.page.orcid.publications-preferences": "Publication preferences", + "person.page.orcid.publications-preferences": "Жарияланымдағы артықшылықтар", // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator", - // TODO New key - Add a translation - "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator", + "person.page.orcid.remove-orcid-message": "Егер сізге ORCID жою қажет болса, репозиторий әкімшісіне хабарласыңыз", // "person.page.orcid.save.preference.changes": "Update settings", - // TODO New key - Add a translation - "person.page.orcid.save.preference.changes": "Update settings", + "person.page.orcid.save.preference.changes": "Параметрлерді жаңарту", // "person.page.orcid.sync-profile.affiliation" : "Affiliation", - // TODO New key - Add a translation - "person.page.orcid.sync-profile.affiliation" : "Affiliation", + "person.page.orcid.sync-profile.affiliation" : "Филиалы", // "person.page.orcid.sync-profile.biographical" : "Biographical data", - // TODO New key - Add a translation - "person.page.orcid.sync-profile.biographical" : "Biographical data", + "person.page.orcid.sync-profile.biographical" : "Өмірбаяндық мәліметтер", // "person.page.orcid.sync-profile.education" : "Education", - // TODO New key - Add a translation - "person.page.orcid.sync-profile.education" : "Education", + "person.page.orcid.sync-profile.education" : "Білімі", // "person.page.orcid.sync-profile.identifiers" : "Identifiers", - // TODO New key - Add a translation - "person.page.orcid.sync-profile.identifiers" : "Identifiers", + "person.page.orcid.sync-profile.identifiers" : "Идентификатор", // "person.page.orcid.sync-fundings.all" : "All fundings", - // TODO New key - Add a translation - "person.page.orcid.sync-fundings.all" : "All fundings", + "person.page.orcid.sync-fundings.all" : "Барлық құралдар", // "person.page.orcid.sync-fundings.mine" : "My fundings", - // TODO New key - Add a translation - "person.page.orcid.sync-fundings.mine" : "My fundings", + "person.page.orcid.sync-fundings.mine" : "Менің қаражатым", // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings", - // TODO New key - Add a translation - "person.page.orcid.sync-fundings.my_selected" : "Selected fundings", + "person.page.orcid.sync-fundings.my_selected" : "Таңдалған құралдар", // "person.page.orcid.sync-fundings.disabled" : "Disabled", - // TODO New key - Add a translation - "person.page.orcid.sync-fundings.disabled" : "Disabled", + "person.page.orcid.sync-fundings.disabled" : "Қолжетімсіз", // "person.page.orcid.sync-publications.all" : "All publications", - // TODO New key - Add a translation - "person.page.orcid.sync-publications.all" : "All publications", + "person.page.orcid.sync-publications.all" : "Барлық жарияланымдар", // "person.page.orcid.sync-publications.mine" : "My publications", - // TODO New key - Add a translation - "person.page.orcid.sync-publications.mine" : "My publications", + "person.page.orcid.sync-publications.mine" : "Менің жарияланымдарым", // "person.page.orcid.sync-publications.my_selected" : "Selected publications", - // TODO New key - Add a translation - "person.page.orcid.sync-publications.my_selected" : "Selected publications", + "person.page.orcid.sync-publications.my_selected" : "Таңдаулы басылымдар", // "person.page.orcid.sync-publications.disabled" : "Disabled", - // TODO New key - Add a translation - "person.page.orcid.sync-publications.disabled" : "Disabled", + "person.page.orcid.sync-publications.disabled" : "Қолжетімсіз", // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry", + "person.page.orcid.sync-queue.discard" : "Өзгерісті болдырмаңыз және ORCID тізілімімен синхрондамаңыз", // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed", + "person.page.orcid.sync-queue.discard.error": "ORCID кезегінің жазбасын жою мүмкін емес", // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully", + "person.page.orcid.sync-queue.discard.success": "ORCID кезегінің жазбасы сәтті жойылды", // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty", + "person.page.orcid.sync-queue.empty-message": "ORCID кезегінің тізілімі бос", // "person.page.orcid.sync-queue.table.header.type" : "Type", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.table.header.type" : "Type", + "person.page.orcid.sync-queue.table.header.type" : "Түрі", // "person.page.orcid.sync-queue.table.header.description" : "Description", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.table.header.description" : "Description", + "person.page.orcid.sync-queue.table.header.description" : "Сипаттамасы", // "person.page.orcid.sync-queue.table.header.action" : "Action", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.table.header.action" : "Action", + "person.page.orcid.sync-queue.table.header.action" : "Әрекет", // "person.page.orcid.sync-queue.description.affiliation": "Affiliations", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.affiliation": "Affiliations", + "person.page.orcid.sync-queue.description.affiliation": "Филиалы", // "person.page.orcid.sync-queue.description.country": "Country", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.country": "Country", + "person.page.orcid.sync-queue.description.country": "ЕЛ", // "person.page.orcid.sync-queue.description.education": "Educations", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.education": "Educations", + "person.page.orcid.sync-queue.description.education": "Білімі", // "person.page.orcid.sync-queue.description.external_ids": "External ids", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.external_ids": "External ids", + "person.page.orcid.sync-queue.description.external_ids": "Қосымша ids", // "person.page.orcid.sync-queue.description.other_names": "Other names", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.other_names": "Other names", + "person.page.orcid.sync-queue.description.other_names": "Басқа атаулары", // "person.page.orcid.sync-queue.description.qualification": "Qualifications", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.qualification": "Qualifications", + "person.page.orcid.sync-queue.description.qualification": "Квалификациясы", // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls", + "person.page.orcid.sync-queue.description.researcher_urls": "Зерттеушінің URL мекенжайы", // "person.page.orcid.sync-queue.description.keywords": "Keywords", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.description.keywords": "Keywords", + "person.page.orcid.sync-queue.description.keywords": "Кілт сөздер", // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry", + "person.page.orcid.sync-queue.tooltip.insert": "ORCID тізіліміне жаңа жазба қосыңыз", // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry", + "person.page.orcid.sync-queue.tooltip.update": "Бұл жазбаны ORCID тізіліміне жаңартыңыз", // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry", + "person.page.orcid.sync-queue.tooltip.delete": "Бұл жазбаны ORCID тізілімінен жойыңыз", // "person.page.orcid.sync-queue.tooltip.publication": "Publication", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.publication": "Publication", + "person.page.orcid.sync-queue.tooltip.publication": "Жарияланымдар", // "person.page.orcid.sync-queue.tooltip.project": "Project", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.project": "Project", + "person.page.orcid.sync-queue.tooltip.project": "Проект", // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation", + "person.page.orcid.sync-queue.tooltip.affiliation": "Филиалы", // "person.page.orcid.sync-queue.tooltip.education": "Education", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.education": "Education", + "person.page.orcid.sync-queue.tooltip.education": "Білімі", // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.qualification": "Qualification", + "person.page.orcid.sync-queue.tooltip.qualification": "Квалификациясы", // "person.page.orcid.sync-queue.tooltip.other_names": "Other name", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.other_names": "Other name", + "person.page.orcid.sync-queue.tooltip.other_names": "Басқа атауы", // "person.page.orcid.sync-queue.tooltip.country": "Country", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.country": "Country", + "person.page.orcid.sync-queue.tooltip.country": "Ел", // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.keywords": "Keyword", + "person.page.orcid.sync-queue.tooltip.keywords": "Кілт сөз", // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier", + "person.page.orcid.sync-queue.tooltip.external_ids": "Сыртқы идентификатор", // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url", + "person.page.orcid.sync-queue.tooltip.researcher_urls": "Зерттеушінің URL мекенжайы", // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry", + "person.page.orcid.sync-queue.send" : "ORCID тізілімімен синхрондау", // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.", + "person.page.orcid.sync-queue.send.unauthorized-error.title": "Рұқсаттардың болмауына байланысты ORCID-ке жіберу сәтсіз аяқталды.", // "person.page.orcid.sync-queue.send.unauthorized-error.content": "Click here to grant again the required permissions. If the problem persists, contact the administrator", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.unauthorized-error.content": "Click here to grant again the required permissions. If the problem persists, contact the administrator", + "person.page.orcid.sync-queue.send.unauthorized-error.content": "Қажетті рұқсаттарды қайтадан беру үшін >мұнда басыңыз. Егер мәселе шешілмесе, әкімшіге хабарласыңыз", // "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid", + "person.page.orcid.sync-queue.send.bad-request-error": "ORCID-ке жіберу сәтсіз аяқталды, өйткені ORCID тізіліміне жіберілген ресурс жарамсыз", // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed", + "person.page.orcid.sync-queue.send.error": "ORCID-ке жіберу сәтсіз аяқталды", // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry", + "person.page.orcid.sync-queue.send.conflict-error": "ORCID-ке жіберу сәтсіз аяқталды, өйткені ресурс ORCID тізілімінде бар", // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.", + "person.page.orcid.sync-queue.send.not-found-warning": "Ресурс енді ORCID тізілімінде жоқ.", // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully", + "person.page.orcid.sync-queue.send.success": "ORCID-ке жіберу сәтті аяқталды", // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid", + "person.page.orcid.sync-queue.send.validation-error": "ORCID-пен синхрондағыңыз келетін деректер жарамсыз", // "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required", + "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Соманың валютасын көрсету талап етіледі", // "person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.external-id.required": "The resource to be sent requires at least one identifier", + "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Жіберілген ресурс үшін кем дегенде бір идентификатор қажет", // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required", + "person.page.orcid.sync-queue.send.validation-error.title.required": "Аты міндетті", // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required", + "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type міндетті", // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required", + "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Басталу күні міндетті", // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required", + "person.page.orcid.sync-queue.send.validation-error.funder.required": "Қаржыландыру қажет", // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country", + "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Жарамсыз 2 сандық ISO 3166 елі", // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required", + "person.page.orcid.sync-queue.send.validation-error.organization.required": "Ұйым міндетті", // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required", + "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Ұйымның атауы міндетті", // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900", + "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "Жариялау күні 1900 жылдан бір жыл артық болуы керек", // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address", + "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Ұйымға жіберу үшін мекен-жай қажет", // "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city", + "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Жөнелтілетін ұйымның мекенжайы үшін қаланы көрсету қажет", // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country", + "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Жіберілетін ұйымның мекен-жайы жарамды болуы керек 2 санық ISO 3166 ел", // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers", + "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Ұйымдардың түсініксіздігін жою үшін идентификатор қажет. Қолдау көрсетілетін идентификаторлар - GRID, Ringgold, заңды тұлға идентификаторлары (LEI) және Crossref демеушілер тізілімінің идентификаторлары", // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value", + "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Ұйым идентификаторлары мәндерді талап етеді", // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "The organization's identifiers requires a source", + "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Ұйым идентификаторлары үшін ақпарат көзі қажет", // "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF", - // TODO New key - Add a translation - "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF", + "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Ұйым идентификаторларының бірінің көзі жарамсыз. Қолдау көздері: RINGGOLD, GRID, LEI және FUNDREF", - // "person.page.orcid.synchronization-mode": "Synchronization mode", - // TODO New key - Add a translation - "person.page.orcid.synchronization-mode": "Synchronization mode", + // "person.page.orcid.synchronization-mode": "Synchronization mode",һ + "person.page.orcid.synchronization-mode": "Синхрондау режимі", // "person.page.orcid.synchronization-mode.batch": "Batch", - // TODO New key - Add a translation - "person.page.orcid.synchronization-mode.batch": "Batch", + "person.page.orcid.synchronization-mode.batch": "Партия", // "person.page.orcid.synchronization-mode.label": "Synchronization mode", - // TODO New key - Add a translation - "person.page.orcid.synchronization-mode.label": "Synchronization mode", + "person.page.orcid.synchronization-mode.label": "Синхрондау режимі", // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).", - // TODO New key - Add a translation - "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).", + "person.page.orcid.synchronization-mode-message": "Orcid-пен синхрондау қалай жүретінін таңдаңыз. Опцияларға \"Қолмен\" (деректерді ORCID-ке қолмен жіберу керек) немесе \ "пакеттік\" (жүйе жоспарланған сценарий арқылы деректерді ORCID-ке жібереді) кіреді.", // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.", - // TODO New key - Add a translation - "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.", + "person.page.orcid.synchronization-mode-funding-message": "Сізге қатысты жоба нысандарын ORCID жазбаңызды қаржыландыру туралы ақпарат тізіміне жіберуді таңдаңыз.", // "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.", - // TODO New key - Add a translation - "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.", + "person.page.orcid.synchronization-mode-publication-message": "Қатысты жариялау нысандарын ORCID жазбаңыздың жұмыс тізіміне жіберу керек пе, жоқ па, соны таңдаңыз.", // "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.", - // TODO New key - Add a translation - "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.", + "person.page.orcid.synchronization-mode-profile-message": "Оқу жоспарын немесе жеке куәліктерді ORCID жазбаңызға жіберуді таңдаңыз.", // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully", - // TODO New key - Add a translation - "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully", + "person.page.orcid.synchronization-settings-update.success": "Синхрондау параметрлері сәтті жаңартылды", // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed", - // TODO New key - Add a translation - "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed", + "person.page.orcid.synchronization-settings-update.error": "Синхрондау баптауларын жаңарту мүмкін емес", // "person.page.orcid.synchronization-mode.manual": "Manual", "person.page.orcid.synchronization-mode.manual": "Қолмен", // "person.page.orcid.scope.authenticate": "Get your ORCID iD", - // TODO New key - Add a translation - "person.page.orcid.scope.authenticate": "Get your ORCID iD", + "person.page.orcid.scope.authenticate": "ORCID iD алу", // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties", - // TODO New key - Add a translation - "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties", + "person.page.orcid.scope.read-limited": "Сенімді тараптар үшін көріну параметрімен сіздің ақпаратты оқыңыз", // "person.page.orcid.scope.activities-update": "Add/update your research activities", - // TODO New key - Add a translation - "person.page.orcid.scope.activities-update": "Add/update your research activities", + "person.page.orcid.scope.activities-update": "Зерттеу жұмыстарын қосыңыз/жаңартыңыз", // "person.page.orcid.scope.person-update": "Add/update other information about you", "person.page.orcid.scope.person-update": "Сіз туралы басқа ақпаратты қосу/жаңарту", // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful", - // TODO New key - Add a translation - "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful", + "person.page.orcid.unlink.success": "Профиль мен ORCID тізілімі арасындағы ажырату сәтті өтті", // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again", - // TODO New key - Add a translation - "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again", + "person.page.orcid.unlink.error": "Профиль мен ORCID тізілімі арасында өшіру кезінде қате пайда болды. Қайта көріңіз", // "person.orcid.sync.setting": "ORCID Synchronization settings", - // TODO New key - Add a translation - "person.orcid.sync.setting": "ORCID Synchronization settings", + "person.orcid.sync.setting": "ORCID синхрондау параметрлері", // "person.orcid.registry.queue": "ORCID Registry Queue", - // TODO New key - Add a translation - "person.orcid.registry.queue": "ORCID Registry Queue", + "person.orcid.registry.queue": "ORCID тіркеу кезегі", // "person.orcid.registry.auth": "ORCID Authorizations", - // TODO New key - Add a translation - "person.orcid.registry.auth": "ORCID Authorizations", + "person.orcid.registry.auth": "ORCID Ауторизациясы", // "home.recent-submissions.head": "Recent Submissions", - // TODO New key - Add a translation - "home.recent-submissions.head": "Recent Submissions", + "home.recent-submissions.head": "Соңғы материалдар", From 6a932ec6ac65ef6794b3945fc6be0dbd0fd30af1 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Tue, 27 Sep 2022 16:21:56 +0200 Subject: [PATCH 032/758] 94390: Remove unused import --- .../research-entities/item-pages/person/person.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts index 1ac70bad9df..e5e2a523389 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts @@ -1,7 +1,6 @@ import { Component } from '@angular/core'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { MetadataValue } from '../../../../core/shared/metadata.models'; import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component'; @listableObjectComponent('Person', ViewMode.StandalonePage) From 3abfbf3f116bda499da300497774d76f18c3bb00 Mon Sep 17 00:00:00 2001 From: myrza1 Date: Wed, 28 Sep 2022 03:47:16 +0600 Subject: [PATCH 033/758] Update kk.json5 Finish translates --- src/assets/i18n/kk.json5 | 565 +++++++++++++-------------------------- 1 file changed, 190 insertions(+), 375 deletions(-) diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index 84d3ba907de..6faf7d4484c 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -370,8 +370,7 @@ "admin.access-control.epeople.search.button": "Іздеу", // "admin.access-control.epeople.search.placeholder": "Search people...", - // TODO New key - Add a translation - "admin.access-control.epeople.search.placeholder": "Search people...", + "admin.access-control.epeople.search.placeholder": "Адамдарды іздеу...", // "admin.access-control.epeople.button.add": "Add EPerson", "admin.access-control.epeople.button.add": "Адамды қосу", @@ -511,8 +510,7 @@ "admin.access-control.groups.search.button": "Іздеу", // "admin.access-control.groups.search.placeholder": "Search groups...", - // TODO New key - Add a translation - "admin.access-control.groups.search.placeholder": "Search groups...", + "admin.access-control.groups.search.placeholder": "Топты іздеу...", // "admin.access-control.groups.table.id": "ID", "admin.access-control.groups.table.id": "Жеке куәлік", @@ -521,8 +519,7 @@ "admin.access-control.groups.table.name": "Аты", // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community", - // TODO New key - Add a translation - "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community", + "admin.access-control.groups.table.collectionOrCommunity": "Жинақ/Қауымдастық", // "admin.access-control.groups.table.members": "Members", "admin.access-control.groups.table.members": "Қатысушылар", @@ -566,8 +563,7 @@ "admin.access-control.groups.form.groupName": "Топтың атауы", // "admin.access-control.groups.form.groupCommunity": "Community or Collection", - // TODO New key - Add a translation - "admin.access-control.groups.form.groupCommunity": "Community or Collection", + "admin.access-control.groups.form.groupCommunity": "Жинақ немесе Қауымдастық", // "admin.access-control.groups.form.groupDescription": "Description", "admin.access-control.groups.form.groupDescription":"Сипаттама", @@ -642,19 +638,16 @@ "admin.access-control.groups.form.members-list.table.name": "Аты", // "admin.access-control.groups.form.members-list.table.identity": "Identity", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.table.identity": "Identity", + "admin.access-control.groups.form.members-list.table.identity": "Сәйкестілік", // "admin.access-control.groups.form.members-list.table.email": "Email", - // TODO New key - Add a translation - "admin.access-control.groups.form.members-list.table.email": "Email", + "admin.access-control.groups.form.members-list.table.email": "Поштасы", // "admin.access-control.groups.form.members-list.table.netid": "NetID", - // TODO New key - Add a translation "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": "Жою/ Add", + "admin.access-control.groups.form.members-list.table.edit": "Жою/Қосу", // "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": "Қатысушыны аты-жөнімен жою \"{{name}}\"", @@ -871,8 +864,7 @@ "bitstream.edit.authorizations.title": "Бит ағынының саясатын өңдеу", // "bitstream.edit.return": "Back", - // TODO New key - Add a translation - "bitstream.edit.return": "Back", + "bitstream.edit.return": "Артқа", // "bitstream.edit.bitstream": "Bitstream: ", "bitstream.edit.bitstream": "Битстрим: ", @@ -1163,8 +1155,7 @@ "collection.delete.confirm": "Растау", // "collection.delete.processing": "Deleting", - // TODO New key - Add a translation - "collection.delete.processing": "Deleting", + "collection.delete.processing": "Өшірудемін", // "collection.delete.head": "Delete Collection", "collection.delete.head": "Топтаманы жою", @@ -1243,8 +1234,7 @@ "collection.edit.item-mapper.remove": "Таңдалған элементтердің салыстыруларын жою", // "collection.edit.item-mapper.search-form.placeholder": "Search items...", - // TODO New key - Add a translation - "collection.edit.item-mapper.search-form.placeholder": "Search items...", + "collection.edit.item-mapper.search-form.placeholder": "Элементі бойынша іздеу...", // "collection.edit.item-mapper.tabs.browse": "Browse mapped items", "collection.edit.item-mapper.tabs.browse": "Салыстырылған элементтерді қарау", @@ -1303,16 +1293,13 @@ "collection.edit.tabs.authorizations.title": "Топтаманы өзгерту - Авторизациялар", // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles", - // TODO New key - Add a translation - "collection.edit.item.authorizations.load-bundle-button": "Load more bundles", + "collection.edit.item.authorizations.load-bundle-button": "Қосымша пакеттерді жүктеңіз", // "collection.edit.item.authorizations.load-more-button": "Load more", - // TODO New key - Add a translation - "collection.edit.item.authorizations.load-more-button": "Load more", + "collection.edit.item.authorizations.load-more-button": "Көбірек көрсет", // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle", - // TODO New key - Add a translation - "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle", + "collection.edit.item.authorizations.show-bitstreams-button": "Бума үшін бит ағынының саясатын көрсету", // "collection.edit.tabs.metadata.head": "Edit Metadata", "collection.edit.tabs.metadata.head": "Метадеректерді өңдеу", @@ -1398,8 +1385,7 @@ "collection.edit.template.edit-button": "Өзгерту", // "collection.edit.template.error": "An error occurred retrieving the template item", - // TODO New key - Add a translation - "collection.edit.template.error": "An error occurred retrieving the template item", + "collection.edit.template.error": "Үлгі элементін алу кезінде қате пайда болды", // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"", "collection.edit.template.head": "Топтамаға арналған үлгі элементін өзгерту \"{{ collection }}\"", @@ -1408,8 +1394,7 @@ "collection.edit.template.label": "Үлгі элементі", // "collection.edit.template.loading": "Loading template item...", - // TODO New key - Add a translation - "collection.edit.template.loading": "Loading template item...", + "collection.edit.template.loading": "Үлгі элементін жүктеу...", // "collection.edit.template.notifications.delete.error": "Failed to delete the item template", "collection.edit.template.notifications.delete.error": "Элемент үлгісін жою мүмкін емес", @@ -1447,8 +1432,7 @@ "collection.form.title": "Атауы", // "collection.form.entityType": "Entity Type", - // TODO New key - Add a translation - "collection.form.entityType": "Entity Type", + "collection.form.entityType": "Нысан түрі", @@ -1467,8 +1451,7 @@ "collection.page.edit": "Жинақты өңдеңіз", // "collection.page.handle": "Permanent URI for this collection", - // TODO New key - Add a translation - "collection.page.handle": "Permanent URI for this collection", + "collection.page.handle": "Бұл коллекция үшін тұрақты URI", // "collection.page.license": "License", "collection.page.license": "Лицензия", @@ -1567,15 +1550,14 @@ // "communityList.breadcrumbs": "Community List", - // TODO New key - Add a translation - "communityList.breadcrumbs": "Community List", + "communityList.breadcrumbs": "Қауымдастықтар тізімі", // "communityList.tabTitle": "Community List", // TODO Source message changed - Revise the translation - "communityList.tabTitle": "DSpace - Қауымдастық Тізімі", + "communityList.tabTitle": " Қауымдастық Тізімі", // "communityList.title": "List of Communities", - "communityList.title": "Қауымдастықтар Тізімі", + "communityList.title": "Қауымдастықтар тізімі", // "communityList.showMore": "Show More", "communityList.showMore": "Көбірек Көрсету", @@ -1601,8 +1583,7 @@ "community.delete.confirm": "Растау", // "community.delete.processing": "Deleting...", - // TODO New key - Add a translation - "community.delete.processing": "Deleting...", + "community.delete.processing": "Жоюда...", // "community.delete.head": "Delete Community", "community.delete.head": "Қауымдастықты Жою", @@ -1623,16 +1604,14 @@ "community.edit.head": "Қауымдастықты Өзгерту", // "community.edit.breadcrumbs": "Edit Community", - "community.edit.breadcrumbs": "Edit Community", + "community.edit.breadcrumbs": "Қауымдастықты өңдеу", // "community.edit.logo.delete.title": "Delete logo", - // TODO New key - Add a translation - "community.edit.logo.delete.title": "Delete logo", + "community.edit.logo.delete.title": "Логотипті жою", // "community.edit.logo.delete-undo.title": "Undo delete", - // TODO New key - Add a translation - "community.edit.logo.delete-undo.title": "Undo delete", + "community.edit.logo.delete-undo.title": "Өшірмеу", // "community.edit.logo.label": "Community logo", "community.edit.logo.label": "Қауымдастық логотипі", @@ -1956,8 +1935,7 @@ "curation.form.submit.error.content": "Тапсырманы іске қосу кезіндегі қателік.", // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object", - // TODO New key - Add a translation - "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object", + "curation.form.submit.error.invalid-handle": "Бұл нысан үшін дескрипторды анықтау мүмкін емес", // "curation.form.handle.label": "Handle:", "curation.form.handle.label": "Қалам:", @@ -2302,12 +2280,10 @@ "form.clear-help": "Таңдалған мәнді жою үшін осы жерді басыңыз", // "form.discard": "Discard", - // TODO New key - Add a translation - "form.discard": "Discard", + "form.discard": "Тастау", // "form.drag": "Drag", - // TODO New key - Add a translation - "form.drag": "Drag", + "form.drag": "Сүйреп апарыңыз", // "form.edit": "Edit", "form.edit": "Өзгерту", @@ -2829,8 +2805,7 @@ "item.edit.item-mapper.notifications.remove.success.head": "Карталауды жою аяқталды", // "item.edit.item-mapper.search-form.placeholder": "Search collections...", - // TODO New key - Add a translation - "item.edit.item-mapper.search-form.placeholder": "Search collections...", + "item.edit.item-mapper.search-form.placeholder": "Жинақтар бойынша іздеу...", // "item.edit.item-mapper.tabs.browse": "Browse mapped collections", "item.edit.item-mapper.tabs.browse": "Карталанған жинақтарды шолу", @@ -2871,7 +2846,7 @@ "item.edit.metadata.headers.language": "Тіл", // "item.edit.metadata.headers.value": "Value", - "item.edit.metadata.headers.value": "құн", + "item.edit.metadata.headers.value": "Құны", // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", "item.edit.metadata.metadatafield.invalid": "Жарамды метадеректер өрісін таңдаңыз", @@ -3140,8 +3115,7 @@ "item.edit.tabs.status.buttons.reinstate.label": "Сақтау ішіндегі элементті қалпына келтіру", // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action", + "item.edit.tabs.status.buttons.unauthorized": "Сіз бұл әрекетті орындауға құқығыңыз жоқ", // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...", "item.edit.tabs.status.buttons.withdraw.button": "Шегінуге...", @@ -3515,102 +3489,78 @@ // "item.version.create.modal.header": "New version", - // TODO New key - Add a translation - "item.version.create.modal.header": "New version", + "item.version.create.modal.header": "Жаңа нұсқа", // "item.version.create.modal.text": "Create a new version for this item", - // TODO New key - Add a translation - "item.version.create.modal.text": "Create a new version for this item", + "item.version.create.modal.text": "Осы элементтің жаңа нұсқасын жасаңыз", // "item.version.create.modal.text.startingFrom": "starting from version {{version}}", - // TODO New key - Add a translation - "item.version.create.modal.text.startingFrom": "starting from version {{version}}", + "item.version.create.modal.text.startingFrom": "{{version}} нұсқасынан бастап", // "item.version.create.modal.button.confirm": "Create", - // TODO New key - Add a translation - "item.version.create.modal.button.confirm": "Create", + "item.version.create.modal.button.confirm": "Құру", // "item.version.create.modal.button.confirm.tooltip": "Create new version", - // TODO New key - Add a translation - "item.version.create.modal.button.confirm.tooltip": "Create new version", + "item.version.create.modal.button.confirm.tooltip": "Жаңа нұсқаны жасау", // "item.version.create.modal.button.cancel": "Cancel", - // TODO New key - Add a translation - "item.version.create.modal.button.cancel": "Cancel", + "item.version.create.modal.button.cancel": "Алып тастау", // "item.version.create.modal.button.cancel.tooltip": "Do not create new version", - // TODO New key - Add a translation - "item.version.create.modal.button.cancel.tooltip": "Do not create new version", + "item.version.create.modal.button.cancel.tooltip": "Жаңа нұсқаны жасамаңыз", // "item.version.create.modal.form.summary.label": "Summary", - // TODO New key - Add a translation - "item.version.create.modal.form.summary.label": "Summary", + "item.version.create.modal.form.summary.label": "Түйіндеме", // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", - // TODO New key - Add a translation - "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version", + "item.version.create.modal.form.summary.placeholder": "Жаңа нұсқаның қысқаша мазмұнын салыңыз", // "item.version.create.modal.submitted.header": "Creating new version...", - // TODO New key - Add a translation - "item.version.create.modal.submitted.header": "Creating new version...", + "item.version.create.modal.submitted.header": "Жаңа нұсқасын жасау...", // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.", - // TODO New key - Add a translation - "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.", + "item.version.create.modal.submitted.text": "Жаңа нұсқа жасалуда. Егер элемент көптеген байланыстарға ие болса, біраз уақыт кетуі мүмкін.", // "item.version.create.notification.success" : "New version has been created with version number {{version}}", - // TODO New key - Add a translation - "item.version.create.notification.success" : "New version has been created with version number {{version}}", + "item.version.create.notification.success" : "Жаңа нұсқа {{version}} нұсқасының нөмірімен жасалды", // "item.version.create.notification.failure" : "New version has not been created", - // TODO New key - Add a translation - "item.version.create.notification.failure" : "New version has not been created", + "item.version.create.notification.failure" : "Жаңа нұсқа жасалмады", // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", - // TODO New key - Add a translation - "item.version.create.notification.inProgress" : "A new version cannot be created because there is an inprogress submission in the version history", + "item.version.create.notification.inProgress" : "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар", // "item.version.delete.modal.header": "Delete version", - // TODO New key - Add a translation - "item.version.delete.modal.header": "Delete version", + "item.version.delete.modal.header": "Нұсқаны өшіру", // "item.version.delete.modal.text": "Do you want to delete version {{version}}?", - // TODO New key - Add a translation - "item.version.delete.modal.text": "Do you want to delete version {{version}}?", + "item.version.delete.modal.text": "Сіз {{version}} нұсқасын жойғыңыз келе ме?", // "item.version.delete.modal.button.confirm": "Delete", - // TODO New key - Add a translation - "item.version.delete.modal.button.confirm": "Delete", + "item.version.delete.modal.button.confirm": "Жою", // "item.version.delete.modal.button.confirm.tooltip": "Delete this version", - // TODO New key - Add a translation - "item.version.delete.modal.button.confirm.tooltip": "Delete this version", + "item.version.delete.modal.button.confirm.tooltip": "Бұл нұсқаны жою", // "item.version.delete.modal.button.cancel": "Cancel", - // TODO New key - Add a translation - "item.version.delete.modal.button.cancel": "Cancel", + "item.version.delete.modal.button.cancel": "Алып тастау", // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version", - // TODO New key - Add a translation - "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version", + "item.version.delete.modal.button.cancel.tooltip": "Бұл нұсқаны жоймаңыз", // "item.version.delete.notification.success" : "Version number {{version}} has been deleted", - // TODO New key - Add a translation - "item.version.delete.notification.success" : "Version number {{version}} has been deleted", + "item.version.delete.notification.success" : "Нұсқа нөмірі {{version}} жойылды", // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted", - // TODO New key - Add a translation - "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted", + "item.version.delete.notification.failure" : "Нұсқа нөмірі {{version}} жойылған жоқ", // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed", - // TODO New key - Add a translation - "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed", + "item.version.edit.notification.success" : "Нұсқа нөмірінің қысқаша сипаттамасы {{version}} өзгертілді", // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed", - // TODO New key - Add a translation - "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed", + "item.version.edit.notification.failure" : "Нұсқа нөмірінің қысқаша сипаттамасы {{version}} өзгертілген жоқ", @@ -3633,18 +3583,16 @@ "journal.page.publisher": "Баспагер", // "journal.page.titleprefix": "Journal: ", - "journal.page.titleprefix": "Күнделік:", + "journal.page.titleprefix": "Журнал:", // "journal.search.results.head": "Journal Search Results", "journal.search.results.head":"Журналдағы іздеу нәтижелері", // "journal-relationships.search.results.head": "Journal Search Results", - // TODO New key - Add a translation - "journal-relationships.search.results.head": "Journal Search Results", + "journal-relationships.search.results.head": "Журналдағы іздеу нәтижелері", // "journal.search.title": "Journal Search", - // TODO Source message changed - Revise the translation - "journal.search.title": "DSpace Angular :: Журналдағы іздеу", + "journal.search.title": "Журналдағы іздеу", @@ -3690,55 +3638,44 @@ "journalvolume.page.issuedate": "Шығарылған күні", // "journalvolume.page.titleprefix": "Journal Volume: ", - "journalvolume.page.titleprefix":"Журнал көлемі:", + "journalvolume.page.titleprefix": "Журнал көлемі:", // "journalvolume.page.volume": "Volume", "journalvolume.page.volume": "Көлемі", // "iiifsearchable.listelement.badge": "Document Media", - // TODO New key - Add a translation - "iiifsearchable.listelement.badge": "Document Media", + "iiifsearchable.listelement.badge": "Құжаттың медиасы", // "iiifsearchable.page.titleprefix": "Document: ", - // TODO New key - Add a translation - "iiifsearchable.page.titleprefix": "Document: ", + "iiifsearchable.page.titleprefix": "Құжат: ", // "iiifsearchable.page.doi": "Permanent Link: ", - // TODO New key - Add a translation - "iiifsearchable.page.doi": "Permanent Link: ", + "iiifsearchable.page.doi": "Тұрақты сілтеме: ", // "iiifsearchable.page.issue": "Issue: ", - // TODO New key - Add a translation - "iiifsearchable.page.issue": "Issue: ", + "iiifsearchable.page.issue": "Шығарылымы: ", // "iiifsearchable.page.description": "Description: ", - // TODO New key - Add a translation - "iiifsearchable.page.description": "Description: ", + "iiifsearchable.page.description": "Сипаттамасы: ", // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.", - // TODO New key - Add a translation - "iiifviewer.fullscreen.notice": "Use full screen for better viewing.", + "iiifviewer.fullscreen.notice": "Анық көру үшін толық экранды пайдаланыңыз.", // "iiif.listelement.badge": "Image Media", - // TODO New key - Add a translation - "iiif.listelement.badge": "Image Media", + "iiif.listelement.badge": "Белгіше", // "iiif.page.titleprefix": "Image: ", - // TODO New key - Add a translation - "iiif.page.titleprefix": "Image: ", + "iiif.page.titleprefix": "Суреті: ", // "iiif.page.doi": "Permanent Link: ", - // TODO New key - Add a translation - "iiif.page.doi": "Permanent Link: ", + "iiif.page.doi": "Тұрақты сілтеме: ", // "iiif.page.issue": "Issue: ", - // TODO New key - Add a translation - "iiif.page.issue": "Issue: ", + "iiif.page.issue": "Шығарылымы: ", // "iiif.page.description": "Description: ", - // TODO New key - Add a translation - "iiif.page.description": "Description: ", + "iiif.page.description": "Сипаттамасы: ", // "loading.bitstream": "Loading bitstream...", @@ -3813,12 +3750,10 @@ "login.form.or-divider": "немесе", // "login.form.oidc": "Log in with OIDC", - // TODO New key - Add a translation - "login.form.oidc": "Log in with OIDC", + "login.form.oidc": "OIDC"-пен кіру, // "login.form.orcid": "Log in with ORCID", - // TODO New key - Add a translation - "login.form.orcid": "Log in with ORCID", + "login.form.orcid": "ORCID-пен кіру", // "login.form.password": "Password", "login.form.password":"Пароль", @@ -3856,8 +3791,7 @@ "menu.header.image.logo": "Репозиторий логотипі", // "menu.header.admin.description": "Management menu", - // TODO New key - Add a translation - "menu.header.admin.description": "Management menu", + "menu.header.admin.description": "Басқару мәзірі", @@ -3961,8 +3895,7 @@ "menu.section.icon.control_panel": "Басқару тақтасының мәзір бөлімі", // "menu.section.icon.curation_tasks": "Curation Task menu section", - // TODO New key - Add a translation - "menu.section.icon.curation_tasks": "Curation Task menu section", + "menu.section.icon.curation_tasks": "Кураторлық тапсырмалар мәзірінің бөлімі", // "menu.section.icon.edit": "Edit menu section", "menu.section.icon.edit": "Өңдеу мәзір бөлімі", @@ -3974,8 +3907,7 @@ "menu.section.icon.find": "Мәзір бөлімін табу", // "menu.section.icon.health": "Health check menu section", - // TODO New key - Add a translation - "menu.section.icon.health": "Health check menu section", + "menu.section.icon.health": "Жағдайды тексеру мәзірінің бөлімі", // "menu.section.icon.import": "Import menu section", "menu.section.icon.import": "Импорттау мәзірі бөлімі", @@ -3987,8 +3919,7 @@ "menu.section.icon.pin": "Бүйірлік тақтаны бекіту", // "menu.section.icon.processes": "Processes Health", - // TODO Source message changed - Revise the translation - "menu.section.icon.processes": "Процесстер мәзірі бөлімі", + "menu.section.icon.processes": "Процесстердің жағдайы", // "menu.section.icon.registries": "Registries menu section", "menu.section.icon.registries": "Тіркеулер мәзірі бөлімі", @@ -3997,8 +3928,7 @@ "menu.section.icon.statistics_task": "Статистика тапсырмалары мәзірі бөлімі", // "menu.section.icon.workflow": "Administer workflow menu section", - // TODO New key - Add a translation - "menu.section.icon.workflow": "Administer workflow menu section", + "menu.section.icon.workflow": "Мәзір бөлімі жұмыс процесін басқару", // "menu.section.icon.unpin": "Unpin sidebar", "menu.section.icon.unpin": "Бүйірлік тақтаны босату", @@ -4045,11 +3975,10 @@ // "menu.section.processes": "Processes", - "menu.section.processes": "процестер", + "menu.section.processes": "Процестер", // "menu.section.health": "Health", - // TODO New key - Add a translation - "menu.section.health": "Health", + "menu.section.health": "Жағдайы", @@ -4102,25 +4031,22 @@ // "menu.section.toggle.statistics_task": "Toggle Statistics Task section", "menu.section.toggle.statistics_task": "Статистика тапсырмасы бөлімін ауыстыру", - // "menu.section.workflow": "Administer Workflow", "menu.section.workflow": "Жұмыс процесін басқару", // "metadata-export-search.tooltip": "Export search results as CSV", - // TODO New key - Add a translation - "metadata-export-search.tooltip": "Export search results as CSV", + "metadata-export-search.tooltip": "Іздеу нәтижелерін CSV форматында экспорттау", + // "metadata-export-search.submit.success": "The export was started successfully", - // TODO New key - Add a translation - "metadata-export-search.submit.success": "The export was started successfully", + "metadata-export-search.submit.success": "Экспорт сәтті басталды", + // "metadata-export-search.submit.error": "Starting the export has failed", - // TODO New key - Add a translation - "metadata-export-search.submit.error": "Starting the export has failed", + "metadata-export-search.submit.error": "Экспортты іске қосу мүмкін емес", // "mydspace.breadcrumbs": "MyDSpace", - // TODO New key - Add a translation - "mydspace.breadcrumbs": "MyDSpace", + "mydspace.breadcrumbs": "Ортам", // "mydspace.description": "", "mydspace.description": "", @@ -4144,7 +4070,7 @@ "mydspace.messages.mark-as-unread": "Оқылмаған деп белгілеу", // "mydspace.messages.no-content": "No content.", - "mydspace.messages.no-content":"Мазмұн жоқ.", + "mydspace.messages.no-content":"Мазмұны жоқ.", // "mydspace.messages.no-messages": "No messages yet.", "mydspace.messages.no-messages": "Әлі хабарлар жоқ.", @@ -4204,12 +4130,10 @@ "mydspace.results.no-uri": "Uri жоқ", // "mydspace.search-form.placeholder": "Search in mydspace...", - // TODO New key - Add a translation - "mydspace.search-form.placeholder": "Search in mydspace...", + "mydspace.search-form.placeholder": "Өз ортадан іздеу...", // "mydspace.show.workflow": "Workflow tasks", - // TODO Source message changed - Revise the translation - "mydspace.show.workflow": "Барлық тапсырмалар", + "mydspace.show.workflow": "Жұмыс процесінің міндеттері", // "mydspace.show.workspace": "Your Submissions", "mydspace.show.workspace":"Сіздің өтініштеріңіз", @@ -4265,15 +4189,13 @@ "nav.login": "Кіру", // "nav.logout": "User profile menu and Log Out", - // TODO Source message changed - Revise the translation - "nav.logout": "Шығу", + "nav.logout": "Пайдаланушы профилі мәзірі және шығу", // "nav.main.description": "Main navigation bar", - // TODO New key - Add a translation - "nav.main.description": "Main navigation bar", + "nav.main.description": "Басты навигация жолағы", // "nav.mydspace": "MyDSpace", - "nav.mydspace": "MyDSpace", + "nav.mydspace": "Менім DSpace", // "nav.profile": "Profile", "nav.profile": "Профиль", @@ -4288,16 +4210,13 @@ "nav.stop-impersonating": "Eperson атын шығаруды тоқтатыңыз", // "nav.toggle" : "Toggle navigation", - // TODO New key - Add a translation - "nav.toggle" : "Toggle navigation", + "nav.toggle" : "Навигацияны ауыстыру", // "nav.user.description" : "User profile bar", - // TODO New key - Add a translation - "nav.user.description" : "User profile bar", + "nav.user.description" : "Пайдаланушы профилі тақтасы", // "none.listelement.badge": "Item", - // TODO New key - Add a translation - "none.listelement.badge": "Item", + "none.listelement.badge": "Элемент", // "orgunit.listelement.badge": "Organizational Unit", @@ -4327,8 +4246,7 @@ // "pagination.options.description": "Pagination options", - // TODO New key - Add a translation - "pagination.options.description": "Pagination options", + "pagination.options.description": "Бетті бөлу нұсқалары", // "pagination.results-per-page": "Results Per Page", "pagination.results-per-page": "Әр беттегі нәтижелер", @@ -4500,42 +4418,33 @@ "process.detail.create" : "Ұқсас процесті жасау", // "process.detail.actions": "Actions", - // TODO New key - Add a translation - "process.detail.actions": "Actions", + "process.detail.actions": "Әрекеттер", // "process.detail.delete.button": "Delete process", - // TODO New key - Add a translation - "process.detail.delete.button": "Delete process", + "process.detail.delete.button": "Процесс жою", // "process.detail.delete.header": "Delete process", - // TODO New key - Add a translation - "process.detail.delete.header": "Delete process", + "process.detail.delete.header": "Процесс жою", // "process.detail.delete.body": "Are you sure you want to delete the current process?", - // TODO New key - Add a translation - "process.detail.delete.body": "Are you sure you want to delete the current process?", + "process.detail.delete.body": "Ағымдағы процесті жойғыңыз келетініне сенімдісіз бе?", // "process.detail.delete.cancel": "Cancel", - // TODO New key - Add a translation - "process.detail.delete.cancel": "Cancel", + "process.detail.delete.cancel": "Алып тастау", // "process.detail.delete.confirm": "Delete process", - // TODO New key - Add a translation - "process.detail.delete.confirm": "Delete process", + "process.detail.delete.confirm": "Процесс жою.", // "process.detail.delete.success": "The process was successfully deleted.", - // TODO New key - Add a translation - "process.detail.delete.success": "The process was successfully deleted.", + "process.detail.delete.success": "Процесс сәтті жойылды.", // "process.detail.delete.error": "Something went wrong when deleting the process", - // TODO New key - Add a translation - "process.detail.delete.error": "Something went wrong when deleting the process", + "process.detail.delete.error": "Процесс жойылған кезде бірдеңе дұрыс болмады", // "process.overview.table.finish" : "Finish time (UTC)", - // TODO Source message changed - Revise the translation - "process.overview.table.finish" :"Аяқтау уақыты", + "process.overview.table.finish" : "Аяқтау уақыты (UTC)", // "process.overview.table.id" : "Process ID", "process.overview.table.id" :"Процесс идентификаторы", @@ -4563,40 +4472,31 @@ "process.overview.new": "Жаңа", // "process.overview.table.actions": "Actions", - // TODO New key - Add a translation - "process.overview.table.actions": "Actions", + "process.overview.table.actions": "Әрекеттер", // "process.overview.delete": "Delete {{count}} processes", - // TODO New key - Add a translation - "process.overview.delete": "Delete {{count}} processes", + "process.overview.delete": "{{count}} процестерді жою", // "process.overview.delete.clear": "Clear delete selection", - // TODO New key - Add a translation - "process.overview.delete.clear": "Clear delete selection", + "process.overview.delete.clear": "Өшіруді өшіру", // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.", - // TODO New key - Add a translation - "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.", + "process.overview.delete.processing": "{{count}} процестер жойылады. Жоюдың толық аяқталғанын күтіңіз. Бұл біраз уақытты алуы мүмкін екенін ескеріңіз.", // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?", - // TODO New key - Add a translation - "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?", + "process.overview.delete.body": "Сіз {{count}} процесс(тер) жойғыңыз келетініне сенімдісіз бе?", // "process.overview.delete.header": "Delete processes", - // TODO New key - Add a translation - "process.overview.delete.header": "Delete processes", + "process.overview.delete.header": "Процесті жою", // "process.bulk.delete.error.head": "Error on deleteing process", - // TODO New key - Add a translation - "process.bulk.delete.error.head": "Error on deleteing process", + "process.bulk.delete.error.head": "Процесті жою қатесі", // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ", - // TODO New key - Add a translation - "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ", + "process.bulk.delete.error.body": "{{processId}} идентификаторы бар Процесс жойылмады. Қалған процестер әлі де жойылады. ", // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted", - // TODO New key - Add a translation - "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted", + "process.bulk.delete.success": "{{count}} процестер сәтті жойылды", @@ -4604,21 +4504,19 @@ "profile.breadcrumbs": "Профильді жаңарту", // "profile.card.identify": "Identify", - "profile.card.identify":"Анықтау", + "profile.card.identify": "Анықтау", // "profile.card.security": "Security", "profile.card.security": "Қауіпсіздік", // "profile.form.submit": "Save", - // TODO Source message changed - Revise the translation "profile.form.submit": "Профильді жаңарту", // "profile.groups.head": "Authorization groups you belong to", "profile.groups.head": "Сіз тиесілі авторизация топтары", // "profile.special.groups.head": "Authorization special groups you belong to", - // TODO New key - Add a translation - "profile.special.groups.head": "Authorization special groups you belong to", + "profile.special.groups.head": "Авторизация сіз тиесілі арнайы топтар", // "profile.head": "Update Profile", "profile.head": "Профильді жаңарту", @@ -4690,11 +4588,10 @@ "profile.title":"Профильді жаңарту", // "profile.card.researcher": "Researcher Profile", - // TODO New key - Add a translation - "profile.card.researcher": "Researcher Profile", + "profile.card.researcher": "Зерттеуші профилі", // "project.listelement.badge": "Research Project", - "project.listelement.badge":"Зерттеу жобасы", + "project.listelement.badge": "Зерттеу жобасы", // "project.page.contributor": "Contributors", "project.page.contributor": "Қалымдар", @@ -4766,16 +4663,13 @@ // "media-viewer.next": "Next", - // TODO New key - Add a translation - "media-viewer.next": "Next", + "media-viewer.next": "Келесісі", // "media-viewer.previous": "Previous", - // TODO New key - Add a translation - "media-viewer.previous": "Previous", + "media-viewer.previous": "Алдыңғы", // "media-viewer.playlist": "Playlist", - // TODO New key - Add a translation - "media-viewer.playlist": "Playlist", + "media-viewer.playlist": "Ойнату тізімі", // "register-email.title": "New user registration", @@ -4945,14 +4839,12 @@ // "repository.image.logo": "Repository logo", - "repository.image.logo": "Repository logo", + "repository.image.logo": "Репозиторий логотипі", // "repository.title.prefix": "DSpace Angular :: ", - // TODO New key - Add a translation "repository.title.prefix": "DSpace Angular :: ", // "repository.title.prefixDSpace": "DSpace Angular ::", - // TODO New key - Add a translation "repository.title.prefixDSpace": "DSpace Angular ::", @@ -5008,12 +4900,10 @@ "resource-policies.edit.page.failure.content":"Ресурстар саясатын өңдеуде қате пайда болды.", // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.", - // TODO New key - Add a translation - "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.", + "resource-policies.edit.page.target-failure.content": "Ресурстар саясатының мақсатты нысанын (тұлғаны немесе топты) өңдеу кезінде қате пайда болды.", // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.", - // TODO New key - Add a translation - "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.", + "resource-policies.edit.page.other-failure.content": "Ресурстар саясатын өңдеу кезінде қате пайда болды. Мақсат (адам немесе топ) сәтті жаңартылды.", // "resource-policies.edit.page.success.content": "Operation successful", "resource-policies.edit.page.success.content": "Операция сәтті өтті", @@ -5049,23 +4939,18 @@ "resource-policies.form.eperson-group-list.table.headers.name": "Аты", // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.header": "Cannot change type", + "resource-policies.form.eperson-group-list.modal.header": "Түрін өзгерту мүмкін емес", // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.", + "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Адамды топпен алмастыру мүмкін емес.", // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.", + "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Топты ePerson-мен алмастыру мүмкін емес.", // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.", + "resource-policies.form.eperson-group-list.modal.text2": "Ағымдағы ресурстар саясатын жойып, дұрыс түрімен жаңасын жасаңыз.", // "resource-policies.form.eperson-group-list.modal.close": "Ok", - // TODO New key - Add a translation "resource-policies.form.eperson-group-list.modal.close": "Ok", // "resource-policies.form.date.end.label": "End Date", @@ -5165,14 +5050,13 @@ "search.filters.applied.f.dateSubmitted": "Ұсыну күні", // "search.filters.applied.f.discoverable": "Non-discoverable", - // TODO Source message changed - Revise the translation "search.filters.applied.f.discoverable": "Жеке", // "search.filters.applied.f.entityType": "Item Type", "search.filters.applied.f.entityType": "Өнім түрі", // "search.filters.applied.f.has_content_in_original_bundle": "Has files", - "search.filters.applied.f.has_content_in_original_bundle":"Файлдар бар", + "search.filters.applied.f.has_content_in_original_bundle": "Файлдар бар", // "search.filters.applied.f.itemtype": "Type", "search.filters.applied.f.itemtype": "Түрі", @@ -5207,8 +5091,7 @@ "search.filters.filter.author.placeholder": "Автордың аты", // "search.filters.filter.author.label": "Search author name", - // TODO New key - Add a translation - "search.filters.filter.author.label": "Search author name", + "search.filters.filter.author.label": "Іздеу авторының аты", // "search.filters.filter.birthDate.head": "Birth Date", "search.filters.filter.birthDate.head": "Туған күні", @@ -5217,12 +5100,10 @@ "search.filters.filter.birthDate.placeholder":"Туған күні", // "search.filters.filter.birthDate.label": "Search birth date", - // TODO New key - Add a translation - "search.filters.filter.birthDate.label": "Search birth date", + "search.filters.filter.birthDate.label": "Туған күнді іздеу", // "search.filters.filter.collapse": "Collapse filter", - // TODO New key - Add a translation - "search.filters.filter.collapse": "Collapse filter", + "search.filters.filter.collapse": "Сүзгіні кішірейту", // "search.filters.filter.creativeDatePublished.head": "Date Published", "search.filters.filter.creativeDatePublished.head": "Жарияланған күні", @@ -5231,8 +5112,7 @@ "search.filters.filter.creativeDatePublished.placeholder": "Жарияланған күні", // "search.filters.filter.creativeDatePublished.label": "Search date published", - // TODO New key - Add a translation - "search.filters.filter.creativeDatePublished.label": "Search date published", + "search.filters.filter.creativeDatePublished.label": "Жарияланған күнімен іздеу", // "search.filters.filter.creativeWorkEditor.head": "Editor", "search.filters.filter.creativeWorkEditor.head": "Редактор", @@ -5241,8 +5121,7 @@ "search.filters.filter.creativeWorkEditor.placeholder": "Редактор", // "search.filters.filter.creativeWorkEditor.label": "Search editor", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkEditor.label": "Search editor", + "search.filters.filter.creativeWorkEditor.label": "Редакторды іздеу", // "search.filters.filter.creativeWorkKeywords.head": "Subject", "search.filters.filter.creativeWorkKeywords.head": "Тақырып", @@ -5260,27 +5139,22 @@ "search.filters.filter.creativeWorkPublisher.placeholder":"Баспагер", // "search.filters.filter.creativeWorkPublisher.label": "Search publisher", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkPublisher.label": "Search publisher", + "search.filters.filter.creativeWorkPublisher.label": "Баспагерді іздеу", // "search.filters.filter.dateIssued.head": "Date", - "search.filters.filter.dateIssued.head": "Кездесуге", + "search.filters.filter.dateIssued.head": "Күн", // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date", - // TODO Source message changed - Revise the translation - "search.filters.filter.dateIssued.max.placeholder": "Ең төменгі күн", + "search.filters.filter.dateIssued.max.placeholder": "Ең жоғары күн", // "search.filters.filter.dateIssued.max.label": "End", - // TODO New key - Add a translation - "search.filters.filter.dateIssued.max.label": "End", + "search.filters.filter.dateIssued.max.label": "Соңы", // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date", - // TODO Source message changed - Revise the translation - "search.filters.filter.dateIssued.min.placeholder":"Максималды күн", + "search.filters.filter.dateIssued.min.placeholder":"Минималды күн", // "search.filters.filter.dateIssued.min.label": "Start", - // TODO New key - Add a translation - "search.filters.filter.dateIssued.min.label": "Start", + "search.filters.filter.dateIssued.min.label": "Бастау", // "search.filters.filter.dateSubmitted.head": "Date submitted", "search.filters.filter.dateSubmitted.head": "Жіберілген күні", @@ -5289,14 +5163,13 @@ "search.filters.filter.dateSubmitted.placeholder": "Ұсыну күні", // "search.filters.filter.dateSubmitted.label": "Search date submitted", - // TODO New key - Add a translation - "search.filters.filter.dateSubmitted.label": "Search date submitted", + "search.filters.filter.dateSubmitted.label": "Жіберілген күнімен сұрау салу", // "search.filters.filter.discoverable.head": "Non-discoverable", "search.filters.filter.discoverable.head": "Жеке", // "search.filters.filter.withdrawn.head": "Withdrawn", - "search.filters.filter.withdrawn.head": "Отозванный", + "search.filters.filter.withdrawn.head": "Алынған", // "search.filters.filter.entityType.head": "Item Type", "search.filters.filter.entityType.head": "Өнім түрі", @@ -5305,12 +5178,10 @@ "search.filters.filter.entityType.placeholder": "Өнім түрі", // "search.filters.filter.entityType.label": "Search item type", - // TODO New key - Add a translation - "search.filters.filter.entityType.label": "Search item type", + "search.filters.filter.entityType.label": "Іздеу элементінің түрі", // "search.filters.filter.expand": "Expand filter", - // TODO New key - Add a translation - "search.filters.filter.expand": "Expand filter", + "search.filters.filter.expand": "Сүзгіні жаю", // "search.filters.filter.has_content_in_original_bundle.head": "Has files", "search.filters.filter.has_content_in_original_bundle.head": "Файлдар бар", @@ -5322,8 +5193,7 @@ "search.filters.filter.itemtype.placeholder":"Түрі", // "search.filters.filter.itemtype.label": "Search type", - // TODO New key - Add a translation - "search.filters.filter.itemtype.label": "Search type", + "search.filters.filter.itemtype.label": "Түрі бойынша іздеу", // "search.filters.filter.jobTitle.head": "Job Title", "search.filters.filter.jobTitle.head": "Лауазымы", @@ -5332,8 +5202,7 @@ "search.filters.filter.jobTitle.placeholder":"Лауазымы", // "search.filters.filter.jobTitle.label": "Search job title", - // TODO New key - Add a translation - "search.filters.filter.jobTitle.label": "Search job title", + "search.filters.filter.jobTitle.label": "Лауазым атауын іздеу", // "search.filters.filter.knowsLanguage.head": "Known language", "search.filters.filter.knowsLanguage.head": "Белгілі тіл", @@ -5342,8 +5211,7 @@ "search.filters.filter.knowsLanguage.placeholder": "Белгілі тіл", // "search.filters.filter.knowsLanguage.label": "Search known language", - // TODO New key - Add a translation - "search.filters.filter.knowsLanguage.label": "Search known language", + "search.filters.filter.knowsLanguage.label": "Белгілі тілде іздеу", // "search.filters.filter.namedresourcetype.head": "Status", "search.filters.filter.namedresourcetype.head": "Мәртебе", @@ -5352,8 +5220,7 @@ "search.filters.filter.namedresourcetype.placeholder": "Мәртебе", // "search.filters.filter.namedresourcetype.label": "Search status", - // TODO New key - Add a translation - "search.filters.filter.namedresourcetype.label": "Search status", + "search.filters.filter.namedresourcetype.label": "Іздеу мәртебесі", // "search.filters.filter.objectpeople.head": "People", "search.filters.filter.objectpeople.head": "Адамдар", @@ -5362,8 +5229,7 @@ "search.filters.filter.objectpeople.placeholder": "Адамдар", // "search.filters.filter.objectpeople.label": "Search people", - // TODO New key - Add a translation - "search.filters.filter.objectpeople.label": "Search people", + "search.filters.filter.objectpeople.label": "Тұлғаны іздеу", // "search.filters.filter.organizationAddressCountry.head": "Country", "search.filters.filter.organizationAddressCountry.head": "Ел", @@ -5372,8 +5238,7 @@ "search.filters.filter.organizationAddressCountry.placeholder": "Ел", // "search.filters.filter.organizationAddressCountry.label": "Search country", - // TODO New key - Add a translation - "search.filters.filter.organizationAddressCountry.label": "Search country", + "search.filters.filter.organizationAddressCountry.label": "Елді іздеу", // "search.filters.filter.organizationAddressLocality.head": "City", "search.filters.filter.organizationAddressLocality.head": "Қала", @@ -5382,8 +5247,7 @@ "search.filters.filter.organizationAddressLocality.placeholder": "Қаласы", // "search.filters.filter.organizationAddressLocality.label": "Search city", - // TODO New key - Add a translation - "search.filters.filter.organizationAddressLocality.label": "Search city", + "search.filters.filter.organizationAddressLocality.label": "Қаланы іздеу", // "search.filters.filter.organizationFoundingDate.head": "Date Founded", "search.filters.filter.organizationFoundingDate.head": "Құрылған күні", @@ -5392,8 +5256,7 @@ "search.filters.filter.organizationFoundingDate.placeholder": "Құрылған күні", // "search.filters.filter.organizationFoundingDate.label": "Search date founded", - // TODO New key - Add a translation - "search.filters.filter.organizationFoundingDate.label": "Search date founded", + "search.filters.filter.organizationFoundingDate.label": "Құрылған күні бойынша іздеу", // "search.filters.filter.scope.head": "Scope", "search.filters.filter.scope.head": "Қолдану саласы", @@ -5402,8 +5265,7 @@ "search.filters.filter.scope.placeholder": "Ауқым сүзгісі", // "search.filters.filter.scope.label": "Search scope filter", - // TODO New key - Add a translation - "search.filters.filter.scope.label": "Search scope filter", + "search.filters.filter.scope.label": "Іздеу аумағының сүзгісі", // "search.filters.filter.show-less": "Collapse", "search.filters.filter.show-less": "Коллапс", @@ -5418,8 +5280,7 @@ "search.filters.filter.subject.placeholder": "Тақырып", // "search.filters.filter.subject.label": "Search subject", - // TODO New key - Add a translation - "search.filters.filter.subject.label": "Search subject", + "search.filters.filter.subject.label": "Іздеу тақырыбы", // "search.filters.filter.submitter.head": "Submitter", "search.filters.filter.submitter.head": "Жіберуші", @@ -5428,8 +5289,7 @@ "search.filters.filter.submitter.placeholder":"Жіберуші", // "search.filters.filter.submitter.label": "Search submitter", - // TODO New key - Add a translation - "search.filters.filter.submitter.label": "Search submitter", + "search.filters.filter.submitter.label": "Іздеу жіберушіні", @@ -5496,20 +5356,16 @@ "search.results.empty": "Сіздің іздеуіңіз нәтиже бермеді.", // "search.results.view-result": "View", - // TODO New key - Add a translation - "search.results.view-result": "View", + "search.results.view-result": "Көрінісі", // "search.results.response.500": "An error occurred during query execution, please try again later", - // TODO New key - Add a translation - "search.results.response.500": "An error occurred during query execution, please try again later", + "search.results.response.500": "Сұрауды орындау кезінде қате пайда болды, кейінірек қайталап көріңіз", // "default.search.results.head": "Search Results", - // TODO New key - Add a translation - "default.search.results.head": "Search Results", + "default.search.results.head": "Іздеу нәтижелері", // "default-relationships.search.results.head": "Search Results", - // TODO New key - Add a translation - "default-relationships.search.results.head": "Search Results", + "default-relationships.search.results.head": "Іздеу нәтижелері", // "search.sidebar.close": "Back to results", @@ -5559,36 +5415,28 @@ "sorting.dc.title.DESC": "Кему тақырыбы", // "sorting.score.ASC": "Least Relevant", - // TODO New key - Add a translation - "sorting.score.ASC": "Least Relevant", + "sorting.score.ASC": "Ең Аз Өзекті", // "sorting.score.DESC": "Most Relevant", - // TODO Source message changed - Revise the translation - "sorting.score.DESC": "Өзектілігі", + "sorting.score.DESC": "Өзектілігі көбірек", // "sorting.dc.date.issued.ASC": "Date Issued Ascending", - // TODO New key - Add a translation - "sorting.dc.date.issued.ASC": "Date Issued Ascending", + "sorting.dc.date.issued.ASC": "Өсу бойынша шығарылған күні", // "sorting.dc.date.issued.DESC": "Date Issued Descending", - // TODO New key - Add a translation - "sorting.dc.date.issued.DESC": "Date Issued Descending", + "sorting.dc.date.issued.DESC": "Кему бойынша шығарылған күні", // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending", - // TODO New key - Add a translation - "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending", + "sorting.dc.date.accessioned.ASC": "Өсу бойынша қол жеткізу күні", // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending", - // TODO New key - Add a translation - "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending", + "sorting.dc.date.accessioned.DESC": "Кему бойынша қол жеткізу күні", // "sorting.lastModified.ASC": "Last modified Ascending", - // TODO New key - Add a translation - "sorting.lastModified.ASC": "Last modified Ascending", + "sorting.lastModified.ASC": "Өсу бойынша соңғы өзгеріс", // "sorting.lastModified.DESC": "Last modified Descending", - // TODO New key - Add a translation - "sorting.lastModified.DESC": "Last modified Descending", + "sorting.lastModified.DESC": "Кему бойынша соңғы өзгеріс", // "statistics.title": "Statistics", @@ -5627,15 +5475,13 @@ // "submission.edit.breadcrumbs": "Edit Submission", - // TODO New key - Add a translation - "submission.edit.breadcrumbs": "Edit Submission", + "submission.edit.breadcrumbs": "Жіберуді өңдеу", // "submission.edit.title": "Edit Submission", "submission.edit.title": "Жіберуді өңдеу", // "submission.general.cancel": "Cancel", - // TODO New key - Add a translation - "submission.general.cancel": "Cancel", + "submission.general.cancel": "Алып тастау", // "submission.general.cannot_submit": "You have not the privilege to make a new submission.", "submission.general.cannot_submit": "Сізде жаңа қойылым жасау артықшылығы жоқ.", @@ -5659,12 +5505,10 @@ "submission.general.discard.submit": "Тастау", // "submission.general.info.saved": "Saved", - // TODO New key - Add a translation - "submission.general.info.saved": "Saved", + "submission.general.info.saved": "Сақталған", // "submission.general.info.pending-changes": "Unsaved changes", - // TODO New key - Add a translation - "submission.general.info.pending-changes": "Unsaved changes", + "submission.general.info.pending-changes": "Сақталмаған өзгерістер", // "submission.general.save": "Save", "submission.general.save": "Сақтау", @@ -5680,36 +5524,28 @@ "submission.import-external.title":"Метадеректерді сыртқы көзден импорттау", // "submission.import-external.title.Journal": "Import a journal from an external source", - // TODO New key - Add a translation - "submission.import-external.title.Journal": "Import a journal from an external source", + "submission.import-external.title.Journal": "Журналды сыртқы көзден импорттау", // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source", - // TODO New key - Add a translation - "submission.import-external.title.JournalIssue": "Import a journal issue from an external source", + "submission.import-external.title.JournalIssue": "Журнал шығарылымын сыртқы көзден импорттаңыз", // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source", - // TODO New key - Add a translation - "submission.import-external.title.JournalVolume": "Import a journal volume from an external source", + "submission.import-external.title.JournalVolume": "Журнал көлемін сыртқы көзден импорттаңыз", // "submission.import-external.title.OrgUnit": "Import a publisher from an external source", - // TODO New key - Add a translation - "submission.import-external.title.OrgUnit": "Import a publisher from an external source", + "submission.import-external.title.OrgUnit": "Баспаны сыртқы көзден импорттаңыз", // "submission.import-external.title.Person": "Import a person from an external source", - // TODO New key - Add a translation - "submission.import-external.title.Person": "Import a person from an external source", + "submission.import-external.title.Person": "Тұлғаны сыртқы көзден импорттаңыз", // "submission.import-external.title.Project": "Import a project from an external source", - // TODO New key - Add a translation - "submission.import-external.title.Project": "Import a project from an external source", + "submission.import-external.title.Project": "Жобаны сыртқы көзден импорттаңыз", // "submission.import-external.title.Publication": "Import a publication from an external source", - // TODO New key - Add a translation - "submission.import-external.title.Publication": "Import a publication from an external source", + "submission.import-external.title.Publication": "Жарияланымды сыртқы көзден импорттау", // "submission.import-external.title.none": "Import metadata from an external source", - // TODO New key - Add a translation - "submission.import-external.title.none": "Import metadata from an external source", + "submission.import-external.title.none": "Метадеректерді сыртқы көзден импорттау", // "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": "Ғарышқа импорттау үшін интернеттен элементтерді табу үшін жоғарыдағы сұрауды енгізіңіз.", @@ -5733,67 +5569,55 @@ "submission.import-external.source.arxiv": "arXiv", // "submission.import-external.source.ads": "NASA/ADS", - // TODO New key - Add a translation "submission.import-external.source.ads": "NASA/ADS", // "submission.import-external.source.cinii": "CiNii", - // TODO New key - Add a translation "submission.import-external.source.cinii": "CiNii", // "submission.import-external.source.crossref": "CrossRef", - // TODO New key - Add a translation "submission.import-external.source.crossref": "CrossRef", // "submission.import-external.source.scielo": "SciELO", - // TODO New key - Add a translation "submission.import-external.source.scielo": "SciELO", // "submission.import-external.source.scopus": "Scopus", - // TODO New key - Add a translation "submission.import-external.source.scopus": "Scopus", // "submission.import-external.source.vufind": "VuFind", - // TODO New key - Add a translation "submission.import-external.source.vufind": "VuFind", // "submission.import-external.source.wos": "Web Of Science", - // TODO New key - Add a translation - "submission.import-external.source.wos": "Web Of Science", + "submission.import-external.source.wos": "Ғылым Желісі", // "submission.import-external.source.orcidWorks": "ORCID", - // TODO New key - Add a translation "submission.import-external.source.orcidWorks": "ORCID", // "submission.import-external.source.epo": "European Patent Office (EPO)", - // TODO New key - Add a translation - "submission.import-external.source.epo": "European Patent Office (EPO)", + "submission.import-external.source.epo": "Еуропалық патенттік ведомство (ЕПВ)", // "submission.import-external.source.loading": "Loading ...", "submission.import-external.source.loading": "Жүктеу...", // "submission.import-external.source.sherpaJournal": "SHERPA Journals", - "submission.import-external.source.sherpaJournal": "ШЕРПА күнделіктері", + "submission.import-external.source.sherpaJournal": "ШЕРПА журналдары", // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN", - // TODO New key - Add a translation - "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN", + "submission.import-external.source.sherpaJournalIssn": "SHERPA журналдағы ISSN", // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers", "submission.import-external.source.sherpaPublisher": "ШЕРПА баспасы", // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API", - // TODO New key - Add a translation - "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API", + "submission.import-external.source.openAIREFunding": "OpenAIRE API қаржыландыру", // "submission.import-external.source.orcid": "ORCID", "submission.import-external.source.orcid": "ОРКИД", // "submission.import-external.source.pubmed": "Pubmed", - "submission.import-external.source.pubmed": "Pubmed", + "submission.import-external.source.pubmed": "Жарияланған", // "submission.import-external.source.pubmedeu": "Pubmed Europe", - // TODO New key - Add a translation - "submission.import-external.source.pubmedeu": "Pubmed Europe", + "submission.import-external.source.pubmedeu": "Жарияланған Еуропа", // "submission.import-external.source.lcname": "Library of Congress Names", "submission.import-external.source.lcname": "Конгресс Кітапханасының Атаулары", @@ -5802,24 +5626,19 @@ "submission.import-external.preview.title": "Элементті алдын-ала қарау", // "submission.import-external.preview.title.Publication": "Publication Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title.Publication": "Publication Preview", + "submission.import-external.preview.title.Publication": "Жарияланымдарды алдын ала қарау", // "submission.import-external.preview.title.none": "Item Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title.none": "Item Preview", + "submission.import-external.preview.title.none": "Элементті алдын ала қарау", // "submission.import-external.preview.title.Journal": "Journal Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title.Journal": "Journal Preview", + "submission.import-external.preview.title.Journal": "Журналды алдын ала қарау", // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview", + "submission.import-external.preview.title.OrgUnit": "Мекемені алдын ала қарау", // "submission.import-external.preview.title.Person": "Person Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title.Person": "Person Preview", + "submission.import-external.preview.title.Person": "Жобаны алдын ала қарау", // "submission.import-external.preview.title.Project": "Project Preview", "submission.import-external.preview.title.Project": "Жобаны алдын ала қарау", @@ -6543,11 +6362,9 @@ "submission.sections.sherpa.publication.information.title": "Атауы", // "submission.sections.sherpa.publication.information.issns": "ISSNs", - // TODO New key - Add a translation "submission.sections.sherpa.publication.information.issns": "ISSNs", // "submission.sections.sherpa.publication.information.url": "URL", - // TODO New key - Add a translation "submission.sections.sherpa.publication.information.url": "URL", // "submission.sections.sherpa.publication.information.publishers": "Publisher", @@ -7256,7 +7073,5 @@ // "home.recent-submissions.head": "Recent Submissions", "home.recent-submissions.head": "Соңғы материалдар", - - - + } From 4489b3417c633386b82ee5de1126465bf5ba4234 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Wed, 28 Sep 2022 18:09:30 +0200 Subject: [PATCH 034/758] 94391: intermittent commit --- ...expandable-admin-sidebar-section.component.html | 2 +- .../shared/dso-page/dso-edit-menu.resolver.spec.ts | 8 +++++--- src/app/shared/dso-page/dso-edit-menu.resolver.ts | 9 +++++---- ...dso-edit-menu-expandable-section.component.html | 14 ++++++++------ src/styles/_global-styles.scss | 5 +++++ 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html index 259dbd10600..1f4666bbd08 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html @@ -7,7 +7,7 @@ [attr.aria-labelledby]="'sidebarName-' + section.id" [attr.aria-expanded]="expanded | async" [title]="('menu.section.icon.' + section.id) | translate" - [class.disabled]="section.model.disabled" + [class.disabled]="section.model?.disabled" (click)="toggleSection($event)" (keyup.space)="toggleSection($event)" (keyup.enter)="toggleSection($event)" diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts index 3f1e34b0e0d..ac4c4dae174 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts @@ -15,6 +15,8 @@ import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-ve import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { Item } from '../../core/shared/item.model'; import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; +import { TextMenuItemModel } from '../menu/menu-item/models/text.model'; +import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; describe('DSOEditMenuResolver', () => { @@ -164,7 +166,7 @@ describe('DSOEditMenuResolver', () => { expect(menuList[0].active).toEqual(false); expect(menuList[0].visible).toEqual(true); expect(menuList[0].model.type).toEqual(MenuItemType.ONCLICK); - expect(menuList[0].model.text).toEqual('message'); + expect((menuList[0].model as TextMenuItemModel).text).toEqual('message'); expect(menuList[0].model.disabled).toEqual(false); expect(menuList[0].icon).toEqual('code-branch'); done(); @@ -179,8 +181,8 @@ describe('DSOEditMenuResolver', () => { expect(menuList[0].active).toEqual(false); expect(menuList[0].visible).toEqual(true); expect(menuList[0].model.type).toEqual(MenuItemType.LINK); - expect(menuList[0].model.text).toEqual('item.page.edit'); - expect(menuList[0].model.link).toEqual('test-url/edit/metadata'); + expect((menuList[0].model as LinkMenuItemModel).text).toEqual('item.page.edit'); + expect((menuList[0].model as LinkMenuItemModel).link).toEqual('test-url/edit/metadata'); expect(menuList[0].icon).toEqual('pencil-alt'); done(); }); diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index d4615843585..ceedda7b600 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -16,6 +16,7 @@ import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; import { hasValue } from '../empty.util'; import { MenuSection } from '../menu/menu.reducer'; +import { TextMenuItemModel } from '../menu/menu-item/models/text.model'; /** * Creates the menus for the dspace object pages @@ -65,17 +66,17 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection /** * Return all the menus for a dso based on the route and state */ - getDsoMenus(dso, route, state) { + getDsoMenus(dso, route, state): Observable[] { return [ this.getItemMenu(dso), - this.getCommonMenu(dso, state) + this.getCommonMenu(dso, state), ]; } /** * Get the common menus between all dspace objects */ - protected getCommonMenu(dso, state): Observable { + protected getCommonMenu(dso, state): Observable { return combineLatest([ this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, dso.self), ]).pipe( @@ -102,7 +103,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection /** * Get item sepcific menus */ - protected getItemMenu(dso): Observable { + protected getItemMenu(dso): Observable { if (dso instanceof Item) { return combineLatest([ this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, dso.self), diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html index b330b1e87d5..d44238eb6e4 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html @@ -1,14 +1,16 @@ -
+
- -
    - +
      +
    • + - + *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"> + +
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss index e337539c157..c71a9695f94 100644 --- a/src/styles/_global-styles.scss +++ b/src/styles/_global-styles.scss @@ -92,3 +92,8 @@ ngb-modal-backdrop { hyphens: auto; } + +ul.dso-edit-dropdown-menu li.nav-item ng-deep a.nav-link { + padding: 0; + display: inline; +} From 785e4085fcb4432d26997e51fa7287037cf3e75e Mon Sep 17 00:00:00 2001 From: Yury Bondarenko Date: Wed, 28 Sep 2022 18:28:41 +0200 Subject: [PATCH 035/758] 94389: Fix icon alignment & dropdown styles --- src/app/shared/dso-page/dso-edit-menu.resolver.ts | 2 -- .../dso-edit-menu-expandable-section.component.html | 9 ++++++--- .../dso-edit-menu-expandable-section.component.scss | 4 ++++ .../dso-edit-menu-expandable-section.component.ts | 12 +++++++++++- src/styles/_global-styles.scss | 3 ++- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index ceedda7b600..2bf1aa08b5e 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -16,7 +16,6 @@ import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; import { hasValue } from '../empty.util'; import { MenuSection } from '../menu/menu.reducer'; -import { TextMenuItemModel } from '../menu/menu-item/models/text.model'; /** * Creates the menus for the dspace object pages @@ -95,7 +94,6 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection index: 1 }, ]; - }) ); } diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html index d44238eb6e4..a119cf03272 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html @@ -4,9 +4,12 @@ -
    -
  • - +
      +
    • +
      + + +
      diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss index ad6166398ca..b37f1be7468 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss @@ -24,3 +24,7 @@ ul.dropdown-menu { color: var(--bs-btn-link-disabled-color); } } + +.dso-edit-menu-dropdown { + max-width: calc(min(600px, 75vw)); +} diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts index e0ad28617b8..ddcc5f80b93 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts @@ -5,6 +5,9 @@ import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-sect import { MenuService } from '../../../menu/menu.service'; import { MenuSection } from '../../../menu/menu.reducer'; import { Router } from '@angular/router'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { hasValue } from '../../../empty.util'; /** * Represents an expandable section in the dso edit menus @@ -21,6 +24,8 @@ export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent menuID: MenuID = MenuID.DSO_EDIT; itemModel; + renderIcons$: Observable; + constructor( @Inject('sectionDataProvider') menuSection: MenuSection, protected menuService: MenuService, @@ -34,6 +39,11 @@ export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent ngOnInit(): void { this.menuService.activateSection(this.menuID, this.section.id); super.ngOnInit(); - } + this.renderIcons$ = this.subSections$.pipe( + map((sections: MenuSection[]) => { + return sections.some(section => hasValue(section.icon)); + }), + ); + } } diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss index c71a9695f94..47b03f3f1c0 100644 --- a/src/styles/_global-styles.scss +++ b/src/styles/_global-styles.scss @@ -93,7 +93,8 @@ ngb-modal-backdrop { } -ul.dso-edit-dropdown-menu li.nav-item ng-deep a.nav-link { +ul.dso-edit-menu-dropdown > li .nav-item.nav-link { + // ensure that links in DSO edit menu dropdowns are unstyled (li elements are styled instead to support icons) padding: 0; display: inline; } From de28af8b5118780590ed44760019ee7482eec38f Mon Sep 17 00:00:00 2001 From: Yury Bondarenko Date: Wed, 28 Sep 2022 20:25:47 +0200 Subject: [PATCH 036/758] Remove unused imports --- src/app/shared/dso-page/dso-edit-menu.resolver.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index e33f62b3bce..8c8d5a71421 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -1,5 +1,5 @@ import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { combineLatest, Observable, of, of as observableOf } from 'rxjs'; +import { combineLatest, Observable, of as observableOf } from 'rxjs'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { MenuService } from '../menu/menu.service'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; @@ -17,7 +17,6 @@ import { hasValue } from '../empty.util'; import { MenuID } from '../menu/menu-id.model'; import { MenuItemType } from '../menu/menu-item-type.model'; import { MenuSection } from '../menu/menu-section.model'; -import { TextMenuItemModel } from '../menu/menu-item/models/text.model'; /** * Creates the menus for the dspace object pages From 802b0e720490ff265ce065da2e5fd9555b8b8719 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Thu, 29 Sep 2022 20:21:21 -0500 Subject: [PATCH 037/758] fix DSpace#1767 Display all bitstream formats on one page and include IDs --- .../bitstream-formats.component.html | 42 ++++++++++--------- .../bitstream-formats.component.ts | 13 +++--- src/assets/i18n/ar.json5 | 4 +- src/assets/i18n/bn.json5 | 4 +- src/assets/i18n/cs.json5 | 4 +- src/assets/i18n/de.json5 | 2 + src/assets/i18n/el.json5 | 2 + src/assets/i18n/en.json5 | 1 + src/assets/i18n/es.json5 | 4 +- src/assets/i18n/fi.json5 | 2 + src/assets/i18n/fr.json5 | 2 + src/assets/i18n/gd.json5 | 2 + src/assets/i18n/hu.json5 | 4 +- src/assets/i18n/ja.json5 | 4 +- src/assets/i18n/kk.json5 | 2 + src/assets/i18n/lv.json5 | 2 + src/assets/i18n/nl.json5 | 4 +- src/assets/i18n/pl.json5 | 4 +- src/assets/i18n/pt-BR.json5 | 4 +- src/assets/i18n/pt-PT.json5 | 2 + src/assets/i18n/sv.json5 | 2 + src/assets/i18n/sw.json5 | 4 +- src/assets/i18n/tr.json5 | 2 + 23 files changed, 80 insertions(+), 36 deletions(-) diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html index 6569b2d4c85..c4304806ce0 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -13,32 +13,34 @@

      {{'admin.registries.bitstream-format [paginationOptions]="pageConfig" [pageInfoState]="(bitstreamFormats | async)?.payload" [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements" - [hideGear]="true" + [hideGear]="false" [hidePagerWhenSinglePage]="true">
      - - - - - - + + + + + + + - - - - - - + + + + + + +
      {{'admin.registries.bitstream-formats.table.name' | translate}}{{'admin.registries.bitstream-formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}
      {{'admin.registries.bitstream-formats.table.id' | translate}}{{'admin.registries.bitstream-formats.table.name' | translate}}{{'admin.registries.bitstream-formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}
      - - {{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
      + + {{bitstreamFormat.id}}{{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
      diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 89d8ac29f3d..add7ef86189 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -32,9 +32,9 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { * The current pagination configuration for the page used by the FindAll method * Currently simply renders all bitstream formats */ - config: FindListOptions = Object.assign(new FindListOptions(), { - elementsPerPage: 20 - }); + // config: FindListOptions = Object.assign(new FindListOptions(), { + // elementsPerPage: 20 + // }); /** * The current pagination configuration for the page @@ -42,7 +42,8 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { */ pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'rbp', - pageSize: 20 + pageSize: 25, + pageSizeOptions: [25, 50, 100, 200] }); constructor(private notificationsService: NotificationsService, @@ -50,7 +51,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { private translateService: TranslateService, private bitstreamFormatService: BitstreamFormatDataService, private paginationService: PaginationService, - ) { + ) { } @@ -140,7 +141,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { ngOnInit(): void { - this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe( + this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe( switchMap((findListOptions: FindListOptions) => { return this.bitstreamFormatService.findAll(findListOptions); }) diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5 index 0d036ff7d36..a4a8cb8b2e8 100644 --- a/src/assets/i18n/ar.json5 +++ b/src/assets/i18n/ar.json5 @@ -207,6 +207,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", // TODO New key - Add a translation "admin.registries.bitstream-formats.table.name": "Name", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5 index 1bc26d2da40..209e2c59250 100644 --- a/src/assets/i18n/bn.json5 +++ b/src/assets/i18n/bn.json5 @@ -165,6 +165,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "নাম", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Back", "admin.registries.bitstream-formats.table.return": "পেছনে", @@ -6126,4 +6128,4 @@ "idle-modal.extend-session": "সেশন প্রসারিত করুন" -} \ No newline at end of file +} diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5 index 0be4403ec9f..2746d7d3df7 100644 --- a/src/assets/i18n/cs.json5 +++ b/src/assets/i18n/cs.json5 @@ -202,6 +202,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", // TODO New key - Add a translation "admin.registries.bitstream-formats.table.name": "Name", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", // TODO New key - Add a translation @@ -6612,4 +6614,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index c699ee25750..1ebcf444ad9 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -177,6 +177,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Name", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Zurück", diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5 index 4d3b57897a7..4781f3ee34b 100644 --- a/src/assets/i18n/el.json5 +++ b/src/assets/i18n/el.json5 @@ -202,6 +202,8 @@ "admin.registries.bitstream-formats.table.internal": "εσωτερικός", "admin.registries.bitstream-formats.table.mimetype": "mimetype", "admin.registries.bitstream-formats.table.name": "Ονομα", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", "admin.registries.bitstream-formats.table.return": "Επιστροφή", "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Γνωστός", "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Υποστηρίζεται", diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 1bdfbedfdc1..ef3a4ea8ef7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -130,6 +130,7 @@ "admin.registries.bitstream-formats.table.mimetype": "MIME Type", "admin.registries.bitstream-formats.table.name": "Name", + "admin.registries.bitstream-formats.table.id" : "ID", "admin.registries.bitstream-formats.table.return": "Back", diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index b738578fc61..dbd4ebad6dc 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -193,6 +193,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nombre", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Back", "admin.registries.bitstream-formats.table.return": "Atrás", @@ -6988,4 +6990,4 @@ -} \ No newline at end of file +} diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5 index 5c5f3b61688..fdd2f19cd73 100644 --- a/src/assets/i18n/fi.json5 +++ b/src/assets/i18n/fi.json5 @@ -156,6 +156,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nimi", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Palaa", diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index 5cfb7ff0995..d2d8acc1f1c 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -176,6 +176,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nom", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Back", "admin.registries.bitstream-formats.table.return": "Retour", diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5 index f72c3aa1c8e..a86565434a7 100644 --- a/src/assets/i18n/gd.json5 +++ b/src/assets/i18n/gd.json5 @@ -156,6 +156,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Ainm", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Back", "admin.registries.bitstream-formats.table.return": "Air ais", diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index a42c36f2633..b2a87e038ce 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -157,6 +157,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Név", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Vissza", @@ -5145,4 +5147,4 @@ "workflow-item.send-back.button.confirm": "Visszaküld", -} \ No newline at end of file +} diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5 index 0d036ff7d36..a4a8cb8b2e8 100644 --- a/src/assets/i18n/ja.json5 +++ b/src/assets/i18n/ja.json5 @@ -207,6 +207,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", // TODO New key - Add a translation "admin.registries.bitstream-formats.table.name": "Name", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index 56651ceaae4..365ee5b3928 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -194,6 +194,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Аты", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Back", "admin.registries.bitstream-formats.table.return": "Қайтару", diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5 index d6c409b7831..c00a72213a4 100644 --- a/src/assets/i18n/lv.json5 +++ b/src/assets/i18n/lv.json5 @@ -168,6 +168,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nosaukums", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Atgriezties", diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5 index bb0b3b121cc..a0c4bd69f6b 100644 --- a/src/assets/i18n/nl.json5 +++ b/src/assets/i18n/nl.json5 @@ -169,6 +169,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Naam", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Terug", @@ -5999,4 +6001,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5 index 0d036ff7d36..a4a8cb8b2e8 100644 --- a/src/assets/i18n/pl.json5 +++ b/src/assets/i18n/pl.json5 @@ -207,6 +207,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", // TODO New key - Add a translation "admin.registries.bitstream-formats.table.name": "Name", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index fbe06877fb9..d2c2761742e 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -169,6 +169,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nome", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Voltar", @@ -5945,4 +5947,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5 index d6bbbd41960..a618bf6e44b 100644 --- a/src/assets/i18n/pt-PT.json5 +++ b/src/assets/i18n/pt-PT.json5 @@ -368,6 +368,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nome", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Voltar", diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5 index c81482d110b..8f77a3d0cc7 100644 --- a/src/assets/i18n/sv.json5 +++ b/src/assets/i18n/sv.json5 @@ -168,6 +168,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Namn", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Back", "admin.registries.bitstream-formats.table.return": "Tillbaka", diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5 index 0d036ff7d36..a4a8cb8b2e8 100644 --- a/src/assets/i18n/sw.json5 +++ b/src/assets/i18n/sw.json5 @@ -207,6 +207,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", // TODO New key - Add a translation "admin.registries.bitstream-formats.table.name": "Name", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5 index d04a6eda2a9..1649123add4 100644 --- a/src/assets/i18n/tr.json5 +++ b/src/assets/i18n/tr.json5 @@ -156,6 +156,8 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "İsim", + // TODO New key - Add a translation + "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Return", "admin.registries.bitstream-formats.table.return": "Geri Dön", From 310726a3c47256a5376435d81d2a653680cf35e1 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Thu, 29 Sep 2022 21:01:51 -0500 Subject: [PATCH 038/758] fix DSpace #1766 Display all the fields for a Metadata Schema in one page and include IDs --- .../metadata-schema/metadata-schema.component.html | 2 ++ src/assets/i18n/ar.json5 | 4 +++- src/assets/i18n/bn.json5 | 4 +++- src/assets/i18n/cs.json5 | 4 +++- src/assets/i18n/de.json5 | 2 ++ src/assets/i18n/el.json5 | 2 ++ src/assets/i18n/en.json5 | 1 + src/assets/i18n/es.json5 | 4 +++- src/assets/i18n/fi.json5 | 2 ++ src/assets/i18n/fr.json5 | 2 ++ src/assets/i18n/gd.json5 | 2 ++ src/assets/i18n/hu.json5 | 4 +++- src/assets/i18n/ja.json5 | 4 +++- src/assets/i18n/kk.json5 | 2 ++ src/assets/i18n/lv.json5 | 2 ++ src/assets/i18n/nl.json5 | 4 +++- src/assets/i18n/pl.json5 | 4 +++- src/assets/i18n/pt-BR.json5 | 4 +++- src/assets/i18n/pt-PT.json5 | 2 ++ src/assets/i18n/sv.json5 | 2 ++ src/assets/i18n/sw.json5 | 4 +++- src/assets/i18n/tr.json5 | 2 ++ 22 files changed, 53 insertions(+), 10 deletions(-) diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html index 49fed0c8472..1a867928f51 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html @@ -25,6 +25,7 @@

      {{'admin.registries.schema.fields.head' | translate}}

      + {{'admin.registries.schema.fields.table.id' | translate}} {{'admin.registries.schema.fields.table.field' | translate}} {{'admin.registries.schema.fields.table.scopenote' | translate}} @@ -39,6 +40,7 @@

      {{'admin.registries.schema.fields.head' | translate}}

      (change)="selectMetadataField(field, $event)"> + {{field.id}} {{schema?.prefix}}.{{field.element}}{{field.qualifier}} {{field.scopeNote}} diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5 index 0d036ff7d36..f390a4b2859 100644 --- a/src/assets/i18n/ar.json5 +++ b/src/assets/i18n/ar.json5 @@ -311,6 +311,8 @@ // "admin.registries.schema.fields.table.field": "Field", // TODO New key - Add a translation "admin.registries.schema.fields.table.field": "Field", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5 index 1bc26d2da40..c0a1f0a73fc 100644 --- a/src/assets/i18n/bn.json5 +++ b/src/assets/i18n/bn.json5 @@ -244,6 +244,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "ক্ষেত্র", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "স্কোপ নোট", @@ -6126,4 +6128,4 @@ "idle-modal.extend-session": "সেশন প্রসারিত করুন" -} \ No newline at end of file +} diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5 index 0be4403ec9f..c6e17c3dd9e 100644 --- a/src/assets/i18n/cs.json5 +++ b/src/assets/i18n/cs.json5 @@ -294,6 +294,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Pole", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Poznámka o rozsahu", @@ -6612,4 +6614,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index c699ee25750..c141ede068e 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -256,6 +256,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Feld", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Gültigkeitsbereich", diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5 index 4d3b57897a7..37b84e1ebb9 100644 --- a/src/assets/i18n/el.json5 +++ b/src/assets/i18n/el.json5 @@ -227,6 +227,8 @@ "admin.registries.schema.fields.no-items": "Δεν υπάρχουν πεδία μεταδεδομένων για εμφάνιση.", "admin.registries.schema.fields.table.delete": "Διαγραφή επιλεγμένων", "admin.registries.schema.fields.table.field": "Πεδίο", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", "admin.registries.schema.fields.table.scopenote": "Πεδίο εφαρμογής", "admin.registries.schema.form.create": "Δημιουργία πεδίου μεταδεδομένων", "admin.registries.schema.form.edit": "Επεξεργασία πεδίου μεταδεδομένων", diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 1bdfbedfdc1..fd462120641 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -184,6 +184,7 @@ "admin.registries.schema.fields.table.delete": "Delete selected", "admin.registries.schema.fields.table.field": "Field", + "admin.registries.schema.fields.table.id" : "ID", "admin.registries.schema.fields.table.scopenote": "Scope Note", diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index b738578fc61..f623853ac94 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -272,6 +272,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Campo", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Nota de alcance", @@ -6988,4 +6990,4 @@ -} \ No newline at end of file +} diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5 index 5c5f3b61688..9d27a5d9f7c 100644 --- a/src/assets/i18n/fi.json5 +++ b/src/assets/i18n/fi.json5 @@ -235,6 +235,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Kenttä", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Soveltamisala", diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index 5cfb7ff0995..f39149b27fb 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -251,6 +251,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Champ", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Note d'application", diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5 index f72c3aa1c8e..f67fe6770d8 100644 --- a/src/assets/i18n/gd.json5 +++ b/src/assets/i18n/gd.json5 @@ -235,6 +235,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Raon", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Nota Leudachd", diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index a42c36f2633..3d70f333044 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -236,6 +236,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Mező", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Cél megjegyzés", @@ -5145,4 +5147,4 @@ "workflow-item.send-back.button.confirm": "Visszaküld", -} \ No newline at end of file +} diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5 index 0d036ff7d36..f390a4b2859 100644 --- a/src/assets/i18n/ja.json5 +++ b/src/assets/i18n/ja.json5 @@ -311,6 +311,8 @@ // "admin.registries.schema.fields.table.field": "Field", // TODO New key - Add a translation "admin.registries.schema.fields.table.field": "Field", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index 56651ceaae4..571e598a138 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -275,6 +275,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Өріс", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Қолдану саласы бойынша ескертпе", diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5 index d6c409b7831..fa8a9b4549d 100644 --- a/src/assets/i18n/lv.json5 +++ b/src/assets/i18n/lv.json5 @@ -249,6 +249,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Lauks", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Jomas Piezīme", diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5 index bb0b3b121cc..3c823fe52a3 100644 --- a/src/assets/i18n/nl.json5 +++ b/src/assets/i18n/nl.json5 @@ -250,6 +250,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Veld", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Opmerking over bereik", @@ -5999,4 +6001,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5 index 0d036ff7d36..f390a4b2859 100644 --- a/src/assets/i18n/pl.json5 +++ b/src/assets/i18n/pl.json5 @@ -311,6 +311,8 @@ // "admin.registries.schema.fields.table.field": "Field", // TODO New key - Add a translation "admin.registries.schema.fields.table.field": "Field", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index fbe06877fb9..314bf090dc2 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -250,6 +250,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Campo", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Nota de escopo", @@ -5945,4 +5947,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5 index d6bbbd41960..2ae3c76673e 100644 --- a/src/assets/i18n/pt-PT.json5 +++ b/src/assets/i18n/pt-PT.json5 @@ -443,6 +443,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Campo", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Descrição", diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5 index c81482d110b..a201675586b 100644 --- a/src/assets/i18n/sv.json5 +++ b/src/assets/i18n/sv.json5 @@ -245,6 +245,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Fält", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Anmärkning (scope note)", diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5 index 0d036ff7d36..f390a4b2859 100644 --- a/src/assets/i18n/sw.json5 +++ b/src/assets/i18n/sw.json5 @@ -311,6 +311,8 @@ // "admin.registries.schema.fields.table.field": "Field", // TODO New key - Add a translation "admin.registries.schema.fields.table.field": "Field", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", // TODO New key - Add a translation @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5 index d04a6eda2a9..b42dd638cf5 100644 --- a/src/assets/i18n/tr.json5 +++ b/src/assets/i18n/tr.json5 @@ -235,6 +235,8 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Alan", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Kapsam Notu", From 2f3d619c8cd20784a8bfd4c038f1f363d4349b7a Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Fri, 30 Sep 2022 12:06:21 +0200 Subject: [PATCH 039/758] 94391: Add support for com/col browse pages --- .../browse-by-metadata-page.component.html | 6 ++- src/app/browse-by/browse-by-routing.module.ts | 6 ++- .../dso-page/dso-edit-menu.resolver.spec.ts | 39 ++++++++++++++++++- .../shared/dso-page/dso-edit-menu.resolver.ts | 12 ++++-- 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html index 2321da02041..c14344e5d54 100644 --- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html +++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html @@ -1,7 +1,9 @@
      -
      +
      + +
      @@ -17,6 +19,8 @@
      + +
      diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts index 72d78f13fd7..e4ed19b0a3d 100644 --- a/src/app/browse-by/browse-by-routing.module.ts +++ b/src/app/browse-by/browse-by-routing.module.ts @@ -4,13 +4,17 @@ import { BrowseByGuard } from './browse-by-guard'; import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver'; import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver'; import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component'; +import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; @NgModule({ imports: [ RouterModule.forChild([ { path: '', - resolve: { breadcrumb: BrowseByDSOBreadcrumbResolver }, + resolve: { + breadcrumb: BrowseByDSOBreadcrumbResolver, + menu: DSOEditMenuResolver + }, children: [ { path: ':id', diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts index ac4c4dae174..1ae91ddb2bb 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts @@ -126,7 +126,7 @@ describe('DSOEditMenuResolver', () => { }); describe('resolve', () => { - it('should create all menus when a dso is found', (done) => { + it('should create all menus when a dso is found based on the route id param', (done) => { spyOn(resolver, 'getDsoMenus').and.returnValue( [observableOf(dummySections1), observableOf(dummySections2)] ); @@ -140,6 +140,41 @@ describe('DSOEditMenuResolver', () => { ] } ); + expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-uuid', true, false); + expect(resolver.getDsoMenus).toHaveBeenCalled(); + done(); + }); + }); + it('should create all menus when a dso is found based on the route scope query param when no id param is present', (done) => { + spyOn(resolver, 'getDsoMenus').and.returnValue( + [observableOf(dummySections1), observableOf(dummySections2)] + ); + const routeWithScope = { + data: { + menu: { + 'statistics': [{ + id: 'statistics-dummy-1', + active: false, + visible: true, + model: null + }] + } + }, + params: {}, + queryParams: {scope: 'test-scope-uuid'}, + }; + + resolver.resolve(routeWithScope as any, null).subscribe(resolved => { + expect(resolved).toEqual( + { + ...route.data.menu, + [MenuID.DSO_EDIT]: [ + ...dummySections1.map((menu) => Object.assign(menu, {id: menu.id + '-test-scope-uuid'})), + ...dummySections2.map((menu) => Object.assign(menu, {id: menu.id + '-test-scope-uuid'})) + ] + } + ); + expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-scope-uuid', true, false); expect(resolver.getDsoMenus).toHaveBeenCalled(); done(); }); @@ -182,7 +217,7 @@ describe('DSOEditMenuResolver', () => { expect(menuList[0].visible).toEqual(true); expect(menuList[0].model.type).toEqual(MenuItemType.LINK); expect((menuList[0].model as LinkMenuItemModel).text).toEqual('item.page.edit'); - expect((menuList[0].model as LinkMenuItemModel).link).toEqual('test-url/edit/metadata'); + expect((menuList[0].model as LinkMenuItemModel).link).toEqual('/items/test-uuid/edit/metadata'); expect(menuList[0].icon).toEqual('pencil-alt'); done(); }); diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 2bf1aa08b5e..25c4f3fdeb1 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -14,8 +14,9 @@ import { map, switchMap } from 'rxjs/operators'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; -import { hasValue } from '../empty.util'; +import { hasNoValue, hasValue } from '../empty.util'; import { MenuSection } from '../menu/menu.reducer'; +import { getDSORoute } from '../../app-routing-paths'; /** * Creates the menus for the dspace object pages @@ -38,8 +39,11 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection * Initialise all dspace object related menus */ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ [key: string]: MenuSection[] }> { - const uuid = route.params.id; - return this.dSpaceObjectDataService.findById(uuid, true, false).pipe( + let id = route.params.id; + if (hasNoValue(id) && hasValue(route.queryParams.scope)) { + id = route.queryParams.scope; + } + return this.dSpaceObjectDataService.findById(id, true, false).pipe( getFirstCompletedRemoteData(), switchMap((dsoRD) => { if (dsoRD.hasSucceeded) { @@ -88,7 +92,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection model: { type: MenuItemType.LINK, text: this.getDsoType(dso) + '.page.edit', - link: new URLCombiner(state.url, 'edit', 'metadata').toString() + link: new URLCombiner(getDSORoute(dso), 'edit', 'metadata').toString() } as LinkMenuItemModel, icon: 'pencil-alt', index: 1 From 3076f67b700fd3fe2ab1a628257951d559e63b70 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Mon, 3 Oct 2022 20:37:53 -0500 Subject: [PATCH 040/758] merge --- src/assets/i18n/pt-BR.json5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index 5dd4404d6cc..7c0c33833cb 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -274,6 +274,9 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Campo", + // TODO New key - Add a translation + "admin.registries.schema.fields.table.id": "ID", + // "admin.registries.schema.fields.table.scopenote": "Scope Note", "admin.registries.schema.fields.table.scopenote": "Nota de escopo", From 273c7543707ccdad44c7fcafcfa967c1fd0b98e9 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 6 Oct 2022 14:53:19 -0500 Subject: [PATCH 041/758] Update version tag for development of next release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b1c7a4b00d..347b83811d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "7.4.0", + "version": "7.5.0-next", "scripts": { "ng": "ng", "config:watch": "nodemon", From efdd6acfff1322f19c833f66b2ed4732d740943e Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Thu, 6 Oct 2022 10:43:58 +0200 Subject: [PATCH 042/758] 95335: Created ListableNotificationObjectComponent --- ...istable-notification-object.component.html | 1 + ...istable-notification-object.component.scss | 0 ...able-notification-object.component.spec.ts | 43 +++++++++++++++++++ .../listable-notification-object.component.ts | 21 +++++++++ .../listable-notification-object.model.ts | 36 ++++++++++++++++ ...table-notification-object.resource-type.ts | 9 ++++ src/app/shared/shared.module.ts | 5 +++ src/assets/i18n/en.json5 | 5 ++- 8 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 src/app/shared/object-list/listable-notification-object/listable-notification-object.component.html create mode 100644 src/app/shared/object-list/listable-notification-object/listable-notification-object.component.scss create mode 100644 src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts create mode 100644 src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts create mode 100644 src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts create mode 100644 src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.html b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.html new file mode 100644 index 00000000000..ba850622ed2 --- /dev/null +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.html @@ -0,0 +1 @@ +

      {{ object?.message | translate }}

      diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.scss b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts new file mode 100644 index 00000000000..3cf05f7fec6 --- /dev/null +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts @@ -0,0 +1,43 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ListableNotificationObjectComponent } from './listable-notification-object.component'; +import { NotificationType } from '../../notifications/models/notification-type'; +import { ListableNotificationObject } from './listable-notification-object.model'; +import { By } from '@angular/platform-browser'; +import { TranslateModule } from '@ngx-translate/core'; + +describe('ListableNotificationObjectComponent', () => { + let component: ListableNotificationObjectComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ], + declarations: [ + ListableNotificationObjectComponent, + ], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ListableNotificationObjectComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + describe('ui', () => { + it('should display the given error message', () => { + component.object = new ListableNotificationObject(NotificationType.Error, 'test error message'); + fixture.detectChanges(); + + const listableNotificationObject: Element = fixture.debugElement.query(By.css('.alert')).nativeElement; + expect(listableNotificationObject.className).toContain(NotificationType.Error); + expect(listableNotificationObject.innerHTML).toBe('test error message'); + }); + }); + + afterEach(() => { + fixture.debugElement.nativeElement.remove(); + }); +}); diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts new file mode 100644 index 00000000000..ca23ee76a2a --- /dev/null +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts @@ -0,0 +1,21 @@ +import { Component } from '@angular/core'; +import { + AbstractListableElementComponent +} from '../../object-collection/shared/object-collection-element/abstract-listable-element.component'; +import { ListableNotificationObject } from './listable-notification-object.model'; +import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator'; +import { ViewMode } from '../../../core/shared/view-mode.model'; +import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type'; + +/** + * The component for displaying a notifications inside an object list + */ +@listableObjectComponent(ListableNotificationObject, ViewMode.ListElement) +@listableObjectComponent(LISTABLE_NOTIFICATION_OBJECT.value, ViewMode.ListElement) +@Component({ + selector: 'ds-listable-notification-object', + templateUrl: './listable-notification-object.component.html', + styleUrls: ['./listable-notification-object.component.scss'], +}) +export class ListableNotificationObjectComponent extends AbstractListableElementComponent { +} diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts new file mode 100644 index 00000000000..7e25030498d --- /dev/null +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts @@ -0,0 +1,36 @@ +import { ListableObject } from '../../object-collection/shared/listable-object.model'; +import { typedObject } from '../../../core/cache/builders/build-decorators'; +import { TypedObject } from '../../../core/cache/object-cache.reducer'; +import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type'; +import { GenericConstructor } from '../../../core/shared/generic-constructor'; +import { NotificationType } from '../../notifications/models/notification-type'; +import { ResourceType } from '../../../core/shared/resource-type'; + +/** + * Object representing a notification message inside a list of objects + */ +@typedObject +export class ListableNotificationObject extends ListableObject implements TypedObject { + + static type: ResourceType = LISTABLE_NOTIFICATION_OBJECT; + type: ResourceType = LISTABLE_NOTIFICATION_OBJECT; + + protected renderTypes: string[]; + + constructor( + public notificationType: NotificationType = NotificationType.Error, + public message: string = 'listable-notification-object.default-message', + ...renderTypes: string[] + ) { + super(); + this.renderTypes = renderTypes; + } + + /** + * Method that returns as which type of object this object should be rendered. + */ + getRenderTypes(): (string | GenericConstructor)[] { + return [...this.renderTypes, this.constructor as GenericConstructor]; + } + +} diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts new file mode 100644 index 00000000000..ed458126bb2 --- /dev/null +++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts @@ -0,0 +1,9 @@ +import { ResourceType } from '../../../core/shared/resource-type'; + +/** + * The resource type for {@link ListableNotificationObject} + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const LISTABLE_NOTIFICATION_OBJECT = new ResourceType('listable-notification-object'); diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 715ee66a99b..35aa8800521 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -177,6 +177,9 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { DsSelectComponent } from './ds-select/ds-select.component'; import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'; +import { + ListableNotificationObjectComponent +} from './object-list/listable-notification-object/listable-notification-object.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -346,6 +349,7 @@ const COMPONENTS = [ CommunitySidebarSearchListElementComponent, SearchNavbarComponent, ScopeSelectorModalComponent, + ListableNotificationObjectComponent, ]; const ENTRY_COMPONENTS = [ @@ -402,6 +406,7 @@ const ENTRY_COMPONENTS = [ OnClickMenuItemComponent, TextMenuItemComponent, ScopeSelectorModalComponent, + ListableNotificationObjectComponent, ]; const SHARED_ITEM_PAGE_COMPONENTS = [ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f742273edbe..dce6f9d3b71 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4162,5 +4162,8 @@ "idle-modal.log-out": "Log out", - "idle-modal.extend-session": "Extend session" + "idle-modal.extend-session": "Extend session", + + + "listable-notification-object.default-message": "This object couldn't be retrieved", } From 4021b847a6db3dcf7b37a48c1c10868eb6275d7c Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Tue, 11 Oct 2022 11:27:31 +1300 Subject: [PATCH 043/758] [#1892] Apply type-bind to concat fields that are not dynamic arrays --- .../models/ds-dynamic-concat.model.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts index 1c568dbd326..1d6037a4097 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts @@ -1,4 +1,10 @@ -import { DynamicFormControlLayout, DynamicFormGroupModel, DynamicFormGroupModelConfig, serializable } from '@ng-dynamic-forms/core'; +import { + DynamicFormControlLayout, + DynamicFormControlRelation, + DynamicFormGroupModel, + DynamicFormGroupModelConfig, + serializable +} from '@ng-dynamic-forms/core'; import { Subject } from 'rxjs'; @@ -16,6 +22,7 @@ export interface DynamicConcatModelConfig extends DynamicFormGroupModelConfig { separator: string; value?: any; hint?: string; + typeBindRelations?: DynamicFormControlRelation[]; relationship?: RelationshipOptions; repeatable: boolean; required: boolean; @@ -29,6 +36,8 @@ export class DynamicConcatModel extends DynamicFormGroupModel { @serializable() separator: string; @serializable() hasLanguages = false; + @serializable() typeBindRelations: DynamicFormControlRelation[]; + @serializable() typeBindHidden = false; @serializable() relationship?: RelationshipOptions; @serializable() repeatable?: boolean; @serializable() required?: boolean; @@ -55,6 +64,7 @@ export class DynamicConcatModel extends DynamicFormGroupModel { this.metadataValue = config.metadataValue; this.valueUpdates = new Subject(); this.valueUpdates.subscribe((value: string) => this.value = value); + this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : []; } get value() { From 964371066a299ea25193d54f7bc878e681f59d9c Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 11 Oct 2022 15:05:06 +0200 Subject: [PATCH 044/758] 95632: Refactor orcid/claim person buttons to dso-menu-resolver --- .../researcher-profile-data.service.ts | 22 ++- .../dso-page/dso-edit-menu.resolver.spec.ts | 49 ++++- .../shared/dso-page/dso-edit-menu.resolver.ts | 69 ++++++- .../dso-page-orcid-button.component.html | 6 - .../dso-page-orcid-button.component.scss | 0 .../dso-page-orcid-button.component.spec.ts | 76 ------- .../dso-page-orcid-button.component.ts | 39 ---- .../person-page-claim-button.component.html | 7 - .../person-page-claim-button.component.scss | 0 ...person-page-claim-button.component.spec.ts | 186 ------------------ .../person-page-claim-button.component.ts | 84 -------- src/app/shared/menu/menu.service.ts | 22 ++- src/app/shared/shared.module.ts | 4 - 13 files changed, 142 insertions(+), 422 deletions(-) delete mode 100644 src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html delete mode 100644 src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss delete mode 100644 src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts delete mode 100644 src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts delete mode 100644 src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html delete mode 100644 src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss delete mode 100644 src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts delete mode 100644 src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts diff --git a/src/app/core/profile/researcher-profile-data.service.ts b/src/app/core/profile/researcher-profile-data.service.ts index 8c62879c378..c43bf696f8d 100644 --- a/src/app/core/profile/researcher-profile-data.service.ts +++ b/src/app/core/profile/researcher-profile-data.service.ts @@ -3,8 +3,8 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { Operation, ReplaceOperation } from 'fast-json-patch'; -import { Observable } from 'rxjs'; -import { find, map } from 'rxjs/operators'; +import { Observable, of as observableOf } from 'rxjs'; +import { find, map, mergeMap } from 'rxjs/operators'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; @@ -130,6 +130,24 @@ export class ResearcherProfileDataService extends IdentifiableDataService { + return this.createFromExternalSource(sourceUri).pipe( + getFirstCompletedRemoteData(), + mergeMap((rd: RemoteData) => { + if (rd.hasSucceeded) { + return this.findRelatedItemId(rd.payload); + } else { + return observableOf(null); + } + }), + ); + } + /** * Create a new object on the server, and store the response in the object cache diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts index 82085ff86aa..abfe618174b 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts @@ -1,7 +1,7 @@ import { TestBed, waitForAsync } from '@angular/core/testing'; import { MenuServiceStub } from '../testing/menu-service.stub'; import { of as observableOf } from 'rxjs'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { AdminSidebarComponent } from '../../admin/admin-sidebar/admin-sidebar.component'; @@ -18,6 +18,8 @@ import { MenuID } from '../menu/menu-id.model'; import { MenuItemType } from '../menu/menu-item-type.model'; import { TextMenuItemModel } from '../menu/menu-item/models/text.model'; import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; +import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; +import { NotificationsService } from '../notifications/notifications.service'; describe('DSOEditMenuResolver', () => { @@ -31,6 +33,9 @@ describe('DSOEditMenuResolver', () => { let menuService; let authorizationService; let dsoVersioningModalService; + let researcherProfileService; + let notificationsService; + let translate; const route = { data: { @@ -99,6 +104,16 @@ describe('DSOEditMenuResolver', () => { getVersioningTooltipMessage: observableOf('message'), openCreateVersionModal: {} }); + researcherProfileService = jasmine.createSpyObj('researcherProfileService', { + createFromExternalSourceAndReturnRelatedItemId: observableOf('mock-id'), + }); + translate = jasmine.createSpyObj('translate', { + get: observableOf('translated-message'), + }); + notificationsService = jasmine.createSpyObj('notificationsService', { + success: {}, + error: {}, + }); TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule], @@ -108,6 +123,9 @@ describe('DSOEditMenuResolver', () => { {provide: MenuService, useValue: menuService}, {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DsoVersioningModalService, useValue: dsoVersioningModalService}, + {provide: ResearcherProfileDataService, useValue: researcherProfileService}, + {provide: TranslateService, useValue: translate}, + {provide: NotificationsService, useValue: notificationsService}, { provide: NgbModal, useValue: { open: () => {/*comment*/ @@ -194,17 +212,30 @@ describe('DSOEditMenuResolver', () => { }); }); describe('getDsoMenus', () => { - it('should return as first part the item version list ', (done) => { + it('should return as first part the item version, orcid and claim list ', (done) => { const result = resolver.getDsoMenus(testObject, route, state); result[0].subscribe((menuList) => { - expect(menuList.length).toEqual(1); - expect(menuList[0].id).toEqual('version-dso'); + expect(menuList.length).toEqual(3); + expect(menuList[0].id).toEqual('orcid-dso'); expect(menuList[0].active).toEqual(false); - expect(menuList[0].visible).toEqual(true); - expect(menuList[0].model.type).toEqual(MenuItemType.ONCLICK); - expect((menuList[0].model as TextMenuItemModel).text).toEqual('message'); - expect(menuList[0].model.disabled).toEqual(false); - expect(menuList[0].icon).toEqual('code-branch'); + // Visible should be false due to the item not being of type person + expect(menuList[0].visible).toEqual(false); + expect(menuList[0].model.type).toEqual(MenuItemType.LINK); + + expect(menuList[1].id).toEqual('version-dso'); + expect(menuList[1].active).toEqual(false); + expect(menuList[1].visible).toEqual(true); + expect(menuList[1].model.type).toEqual(MenuItemType.ONCLICK); + expect((menuList[1].model as TextMenuItemModel).text).toEqual('message'); + expect(menuList[1].model.disabled).toEqual(false); + expect(menuList[1].icon).toEqual('code-branch'); + + expect(menuList[2].id).toEqual('claim-dso'); + expect(menuList[2].active).toEqual(false); + // Visible should be false due to the item not being of type person + expect(menuList[2].visible).toEqual(false); + expect(menuList[2].model.type).toEqual(MenuItemType.ONCLICK); + expect((menuList[2].model as TextMenuItemModel).text).toEqual('item.page.claim.button'); done(); }); diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index ba695a002c1..31e1baf76b3 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -9,15 +9,18 @@ import { Item } from '../../core/shared/item.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model'; import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { map, switchMap } from 'rxjs/operators'; +import { map, mergeMap, switchMap, take } from 'rxjs/operators'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; -import { hasNoValue, hasValue } from '../empty.util'; +import { hasNoValue, hasValue, isNotEmpty } from '../empty.util'; import { MenuID } from '../menu/menu-id.model'; import { MenuItemType } from '../menu/menu-item-type.model'; import { MenuSection } from '../menu/menu-section.model'; import { getDSORoute } from '../../app-routing-paths'; +import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; +import { NotificationsService } from '../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; /** * Creates the menus for the dspace object pages @@ -33,6 +36,9 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection protected authorizationService: AuthorizationDataService, protected modalService: NgbModal, protected dsoVersioningModalService: DsoVersioningModalService, + protected researcherProfileService: ResearcherProfileDataService, + protected notificationsService: NotificationsService, + protected translate: TranslateService, ) { } @@ -96,7 +102,7 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection link: new URLCombiner(getDSORoute(dso), 'edit', 'metadata').toString() } as LinkMenuItemModel, icon: 'pencil-alt', - index: 1 + index: 2 }, ]; }) @@ -104,17 +110,32 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection } /** - * Get item sepcific menus + * Get item specific menus */ protected getItemMenu(dso): Observable { if (dso instanceof Item) { return combineLatest([ this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, dso.self), this.dsoVersioningModalService.isNewVersionButtonDisabled(dso), - this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create') + this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'), + this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self), + this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self), ]).pipe( - map(([canCreateVersion, disableVersioning, versionTooltip]) => { + map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem]) => { + const isPerson = this.getDsoType(dso) === 'person'; return [ + { + id: 'orcid-dso', + active: false, + visible: isPerson && canSynchronizeWithOrcid, + model: { + type: MenuItemType.LINK, + text: 'item.page.orcid.tooltip', + link: new URLCombiner(getDSORoute(dso), 'orcid').toString() + } as LinkMenuItemModel, + icon: 'orcid fab fa-lg', + index: 0 + }, { id: 'version-dso', active: false, @@ -128,7 +149,21 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection } } as OnClickMenuItemModel, icon: 'code-branch', - index: 0 + index: 1 + }, + { + id: 'claim-dso', + active: false, + visible: isPerson && canClaimItem, + model: { + type: MenuItemType.ONCLICK, + text: 'item.page.claim.button', + function: () => { + this.claimResearcher(dso); + } + } as OnClickMenuItemModel, + icon: 'hand-paper', + index: 3 }, ]; }), @@ -138,6 +173,26 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection } } + /** + * Claim a researcher by creating a profile + * Shows notifications and/or hides the menu section on success/error + */ + protected claimResearcher(dso) { + this.researcherProfileService.createFromExternalSourceAndReturnRelatedItemId(dso.self) + .subscribe((id: string) => { + if (isNotEmpty(id)) { + this.notificationsService.success(this.translate.get('researcherprofile.success.claim.title'), + this.translate.get('researcherprofile.success.claim.body')); + this.authorizationService.invalidateAuthorizationsRequestCache(); + this.menuService.hideMenuSection(MenuID.DSO_EDIT, 'claim-dso-' + dso.uuid); + } else { + this.notificationsService.error( + this.translate.get('researcherprofile.error.claim.title'), + this.translate.get('researcherprofile.error.claim.body')); + } + }); + } + /** * Retrieve the dso or entity type for an object to be used in generic messages */ diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html deleted file mode 100644 index 305900ae336..00000000000 --- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts deleted file mode 100644 index c70ec4b8084..00000000000 --- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -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'; -import { DsoPageOrcidButtonComponent } from './dso-page-orcid-button.component'; - -describe('DsoPageOrcidButtonComponent', () => { - let component: DsoPageOrcidButtonComponent; - 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: [DsoPageOrcidButtonComponent], - imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule], - providers: [ - { provide: AuthorizationDataService, useValue: authorizationService } - ] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DsoPageOrcidButtonComponent); - 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.CanSynchronizeWithORCID, 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-orcid-button/dso-page-orcid-button.component.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts deleted file mode 100644 index c345d8cbdcc..00000000000 --- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; - -import { BehaviorSubject } from 'rxjs'; -import { take } from 'rxjs/operators'; - -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; - -@Component({ - selector: 'ds-dso-page-orcid-button', - templateUrl: './dso-page-orcid-button.component.html', - styleUrls: ['./dso-page-orcid-button.component.scss'] -}) -export class DsoPageOrcidButtonComponent 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; - - /** - * Whether or not the current user is authorized to edit the DSpaceObject - */ - isAuthorized: BehaviorSubject = new BehaviorSubject(false); - - constructor(protected authorizationService: AuthorizationDataService) { } - - ngOnInit() { - this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, this.dso.self).pipe(take(1)).subscribe((isAuthorized: boolean) => { - this.isAuthorized.next(isAuthorized); - }); - } - -} diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html deleted file mode 100644 index c4bba286bf6..00000000000 --- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts deleted file mode 100644 index 5d589187b98..00000000000 --- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts +++ /dev/null @@ -1,186 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; - -import { of as observableOf } from 'rxjs'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; - -import { PersonPageClaimButtonComponent } from './person-page-claim-button.component'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { NotificationsService } from '../../notifications/notifications.service'; -import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; -import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; -import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service'; -import { RouteService } from '../../../core/services/route.service'; -import { routeServiceStub } from '../../testing/route-service.stub'; -import { Item } from '../../../core/shared/item.model'; -import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; -import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; -import { getTestScheduler } from 'jasmine-marbles'; -import { TestScheduler } from 'rxjs/testing'; - -describe('PersonPageClaimButtonComponent', () => { - let scheduler: TestScheduler; - let component: PersonPageClaimButtonComponent; - let fixture: ComponentFixture; - - const mockItem: Item = Object.assign(new Item(), { - metadata: { - 'person.email': [ - { - language: 'en_US', - value: 'fake@email.com' - } - ], - 'person.birthDate': [ - { - language: 'en_US', - value: '1993' - } - ], - 'person.jobTitle': [ - { - language: 'en_US', - value: 'Developer' - } - ], - 'person.familyName': [ - { - language: 'en_US', - value: 'Doe' - } - ], - 'person.givenName': [ - { - language: 'en_US', - value: 'John' - } - ] - }, - _links: { - self: { - href: 'item-href' - } - } - }); - - const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), { - id: 'test-id', - visible: true, - type: 'profile', - _links: { - item: { - href: 'https://rest.api/rest/api/profiles/test-id/item' - }, - self: { - href: 'https://rest.api/rest/api/profiles/test-id' - }, - } - }); - - const notificationsService = new NotificationsServiceStub(); - - const authorizationDataService = jasmine.createSpyObj('authorizationDataService', { - isAuthorized: jasmine.createSpy('isAuthorized') - }); - - const researcherProfileService = jasmine.createSpyObj('researcherProfileService', { - createFromExternalSource: jasmine.createSpy('createFromExternalSource'), - findRelatedItemId: jasmine.createSpy('findRelatedItemId'), - }); - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }) - ], - declarations: [PersonPageClaimButtonComponent], - providers: [ - { provide: AuthorizationDataService, useValue: authorizationDataService }, - { provide: NotificationsService, useValue: notificationsService }, - { provide: ResearcherProfileDataService, useValue: researcherProfileService }, - { provide: RouteService, useValue: routeServiceStub }, - ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(PersonPageClaimButtonComponent); - component = fixture.componentInstance; - component.object = mockItem; - }); - - describe('when item can be claimed', () => { - beforeEach(() => { - authorizationDataService.isAuthorized.and.returnValue(observableOf(true)); - researcherProfileService.createFromExternalSource.calls.reset(); - researcherProfileService.findRelatedItemId.calls.reset(); - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should create claim button', () => { - const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]')); - expect(btn).toBeTruthy(); - }); - - describe('claim', () => { - describe('when successfully', () => { - beforeEach(() => { - scheduler = getTestScheduler(); - researcherProfileService.createFromExternalSource.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile)); - researcherProfileService.findRelatedItemId.and.returnValue(observableOf('test-id')); - }); - - it('should display success notification', () => { - scheduler.schedule(() => component.claim()); - scheduler.flush(); - - expect(researcherProfileService.findRelatedItemId).toHaveBeenCalled(); - expect(notificationsService.success).toHaveBeenCalled(); - }); - }); - - describe('when not successfully', () => { - beforeEach(() => { - scheduler = getTestScheduler(); - researcherProfileService.createFromExternalSource.and.returnValue(createFailedRemoteDataObject$()); - }); - - it('should display success notification', () => { - scheduler.schedule(() => component.claim()); - scheduler.flush(); - - expect(researcherProfileService.findRelatedItemId).not.toHaveBeenCalled(); - expect(notificationsService.error).toHaveBeenCalled(); - }); - }); - }); - - }); - - describe('when item cannot be claimed', () => { - beforeEach(() => { - authorizationDataService.isAuthorized.and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should create claim button', () => { - const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]')); - expect(btn).toBeFalsy(); - }); - - }); -}); diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts deleted file mode 100644 index f0071d0a417..00000000000 --- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; - -import { BehaviorSubject, Observable, of as observableOf } from 'rxjs'; -import { mergeMap, take } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; - -import { RouteService } from '../../../core/services/route.service'; -import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { NotificationsService } from '../../notifications/notifications.service'; -import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service'; -import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model'; -import { isNotEmpty } from '../../empty.util'; -import { DSpaceObject } from '../../../core/shared/dspace-object.model'; - -@Component({ - selector: 'ds-person-page-claim-button', - templateUrl: './person-page-claim-button.component.html', - styleUrls: ['./person-page-claim-button.component.scss'] -}) -export class PersonPageClaimButtonComponent implements OnInit { - - /** - * The target person item to claim - */ - @Input() object: DSpaceObject; - - /** - * A boolean representing if item can be claimed or not - */ - claimable$: BehaviorSubject = new BehaviorSubject(false); - - constructor(protected routeService: RouteService, - protected authorizationService: AuthorizationDataService, - protected notificationsService: NotificationsService, - protected translate: TranslateService, - protected researcherProfileService: ResearcherProfileDataService) { - } - - ngOnInit(): void { - this.authorizationService.isAuthorized(FeatureID.CanClaimItem, this.object._links.self.href, null, false).pipe( - take(1) - ).subscribe((isAuthorized: boolean) => { - this.claimable$.next(isAuthorized); - }); - - } - - /** - * Create a new researcher profile claiming the current item. - */ - claim() { - this.researcherProfileService.createFromExternalSource(this.object._links.self.href).pipe( - getFirstCompletedRemoteData(), - mergeMap((rd: RemoteData) => { - if (rd.hasSucceeded) { - return this.researcherProfileService.findRelatedItemId(rd.payload); - } else { - return observableOf(null); - } - })) - .subscribe((id: string) => { - if (isNotEmpty(id)) { - this.notificationsService.success(this.translate.get('researcherprofile.success.claim.title'), - this.translate.get('researcherprofile.success.claim.body')); - this.claimable$.next(false); - } else { - this.notificationsService.error( - this.translate.get('researcherprofile.error.claim.title'), - this.translate.get('researcherprofile.error.claim.body')); - } - }); - } - - /** - * Returns true if the item is claimable, false otherwise. - */ - isClaimable(): Observable { - return this.claimable$; - } - -} diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts index f44ddea649b..60f4d6f89a8 100644 --- a/src/app/shared/menu/menu.service.ts +++ b/src/app/shared/menu/menu.service.ts @@ -11,9 +11,9 @@ import { DeactivateMenuSectionAction, ExpandMenuAction, ExpandMenuPreviewAction, - HideMenuAction, + HideMenuAction, HideMenuSectionAction, RemoveMenuSectionAction, - ShowMenuAction, + ShowMenuAction, ShowMenuSectionAction, ToggleActiveMenuSectionAction, ToggleMenuAction, } from './menu.actions'; @@ -240,6 +240,15 @@ export class MenuService { this.store.dispatch(new ShowMenuAction(menuID)); } + /** + * Show a given menu section + * @param {MenuID} menuID The ID of the menu + * @param id The ID of the section + */ + showMenuSection(menuID: MenuID, id: string): void { + this.store.dispatch(new ShowMenuSectionAction(menuID, id)); + } + /** * Hide a given menu * @param {MenuID} menuID The ID of the menu @@ -248,6 +257,15 @@ export class MenuService { this.store.dispatch(new HideMenuAction(menuID)); } + /** + * Hide a given menu section + * @param {MenuID} menuID The ID of the menu + * @param id The ID of the section + */ + hideMenuSection(menuID: MenuID, id: string): void { + this.store.dispatch(new HideMenuSectionAction(menuID, id)); + } + /** * Activate a given menu section when it's currently inactive or deactivate it when it's currently active * @param {MenuID} menuID The ID of the menu diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index a341a5178a0..90da0bc1dc8 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -305,11 +305,9 @@ import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component' import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component'; import { RSSComponent } from './rss-feed/rss.component'; import { ExternalLinkMenuItemComponent } from './menu/menu-item/external-link-menu-item.component'; -import { DsoPageOrcidButtonComponent } from './dso-page/dso-page-orcid-button/dso-page-orcid-button.component'; import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component'; import { BrowserOnlyPipe } from './utils/browser-only.pipe'; import { ThemedLoadingComponent } from './loading/themed-loading.component'; -import { PersonPageClaimButtonComponent } from './dso-page/person-page-claim-button/person-page-claim-button.component'; import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component'; import { ItemPageTitleFieldComponent @@ -578,12 +576,10 @@ const ENTRY_COMPONENTS = [ const SHARED_ITEM_PAGE_COMPONENTS = [ MetadataFieldWrapperComponent, MetadataValuesComponent, - PersonPageClaimButtonComponent, ItemAlertsComponent, GenericItemPageFieldComponent, MetadataRepresentationListComponent, RelatedItemsComponent, - DsoPageOrcidButtonComponent, DsoEditMenuSectionComponent, DsoEditMenuComponent, DsoEditMenuExpandableSectionComponent, From 4bb11cbadfcb04187623ef68ed463e104e3d665e Mon Sep 17 00:00:00 2001 From: lucaszc Date: Wed, 12 Oct 2022 11:29:27 -0300 Subject: [PATCH 045/758] Fix button translation ... --- .../home-page/recent-item-list/recent-item-list.component.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html index 919b8646bb3..7f9ca2646bb 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.html +++ b/src/app/home-page/recent-item-list/recent-item-list.component.html @@ -6,8 +6,7 @@

      {{'home.recent-submissions.head' | translate}}

      - +

From 603c60f36865ecf258e654e01dc2590a1f61c6e4 Mon Sep 17 00:00:00 2001 From: Lucas Zinato Carraro Date: Wed, 12 Oct 2022 11:38:18 -0300 Subject: [PATCH 046/758] Add missing translations in version 7.4 pt-BR Add missing keywords, and correct translations in pt-BR --- src/assets/i18n/pt-BR.json5 | 53 ++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index dae60803f57..7d4c49fa2d8 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -745,6 +745,33 @@ // "admin.access-control.groups.form.return": "Back", "admin.access-control.groups.form.return": "Voltar", + //"admin.batch-import.breadcrumbs": "Import Batch", + "admin.batch-import.breadcrumbs": "Importar um Lote", + + //"admin.batch-import.title": "Import Batch", + "admin.batch-import.title": "Importar um Lote", + + //"admin.batch-import.page.header": "Import Batch", + "admin.batch-import.page.header": "Importar um Lote", + + //"admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import", + "admin.batch-import.page.help": "Selecione a Coleção para o qual deseja importar. Arraste ou selecione um arquivo zip no formato Simple Archive Format (SAF) que inclua os Items para importar", + + //"admin.batch-import.page.dropMsg": "Drop a batch ZIP to import", + "admin.batch-import.page.dropMsg": "Arraste e solte um lote ZIP para importar", + + //"admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import", + "admin.batch-import.page.dropMsgReplace": "Arraste e solte um lote ZIP para substituir o lote para importar", + + //"admin.batch-import.page.error.addFile": "Select Zip file first!", + "admin.batch-import.page.error.addFile": "Selecione um arquivo ZIP primeiro!", + + //"admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.", + "admin.batch-import.page.validateOnly.hint": "Quando selecionado , o ZIP enviado sera validado. Você receberá um relatório das alterações detectadas, mas nenhuma alteração será salva.", + + //"admin.batch-import.page.remove": "remove", + "admin.batch-import.page.remove": "remover", + // "admin.search.breadcrumbs": "Administrative Search", "admin.search.breadcrumbs": "Pesquisa Administrativa", @@ -820,6 +847,9 @@ // "admin.metadata-import.page.button.proceed": "Proceed", "admin.metadata-import.page.button.proceed": "Continuar", + //"admin.metadata-import.page.button.select-collection": "Select Collection", + "admin.metadata-import.page.button.select-collection": "Selecione a Coleção", + // "admin.metadata-import.page.error.addFile": "Select file first!", "admin.metadata-import.page.error.addFile": "Selecione o arquivo primeiro!", @@ -1176,7 +1206,7 @@ "collection.edit.item-mapper.confirm": "Mapear itens selecionados", // "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 é a ferramenta de mapeação de itens que permite administradores de coleções a mapear itens de outras coleções nesta. VoCẽ pode busca-los em outras coleções para mapeá-los, ou navegar na lista dos itens atualmente mapeados.", + "collection.edit.item-mapper.description": "Esta é a ferramenta de mapeação de itens que permite administradores de coleções a mapear itens de outras coleções nesta. Você pode buscar em outras coleções para mapear, ou navegar na lista dos itens atualmente mapeados.", // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections", "collection.edit.item-mapper.head": "Mapeador de Itens - Mapear itens em Outras Coleções", @@ -1912,6 +1942,12 @@ // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", "dso-selector.export-metadata.dspaceobject.head": "Exportar metadados de", + //"dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from", + "dso-selector.export-batch.dspaceobject.head": "Exportar Lote (ZIP) de", + + //"dso-selector.import-batch.dspaceobject.head": "Import batch from", + "dso-selector.import-batch.dspaceobject.head": "Importar lote de", + // "dso-selector.no-results": "No {{ type }} found", "dso-selector.no-results": "Nenhum(a) {{ type }} encontrado(a)", @@ -1954,6 +1990,18 @@ // "confirmation-modal.export-metadata.confirm": "Export", "confirmation-modal.export-metadata.confirm": "Exportar", + //"confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}", + "confirmation-modal.export-batch.header": "Exportar lote (ZIP) para {{ dsoName }}", + + //"confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}", + "confirmation-modal.export-batch.info": "Você tem certeza que deseja exportar o lote (ZIP) para {{ dsoName }}", + + //"confirmation-modal.export-batch.cancel": "Cancel", + "confirmation-modal.export-batch.cancel": "Cancelar", + + //"confirmation-modal.export-batch.confirm": "Export", + "confirmation-modal.export-batch.confirm": "Exportar", + // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"", "confirmation-modal.delete-eperson.header": "Apagar EPerson \"{{ dsoName }}\"", @@ -3748,6 +3796,9 @@ // "menu.section.import_batch": "Batch Import (ZIP)", "menu.section.import_batch": "Importação em Lote (ZIP)", + + // "menu.section.export_batch": "Batch Export (ZIP)", + "menu.section.export_batch": "Exportação em Lote (ZIP)", // "menu.section.import_metadata": "Metadata", "menu.section.import_metadata": "Metadados", From 519e031e6a77124edec2ba6f838df504328b831b Mon Sep 17 00:00:00 2001 From: Lucas Zinato Carraro Date: Wed, 12 Oct 2022 12:06:03 -0300 Subject: [PATCH 047/758] Fix missing { --- .../home-page/recent-item-list/recent-item-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html index 7f9ca2646bb..cd14891b3ff 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.html +++ b/src/app/home-page/recent-item-list/recent-item-list.component.html @@ -6,7 +6,7 @@

{{'home.recent-submissions.head' | translate}}

- +
From ff1ea804c9408fb7b7a1a2361eb34c386dddf260 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Thu, 13 Oct 2022 14:02:40 +0200 Subject: [PATCH 048/758] 95648: Issue 1900 - URl encode/escape prefix value in facets endpoint --- src/app/core/shared/search/search.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts index 75723366bc2..d3cca3dc908 100644 --- a/src/app/core/shared/search/search.service.ts +++ b/src/app/core/shared/search/search.service.ts @@ -376,7 +376,7 @@ export class SearchService implements OnDestroy { let href; const args: string[] = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`]; if (hasValue(filterQuery)) { - args.push(`prefix=${filterQuery}`); + args.push(`prefix=${encodeURIComponent(filterQuery)}`); } if (hasValue(searchOptions)) { href = searchOptions.toRestUrl(filterConfig._links.self.href, args); From f5cbe54348ce6e685633142ac02f8fa9f5951bc1 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 14 Oct 2022 11:09:54 -0500 Subject: [PATCH 049/758] Add data.util.spec.ts which all pass when using moment.js --- src/app/shared/date.util.spec.ts | 89 ++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 src/app/shared/date.util.spec.ts diff --git a/src/app/shared/date.util.spec.ts b/src/app/shared/date.util.spec.ts new file mode 100644 index 00000000000..abdfc9a88fa --- /dev/null +++ b/src/app/shared/date.util.spec.ts @@ -0,0 +1,89 @@ +import { dateToString, dateToNgbDateStruct, dateToISOFormat, isValidDate } from './date.util'; + +fdescribe('Date Utils', () => { + + describe('dateToISOFormat', () => { + it('should convert Date to YYYY-MM-DDThh:mm:ssZ string', () => { + // NOTE: month is zero indexed which is why it increases by one + expect(dateToISOFormat(new Date(2022, 5, 3))).toEqual('2022-06-03T00:00:00Z'); + }); + it('should convert Date string to YYYY-MM-DDThh:mm:ssZ string', () => { + expect(dateToISOFormat('2022-06-03')).toEqual('2022-06-03T00:00:00Z'); + }); + it('should convert Month string to YYYY-MM-DDThh:mm:ssZ string', () => { + expect(dateToISOFormat('2022-06')).toEqual('2022-06-01T00:00:00Z'); + }); + it('should convert Year string to YYYY-MM-DDThh:mm:ssZ string', () => { + expect(dateToISOFormat('2022')).toEqual('2022-01-01T00:00:00Z'); + }); + it('should convert ISO Date string to YYYY-MM-DDThh:mm:ssZ string', () => { + // NOTE: Time is always zeroed out as proven by this test. + expect(dateToISOFormat('2022-06-03T03:24:04Z')).toEqual('2022-06-03T00:00:00Z'); + }); + it('should convert NgbDateStruct to YYYY-MM-DDThh:mm:ssZ string', () => { + // NOTE: month is zero indexed which is why it increases by one + const date = new Date(2022, 5, 3); + expect(dateToISOFormat(dateToNgbDateStruct(date))).toEqual('2022-06-03T00:00:00Z'); + }); + }); + + describe('dateToString', () => { + it('should convert Date to YYYY-MM-DD string', () => { + // NOTE: month is zero indexed which is why it increases by one + expect(dateToString(new Date(2022, 5, 3))).toEqual('2022-06-03'); + }); + it('should convert Date with time to YYYY-MM-DD string', () => { + // NOTE: month is zero indexed which is why it increases by one + expect(dateToString(new Date(2022, 5, 3, 3, 24, 0))).toEqual('2022-06-03'); + }); + it('should convert Month only to YYYY-MM-DD string', () => { + // NOTE: month is zero indexed which is why it increases by one + expect(dateToString(new Date(2022, 5))).toEqual('2022-06-01'); + }); + it('should convert ISO Date to YYYY-MM-DD string', () => { + expect(dateToString(new Date('2022-06-03T03:24:00Z'))).toEqual('2022-06-03'); + }); + it('should convert NgbDateStruct to YYYY-MM-DD string', () => { + // NOTE: month is zero indexed which is why it increases by one + const date = new Date(2022, 5, 3); + expect(dateToString(dateToNgbDateStruct(date))).toEqual('2022-06-03'); + }); + }); + + + describe('isValidDate', () => { + it('should return false for null', () => { + expect(isValidDate(null)).toBe(false); + }); + it('should return false for empty string', () => { + expect(isValidDate('')).toBe(false); + }); + it('should return false for text', () => { + expect(isValidDate('test')).toBe(false); + }); + it('should return true for YYYY', () => { + expect(isValidDate('2022')).toBe(true); + }); + it('should return true for YYYY-MM', () => { + expect(isValidDate('2022-12')).toBe(true); + }); + it('should return true for YYYY-MM-DD', () => { + expect(isValidDate('2022-06-03')).toBe(true); + }); + it('should return true for YYYY-MM-DDTHH:MM:SS', () => { + expect(isValidDate('2022-06-03T10:20:30')).toBe(true); + }); + it('should return true for YYYY-MM-DDTHH:MM:SSZ', () => { + expect(isValidDate('2022-06-03T10:20:30Z')).toBe(true); + }); + it('should return false for a month that does not exist', () => { + expect(isValidDate('2022-13')).toBe(false); + }); + it('should return false for a day that does not exist', () => { + expect(isValidDate('2022-02-60')).toBe(false); + }); + it('should return false for a time that does not exist', () => { + expect(isValidDate('2022-02-60T10:60:20')).toBe(false); + }); + }); +}); \ No newline at end of file From 3eca2b323e127c13fda1dac93919acc97facea12 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 14 Oct 2022 11:18:11 -0500 Subject: [PATCH 050/758] Bug fix to initial test --- src/app/shared/date.util.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/date.util.spec.ts b/src/app/shared/date.util.spec.ts index abdfc9a88fa..fbc8d60e3fc 100644 --- a/src/app/shared/date.util.spec.ts +++ b/src/app/shared/date.util.spec.ts @@ -1,11 +1,11 @@ import { dateToString, dateToNgbDateStruct, dateToISOFormat, isValidDate } from './date.util'; -fdescribe('Date Utils', () => { +describe('Date Utils', () => { describe('dateToISOFormat', () => { it('should convert Date to YYYY-MM-DDThh:mm:ssZ string', () => { // NOTE: month is zero indexed which is why it increases by one - expect(dateToISOFormat(new Date(2022, 5, 3))).toEqual('2022-06-03T00:00:00Z'); + expect(dateToISOFormat(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03T00:00:00Z'); }); it('should convert Date string to YYYY-MM-DDThh:mm:ssZ string', () => { expect(dateToISOFormat('2022-06-03')).toEqual('2022-06-03T00:00:00Z'); From c75f5f7c8123fc5f861c9b14eb74597783710148 Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Fri, 7 Oct 2022 19:23:16 +0530 Subject: [PATCH 051/758] [CST-7119] User menu fixes and improvements --- .../expandable-navbar-section.component.html | 2 +- .../expandable-navbar-section.component.scss | 7 ++++++ .../navbar-section.component.html | 4 +-- .../navbar-section.component.scss | 5 ++++ src/app/navbar/navbar.component.html | 5 +++- src/app/navbar/navbar.component.scss | 2 +- src/app/navbar/navbar.component.spec.ts | 25 ++++++++++++++++++- src/app/navbar/navbar.component.ts | 17 ++++++++++++- src/app/root/root.component.html | 6 ++--- .../auth-nav-menu.component.html | 14 +++++------ .../user-menu/user-menu.component.html | 11 +++++--- .../user-menu/user-menu.component.spec.ts | 18 +++++++++++-- .../user-menu/user-menu.component.ts | 7 +++++- src/assets/i18n/en.json5 | 4 ++- .../dspace/app/navbar/navbar.component.html | 7 ++++-- .../dspace/app/navbar/navbar.component.scss | 2 +- src/themes/dspace/styles/_global-styles.scss | 9 ------- 17 files changed, 108 insertions(+), 37 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 d8a517dc554..d04c22e60af 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,4 +1,4 @@ -
+
-
\ No newline at end of file +
diff --git a/src/app/navbar/navbar-section/navbar-section.component.scss b/src/app/navbar/navbar-section/navbar-section.component.scss index e69de29bb2d..7af4ada8e63 100644 --- a/src/app/navbar/navbar-section/navbar-section.component.scss +++ b/src/app/navbar/navbar-section/navbar-section.component.scss @@ -0,0 +1,5 @@ +.navbar-section { + display: flex; + align-items: center; + height: 100%; +} diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index b41f2ea7067..bc1e04f5130 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -1,10 +1,13 @@
diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.html b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.scss b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts new file mode 100644 index 00000000000..4fdbd9125b2 --- /dev/null +++ b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts @@ -0,0 +1,15 @@ +import { + CollectionDropdownComponent as BaseComponent +} from '../../../../../app/shared/collection-dropdown/collection-dropdown.component'; +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-collection-dropdown', + templateUrl: '../../../../../app/shared/collection-dropdown/collection-dropdown.component.html', + // templateUrl: './collection-dropdown.component.html', + styleUrls: ['../../../../../app/shared/collection-dropdown/collection-dropdown.component.scss'] + // styleUrls: ['./collection-dropdown.component.scss'] +}) +export class CollectionDropdownComponent extends BaseComponent { + +} diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts index 4e3c6f8b464..6bca5180928 100644 --- a/src/themes/custom/eager-theme.module.ts +++ b/src/themes/custom/eager-theme.module.ts @@ -43,6 +43,7 @@ import { import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component'; import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component'; +import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component'; /** @@ -58,6 +59,7 @@ const ENTRY_COMPONENTS = [ CommunityListElementComponent, CollectionListElementComponent, + CollectionDropdownComponent, ]; const DECLARATIONS = [ From 02499f8019f3d47849df7d3662d2899e772444d2 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Mon, 31 Oct 2022 19:42:07 +0100 Subject: [PATCH 098/758] 96062: Theme the ExternalSourceEntryImportModalComponent --- ...-relation-external-source-tab.component.ts | 2 +- ...nal-source-entry-import-modal.component.ts | 22 +++++++++++++++++++ src/app/shared/form/form.module.ts | 4 ++++ ...l-source-entry-import-modal.component.html | 0 ...l-source-entry-import-modal.component.scss | 0 ...nal-source-entry-import-modal.component.ts | 15 +++++++++++++ src/themes/custom/lazy-theme.module.ts | 4 ++++ 7 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts create mode 100644 src/themes/custom/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 create mode 100644 src/themes/custom/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.scss create mode 100644 src/themes/custom/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 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 e5ea98e5374..0c41586eabc 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 @@ -15,7 +15,7 @@ import { fadeIn, fadeInOut } from '../../../../../animations/fade'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; import { RelationshipOptions } from '../../../models/relationship-options.model'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component'; +import { ThemedExternalSourceEntryImportModalComponent as ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component'; import { hasValue } from '../../../../../empty.util'; import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service'; import { Item } from '../../../../../../core/shared/item.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-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/themed-external-source-entry-import-modal.component.ts new file mode 100644 index 00000000000..26e6097c2d7 --- /dev/null +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts @@ -0,0 +1,22 @@ +import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal.component'; +import { ThemedComponent } from '../../../../../../theme-support/themed.component'; +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-themed-external-source-entry-import-modal', + styleUrls: [], + templateUrl: '../../../../../../../shared/theme-support/themed.component.html', +}) +export class ThemedExternalSourceEntryImportModalComponent extends ThemedComponent { + protected getComponentName(): string { + return 'ExternalSourceEntryImportModalComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../../../../../../../themes/${themeName}/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`); + } + + protected importUnthemedComponent(): Promise { + return import(`./external-source-entry-import-modal.component`); + } +} diff --git a/src/app/shared/form/form.module.ts b/src/app/shared/form/form.module.ts index 62ab5bd6476..741d51b6160 100644 --- a/src/app/shared/form/form.module.ts +++ b/src/app/shared/form/form.module.ts @@ -30,6 +30,9 @@ import { ExistingRelationListElementComponent } from './builder/ds-dynamic-form- import { ExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; import { CustomSwitchComponent } from './builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component'; import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap'; +import { + ThemedExternalSourceEntryImportModalComponent +} from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component'; const COMPONENTS = [ CustomSwitchComponent, @@ -53,6 +56,7 @@ const COMPONENTS = [ ExistingMetadataListElementComponent, ExistingRelationListElementComponent, ExternalSourceEntryImportModalComponent, + ThemedExternalSourceEntryImportModalComponent, FormComponent ]; diff --git a/src/themes/custom/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/themes/custom/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 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/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.scss b/src/themes/custom/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.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/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/themes/custom/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 new file mode 100644 index 00000000000..cd1de5d159d --- /dev/null +++ b/src/themes/custom/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 @@ -0,0 +1,15 @@ +import { + ExternalSourceEntryImportModalComponent as BaseComponent +} from '../../../../../../../../../../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'; +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-external-source-entry-import-modal', + styleUrls: ['../../../../../../../../../../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.scss'], + // styleUrls: ['./external-source-entry-import-modal.component.scss'], + templateUrl: '../../../../../../../../../../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', + // templateUrl: './external-source-entry-import-modal.component.html' +}) +export class ExternalSourceEntryImportModalComponent extends BaseComponent { + +} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index d2ac0ae7877..2ff4af79466 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -114,6 +114,9 @@ import { ObjectListComponent } from './app/shared/object-list/object-list.compon import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component'; import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component'; import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component'; +import { + ExternalSourceEntryImportModalComponent +} from './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'; const DECLARATIONS = [ FileSectionComponent, @@ -168,6 +171,7 @@ const DECLARATIONS = [ BrowseByMetadataPageComponent, BrowseByDatePageComponent, BrowseByTitlePageComponent, + ExternalSourceEntryImportModalComponent, ]; From 43df05fe35026a46bf19677aeb49092e600a20ad Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Tue, 1 Nov 2022 15:04:03 +0530 Subject: [PATCH 099/758] [CST-7217]applied css for facet break --- .../search-facet-option/search-facet-option.component.html | 2 +- .../search-facet-option/search-facet-option.component.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html index 3c15eff1270..bf165274d50 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html @@ -4,7 +4,7 @@ [queryParams]="addQueryParams" queryParamsHandling="merge"> diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss index 74cede54a86..45e32f21e7a 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss @@ -7,3 +7,6 @@ a { vertical-align: text-top; } } +.break-facet { + word-break: break-all; +} From 46f108072059f4a5ec8dc5868a229ac06ac10fe6 Mon Sep 17 00:00:00 2001 From: AndrukhivAndriy <79985930+AndrukhivAndriy@users.noreply.github.com> Date: Tue, 1 Nov 2022 03:00:45 -0700 Subject: [PATCH 100/758] Add: Ukrainian translation --- src/assets/i18n/uk.json5 | 5475 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 5475 insertions(+) create mode 100644 src/assets/i18n/uk.json5 diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5 new file mode 100644 index 00000000000..b0413d9353a --- /dev/null +++ b/src/assets/i18n/uk.json5 @@ -0,0 +1,5475 @@ +{ + + // "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": "Ви не авторизовані для доступу до цієї сторінки. Ви можете скористатися кнопкою нижче, щоб повернутися на головну сторінку.", + + // "401.link.home-page": "Take me to the home page", + + "401.link.home-page": "Перейти на головну сторінку", + + // "401.unauthorized": "unauthorized", + + "401.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.", + + "403.help": "Ви не маєте дозволу на доступ до цієї сторінки. Ви можете скористатися кнопкою нижче, щоб повернутися на головну сторінку.", + + // "403.link.home-page": "Take me to the home page", + + "403.link.home-page": "Перейти на головну сторінку", + + // "403.forbidden": "forbidden", + + "403.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": "Ми не можемо знайти сторінку, яку ви шукаєте. Можливо, сторінку було переміщено або видалено. Ви можете скористатися кнопкою нижче, щоб повернутися на головну сторінку. ", + + // "404.link.home-page": "Take me to the home page", + "404.link.home-page": "Перейти на головну сторінку", + + // "404.page-not-found": "page not found", + "404.page-not-found": "сторінка не знайдена", + + // "admin.curation-tasks.breadcrumbs": "System curation tasks", + + "admin.curation-tasks.breadcrumbs": "Управління системою", + + // "admin.curation-tasks.title": "System curation tasks", + + "admin.curation-tasks.title": "Управління системою", + + // "admin.curation-tasks.header": "System curation tasks", + + "admin.curation-tasks.header": "Управління системою", + + // "admin.registries.bitstream-formats.breadcrumbs": "Format registry", + + "admin.registries.bitstream-formats.breadcrumbs": "Реєстр форматів", + + // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format", + + "admin.registries.bitstream-formats.create.breadcrumbs": "Формат файлів", + + // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.", + "admin.registries.bitstream-formats.create.failure.content": "Під час створення нового файлу сталася помилка.", + + // "admin.registries.bitstream-formats.create.failure.head": "Failure", + "admin.registries.bitstream-formats.create.failure.head": "Крах", + + // "admin.registries.bitstream-formats.create.head": "Create Bitstream format", + "admin.registries.bitstream-formats.create.head": "Створити формат файлу", + + // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format", + "admin.registries.bitstream-formats.create.new": "Додати новий формат файлу", + + // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.", + "admin.registries.bitstream-formats.create.success.content": "Новий формат файлу був успішно створений.", + + // "admin.registries.bitstream-formats.create.success.head": "Success", + "admin.registries.bitstream-formats.create.success.head": "Успішно", + + // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)", + "admin.registries.bitstream-formats.delete.failure.amount": "Неможливо видалити {{ amount }} формат(и)", + + // "admin.registries.bitstream-formats.delete.failure.head": "Failure", + "admin.registries.bitstream-formats.delete.failure.head": "Крах", + + // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)", + "admin.registries.bitstream-formats.delete.success.amount": "Успішно видалено {{ amount }} формат(и)", + + // "admin.registries.bitstream-formats.delete.success.head": "Success", + "admin.registries.bitstream-formats.delete.success.head": "Успіх", + + // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.", + "admin.registries.bitstream-formats.description": "Цей список форматів файлів містить інформацію про відомі формати та рівень їх підтримки.", + + // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format", + + "admin.registries.bitstream-formats.edit.breadcrumbs": "Формат файлу", + + // "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": "Опис", + + // "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": "Розширення — це розширення файлів, які використовуються для автоматичного визначення формату завантажених файлів. Ви можете ввести кілька розширень для кожного формату.", + + // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions", + "admin.registries.bitstream-formats.edit.extensions.label": "Розширення файлу", + + // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot", + "admin.registries.bitstream-formats.edit.extensions.placeholder": "Ввведіть розширення файлу без крапки", + + // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.", + "admin.registries.bitstream-formats.edit.failure.content": "Виникла помилка при редагуванні формату файлу.", + + // "admin.registries.bitstream-formats.edit.failure.head": "Failure", + "admin.registries.bitstream-formats.edit.failure.head": "Крах", + + // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}", + "admin.registries.bitstream-formats.edit.head": "Формат файлу: {{ 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": "Формати, позначені як внутрішні, приховані від користувача та використовуються в адміністративних цілях.", + + // "admin.registries.bitstream-formats.edit.internal.label": "Internal", + "admin.registries.bitstream-formats.edit.internal.label": "Внутрішні", + + // "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": "Тип MIME, пов’язаний із цим форматом, не обов’язково має бути унікальним.", + + // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type", + "admin.registries.bitstream-formats.edit.mimetype.label": "Тип 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": "Унікальна назва формату, (наприклад Microsoft Word XP or Microsoft Word 2000)", + + // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name", + "admin.registries.bitstream-formats.edit.shortDescription.label": "Ім'я", + + // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.", + "admin.registries.bitstream-formats.edit.success.content": "Формат файлу успішно відредаговано.", + + // "admin.registries.bitstream-formats.edit.success.head": "Success", + "admin.registries.bitstream-formats.edit.success.head": "Успішно", + + // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.", + "admin.registries.bitstream-formats.edit.supportLevel.hint": "Рівень підтримки, який ваша установа обіцяє для цього формату.", + + // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level", + "admin.registries.bitstream-formats.edit.supportLevel.label": "Рівень підтримки", + + // "admin.registries.bitstream-formats.head": "Bitstream Format Registry", + "admin.registries.bitstream-formats.head": "Реєстр формату файлу", + + // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.", + "admin.registries.bitstream-formats.no-items": "Немає форматів файлів.", + + // "admin.registries.bitstream-formats.table.delete": "Delete selected", + "admin.registries.bitstream-formats.table.delete": "Видалити видалене", + + // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all", + "admin.registries.bitstream-formats.table.deselect-all": "Зняти вибір із усіх", + + // "admin.registries.bitstream-formats.table.internal": "internal", + "admin.registries.bitstream-formats.table.internal": "внутрішні", + + // "admin.registries.bitstream-formats.table.mimetype": "MIME Type", + "admin.registries.bitstream-formats.table.mimetype": "Тип MIME", + + // "admin.registries.bitstream-formats.table.name": "Name", + "admin.registries.bitstream-formats.table.name": "Ім'я", + + // "admin.registries.bitstream-formats.table.return": "Return", + "admin.registries.bitstream-formats.table.return": "Повернутись", + + // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known", + "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Відомо", + + // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported", + "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Підтримується", + + // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown", + "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Невідомо", + + // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level", + "admin.registries.bitstream-formats.table.supportLevel.head": "Рівні підтримки", + + // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry", + "admin.registries.bitstream-formats.title": "Репозитарій :: реєстр формату файлу", + + + + // "admin.registries.metadata.breadcrumbs": "Metadata registry", + // TODO New key - Add a translation + "admin.registries.metadata.breadcrumbs": "Реєстр метаданих", + + // "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": "Реєстр метаданих підтримує список усіх полів метаданих, доступних у репозитарії. Ці поля можна розділити на кілька схем. Однак для ПЗ DSpace потрібна схема Dublin Core.", + + // "admin.registries.metadata.form.create": "Create metadata schema", + "admin.registries.metadata.form.create": "Створити схему метаданих", + + // "admin.registries.metadata.form.edit": "Edit metadata schema", + "admin.registries.metadata.form.edit": "Редагувати схему метаданих", + + // "admin.registries.metadata.form.name": "Name", + "admin.registries.metadata.form.name": "Ім'я", + + // "admin.registries.metadata.form.namespace": "Namespace", + "admin.registries.metadata.form.namespace": "Простір", + + // "admin.registries.metadata.head": "Metadata Registry", + "admin.registries.metadata.head": "Реєстр метаданих", + + // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.", + "admin.registries.metadata.schemas.no-items": "Немає схеми метаданих.", + + // "admin.registries.metadata.schemas.table.delete": "Delete selected", + "admin.registries.metadata.schemas.table.delete": "Видалити виділене", + + // "admin.registries.metadata.schemas.table.id": "ID", + "admin.registries.metadata.schemas.table.id": "Ідентифікатор", + + // "admin.registries.metadata.schemas.table.name": "Name", + "admin.registries.metadata.schemas.table.name": "Ім'я", + + // "admin.registries.metadata.schemas.table.namespace": "Namespace", + "admin.registries.metadata.schemas.table.namespace": "Простір", + + // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry", + "admin.registries.metadata.title": "Репозитарій :: Реєстр метаданих", + + + + // "admin.registries.schema.breadcrumbs": "Metadata schema", + + "admin.registries.schema.breadcrumbs": "Схема метаданих", + + // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".", + "admin.registries.schema.description": "Це схема метаданих для \"{{namespace}}\".", + + // "admin.registries.schema.fields.head": "Schema metadata fields", + "admin.registries.schema.fields.head": "Поля схеми метаданих", + + // "admin.registries.schema.fields.no-items": "No metadata fields to show.", + "admin.registries.schema.fields.no-items": "Немає полів метаданих.", + + // "admin.registries.schema.fields.table.delete": "Delete selected", + "admin.registries.schema.fields.table.delete": "Видалити виділене", + + // "admin.registries.schema.fields.table.field": "Field", + "admin.registries.schema.fields.table.field": "Поле", + + // "admin.registries.schema.fields.table.scopenote": "Scope Note", + "admin.registries.schema.fields.table.scopenote": "Примітка щодо сфери застосування", + + // "admin.registries.schema.form.create": "Create metadata field", + "admin.registries.schema.form.create": "Створити поле метаданих", + + // "admin.registries.schema.form.edit": "Edit metadata field", + "admin.registries.schema.form.edit": "Редагувати поле метаданих", + + // "admin.registries.schema.form.element": "Element", + "admin.registries.schema.form.element": "Елементи", + + // "admin.registries.schema.form.qualifier": "Qualifier", + "admin.registries.schema.form.qualifier": "Кваліфікатор", + + // "admin.registries.schema.form.scopenote": "Scope Note", + "admin.registries.schema.form.scopenote": "Примітка щодо сфери застосування", + + // "admin.registries.schema.head": "Metadata Schema", + "admin.registries.schema.head": "Схема метаданих", + + // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"", + "admin.registries.schema.notification.created": "Схема метаданих \"{{prefix}}\" успішно створена", + + // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas", + "admin.registries.schema.notification.deleted.failure": "Неможливо видалити {{amount}} схему метаданих", + + // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas", + "admin.registries.schema.notification.deleted.success": "{{amount}} схема метаданих успішно видалена", + + // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"", + "admin.registries.schema.notification.edited": "Схема метаданих \"{{prefix}}\" успішно відредагована", + + // "admin.registries.schema.notification.failure": "Error", + "admin.registries.schema.notification.failure": "Помилка", + + // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"", + "admin.registries.schema.notification.field.created": "Поле метаданих \"{{field}}\" успішно створено", + + // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields", + "admin.registries.schema.notification.field.deleted.failure": "Неможливо видалити {{amount}} поле(я) метаданих", + + // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields", + "admin.registries.schema.notification.field.deleted.success": "{{amount}} поля метаданих успішно видалено", + + // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"", + "admin.registries.schema.notification.field.edited": "\"{{field}}\" поле метаданих успішно відредаговано", + + // "admin.registries.schema.notification.success": "Success", + "admin.registries.schema.notification.success": "Успіх", + + // "admin.registries.schema.return": "Return", + "admin.registries.schema.return": "Повернутись", + + // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry", + "admin.registries.schema.title": "Репозитарій :: реєстр схеми метаданих", + + + + // "admin.access-control.epeople.actions.delete": "Delete EPerson", + + "admin.access-control.epeople.actions.delete": "Видалити користувача", + + // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson", + + "admin.access-control.epeople.actions.impersonate": "Видати себе за користувача", + + // "admin.access-control.epeople.actions.reset": "Скинути пароль", + + "admin.access-control.epeople.actions.reset": "Скинути пароль", + + // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson", + // TODO New key - Add a translation + "admin.access-control.epeople.actions.stop-impersonating": "Зупинити видавати себе за користувача", + + // "admin.access-control.epeople.title": "Репозитарій :: EPeople", + "admin.access-control.epeople.title": "Репозитарій :: Користувачі", + + // "admin.access-control.epeople.head": "EPeople", + "admin.access-control.epeople.head": "Користувачі", + + // "admin.access-control.epeople.search.head": "Search", + "admin.access-control.epeople.search.head": "Шукати", + + // "admin.access-control.epeople.button.see-all": "Browse All", + "admin.access-control.epeople.button.see-all": "Переглянути всі", + + // "admin.access-control.epeople.search.scope.metadata": "Metadata", + "admin.access-control.epeople.search.scope.metadata": "Метадані", + + // "admin.access-control.epeople.search.scope.email": "E-mail (exact)", + "admin.access-control.epeople.search.scope.email": "E-mail", + + // "admin.access-control.epeople.search.button": "Шукати", + "admin.access-control.epeople.search.button": "Шукати", + + // "admin.access-control.epeople.button.add": "Add EPerson", + "admin.access-control.epeople.button.add": "Додати користувача", + + // "admin.access-control.epeople.table.id": "ID", + "admin.access-control.epeople.table.id": "ID", + + // "admin.access-control.epeople.table.name": "Name", + "admin.access-control.epeople.table.name": "Ім'я", + + // "admin.access-control.epeople.table.email": "E-mail (exact)", + "admin.access-control.epeople.table.email": "E-mail", + + // "admin.access-control.epeople.table.edit": "Edit", + "admin.access-control.epeople.table.edit": "Редагувати", + + // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"", + "admin.access-control.epeople.table.edit.buttons.edit": "Редагувати \"{{name}}\"", + + // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"", + "admin.access-control.epeople.table.edit.buttons.remove": "Видалити \"{{name}}\"", + + // "admin.access-control.epeople.no-items": "No EPeople to show.", + "admin.access-control.epeople.no-items": "Користувачі відсутні.", + + // "admin.access-control.epeople.form.create": "Create EPerson", + "admin.access-control.epeople.form.create": "Створити користувача", + + // "admin.access-control.epeople.form.edit": "Edit EPerson", + "admin.access-control.epeople.form.edit": "Редагувати користувача", + + // "admin.access-control.epeople.form.firstName": "First name", + "admin.access-control.epeople.form.firstName": "Ім'я", + + // "admin.access-control.epeople.form.lastName": "Last name", + "admin.access-control.epeople.form.lastName": "Прізвище", + + // "admin.access-control.epeople.form.email": "E-mail", + "admin.access-control.epeople.form.email": "E-mail", + + // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address", + "admin.access-control.epeople.form.emailHint": "E-mail повинен бути правильний", + + // "admin.access-control.epeople.form.canLogIn": "Can log in", + "admin.access-control.epeople.form.canLogIn": "Може увійти", + + // "admin.access-control.epeople.form.requireCertificate": "Requires certificate", + "admin.access-control.epeople.form.requireCertificate": "Вимагати сертифікат", + + // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.success": "Користувач \"{{name}}\" успішно створений", + + // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.failure": "Неможливо створити користувача \"{{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": "Неможливо створити користувача \"{{name}}\", e-pasts \"{{email}}\" вже використовується.", + + // "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": "Неможливо редагувати користувача \"{{name}}\", e-pasts \"{{email}}\" вже використовується.", + + // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.edited.success": "Користувач \"{{name}}\" успішно відредагований", + + // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.edited.failure": "Неможливо відредагувати користувача \"{{name}}\"", + + // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"", + + "admin.access-control.epeople.form.notification.deleted.success": "Користувач \"{{name}}\" успішно видалений", + + // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"", + + "admin.access-control.epeople.form.notification.deleted.failure": "Неможливо видалити користувача \"{{name}}\"", + + // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:", + "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Член груп:", + + // "admin.access-control.epeople.form.table.id": "ID", + "admin.access-control.epeople.form.table.id": "ID", + + // "admin.access-control.epeople.form.table.name": "Name", + "admin.access-control.epeople.form.table.name": "Ім'я", + + // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups", + "admin.access-control.epeople.form.memberOfNoGroups": "Користувач не є членом жодної групи", + + // "admin.access-control.epeople.form.goToGroups": "Add to groups", + "admin.access-control.epeople.form.goToGroups": "Додати до груп", + + // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"", + "admin.access-control.epeople.notification.deleted.failure": "Неможливо видалити користувача: \"{{name}}\"", + + // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"", + "admin.access-control.epeople.notification.deleted.success": "Користувача \"{{name}}\" успішно видалено", + + + + // "admin.access-control.groups.title": "Репозитарій :: Групи", + "admin.access-control.groups.title": "Репозитарій :: Групи", + + // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group", + + "admin.access-control.groups.title.singleGroup": "Репозитарій :: Редагувати групу", + + // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group", + + "admin.access-control.groups.title.addGroup": "Репозитарій :: Створити нову групу", + + // "admin.access-control.groups.head": "Groups", + "admin.access-control.groups.head": "Групи", + + // "admin.access-control.groups.button.add": "Add group", + "admin.access-control.groups.button.add": "Створити нову групу", + + // "admin.access-control.groups.search.head": "Search groups", + "admin.access-control.groups.search.head": "Шукати групу", + + // "admin.access-control.groups.button.see-all": "Browse all", + "admin.access-control.groups.button.see-all": "Переглянути всі", + + // "admin.access-control.groups.search.button": "Search", + "admin.access-control.groups.search.button": "Шукати", + + // "admin.access-control.groups.table.id": "ID", + "admin.access-control.groups.table.id": "ID", + + // "admin.access-control.groups.table.name": "Name", + "admin.access-control.groups.table.name": "Ім'я", + + // "admin.access-control.groups.table.members": "Members", + "admin.access-control.groups.table.members": "Члени", + + // "admin.access-control.groups.table.edit": "Edit", + "admin.access-control.groups.table.edit": "Редагувати", + + // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"", + "admin.access-control.groups.table.edit.buttons.edit": "Редагувати \"{{name}}\"", + + // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"", + "admin.access-control.groups.table.edit.buttons.remove": "Видалити \"{{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": "Групи не знайдено за Вашими критеріями ", + + // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"", + "admin.access-control.groups.notification.deleted.success": "Група \"{{name}}\" успішно видалена", + + // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"", + + "admin.access-control.groups.notification.deleted.failure.title": "Групу \"{{name}}\" видалити неможливо", + + // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"", + + "admin.access-control.groups.notification.deleted.failure.content": "Причина: \"{{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": "Ця група є постійна, тому її не можна редагувати чи видаляти. Ви все ще можете так це додавати та видаляти учасників групи за допомогою цієї сторінки.", + + // "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": "Цю групу не можна змінити або видалити, оскільки вона відповідає за ролі в процесі подання чи опрацювання документів в \"{{name}}\" {{comcol}}. Ви можете видалити її \"assign roles\" на сторінці {{comcol}} вкладки Редагування. Ви все ще можете додавати та видаляти учасників групи за допомогою цієї сторінки.", + + // "admin.access-control.groups.form.head.create": "Create group", + "admin.access-control.groups.form.head.create": "Створити групу", + + // "admin.access-control.groups.form.head.edit": "Edit group", + "admin.access-control.groups.form.head.edit": "Редагувати групу", + + // "admin.access-control.groups.form.groupName": "Group name", + "admin.access-control.groups.form.groupName": "Ім'я групи", + + // "admin.access-control.groups.form.groupDescription": "Description", + "admin.access-control.groups.form.groupDescription": "Опис", + + // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"", + "admin.access-control.groups.form.notification.created.success": "Група \"{{name}}\" успішно створена", + + // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"", + "admin.access-control.groups.form.notification.created.failure": "Неможливо створити групу \"{{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": "Неможливо створити групу: \"{{name}}\". Це ім'я вже зайняте .", + + // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"", + + "admin.access-control.groups.form.notification.edited.failure": "Неможливо редагувати групу \"{{name}}\"", + + // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Ім'я \"{{name}}\" вже використовується!", + + "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Ім'я \"{{name}}\" вже використовується!", + + // "admin.access-control.groups.form.notification.edited.success": "Група \"{{name}}\" успішно відредагована", + + "admin.access-control.groups.form.notification.edited.success": "Група \"{{name}}\" успішно відредагована", + + // "admin.access-control.groups.form.actions.delete": "Delete Group", + + "admin.access-control.groups.form.actions.delete": "Видалити групу", + + // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"", + + "admin.access-control.groups.form.delete-group.modal.header": "Видалити групу \"{{ 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": "Ви впевнені, що хочете видалити групу \"{{ dsoName }}\"?", + + // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel", + + "admin.access-control.groups.form.delete-group.modal.cancel": "Відмінити", + + // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete", + + "admin.access-control.groups.form.delete-group.modal.confirm": "Видалити", + + // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"", + + "admin.access-control.groups.form.notification.deleted.success": "Група \"{{ name }}\" успішно видалена", + + // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"", + + "admin.access-control.groups.form.notification.deleted.failure.title": "Неможливо видалити групу \"{{ name }}\"", + + // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"", + + "admin.access-control.groups.form.notification.deleted.failure.content": "Причина: \"{{ cause }}\"", + + // "admin.access-control.groups.form.members-list.head": "EPeople", + "admin.access-control.groups.form.members-list.head": "Користувачі", + + // "admin.access-control.groups.form.members-list.search.head": "Add EPeople", + "admin.access-control.groups.form.members-list.search.head": "Додати користувача", + + // "admin.access-control.groups.form.members-list.button.see-all": "Browse All", + "admin.access-control.groups.form.members-list.button.see-all": "Переглянути всіх", + + // "admin.access-control.groups.form.members-list.headMembers": "Current Members", + "admin.access-control.groups.form.members-list.headMembers": "Поточні учасники групи", + + // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata", + "admin.access-control.groups.form.members-list.search.scope.metadata": "Метадані", + + // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)", + "admin.access-control.groups.form.members-list.search.scope.email": "E-mail", + + // "admin.access-control.groups.form.members-list.search.button": "Search", + "admin.access-control.groups.form.members-list.search.button": "Шукати", + + // "admin.access-control.groups.form.members-list.table.id": "ID", + "admin.access-control.groups.form.members-list.table.id": "ID", + + // "admin.access-control.groups.form.members-list.table.name": "Name", + "admin.access-control.groups.form.members-list.table.name": "Ім'я", + + // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add", + "admin.access-control.groups.form.members-list.table.edit": "Видалити / Додати", + + // "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": "Видалити учасника групи з ім'ям \"{{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": "Учасника \"{{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": "Неможливо додати \"{{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": "Учасника \"{{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": "Неможливо видалити учасника \"{{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": "Додати учасника з ім'ям \"{{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": "Відсутня активна/поточна група. Виберіть спочатку її ім'я", + + // "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": "У групі відсутні учасники. Проведіть пошук та додайте", + + // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search", + "admin.access-control.groups.form.members-list.no-items": "Не знайдено жодного учасника групи", + + // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"", + + "admin.access-control.groups.form.subgroups-list.notification.failure": "Щось пішло не так: \"{{cause}}\"", + + // "admin.access-control.groups.form.subgroups-list.head": "Groups", + "admin.access-control.groups.form.subgroups-list.head": "Групи", + + // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup", + "admin.access-control.groups.form.subgroups-list.search.head": "Додати групу", + + // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All", + "admin.access-control.groups.form.subgroups-list.button.see-all": "Переглянути всі", + + // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups", + "admin.access-control.groups.form.subgroups-list.headSubgroups": "Поточні підгрупи", + + // "admin.access-control.groups.form.subgroups-list.search.button": "Search", + "admin.access-control.groups.form.subgroups-list.search.button": "Шукати", + + // "admin.access-control.groups.form.subgroups-list.table.id": "ID", + "admin.access-control.groups.form.subgroups-list.table.id": "ID", + + // "admin.access-control.groups.form.subgroups-list.table.name": "Name", + "admin.access-control.groups.form.subgroups-list.table.name": "Ім'я", + + // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add", + "admin.access-control.groups.form.subgroups-list.table.edit": "Видалити / Додати", + + // "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": "Видалити підгрупу \"{{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": "Додати підгрупу \"{{name}}\"", + + // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group", + "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Поточна група", + + // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Підгрупа \"{{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": "Неможливо додати підгрупу \"{{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": "Підгрупа \"{{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": "Неможливо видалити підгрупу \"{{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": "Відсутня активна група. Спочатку вкажіть ім'я", + + // "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": "Це поточна група. Вона не може бути додана", + + // "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": "Група не знайдена за критерієм імені чи 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": "Жодної підгрупи у групі немає.", + + // "admin.access-control.groups.form.return": "Return to groups", + "admin.access-control.groups.form.return": "Повернутись до груп", + + + + // "admin.search.breadcrumbs": "Administrative Search", + "admin.search.breadcrumbs": "Пошук адміністратора", + + // "admin.search.collection.edit": "Edit", + "admin.search.collection.edit": "Редагувати", + + // "admin.search.community.edit": "Edit", + "admin.search.community.edit": "Редагувати", + + // "admin.search.item.delete": "Delete", + "admin.search.item.delete": "Видалити", + + // "admin.search.item.edit": "Edit", + "admin.search.item.edit": "Редагувати", + + // "admin.search.item.make-private": "Make Private", + "admin.search.item.make-private": "Зробити приватним", + + // "admin.search.item.make-public": "Make Public", + "admin.search.item.make-public": "Зробити публічним", + + // "admin.search.item.move": "Move", + "admin.search.item.move": "Перемістити", + + // "admin.search.item.reinstate": "Reinstate", + "admin.search.item.reinstate": "Відновити", + + // "admin.search.item.withdraw": "Withdraw", + "admin.search.item.withdraw": "Вилучити", + + // "admin.search.title": "Administrative Search", + "admin.search.title": "Пошук адміністратора", + + // "administrativeView.search.results.head": "Administrative Search", + "administrativeView.search.results.head": "Пошук адміністратора", + + + + + // "admin.workflow.breadcrumbs": "Administer Workflow", + "admin.workflow.breadcrumbs": "Адміністрування робочого процесу", + + // "admin.workflow.title": "Administer Workflow", + "admin.workflow.title": "Адміністрування робочого процесу", + + // "admin.workflow.item.workflow": "Workflow", + "admin.workflow.item.workflow": "Робочий процес", + + // "admin.workflow.item.delete": "Delete", + "admin.workflow.item.delete": "Видалити", + + // "admin.workflow.item.send-back": "Send back", + "admin.workflow.item.send-back": "Повернути назад", + + + + // "admin.metadata-import.breadcrumbs": "Import Metadata", + + "admin.metadata-import.breadcrumbs": "Імпортувати метадані", + + // "admin.metadata-import.title": "Import Metadata", + + "admin.metadata-import.title": "Імпортувати метадані", + + // "admin.metadata-import.page.header": "Import Metadata", + + "admin.metadata-import.page.header": "Імпортувати метадані", + + // "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": "Тут можна скинути або переглянути файли CSV, які містять пакетні операції з метаданими", + + // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import", + + "admin.metadata-import.page.dropMsg": "Скинути метадані CSV для імпорту", + + // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import", + + "admin.metadata-import.page.dropMsgReplace": "Скинути для заміни метаданих CSV для імпорту", + + // "admin.metadata-import.page.button.return": "Return", + + "admin.metadata-import.page.button.return": "Повернутись", + + // "admin.metadata-import.page.button.proceed": "Proceed", + + "admin.metadata-import.page.button.proceed": "Продовжити", + + // "admin.metadata-import.page.error.addFile": "Select file first!", + + "admin.metadata-import.page.error.addFile": "Спочатку виберіть файл", + + + + + // "auth.errors.invalid-user": "Invalid email address or password.", + "auth.errors.invalid-user": "Неправильний емейл чи пароль.", + + // "auth.messages.expired": "Your session has expired. Please log in again.", + "auth.messages.expired": "Час сесії вичерпано. Увійдіть знову.", + + + + // "bitstream.edit.bitstream": "Bitstream: ", + "bitstream.edit.bitstream": "Файл: ", + + // "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": "За бажанням надайте, наприклад, короткий опис файлу, \"Galvanais raksts\" або \"експериментальні читання даних\".", + + // "bitstream.edit.form.description.label": "Description", + "bitstream.edit.form.description.label": "Опис", + + // "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": "Перший день, з якого доступ дозволено. Ця дата може бути змінена у цій формі. Для ембарго на цей файл перейдіть у вкладку Статус документа(item), та клацніть Авторизація..., створіть чи відредагуйте політику доступу Читання (READ) та задайте Дата старту.", + + // "bitstream.edit.form.embargo.label": "Embargo until specific date", + "bitstream.edit.form.embargo.label": "Ембарго до дати", + + // "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": "Змініть назву файла. Зверніть увагу, що це вплине на посилання. Проте мали б прцювати і старе посилання доки не зміниться ID документу.", + + // "bitstream.edit.form.fileName.label": "Filename", + "bitstream.edit.form.fileName.label": "Ім'я файлу", + + // "bitstream.edit.form.newFormat.label": "Describe new format", + "bitstream.edit.form.newFormat.label": "Опишіть новий формат", + + // "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": "Програмне забезпечення та його версія, яке Ви використали при створенні файлу (наприклад, \" ACMESoft SuperApp versija 1.5 \").", + + // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream", + "bitstream.edit.form.primaryBitstream.label": "Головний файл", + + // "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": "Якщо формату немає у переліку, будь ласка опишіть його.", + + // "bitstream.edit.form.selectedFormat.label": "Selected Format", + "bitstream.edit.form.selectedFormat.label": "Вибрані формати", + + // "bitstream.edit.form.selectedFormat.unknown": "Format not in list", + "bitstream.edit.form.selectedFormat.unknown": "Формату немає у переліку", + + // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format", + "bitstream.edit.notifications.error.format.title": "Сталась помилка при збереженні формату файла.", + + // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.", + "bitstream.edit.notifications.saved.content": "Зміни до цього файлу були збережені.", + + // "bitstream.edit.notifications.saved.title": "Bitstream saved", + "bitstream.edit.notifications.saved.title": "Файл збережено", + + // "bitstream.edit.title": "Edit bitstream", + "bitstream.edit.title": "Редагувати файл", + + + + // "browse.comcol.by.author": "By Author", + "browse.comcol.by.author": "За автором", + + // "browse.comcol.by.dateissued": "За датою", + "browse.comcol.by.dateissued": "За датою", + + // "browse.comcol.by.subject": "By Subject", + "browse.comcol.by.subject": "За темою", + + // "browse.comcol.by.title": "By Title", + "browse.comcol.by.title": "За назвою", + + // "browse.comcol.head": "Browse", + "browse.comcol.head": "Переглянути", + + // "browse.empty": "No items to show.", + "browse.empty": "Немає документів.", + + // "browse.metadata.author": "Author", + "browse.metadata.author": "Автор", + + // "browse.metadata.dateissued": "Issue Date", + "browse.metadata.dateissued": "Дата публікації", + + // "browse.metadata.subject": "Subject", + "browse.metadata.subject": "Ключові слова", + + // "browse.metadata.title": "Title", + "browse.metadata.title": "Назва", + + // "browse.metadata.author.breadcrumbs": "Browse by Author", + "browse.metadata.author.breadcrumbs": "Переглянути за автором", + + // "browse.metadata.dateissued.breadcrumbs": "Browse by Date", + "browse.metadata.dateissued.breadcrumbs": "Переглянути за датою", + + // "browse.metadata.subject.breadcrumbs": "Browse by Subject", + "browse.metadata.subject.breadcrumbs": "Переглянути за ключовими словами", + + // "browse.metadata.title.breadcrumbs": "Browse by Title", + "browse.metadata.title.breadcrumbs": "Переглянути за назвою", + + // "browse.startsWith.choose_start": "(Choose start)", + "browse.startsWith.choose_start": "(виберіть початок)", + + // "browse.startsWith.choose_year": "(Choose year)", + "browse.startsWith.choose_year": "(виберіть рік)", + + // "browse.startsWith.jump": "Jump to a point in the index:", + "browse.startsWith.jump": "Перейти на індекс:", + + // "browse.startsWith.months.april": "April", + "browse.startsWith.months.april": "Квітень", + + // "browse.startsWith.months.august": "August", + "browse.startsWith.months.august": "Серпень", + + // "browse.startsWith.months.december": "December", + "browse.startsWith.months.december": "Грудень", + + // "browse.startsWith.months.february": "February", + "browse.startsWith.months.february": "Лютий", + + // "browse.startsWith.months.january": "January", + "browse.startsWith.months.january": "Січень", + + // "browse.startsWith.months.july": "July", + "browse.startsWith.months.july": "Липень", + + // "browse.startsWith.months.june": "June", + "browse.startsWith.months.june": "Червень", + + // "browse.startsWith.months.march": "March", + "browse.startsWith.months.march": "Березень", + + // "browse.startsWith.months.may": "May", + "browse.startsWith.months.may": "Травень", + + // "browse.startsWith.months.none": "(Choose month)", + "browse.startsWith.months.none": "(Виберіть місяць)", + + // "browse.startsWith.months.november": "November", + "browse.startsWith.months.november": "Листопад", + + // "browse.startsWith.months.october": "October", + "browse.startsWith.months.october": "Жовтень", + + // "browse.startsWith.months.september": "September", + "browse.startsWith.months.september": "Вересень", + + // "browse.startsWith.submit": "Go", + "browse.startsWith.submit": "Перейти", + + // "browse.startsWith.type_date": "Or type in a date (year-month):", + "browse.startsWith.type_date": "Або введіть дату (рік-місяць):", + + // "browse.startsWith.type_text": "Or enter first few letters:", + "browse.startsWith.type_text": "Або введіть перші символи:", + + // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}", + "browse.title": "Перегляд {{ collection }} за {{ field }} {{ value }}", + + + // "chips.remove": "Remove chip", + // TODO "chips.remove": "Remove chip", + "chips.remove": "Remove chip", + + + + // "collection.create.head": "Create a Collection", + "collection.create.head": "Створити зібрання", + + // "collection.create.notifications.success": "Successfully created the Collection", + "collection.create.notifications.success": "Зібрання успішно створено", + + // "collection.create.sub-head": "Create a Collection for Community {{ parent }}", + "collection.create.sub-head": "Створити зібрання у колекції {{ 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": "Відмінити", + + // "collection.delete.confirm": "Confirm", + "collection.delete.confirm": "Підтвердити", + + // "collection.delete.head": "Delete Collection", + "collection.delete.head": "Видалити зібрання", + + // "collection.delete.notification.fail": "Collection could not be deleted", + "collection.delete.notification.fail": "Зібрання не може бути видалене", + + // "collection.delete.notification.success": "Successfully deleted collection", + "collection.delete.notification.success": "Зібрання успішно видалено", + + // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"", + "collection.delete.text": "Ви впевнені, що хочете видалити зібрання \"{{ dso }}\"?", + + + + // "collection.edit.delete": "Delete this collection", + "collection.edit.delete": "Видалити це зібрання", + + // "collection.edit.head": "Edit Collection", + "collection.edit.head": "Редагувати зібрання", + + // "collection.edit.breadcrumbs": "Edit Collection", + "collection.edit.breadcrumbs": "Редагувати зібрання", + + + + // "collection.edit.tabs.mapper.head": "Item Mapper", + + "collection.edit.tabs.mapper.head": "Карта документа", + + // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper", + + "collection.edit.tabs.item-mapper.title": "Редагування зібрання - Карта документа", + + // "collection.edit.item-mapper.cancel": "Cancel", + "collection.edit.item-mapper.cancel": "Відмінити", + + // "collection.edit.item-mapper.collection": "Collection: \"{{name}}\"", + "collection.edit.item-mapper.collection": "Зібрання: \"{{name}}\"", + + // "collection.edit.item-mapper.confirm": "Map selected items", + "collection.edit.item-mapper.confirm": "Карта вибраних документів", + + // "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": "Це інструмент відображення елементів документа, який дозволяє адміністраторам колекції відображати елементи з інших колекцій у цю колекцію. Ви можете шукати елементи з інших колекцій і відображати їх, або переглядати список відображених елементів.", + + // "collection.edit.item-mapper.head": " - Map Items from Other Collections", + "collection.edit.item-mapper.head": "Карта документа - карта документів з іншого зібрання", + + // "collection.edit.item-mapper.no-search": "Please enter a query to search", + "collection.edit.item-mapper.no-search": "Введіть запит для пошуку", + + // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.", + "collection.edit.item-mapper.notifications.map.error.content": "Виникла помилка {{amount}} при відображені елементів документа.", + + // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors", + "collection.edit.item-mapper.notifications.map.error.head": "Помилка відображення елементів документа", + + // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.", + "collection.edit.item-mapper.notifications.map.success.content": "Документ {{amount}} успішно mapped.", + + // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed", + // TODO "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed" + "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed", + + // "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": "Виникла помилка mappings документа {{amount}}.", + + // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors", + "collection.edit.item-mapper.notifications.unmap.error.head": "Видалити помилки mapping", + + // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.", + "collection.edit.item-mapper.notifications.unmap.success.content": "Успішно видалено mappings документа {{amount}}.", + + // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", + // TODO "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", + "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", + + // "collection.edit.item-mapper.remove": "Remove selected item mappings", + "collection.edit.item-mapper.remove": "Видалити mapping документа", + + // "collection.edit.item-mapper.tabs.browse": "Browse mapped items", + "collection.edit.item-mapper.tabs.browse": "Переглянути елементи документа", + + // "collection.edit.item-mapper.tabs.map": "Map new items", + "collection.edit.item-mapper.tabs.map": "mapping нових документів", + + + + // "collection.edit.logo.label": "Collection logo", + "collection.edit.logo.label": "Логотип зібрання", + + // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.", + "collection.edit.logo.notifications.add.error": "Завантаження логотипу зібрання не вдалось.", + + // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.", + "collection.edit.logo.notifications.add.success": "Логотип зібрання успішно завантажено.", + + // "collection.edit.logo.notifications.delete.success.title": "Logo deleted", + "collection.edit.logo.notifications.delete.success.title": "Логотип видалено", + + // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo", + "collection.edit.logo.notifications.delete.success.content": "Логотип зібрання успішно видалено.", + + // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo", + "collection.edit.logo.notifications.delete.error.title": "Виникла помилка при видаленні логотипа", + + // "collection.edit.logo.upload": "Drop a Collection Logo to upload", + "collection.edit.logo.upload": "Виберіть логотип зібрання для завантаження", + + + + // "collection.edit.notifications.success": "Successfully edited the Collection", + "collection.edit.notifications.success": "Зібрання успішно відредаговано", + + // "collection.edit.return": "Return", + "collection.edit.return": "Повернутись", + + + + // "collection.edit.tabs.curate.head": "Curate", + // TODO "collection.edit.tabs.curate.head": "Curate", + "collection.edit.tabs.curate.head": "Curate", + + // "collection.edit.tabs.curate.title": "Collection Edit - Curate", + // TODO "collection.edit.tabs.curate.title": "Collection Edit - Curate", + "collection.edit.tabs.curate.title": "Collection Edit - Curate", + + // "collection.edit.tabs.authorizations.head": "Authorizations", + + "collection.edit.tabs.authorizations.head": "Авторизація", + + // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations", + + "collection.edit.tabs.authorizations.title": "Редагування зібрання - авторизація ", + + // "collection.edit.tabs.metadata.head": "Edit Metadata", + "collection.edit.tabs.metadata.head": "Редагувати метадані", + + // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata", + "collection.edit.tabs.metadata.title": "Редагування зібрання - метадані", + + // "collection.edit.tabs.roles.head": "Assign Roles", + "collection.edit.tabs.roles.head": "Призначити ролі", + + // "collection.edit.tabs.roles.title": "Collection Edit - Roles", + "collection.edit.tabs.roles.title": "Редагування зібрання - ролі", + + // "collection.edit.tabs.source.external": "This collection harvests its content from an external source", + "collection.edit.tabs.source.external": "Вміст зібрання взято із зовнішнього джерела інформації", + + // "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": "Ви повинні надати ідентифікатор цільового зібрання", + + // "collection.edit.tabs.source.form.harvestType": "Content being harvested", + "collection.edit.tabs.source.form.harvestType": "Вміст отримано", + + // "collection.edit.tabs.source.form.head": "Configure an external source", + "collection.edit.tabs.source.form.head": "Налаштувати зовнішні джерела інформації", + + // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format", + "collection.edit.tabs.source.form.metadataConfigId": "Формат метаданих", + + // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id", + // TODO "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id" + "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id", + + // "collection.edit.tabs.source.form.oaiSource": "OAI Provider", + "collection.edit.tabs.source.form.oaiSource": "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": "Завантажити метадані та файли (потрібна 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": "Завантажити метадані та посилання на файли (потрібна ORE підтримка)", + + // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only", + "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Завантажити тільки метадані", + + // "collection.edit.tabs.source.head": "Content Source", + "collection.edit.tabs.source.head": "Джерело вмісту", + + // "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": "Ваші зміни скасовано. Щоб відновити зміни, натисніть кнопку -Скасувати-", + + // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded", + "collection.edit.tabs.source.notifications.discarded.title": "Ваші зміни скасовано", + + // "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": "Ваші зміни не збережено. Перед збереженням переконайтеся, що всі поля правильно заповнені.", + + // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid", + "collection.edit.tabs.source.notifications.invalid.title": "Помилки у метаданих", + + // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.", + "collection.edit.tabs.source.notifications.saved.content": "Ваші зміни до вмісту зібрання збережено.", + + // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved", + "collection.edit.tabs.source.notifications.saved.title": "Вміст джерела даних збереено", + + // "collection.edit.tabs.source.title": " - Content Source", + "collection.edit.tabs.source.title": "Редагування зібрання - джерела даних", + + + + // "collection.edit.template.add-button": "Add", + + "collection.edit.template.add-button": "Додати", + + // "collection.edit.template.breadcrumbs": "Item template", + + "collection.edit.template.breadcrumbs": "Шаблон документа", + + // "collection.edit.template.cancel": "Cancel", + + "collection.edit.template.cancel": "Відмінити", + + // "collection.edit.template.delete-button": "Delete", + + "collection.edit.template.delete-button": "Видалити", + + // "collection.edit.template.edit-button": "Edit", + + "collection.edit.template.edit-button": "Редагувати", + + // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"", + + "collection.edit.template.head": "Редагувати шаблон документа зібрання \"{{ collection }}\"", + + // "collection.edit.template.label": "Template item", + + "collection.edit.template.label": "Шаблон документа", + + // "collection.edit.template.notifications.delete.error": "Failed to delete the item template", + + "collection.edit.template.notifications.delete.error": "Не вдалося видалити шаблон елемента", + + // "collection.edit.template.notifications.delete.success": "Шаблон документа успішно видалено", + + "collection.edit.template.notifications.delete.success": "Шаблон документа успішно видалено", + + // "collection.edit.template.title": "Edit Template Item", + + "collection.edit.template.title": "Редагувати шаблон документа", + + + + // "collection.form.abstract": "Short Description", + "collection.form.abstract": "Короткий опис", + + // "collection.form.description": "Introductory text (HTML)", + "collection.form.description": "Вступний текст (HTML)", + + // "collection.form.errors.title.required": "Please enter a collection name", + "collection.form.errors.title.required": "Введіть назву зібрання", + + // "collection.form.license": "License", + "collection.form.license": "Ліцензійна угода", + + // "collection.form.provenance": "Provenance", + "collection.form.provenance": "Походження", + + // "collection.form.rights": "Copyright text (HTML)", + "collection.form.rights": "Копірайт (HTML)", + + // "collection.form.tableofcontents": "News (HTML)", + "collection.form.tableofcontents": "Новини (HTML)", + + // "collection.form.title": "Name", + "collection.form.title": "Ім'я", + + + + // "collection.listelement.badge": "Collection", + + "collection.listelement.badge": "Зібрання", + + +//"home.recent-submissions.head": "Recent Submissions", +"home.recent-submissions.head": "Нові надходження", + + +//"thumbnail.default.alt": "Thumbnail Image", +"thumbnail.default.alt": "Ескіз", + +// "thumbnail.default.placeholder": "No Thumbnail Available", +"thumbnail.default.placeholder": "Ескіз недоступний", + +// "thumbnail.project.alt": "Project Logo", + "thumbnail.project.alt": "Логотип проекту", + +// TODO "thumbnail.project.placeholder": "Project Placeholder Image", + "thumbnail.project.placeholder": "Project Placeholder Image", + +// "thumbnail.orgunit.alt": "OrgUnit Logo", +"thumbnail.orgunit.alt": "Логотип організації", + + "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image", + +// "thumbnail.person.alt": "Profile Picture", +"thumbnail.person.alt": "Зображення профілю", + + // "thumbnail.person.placeholder": "No Profile Picture Available", +"thumbnail.person.placeholder": "Зображення профілю відсутне", + + + + // "collection.page.browse.recent.head": "Recent Submissions", + "collection.page.browse.recent.head": "Нові надходження", + + // "collection.page.browse.recent.empty": "No items to show", + "collection.page.browse.recent.empty": "Немає документів", + + // "collection.page.edit": "Edit this collection", + + "collection.page.edit": "Редагувати зібрання", + + // "collection.page.handle": "Permanent URI for this collection", + "collection.page.handle": "Постійне посилання зібрання", + + // "collection.page.license": "License", + "collection.page.license": "Ліцензійна угода", + + // "collection.page.news": "News", + "collection.page.news": "Новини", + + + + // "collection.select.confirm": "Confirm selected", + "collection.select.confirm": "Підтвердити вибрані", + + // "collection.select.empty": "No collections to show", + "collection.select.empty": "Зібрання відсутні", + + // "collection.select.table.title": "Title", + "collection.select.table.title": "Назва", + + + + // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.", + "collection.source.update.notifications.error.content": "Введені налаштування перевірені та не працюють.", + + // "collection.source.update.notifications.error.title": "Server Error", + "collection.source.update.notifications.error.title": "Помилка роботи сервера, трясця його матері", + + + + // "communityList.tabTitle": "DSpace - Community List", + "communityList.tabTitle": "Репозитарій - Фонди", + + // "communityList.title": "List of Communities", + "communityList.title": "Перелік фондів", + + // "communityList.showMore": "Show More", + "communityList.showMore": "Детальніше", + + + + // "community.create.head": "Create a Community", + "community.create.head": "Створити фонд", + + // "community.create.notifications.success": "Successfully created the Community", + "community.create.notifications.success": "Фонд успішно створено", + + // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}", + "community.create.sub-head": "Створити підфонд фонду {{ parent }}", + + // "community.curate.header": "Curate Community: {{community}}", + + "community.curate.header": "Основний фонд: {{community}}", + + // "community.delete.cancel": "Cancel", + "community.delete.cancel": "Відмінити", + + // "community.delete.confirm": "Confirm", + "community.delete.confirm": "Підтвердити", + + // "community.delete.head": "Delete Community", + "community.delete.head": "Видалити фонд", + + // "community.delete.notification.fail": "Community could not be deleted", + "community.delete.notification.fail": "Фонд не може бути видалено", + + // "community.delete.notification.success": "Successfully deleted community", + "community.delete.notification.success": "Фонд успішно видалено", + + // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"", + "community.delete.text": "Ви впевнені, що хочете видалити фонд \"{{ dso }}\"", + + // "community.edit.delete": "Delete this community", + "community.edit.delete": "Видалити цей фонд", + + // "community.edit.head": "Edit Community", + "community.edit.head": "Редагувати фонд", + + // "community.edit.breadcrumbs": "Edit Community", + "community.edit.breadcrumbs": "Редагувати фонд", + + + // "community.edit.logo.label": "Community logo", + "community.edit.logo.label": "Логотип фонду", + + // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.", + "community.edit.logo.notifications.add.error": "Помилка завантаження логотипу фонду. Перевірте все ще раз.", + + // "community.edit.logo.notifications.add.success": "Upload Community logo successful.", + "community.edit.logo.notifications.add.success": "Успішне завантаження логотипу фонду", + + // "community.edit.logo.notifications.delete.success.title": "Logo deleted", + "community.edit.logo.notifications.delete.success.title": "Логотип видалено", + + // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo", + "community.edit.logo.notifications.delete.success.content": "Логотип фонду успішно видалено", + + // "community.edit.logo.notifications.delete.error.title": "Error deleting logo", + "community.edit.logo.notifications.delete.error.title": "Помилка видалення логотипу", + + // "community.edit.logo.upload": "Drop a Community Logo to upload", + "community.edit.logo.upload": "Виберіть логотип фонду для завантаження", + + + + // "community.edit.notifications.success": "Successfully edited the Community", + "community.edit.notifications.success": "Фонд успішно відредаговано", + + // "community.edit.notifications.unauthorized": "You do not have privileges to make this change", + + "community.edit.notifications.unauthorized": "У Вас немає повноважень для змін", + + // "community.edit.notifications.error": "An error occured while editing the Community", + + "community.edit.notifications.error": "Виникла помилка при редагуванні фонду", + + // "community.edit.return": "Return", + "community.edit.return": "Повернутись", + + + + // "community.edit.tabs.curate.head": "Curate", + "community.edit.tabs.curate.head": "Основне/Curate", + + // "community.edit.tabs.curate.title": "Community Edit - Curate", + "community.edit.tabs.curate.title": "Редагування фонду - основне", + + // "community.edit.tabs.metadata.head": "Edit Metadata", + "community.edit.tabs.metadata.head": "Реадгувати метадані", + + // "community.edit.tabs.metadata.title": "Community Edit - Metadata", + "community.edit.tabs.metadata.title": "Редагування фонду - метадані", + + // "community.edit.tabs.roles.head": "Assign Roles", + "community.edit.tabs.roles.head": "Призначити ролі", + + // "community.edit.tabs.roles.title": "Community Edit - Roles", + "community.edit.tabs.roles.title": "Редаувати фонд - ролі", + + // "community.edit.tabs.authorizations.head": "Authorizations", + + "community.edit.tabs.authorizations.head": "Авторизація", + + // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations", + + "community.edit.tabs.authorizations.title": "Редагування фонду - авторизація", + + + + // "community.listelement.badge": "Community", + + "community.listelement.badge": "Фонд", + + + + // "comcol-role.edit.no-group": "None", + + "comcol-role.edit.no-group": "Жодної", + + // "comcol-role.edit.create": "Create", + + "comcol-role.edit.create": "Створити", + + // "comcol-role.edit.restrict": "Restrict", + + "comcol-role.edit.restrict": "Обмежити", + + // "comcol-role.edit.delete": "Delete", + + "comcol-role.edit.delete": "Видалити", + + + // "comcol-role.edit.community-admin.name": "Administrators", + + "comcol-role.edit.community-admin.name": "Адміністратори", + + // "comcol-role.edit.collection-admin.name": "Administrators", + + "comcol-role.edit.collection-admin.name": "Адміністратори", + + + // "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": "Адміністратори фонду можуть створювати підфонди або зібрання, а також керувати цими. Крім того, вони вирішують, хто може надсилати документи до будь-якого зібрання, редагувати метадані документа (після надсилання) і додавати (відображати) існуючі елементи з інших зібрань(за умови наданих повноважень).", + + // "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": "Адміністратори зібрання вирішують, хто може надсилати документи до зібрання, редагувати метадані документів (після надсилання) і додавати документи з інших зібрань (за умови наданих повноважень).", + + + // "comcol-role.edit.submitters.name": "Submitters", + + "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.", + + "comcol-role.edit.submitters.description": "Користувачі та групи у яких є повноваження вносити документи до цього зібрання.", + + + // "comcol-role.edit.item_read.name": "Default item read access", + + "comcol-role.edit.item_read.name": "Доступ на читання документа", + + // "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": "Користувачі та групи, які можуть читати нові документи, що надіслані до цього зібрання. Зміни цієї ролі не мають зворотної сили. Існуючі документи в системі все ще будуть доступні для перегляду тим, хто мав доступ для читання на момент їх додавання.", + + // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.", + + "comcol-role.edit.item_read.anonymous-group": "Для групи Anonymous встановлено права документа на читання.", + + + // "comcol-role.edit.bitstream_read.name": "Доступ на читання для файла", + + "comcol-role.edit.bitstream_read.name": "Доступ на читання для файла", + + // "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": "Адміністратори фонду можуть створювати підфонди або зібрання, а також керувати ними. Крім того, вони вирішують, хто може надсилати документи до будь-якого зібрання, редагувати метадані документа (після надсилання) і додавати документи з інших колекцій (за умови наявності прав доступу)..", + + // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.", + + "comcol-role.edit.bitstream_read.anonymous-group": "Для групи Anonymous встановлено права файла на читання", + + + // "comcol-role.edit.editor.name": "Редактори", + + "comcol-role.edit.editor.name": "Редактори", + + // "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": "Редактори мають повноваження редагувати метадані, приймати та відхиляти їх, зокрема, для документів, що заносяться у репозитарій.", + + + // "comcol-role.edit.finaleditor.name": "Final editors", + + "comcol-role.edit.finaleditor.name": "Остаточні редактори", + + // "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": "Остаточні редактори мають повноваження редагувати метадані, але не мають права відхилити документ.", + + + // "comcol-role.edit.reviewer.name": "Reviewers", + + "comcol-role.edit.reviewer.name": "Рецензенти", + + // "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": "Рецензенти можуть приймати або відхиляти вхідні документи. Однак вони не можуть редагувати метадані.", + + + + // "community.form.abstract": "Short Description", + "community.form.abstract": "Короткий опис", + + // "community.form.description": "Introductory text (HTML)", + "community.form.description": "Вхідний текст (HTML)", + + // "community.form.errors.title.required": "Please enter a community name", + "community.form.errors.title.required": "Будь ласка, введіть назву фонду", + + // "community.form.rights": "Copyright text (HTML)", + "community.form.rights": "Копірайт (HTML)", + + // "community.form.tableofcontents": "News (HTML)", + "community.form.tableofcontents": "Новини (HTML)", + + // "community.form.title": "Name", + "community.form.title": "Ім'я", + + // "community.page.edit": "Edit this community", + + "community.page.edit": "Редагувати фонд", + + // "community.page.handle": "Permanent URI for this community", + "community.page.handle": "Постійне посилання на фонд", + + // "community.page.license": "License", + "community.page.license": "Ліцензійна угода", + + // "community.page.news": "News", + "community.page.news": "Новини", + + // "community.all-lists.head": "Subcommunities and Collections", + "community.all-lists.head": "Підфонди та зібрання", + + // "community.sub-collection-list.head": "Collections of this Community", + "community.sub-collection-list.head": "Зібрання у цьому фонді", + + // "community.sub-community-list.head": "Communities of this Community", + "community.sub-community-list.head": "Фонди, що знаходяться у цьому фонді", + + + // "cookies.consent.accept-all": "Accept all", + "cookies.consent.accept-all": "Прийняти все", + + // "cookies.consent.accept-selected": "Accept selected", + "cookies.consent.accept-selected": "Прийняти вибране", + + // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)", + "cookies.consent.app.opt-out.description": "Цей додаток був завантажений по замовчуванню. Але Ви можете відмовитись від нього", + + // "cookies.consent.app.opt-out.title": "(opt-out)", + "cookies.consent.app.opt-out.title": "(відмовитись)", + + // "cookies.consent.app.purpose": "purpose", + "cookies.consent.app.purpose": "ціль", + + // "cookies.consent.app.required.description": "This application is always required", + "cookies.consent.app.required.description": "Цей додаток завжди потрібний", + + // "cookies.consent.app.required.title": "(always required)", + "cookies.consent.app.required.title": "(завжди потрібний)", + + // "cookies.consent.update": "There were changes since your last visit, please update your consent.", + "cookies.consent.update": "З часу вашого останнього відвідування відбулися зміни, підтвердьте це.", + + // "cookies.consent.close": "Close", + "cookies.consent.close": "Закрити", + + // "cookies.consent.decline": "Decline", + "cookies.consent.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}.", + "cookies.consent.content-notice.description": "Ми збираємо та обробляємо вашу особисту інформацію для таких цілей: автентифікація, налаштування та статистика.
Щоб дізнатися більше, прочитайте нашу політику {privacyPolicy}.", + + // "cookies.consent.content-notice.learnMore": "Customize", + "cookies.consent.content-notice.learnMore": "Налаштувати", + + // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.", + "cookies.consent.content-modal.description": "Тут ви можете переглянути та налаштувати збір інформаціїпро Вас.", + + // "cookies.consent.content-modal.privacy-policy.name": "privacy policy", + "cookies.consent.content-modal.privacy-policy.name": "політика приватності", + + // "cookies.consent.content-modal.privacy-policy.text": " {privacyPolicy}.", + "cookies.consent.content-modal.privacy-policy.text": "Детальніше - {privacyPolicy}.", + + // "cookies.consent.content-modal.title": "Information that we collect", + "cookies.consent.content-modal.title": "Інформація, яку ми збираємо", + + // "cookies.consent.app.title.authentication": "Authentication", + "cookies.consent.app.title.authentication": "Увійти", + + // "cookies.consent.app.description.authentication": "Required for signing you in", + "cookies.consent.app.description.authentication": "Необхідно для входу", + + // "cookies.consent.app.title.preferences": "Preferences", + "cookies.consent.app.title.preferences": "Налаштування", + + // "cookies.consent.app.description.preferences": "Required for saving your preferences", + "cookies.consent.app.description.preferences": "Необхідно для збереження ваших налаштувань", + + // "cookies.consent.app.title.acknowledgement": "Acknowledgement", + "cookies.consent.app.title.acknowledgement": "Підтвердження", + + // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents", + "cookies.consent.app.description.acknowledgement": "Необхідний для збереження Ваших підтверджень і згод", + + // "cookies.consent.app.title.google-analytics": "Google Analytics", + "cookies.consent.app.title.google-analytics": "Google Analytics", + + // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data", + "cookies.consent.app.description.google-analytics": "Дозволяє нам відстежувати статистичні дані", + + // "cookies.consent.purpose.functional": "Functional", + "cookies.consent.purpose.functional": "Функціональний", + + // "cookies.consent.purpose.statistical": "Statistical", + "cookies.consent.purpose.statistical": "Статичний", + + + // "curation-task.task.checklinks.label": "Check Links in Metadata", + "curation-task.task.checklinks.label": "Перевірте посилання у метаданих", + + // "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", + "curation-task.task.profileformats.label": "Профіль форматів файлів", + + // "curation-task.task.requiredmetadata.label": "Check for Required Metadata", + "curation-task.task.requiredmetadata.label": "Перевірте наявність необхідних метаданих", + + // "curation-task.task.translate.label": "Microsoft Translator", + "curation-task.task.translate.label": "Microsoft Translator", + + // "curation-task.task.vscan.label": "Virus Scan", + "curation-task.task.vscan.label": "Перевірка на віруси", + + + + // "curation.form.task-select.label": "Task:", + "curation.form.task-select.label": "Завдання:", + + // "curation.form.submit": "Start", + "curation.form.submit": "Почати", + + // "curation.form.submit.success.head": "The curation task has been started successfully", + "curation.form.submit.success.head": "Завдання успішно розпочате", + + // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.", + "curation.form.submit.success.content": "Ви будете перенаправлені на сторінку відповідного процесу.", + + // "curation.form.submit.error.head": "Running the curation task failed", + "curation.form.submit.error.head": "Не вдалося виконати завдання", + + // "curation.form.submit.error.content": "An error occured when trying to start the curation task.", + "curation.form.submit.error.content": "Виникла помилка при спробі розпочати завдання.", + + // "curation.form.handle.label": "Handle:", + + "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)", + "curation.form.handle.hint": "Підказка: Введіть [your-handle-prefix]/0 для запуску завдання на весь сайт (не всі види завдань це підтримують)", + + + + // "dso-selector.create.collection.head": "New collection", + "dso-selector.create.collection.head": "Нове зібрання", + + // "dso-selector.create.collection.sub-level": "Create a new collection in", + "dso-selector.create.collection.sub-level": "Створити нове зібрання в", + + // "dso-selector.create.community.head": "New community", + "dso-selector.create.community.head": "Новий фонд", + + // "dso-selector.create.community.sub-level": "Create a new community in", + "dso-selector.create.community.sub-level": "Створити новий фонд в", + + // "dso-selector.create.community.top-level": "Create a new top-level community", + "dso-selector.create.community.top-level": "Створити фонд верхнього рівня", + + // "dso-selector.create.item.head": "New item", + "dso-selector.create.item.head": "Новий документ", + + // "dso-selector.create.item.sub-level": "Create a new item in", + "dso-selector.create.item.sub-level": "Створити новий документ в", + + // "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": "Редагувати зібрання", + + // "dso-selector.edit.community.head": "Edit community", + "dso-selector.edit.community.head": "Редагувати фонд", + + // "dso-selector.edit.item.head": "Edit item", + "dso-selector.edit.item.head": "Редагувати документ", + + // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", + "dso-selector.export-metadata.dspaceobject.head": "Експорт метаданих з", + + // "dso-selector.no-results": "No {{ type }} found", + "dso-selector.no-results": "{{ type }} не знайдено", + + // "dso-selector.placeholder": "Search for a {{ type }}", + "dso-selector.placeholder": "Шукати {{ type }}", + + + + // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", + "confirmation-modal.export-metadata.header": "Експорт метаданих для {{ dsoName }}", + + // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}", + "confirmation-modal.export-metadata.info": "Ви впевнені, що хочете експортувати метадані для {{ dsoName }}?", + + // "confirmation-modal.export-metadata.cancel": "Cancel", + "confirmation-modal.export-metadata.cancel": "Скасувати", + + // "confirmation-modal.export-metadata.confirm": "Export", + "confirmation-modal.export-metadata.confirm": "Скасувати", + + // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"", + "confirmation-modal.delete-eperson.header": "Видалити користувача \"{{ dsoName }}\"", + + // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"", + "confirmation-modal.delete-eperson.info": "Ви впевнені, що хочете видалити користувача \"{{ dsoName }}\"?", + + // "confirmation-modal.delete-eperson.cancel": "Cancel", + "confirmation-modal.delete-eperson.cancel": "Скасувати", + + // "confirmation-modal.delete-eperson.confirm": "Delete", + "confirmation-modal.delete-eperson.confirm": "Видалити", + + + // "error.bitstream": "Error fetching bitstream", + "error.bitstream": "Виникла помилка при отриманні файлу", + + // "error.browse-by": "Error fetching items", + "error.browse-by": "Виникла помилка при отриманні документа", + + // "error.collection": "Error fetching collection", + "error.collection": "Виникла помилка при отриманні зібрання", + + // "error.collections": "Error fetching collections", + "error.collections": "Виникла помилка при отриманні зібрань", + + // "error.community": "Error fetching community", + "error.community": "Виникла помилка при отриманні фонду", + + // "error.identifier": "No item found for the identifier", + "error.identifier": "Жодного документу не знайдено за вказаним ідентифікатором", + + // "error.default": "Error", + "error.default": "Виникла якась помилка, шляк трафить", + + // "error.item": "Error fetching item", + "error.item": "Виникла помилка при отриманні документа", + + // "error.items": "Error fetching items", + "error.items": "Виникла помилка при отриманні документів", + + // "error.objects": "Error fetching objects", + "error.objects": "Виникла помилка при отриманні об'єктів", + + // "error.recent-submissions": "Error fetching recent submissions", + "error.recent-submissions": "Виникла помилка при отриманні останніх submissions ", + + // "error.search-results": "Error fetching search results", + "error.search-results": "Виникла помилка при отриманні пошукових результатів", + + // "error.sub-collections": "Error fetching sub-collections", + "error.sub-collections": "Виникла помилка при отриманні підзібрання", + + // "error.sub-communities": "Error fetching sub-communities", + "error.sub-communities": "Виникла помилка при отриманні підфонду", + + // "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": "Сталася помилка. Перевірте конфігурацію форми введення. Подробиці нижче:

", + + // "error.top-level-communities": "Error fetching top-level communities", + "error.top-level-communities": "Виникла помилка при отриманні фонду верхнього рівня", + + // "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": "Ви повинні дати згоду на умови ліцензії, щоб завершити submission. Якщо ви не можете погодитись на умови ліцензії на даний момент, ви можете зберегти свою роботу та повернутися пізніше або видалити submission.", + + // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.", + "error.validation.pattern": "Вхідна інформація обмежена поточним шаблоном: {{ pattern }}.", + + // "error.validation.filerequired": "The file upload is mandatory", + "error.validation.filerequired": "Завантаження файлу є обов'язковим", + + + + // "file-section.error.header": "Error obtaining files for this item", + "file-section.error.header": "Помилка отримання файлів для цього документа", + + + + // "footer.copyright": "copyright © 2002-{{ year }}", + "footer.copyright": "copyright © 2002-{{ year }}", + + // "footer.link.dspace": "DSpace software", + //TODO Change your univer + "footer.link.dspace": "DSpace software and Lviv Polytechnic National University", + + // "footer.link.lyrasis": "LYRASIS", + "footer.link.lyrasis": "LYRASIS", + + // "footer.link.cookies": "Cookie settings", + "footer.link.cookies": "Налаштування куків", + + // "footer.link.privacy-policy": "Privacy policy", + "footer.link.privacy-policy": "Політика приватності", + + // "footer.link.end-user-agreement":"End User Agreement", + "footer.link.end-user-agreement":"Угода користувача", + + + + // "forgot-email.form.header": "Forgot Password", + "forgot-email.form.header": "Забули пароль?", + + // "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": "Зареєструйтесь для отримання повідомлень про нові надходження та отримайте можливість вносити документи.", + + // "forgot-email.form.email": "Email Address *", + "forgot-email.form.email": "Email *", + + // "forgot-email.form.email.error.required": "Please fill in an email address", + "forgot-email.form.email.error.required": "Введіть email", + + // "forgot-email.form.email.error.pattern": "Please fill in a valid email address", + "forgot-email.form.email.error.pattern": "Ви повинні ввести правильний email", + + // "forgot-email.form.email.hint": "This address will be verified and used as your login name.", + "forgot-email.form.email.hint": "Ми провіримо цей email. Використовуйте його для входу у репозитарій", + + // "forgot-email.form.submit": "Submit", + "forgot-email.form.submit": "Надіслати", + + // "forgot-email.form.success.head": "Verification email sent", + "forgot-email.form.success.head": "На Ваш email було надіслане повідомлення", + + // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", + "forgot-email.form.success.content": "На {{ email }} було надіслане повідомлення, що містить спеціальне посилання та подальші інструкції.", + + // "forgot-email.form.error.head": "Error when trying to register email", + "forgot-email.form.error.head": "Виникла помилка при реєстрації email", + + // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}", + "forgot-email.form.error.content": "Виникла помилка при реєстрації email: {{ email }}", + + + + // "forgot-password.title": "Forgot Password", + "forgot-password.title": "Забули пароль?", + + // "forgot-password.form.head": "Forgot Password", + "forgot-password.form.head": "Забули пароль?", + + // "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": "Введіть новий пароль у поле нижче та підтвердьте його, ввівши його ще раз у друге поле. Він має містити щонайменше 6 символів.", + + // "forgot-password.form.card.security": "Security", + "forgot-password.form.card.security": "Безпека", + + // "forgot-password.form.identification.header": "Identify", + "forgot-password.form.identification.header": "Ідентифікація", + + // "forgot-password.form.identification.email": "Email address: ", + "forgot-password.form.identification.email": "Email: ", + + // "forgot-password.form.label.password": "Password", + "forgot-password.form.label.password": "Пароль", + + // "forgot-password.form.label.passwordrepeat": "Retype to confirm", + "forgot-password.form.label.passwordrepeat": "Введіть ще раз для підтвердження", + + // "forgot-password.form.error.empty-password": "Please enter a password in the box below.", + "forgot-password.form.error.empty-password": "Введіть пароль у поле нижче.", + + // "forgot-password.form.error.matching-passwords": "The passwords do not match.", + "forgot-password.form.error.matching-passwords": "Паролі не співпадають.", + + // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.", + "forgot-password.form.error.password-length": "Довжина пароля повинна становити не менше 6 символів.", + + // "forgot-password.form.notification.error.title": "Error when trying to submit new password", + "forgot-password.form.notification.error.title": "Виникла помилка при реєстрації нового пароля", + + // "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": "Пароль успішно скинуто. Ви увійшли під щойно створеним користувачем.", + + // "forgot-password.form.notification.success.title": "Password reset completed", + "forgot-password.form.notification.success.title": "Пароль скинуто успішно", + + // "forgot-password.form.submit": "Submit password", + "forgot-password.form.submit": "Надіслати пароль", + + + + // "form.add": "Add", + "form.add": "Додати", + + // "form.add-help": "Click here to add the current entry and to add another one", + "form.add-help": "Натисніть тут, щоб додати поточний запис і додати інший", + + // "form.cancel": "Cancel", + "form.cancel": "Скасувати", + + // "form.clear": "Clear", + "form.clear": "Очистити", + + // "form.clear-help": "Click here to remove the selected value", + "form.clear-help": "Натисніть тут, щоб видалити вибране значення", + + // "form.edit": "Edit", + "form.edit": "Редагувати", + + // "form.edit-help": "Click here to edit the selected value", + "form.edit-help": "Натисніть тут, щоб змінити вибране значення", + + // "form.first-name": "First name", + "form.first-name": "Ім'я", + + // "form.group-collapse": "Collapse", + "form.group-collapse": "Згорнути", + + // "form.group-collapse-help": "Click here to collapse", + "form.group-collapse-help": "Натисніть тут щоб згорнути", + + // "form.group-expand": "Expand", + "form.group-expand": "Розгорнути", + + // "form.group-expand-help": "Click here to expand and add more elements", + "form.group-expand-help": "Натисніть тут, щоб розгорнути та додати більше елементів", + + // "form.last-name": "Last name", + "form.last-name": "Прізвище", + + // "form.loading": "Loading...", + "form.loading": "Вантажиться...", + + // "form.lookup": "Lookup", + "form.lookup": "Пошук", + + // "form.lookup-help": "Click here to look up an existing relation", + "form.lookup-help": "Клацніть тут, щоб знайти існуючий зв’язок", + + // "form.no-results": "No results found", + "form.no-results": "Нічого не знайдено", + + // "form.no-value": "No value entered", + "form.no-value": "Значення не введено", + + // "form.other-information": {}, + "form.other-information": {}, + + // "form.remove": "Remove", + "form.remove": "Видалити", + + // "form.save": "Save", + "form.save": "Зберегти", + + // "form.save-help": "Save changes", + "form.save-help": "Зберегти зміни", + + // "form.search": "Search", + "form.search": "Пошук", + + // "form.search-help": "Click here to look for an existing correspondence", + "form.search-help": "Клацніть тут, щоб знайти наявне листування", + + // "form.submit": "Submit", + "form.submit": "Надіслати", + + + + // "home.description": "", + "home.description": "", + + // "home.breadcrumbs": "Home", + "home.breadcrumbs": "Головна", + + // "home.title": "DSpace Angular :: Home", + // TODO Change univer name + "home.title": "Репозитарій Львівської політехніки :: Головна", + + // "home.top-level-communities.head": "Communities in DSpace", + "home.top-level-communities.head": "Фонди", + + // "home.top-level-communities.help": "Select a community to browse its collections.", + "home.top-level-communities.help": "Виберіть фонд, щоб переглянути його зібрання.", + + + + // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement", + "info.end-user-agreement.accept": "Я прочитав та погоджуюсь із користувацькою угодою", + + // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement", + "info.end-user-agreement.accept.error": "Виникла помилки при при фіксуванні Вашої згоди на користувацьку угоду", + + // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement", + "info.end-user-agreement.accept.success": "Користувацьку угоду успішно оновлено", + + // "info.end-user-agreement.breadcrumbs": "End User Agreement", + "info.end-user-agreement.breadcrumbs": "Користувацька угода", + + // "info.end-user-agreement.buttons.cancel": "Cancel", + "info.end-user-agreement.buttons.cancel": "Відмінити", + + // "info.end-user-agreement.buttons.save": "Save", + "info.end-user-agreement.buttons.save": "Зберегти", + + // "info.end-user-agreement.head": "End User Agreement", + "info.end-user-agreement.head": "Користувацька угода", + + // "info.end-user-agreement.title": "End User Agreement", + "info.end-user-agreement.title": "Користувацька угода", + + // "info.privacy.breadcrumbs": "Privacy Statement", + "info.privacy.breadcrumbs": "Заява про конфіденційність", + + // "info.privacy.head": "Privacy Statement", + "info.privacy.head": "Заява про конфіденційність", + + // "info.privacy.title": "Privacy Statement", + "info.privacy.title": "Заява про конфіденційність", + + + + // "item.alerts.private": "This item is private", + "item.alerts.private": "Доступ до документа закритий", + + // "item.alerts.withdrawn": "This item has been withdrawn", + "item.alerts.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.", + "item.edit.authorizations.heading": "За допомогою цього редактора ви можете переглядати та змінювати політики документа, а також змінювати політики окремих компонентів документа. Документ — це множина пакетів, а пакети — це множина файлів. Контейнери зазвичай мають політики ADD/REMOVE/READ/WRITE, тоді як файли мають лише політики READ/WRITE.", + + // "item.edit.authorizations.title": "Edit item's Policies", + "item.edit.authorizations.title": "Редагувати політики документа", + + + + // "item.badge.private": "Private", + "item.badge.private": "Приватне", + + // "item.badge.withdrawn": "Withdrawn", + "item.badge.withdrawn": "Вилучено", + + + + // "item.bitstreams.upload.bundle": "Bundle", + "item.bitstreams.upload.bundle": "контейнер файлів", + + // "item.bitstreams.upload.bundle.placeholder": "Select a bundle", + "item.bitstreams.upload.bundle.placeholder": "Виберіть контейнер файлів", + + // "item.bitstreams.upload.bundle.new": "Create bundle", + "item.bitstreams.upload.bundle.new": "Створити контейнер файлів", + + // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.", + "item.bitstreams.upload.bundles.empty": "Цей документ не містить контейнеру файлів, щоб завантажити файл.", + + // "item.bitstreams.upload.cancel": "Cancel", + "item.bitstreams.upload.cancel": "Відмінити", + + // "item.bitstreams.upload.drop-message": "Drop a file to upload", + "item.bitstreams.upload.drop-message": "Виберіть файл для завантаження", + + // "item.bitstreams.upload.item": "Item: ", + "item.bitstreams.upload.item": "Документ: ", + + // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.", + "item.bitstreams.upload.notifications.bundle.created.content": "Контейнер файлів створено.", + + // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle", + "item.bitstreams.upload.notifications.bundle.created.title": "Контейнер файлів створено.", + + // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.", + "item.bitstreams.upload.notifications.upload.failed": "Не вдалось завантажити. Перевірте вміст даних", + + // "item.bitstreams.upload.title": "Upload bitstream", + "item.bitstreams.upload.title": "Завантажити файл", + + + + // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload", + "item.edit.bitstreams.bundle.edit.buttons.upload": "Завантажити", + + // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.", + "item.edit.bitstreams.bundle.displaying": "Зараз відображаються {{ amount }}файли {{ total }}.", + + // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})", + "item.edit.bitstreams.bundle.load.all": "Завантажити все ({{ total }})", + + // "item.edit.bitstreams.bundle.load.more": "Load more", + "item.edit.bitstreams.bundle.load.more": "Завантажити ще", + + // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}", + "item.edit.bitstreams.bundle.name": "Контейнер файлів: {{ name }}", + + // "item.edit.bitstreams.discard-button": "Discard", + "item.edit.bitstreams.discard-button": "Відхилити", + + // "item.edit.bitstreams.edit.buttons.download": "Download", + "item.edit.bitstreams.edit.buttons.download": "Завантажити", + + // "item.edit.bitstreams.edit.buttons.drag": "Drag", + "item.edit.bitstreams.edit.buttons.drag": "Перетягнути", + + // "item.edit.bitstreams.edit.buttons.edit": "Edit", + "item.edit.bitstreams.edit.buttons.edit": "Редагувати", + + // "item.edit.bitstreams.edit.buttons.remove": "Remove", + "item.edit.bitstreams.edit.buttons.remove": "Видалити", + + // "item.edit.bitstreams.edit.buttons.undo": "Undo changes", + "item.edit.bitstreams.edit.buttons.undo": "Відмінити зміни", + + // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.", + "item.edit.bitstreams.empty": "Цей документ не містить жодного файлу. Клацніть для завантаження", + + // "item.edit.bitstreams.headers.actions": "Actions", + "item.edit.bitstreams.headers.actions": "Дії", + + // "item.edit.bitstreams.headers.bundle": "Bundle", + "item.edit.bitstreams.headers.bundle": "Контецнер файлів", + + // "item.edit.bitstreams.headers.description": "Description", + "item.edit.bitstreams.headers.description": "Опис", + + // "item.edit.bitstreams.headers.format": "Format", + "item.edit.bitstreams.headers.format": "Формат", + + // "item.edit.bitstreams.headers.name": "Name", + "item.edit.bitstreams.headers.name": "Назва", + + // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + "item.edit.bitstreams.notifications.discarded.content": "Ваші зміни скасовано. Щоб відновити зміни, натисніть кнопку -Назад-.", + + // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded", + "item.edit.bitstreams.notifications.discarded.title": "Зміни скасовано", + + // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams", + "item.edit.bitstreams.notifications.move.failed.title": "Помилка переміщення файлу", + + // "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": "Зміни до документа збережені.", + + // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved", + "item.edit.bitstreams.notifications.move.saved.title": "Зміни до документа збережені", + + // "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": "Документ, над яким ви зараз працюєте, був змінений іншим користувачем. Ваші поточні зміни відхилено, щоб запобігти конфліктам", + + // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated", + "item.edit.bitstreams.notifications.outdated.title": "Зміни застаріли", + + // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream", + "item.edit.bitstreams.notifications.remove.failed.title": "Помилка видалення файла", + + // "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": "Ваші зміни до документа збережено.", + + // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved", + "item.edit.bitstreams.notifications.remove.saved.title": "Ваші зміни до документа збережено", + + // "item.edit.bitstreams.reinstate-button": "Undo", + "item.edit.bitstreams.reinstate-button": "Назад", + + // "item.edit.bitstreams.save-button": "Save", + "item.edit.bitstreams.save-button": "Зберегти", + + // "item.edit.bitstreams.upload-button": "Upload", + "item.edit.bitstreams.upload-button": "Завантажити", + + + + // "item.edit.delete.cancel": "Cancel", + "item.edit.delete.cancel": "Відмінити", + + // "item.edit.delete.confirm": "Delete", + "item.edit.delete.confirm": "Видалити", + + // "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": "Ви впевнені, що цей документ потрібно повністю видалити? Застереження: можливості відновити не буде.", + + // "item.edit.delete.error": "An error occurred while deleting the item", + "item.edit.delete.error": "Виникла помилка при видаленні документа", + + // "item.edit.delete.header": "Delete item: {{ id }}", + "item.edit.delete.header": "Видалити документ: {{ id }}", + + // "item.edit.delete.success": "The item has been deleted", + "item.edit.delete.success": "Документ видалено", + + // "item.edit.head": "Edit Item", + "item.edit.head": "Редагувати документ", + + // "item.edit.breadcrumbs": "Edit Item", + "item.edit.breadcrumbs": "Редагувати документ", + + + // "item.edit.tabs.mapper.head": "Collection Mapper", + "item.edit.tabs.mapper.head": "Карта зібрання", + + // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper", + "item.edit.tabs.item-mapper.title": "Редагування документа - карта зібрання", + + // "item.edit.item-mapper.buttons.add": "Map item to selected collections", + "item.edit.item-mapper.buttons.add": "Карта документа до вибраного зібрання", + + // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections", + "item.edit.item-mapper.buttons.remove": "Видалити карту документа для вибраного зібрання", + + // "item.edit.item-mapper.cancel": "Cancel", + "item.edit.item-mapper.cancel": "Відмінити", + + // "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": "Це інструмент карти документа, який дозволяє адміністраторам прив'язувати цей документ до інших зібрань. Ви можете шукати зібрання та прив'язувати їх, або переглядати список зібрань на які посилається документ.", + + // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections", + "item.edit.item-mapper.head": "Карта документа - прив'язка документа до зібрання", + + // "item.edit.item-mapper.item": "Item: \"{{name}}\"", + "item.edit.item-mapper.item": "Документ: \"{{name}}\"", + + // "item.edit.item-mapper.no-search": "Please enter a query to search", + "item.edit.item-mapper.no-search": "Введіть запит для пошуку", + + // "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": "Виникла помилка прив'язування документа до{{amount}} зібрання.", + + // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors", + "item.edit.item-mapper.notifications.add.error.head": "Помилка прив'язування", + + // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.", + "item.edit.item-mapper.notifications.add.success.content": "Документ успішно прив'язано до {{amount}} зібрання.", + + // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed", + "item.edit.item-mapper.notifications.add.success.head": "Прив'язування завершене", + + // "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": "Виникла помилка прив'язування документа до {{amount}} зібрання.", + + // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors", + "item.edit.item-mapper.notifications.remove.error.head": "Виникла помилка прив'язування", + + // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.", + "item.edit.item-mapper.notifications.remove.success.content": "Прив'язування документа до {{amount}} зібрання успішно видалено.", + + // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed", + "item.edit.item-mapper.notifications.remove.success.head": "Прив'язування видалено", + + // "item.edit.item-mapper.tabs.browse": "Browse mapped collections", + "item.edit.item-mapper.tabs.browse": "Переглянути прив'язки зібрання", + + // "item.edit.item-mapper.tabs.map": "Map new collections", + "item.edit.item-mapper.tabs.map": "Прив'язати нове зібрання", + + + + // "item.edit.metadata.add-button": "Add", + "item.edit.metadata.add-button": "Додати", + + // "item.edit.metadata.discard-button": "Discard", + "item.edit.metadata.discard-button": "Відмінити", + + // "item.edit.metadata.edit.buttons.edit": "Edit", + "item.edit.metadata.edit.buttons.edit": "Редагувати", + + // "item.edit.metadata.edit.buttons.remove": "Remove", + "item.edit.metadata.edit.buttons.remove": "Видалити", + + // "item.edit.metadata.edit.buttons.undo": "Undo changes", + "item.edit.metadata.edit.buttons.undo": "Відмінити зміни", + + // "item.edit.metadata.edit.buttons.unedit": "Stop editing", + "item.edit.metadata.edit.buttons.unedit": "Зупинити редагування", + + // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.", + "item.edit.metadata.empty": "Документ не містить жодних метаданих. Клікніть Додати щоб почати додавати метадані.", + + // "item.edit.metadata.headers.edit": "Edit", + "item.edit.metadata.headers.edit": "Редагувати", + + // "item.edit.metadata.headers.field": "Field", + "item.edit.metadata.headers.field": "Поле", + + // "item.edit.metadata.headers.language": "Lang", + "item.edit.metadata.headers.language": "Мова", + + // "item.edit.metadata.headers.value": "Value", + "item.edit.metadata.headers.value": "Значення", + + // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", + "item.edit.metadata.metadatafield.invalid": "Виберіть відповідне поле метаданих", + + // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + "item.edit.metadata.notifications.discarded.content": "Ваші зміни скасовано. Щоб відновити зміни, натисніть кнопку -Повернутись-.", + + // "item.edit.metadata.notifications.discarded.title": "Changed discarded", + "item.edit.metadata.notifications.discarded.title": "Ваші зміни скасовано", + + // "item.edit.metadata.notifications.error.title": "An error occurred", + "item.edit.metadata.notifications.error.title": "Ваші зміни скасовано", + + // "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": "Ваші зміни не збережено. Перед збереженням переконайтеся, що всі поля вірно заповнені.", + + // "item.edit.metadata.notifications.invalid.title": "Metadata invalid", + "item.edit.metadata.notifications.invalid.title": "Помилкові метадані", + + // "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": "Документ, над яким ви зараз працюєте, був змінений іншим користувачем. Ваші поточні зміни відхилено, щоб запобігти конфліктам", + + // "item.edit.metadata.notifications.outdated.title": "Changed outdated", + "item.edit.metadata.notifications.outdated.title": "Зміни застаріли", + + // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.", + "item.edit.metadata.notifications.saved.content": "Ваші зміни метаданих документа збережено.", + + // "item.edit.metadata.notifications.saved.title": "Metadata saved", + "item.edit.metadata.notifications.saved.title": "Метадані збережено", + + // "item.edit.metadata.reinstate-button": "Undo", + "item.edit.metadata.reinstate-button": "Повернутись", + + // "item.edit.metadata.save-button": "Save", + "item.edit.metadata.save-button": "Зберегти", + + + + // "item.edit.modify.overview.field": "Field", + "item.edit.modify.overview.field": "Поле", + + // "item.edit.modify.overview.language": "Language", + "item.edit.modify.overview.language": "Мова", + + // "item.edit.modify.overview.value": "Value", + "item.edit.modify.overview.value": "Значення", + + + + // "item.edit.move.cancel": "Cancel", + "item.edit.move.cancel": "Відмінити", + + // "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": "Виберіть зібрання, до якої потрібно перемістити цей документ. Щоб звузити список відображених зібрань, ви можете ввести пошуковий запит у поле.", + + // "item.edit.move.error": "An error occurred when attempting to move the item", + "item.edit.move.error": "Під час спроби перемістити документ - сталася помилка", + + // "item.edit.move.head": "Move item: {{id}}", + "item.edit.move.head": "Перемістити документ: {{id}}", + + // "item.edit.move.inheritpolicies.checkbox": "Inherit policies", + "item.edit.move.inheritpolicies.checkbox": "Наслідувати політики", + + // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection", + "item.edit.move.inheritpolicies.description": "Наслідувати політики за замовчуванням цільового зібрання", + + // "item.edit.move.move": "Move", + "item.edit.move.move": "Перенести", + + // "item.edit.move.processing": "Moving...", + "item.edit.move.processing": "Переносимо...", + + // "item.edit.move.search.placeholder": "Enter a search query to look for collections", + "item.edit.move.search.placeholder": "Введіть пошуковий запит для пошуку зібрання", + + // "item.edit.move.success": "The item has been moved successfully", + "item.edit.move.success": "Документ успішно перенесено", + + // "item.edit.move.title": "Move item", + "item.edit.move.title": "Перенести документ", + + + + // "item.edit.private.cancel": "Cancel", + "item.edit.private.cancel": "Відмінити", + + // "item.edit.private.confirm": "Make it Private", + "item.edit.private.confirm": "Закрити доступ", + + // "item.edit.private.description": "Are you sure this item should be made private in the archive?", + "item.edit.private.description": "Ви впевнені, що хочете закрити доступ до документа?", + + // "item.edit.private.error": "An error occurred while making the item private", + "item.edit.private.error": "Виникла помилка при закритті доступу до документа", + + // "item.edit.private.header": "Make item private: {{ id }}", + "item.edit.private.header": "Закрити доступ документу: {{ id }}", + + // "item.edit.private.success": "The item is now private", + "item.edit.private.success": "Доступ до документа закритий", + + + + // "item.edit.public.cancel": "Cancel", + "item.edit.public.cancel": "ВІдмінити", + + // "item.edit.public.confirm": "Make it Public", + "item.edit.public.confirm": "Зробити загальнодоступним", + + // "item.edit.public.description": "Are you sure this item should be made public in the archive?", + "item.edit.public.description": "Ви впевнені, що хочете зробити вільним доступ до документа?", + + // "item.edit.public.error": "An error occurred while making the item public", + "item.edit.public.error": "Виникла помилка при відкритті доступу до документа", + + // "item.edit.public.header": "Make item public: {{ id }}", + "item.edit.public.header": "Зробити документ загальнодоступним: {{ id }}", + + // "item.edit.public.success": "The item is now public", + "item.edit.public.success": "Документ тепер загальнодоступний", + + + + // "item.edit.reinstate.cancel": "Cancel", + "item.edit.reinstate.cancel": "Відмінити", + + // "item.edit.reinstate.confirm": "Reinstate", + "item.edit.reinstate.confirm": "Відновити", + + // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?", + "item.edit.reinstate.description": "Ви дійсно хочете відновити документ?", + + // "item.edit.reinstate.error": "An error occurred while reinstating the item", + "item.edit.reinstate.error": "Виникла помилка при відновленні документа", + + // "item.edit.reinstate.header": "Reinstate item: {{ id }}", + "item.edit.reinstate.header": "Відновлення документа: {{ id }}", + + // "item.edit.reinstate.success": "The item was reinstated successfully", + "item.edit.reinstate.success": "Документ був успішно відновлений", + + + + // "item.edit.relationships.discard-button": "Discard", + "item.edit.relationships.discard-button": "Відмінити", + + // "item.edit.relationships.edit.buttons.add": "Add", + "item.edit.relationships.edit.buttons.add": "Додати", + + // "item.edit.relationships.edit.buttons.remove": "Remove", + "item.edit.relationships.edit.buttons.remove": "Видалити", + + // "item.edit.relationships.edit.buttons.undo": "Undo changes", + "item.edit.relationships.edit.buttons.undo": "Повернути зміни", + + // "item.edit.relationships.no-relationships": "No relationships", + "item.edit.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": "Ваші зміни скасовано. Щоб відновити зміни, натисніть кнопку -Повернутись-", + + // "item.edit.relationships.notifications.discarded.title": "Changes discarded", + "item.edit.relationships.notifications.discarded.title": "Зміни скасовано", + + // "item.edit.relationships.notifications.failed.title": "Error editing relationships", + "item.edit.relationships.notifications.failed.title": "Помилка редагування зв'яків", + + // "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": "Документ, над яким ви зараз працюєте, був змінений іншим користувачем. Ваші поточні зміни відхилено, щоб запобігти конфліктам", + + // "item.edit.relationships.notifications.outdated.title": "Changes outdated", + "item.edit.relationships.notifications.outdated.title": "Зміни застаріли", + + // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.", + "item.edit.relationships.notifications.saved.content": "Зміни до зв'язків документа успішно збережено.", + + // "item.edit.relationships.notifications.saved.title": "Relationships saved", + "item.edit.relationships.notifications.saved.title": "Зв'язки збережено", + + // "item.edit.relationships.reinstate-button": "Undo", + "item.edit.relationships.reinstate-button": "Повернутись", + + // "item.edit.relationships.save-button": "Save", + "item.edit.relationships.save-button": "Зберегти", + + // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item", + "item.edit.relationships.no-entity-type": "Додайте 'dspace.entity.type' для створення зв'язків для документа", + + + + // "item.edit.tabs.bitstreams.head": "Bitstreams", + "item.edit.tabs.bitstreams.head": "Файли", + + // "item.edit.tabs.bitstreams.title": "Редагування докумена - Файли", + "item.edit.tabs.bitstreams.title": "Редагування докумена - Файли", + + // "item.edit.tabs.curate.head": "Curate", + // TODO translate + "item.edit.tabs.curate.head": "Curate", + + // "item.edit.tabs.curate.title": "Item Edit - Curate", + // TODO translate + "item.edit.tabs.curate.title": "Редагування документа - Curate", + + // "item.edit.tabs.metadata.head": "Metadata", + "item.edit.tabs.metadata.head": "Метадані", + + // "item.edit.tabs.metadata.title": "Item Edit - Metadata", + "item.edit.tabs.metadata.title": "Редагування документа - метадані", + + // "item.edit.tabs.relationships.head": "Relationships", + "item.edit.tabs.relationships.head": "Зв'язки", + + // "item.edit.tabs.relationships.title": "Редагування документа - зв'язки", + "item.edit.tabs.relationships.title": "Редагування документа - зв'язки", + + // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...", + "item.edit.tabs.status.buttons.authorizations.button": "Авторизація...", + + // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies", + "item.edit.tabs.status.buttons.authorizations.label": "Редагувати політики доступу документа", + + // "item.edit.tabs.status.buttons.delete.button": "Permanently delete", + "item.edit.tabs.status.buttons.delete.button": "Видалити назавжди", + + // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item", + "item.edit.tabs.status.buttons.delete.label": "Повністю видалити документ", + + // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections", + "item.edit.tabs.status.buttons.mappedCollections.button": "Прив'язані зібрання", + + // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections", + "item.edit.tabs.status.buttons.mappedCollections.label": "Керувати прив'язаними зібраннями", + + // "item.edit.tabs.status.buttons.move.button": "Move...", + "item.edit.tabs.status.buttons.move.button": "Перемістити...", + + // "item.edit.tabs.status.buttons.move.label": "Move item to another collection", + "item.edit.tabs.status.buttons.move.label": "Перемістити документ до іншого зібрання", + + // "item.edit.tabs.status.buttons.private.button": "Make it private...", + "item.edit.tabs.status.buttons.private.button": "Закрити доступ...", + + // "item.edit.tabs.status.buttons.private.label": "Make item private", + "item.edit.tabs.status.buttons.private.label": "Закрити доступ до документа", + + // "item.edit.tabs.status.buttons.public.button": "Make it public...", + "item.edit.tabs.status.buttons.public.button": "Зробити загальнодоступним...", + + // "item.edit.tabs.status.buttons.public.label": "Make item public", + "item.edit.tabs.status.buttons.public.label": "Зробити документ загальнодоступним", + + // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", + "item.edit.tabs.status.buttons.reinstate.button": "Відновити...", + + // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository", + "item.edit.tabs.status.buttons.reinstate.label": "Відновити документ в репозиторій", + + // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...", + "item.edit.tabs.status.buttons.withdraw.button": "Вилучити...", + + // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository", + "item.edit.tabs.status.buttons.withdraw.label": "Вилучити документ з репозиторію", + + // "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": "Вітаємо на сторінці керування документами. Тут ви можете вилучити, відновити, перемістити або видалити елемент. Ви також можете оновити або додати нові метадані чи файли на інших вкладках.", + + // "item.edit.tabs.status.head": "Status", + "item.edit.tabs.status.head": "Статус", + + // "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", + + // "item.edit.tabs.status.labels.itemPage": "Item Page", + "item.edit.tabs.status.labels.itemPage": "Сторінка документа", + + // "item.edit.tabs.status.labels.lastModified": "Last Modified", + "item.edit.tabs.status.labels.lastModified": "Останні редагування", + + // "item.edit.tabs.status.title": "Item Edit - Status", + "item.edit.tabs.status.title": "Редагування документа - статус", + + // "item.edit.tabs.versionhistory.head": "Version History", + "item.edit.tabs.versionhistory.head": "Історія версій", + + // "item.edit.tabs.versionhistory.title": "Item Edit - Version History", + "item.edit.tabs.versionhistory.title": "Редагування документа - історія версій", + + // "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": "Редагування або додавання нових версій ще неможливе в цьому інтерфейсі користувача.", + + // "item.edit.tabs.view.head": "View Item", + "item.edit.tabs.view.head": "Перегляд документа", + + // "item.edit.tabs.view.title": "Item Edit - View", + "item.edit.tabs.view.title": "Редагування документа - перегляд", + + + + // "item.edit.withdraw.cancel": "Cancel", + "item.edit.withdraw.cancel": "Відмінити", + + // "item.edit.withdraw.confirm": "Withdraw", + "item.edit.withdraw.confirm": "Вилучити", + + // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?", + "item.edit.withdraw.description": "Ви впевнені, що бажаєте вилучити документ?", + + // "item.edit.withdraw.error": "An error occurred while withdrawing the item", + "item.edit.withdraw.error": "Виникла помилка при вилученні документа", + + // "item.edit.withdraw.header": "Withdraw item: {{ id }}", + "item.edit.withdraw.header": "Вилучити документ: {{ id }}", + + // "item.edit.withdraw.success": "The item was withdrawn successfully", + "item.edit.withdraw.success": "Документ був успішно вилучений", + + + + // "item.listelement.badge": "Item", + "item.listelement.badge": "Документ", + + // "item.page.description": "Description", + "item.page.description": "Опис", + + // "item.page.edit": "Edit this item", + "item.page.edit": "Редагувати цей документ", + + // "item.page.journal-issn": "Journal ISSN", + "item.page.journal-issn": "Номер ISSN", + + // "item.page.journal-title": "Journal Title", + "item.page.journal-title": "Назва журналу", + + // "item.page.publisher": "Publisher", + "item.page.publisher": "Видавець", + + // "item.page.titleprefix": "Item: ", + "item.page.titleprefix": "Документ: ", + + // "item.page.volume-title": "Volume Title", + "item.page.volume-title": "Назва тому", + + // "item.search.results.head": "Результат пошуку за документами", + "item.search.results.head": "Результат пошуку за документами", + + // "item.search.title": "DSpace Angular :: Item Search", + "item.search.title": "Репозитарій :: Пошук документів", + + + + // "item.page.abstract": "Abstract", + "item.page.abstract": "Анотація", + + // "item.page.author": "Authors", + "item.page.author": "Автори", + + // "item.page.citation": "Citation", + "item.page.citation": "Бібліографічний опис", + + // "item.page.collections": "Collections", + "item.page.collections": "Зібрання", + + // "item.page.date": "Date", + "item.page.date": "Дата", + + // "item.page.edit": "Edit this item", + "item.page.edit": "Редагувати цей документ", + + // "item.page.files": "Files", + "item.page.files": "Файли", + + // "item.page.filesection.description": "Description:", + "item.page.filesection.description": "Опис:", + + // "item.page.filesection.download": "Download", + "item.page.filesection.download": "Завантажити", + + // "item.page.filesection.format": "Format:", + "item.page.filesection.format": "Формат:", + + // "item.page.filesection.name": "Name:", + "item.page.filesection.name": "Назва:", + + // "item.page.filesection.size": "Size:", + "item.page.filesection.size": "Розмір:", + + // "item.page.journal.search.title": "Articles in this journal", + "item.page.journal.search.title": "Публікації у цьому виданні", + + // "item.page.link.full": "Full item page", + "item.page.link.full": "Повна інформація про документ", + + // "item.page.link.simple": "Simple item page", + "item.page.link.simple": "Скорочена інформація про документ", + + // "item.page.person.search.title": "Articles by this author", + "item.page.person.search.title": "Публікації за автором", + + // "item.page.related-items.view-more": "Show {{ amount }} more", + "item.page.related-items.view-more": "Показати {{ amount }} більше", + + // "item.page.related-items.view-less": "Hide last {{ amount }}", + "item.page.related-items.view-less": "Приховати останні {{ amount }}", + + // "item.page.relationships.isAuthorOfPublication": "Publications", + "item.page.relationships.isAuthorOfPublication": "Публікації", + + // "item.page.relationships.isJournalOfPublication": "Publications", + "item.page.relationships.isJournalOfPublication": "Публікації", + + // "item.page.relationships.isOrgUnitOfPerson": "Authors", + "item.page.relationships.isOrgUnitOfPerson": "Автори", + + // "item.page.relationships.isOrgUnitOfProject": "Research Projects", + "item.page.relationships.isOrgUnitOfProject": "Дослідницькі проекти", + + // "item.page.subject": "Keywords", + "item.page.subject": "Ключові слова", + + // "item.page.uri": "URI", + "item.page.uri": "URI", + + // "item.page.bitstreams.view-more": "Show more", + "item.page.bitstreams.view-more": "Показати більше", + + // "item.page.bitstreams.collapse": "Collapse", + "item.page.bitstreams.collapse": "Згорнути", + + // "item.page.filesection.original.bundle" : "Original bundle", + "item.page.filesection.original.bundle" : "Контейнер файлів", + + // "item.page.filesection.license.bundle" : "License bundle", + "item.page.filesection.license.bundle" : "Ліцензійна угода", + + // "item.preview.dc.identifier.uri": "Identifier:", + "item.preview.dc.identifier.uri": "Ідентифікатор:", + + // "item.preview.dc.contributor.author": "Authors:", + "item.preview.dc.contributor.author": "Автори:", + + // "item.preview.dc.date.issued": "Published date:", + "item.preview.dc.date.issued": "Дата публікації:", + + // "item.preview.dc.description.abstract": "Abstract:", + "item.preview.dc.description.abstract": "Анотація:", + + // "item.preview.dc.identifier.other": "Other identifier:", + "item.preview.dc.identifier.other": "Інший ідентифікатор:", + + // "item.preview.dc.language.iso": "Language:", + "item.preview.dc.language.iso": "Мова:", + + // "item.preview.dc.subject": "Subjects:", + "item.preview.dc.subject": "Ключові слова:", + + // "item.preview.dc.title": "Title:", + "item.preview.dc.title": "Назва:", + + // "item.preview.person.familyName": "Surname:", + "item.preview.person.familyName": "Прізвище:", + + // "item.preview.person.givenName": "Name:", + "item.preview.person.givenName": "Ім'я:", + + // "item.preview.person.identifier.orcid": "ORCID:", + "item.preview.person.identifier.orcid": "ORCID:", + + + // "item.select.confirm": "Confirm selected", + "item.select.confirm": "Підтвердити вибрані", + + // "item.select.empty": "No items to show", + "item.select.empty": "Таких документів немає", + + // "item.select.table.author": "Author", + "item.select.table.author": "Автор", + + // "item.select.table.collection": "Collection", + "item.select.table.collection": "Зібрання", + + // "item.select.table.title": "Title", + "item.select.table.title": "Назва", + + + // "item.version.history.empty": "There are no other versions for this item yet.", + "item.version.history.empty": "Іншої версії цього документу немає.", + + // "item.version.history.head": "Version History", + "item.version.history.head": "Історія версій", + + // "item.version.history.return": "Return", + "item.version.history.return": "Повернутись", + + // "item.version.history.selected": "Selected version", + "item.version.history.selected": "Вибрана версія", + + // "item.version.history.table.version": "Version", + "item.version.history.table.version": "Версія", + + // "item.version.history.table.item": "Item", + "item.version.history.table.item": "Документ", + + // "item.version.history.table.editor": "Editor", + "item.version.history.table.editor": "Редактор", + + // "item.version.history.table.date": "Date", + "item.version.history.table.date": "Дата", + + // "item.version.history.table.summary": "Summary", + "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.", + "item.version.notice": "Це не остання версія документа. Останню версію можна знайти за покликанням ТУТ.", + + + + // "journal.listelement.badge": "Journal", + "journal.listelement.badge": "Видання", + + // "journal.page.description": "Description", + "journal.page.description": "Опис", + + // "journal.page.edit": "Edit this item", + "journal.page.edit": "Редагувати цей документ", + + // "journal.page.editor": "Editor-in-Chief", + "journal.page.editor": "Головний редактор", + + // "journal.page.issn": "ISSN", + "journal.page.issn": "ISSN", + + // "journal.page.publisher": "Publisher", + "journal.page.publisher": "Видавець", + + // "journal.page.titleprefix": "Journal: ", + "journal.page.titleprefix": "Видання: ", + + // "journal.search.results.head": "Journal Search Results", + "journal.search.results.head": "Пошук у виданні", + + // "journal.search.title": "DSpace Angular :: Journal Search", + "journal.search.title": "Репозитарій :: пошук видання", + + + + // "journalissue.listelement.badge": "Journal Issue", + "journalissue.listelement.badge": "Випуск видання", + + // "journalissue.page.description": "Description", + "journalissue.page.description": "Опис", + + // "journalissue.page.edit": "Edit this item", + "journalissue.page.edit": "Редагувати цей документ", + + // "journalissue.page.issuedate": "Issue Date", + "journalissue.page.issuedate": "Дата випуску", + + // "journalissue.page.journal-issn": "Journal ISSN", + "journalissue.page.journal-issn": "ISSN", + + // "journalissue.page.journal-title": "Journal Title", + "journalissue.page.journal-title": "Назва видання", + + // "journalissue.page.keyword": "Keywords", + "journalissue.page.keyword": "Ключові слова", + + // "journalissue.page.number": "Number", + "journalissue.page.number": "Номер", + + // "journalissue.page.titleprefix": "Journal Issue: ", + "journalissue.page.titleprefix": "Випуск видання: ", + + + + // "journalvolume.listelement.badge": "Journal Volume", + "journalvolume.listelement.badge": "Том видання", + + // "journalvolume.page.description": "Description", + "journalvolume.page.description": "Опис", + + // "journalvolume.page.edit": "Edit this item", + + "journalvolume.page.edit": "Редагувати цей документ", + + // "journalvolume.page.issuedate": "Issue Date", + "journalvolume.page.issuedate": "Дата випуску", + + // "journalvolume.page.titleprefix": "Journal Volume: ", + "journalvolume.page.titleprefix": "Том видання: ", + + // "journalvolume.page.volume": "Volume", + "journalvolume.page.volume": "Том", + + + + // "loading.bitstream": "Loading bitstream...", + "loading.bitstream": "Файл вантажится...", + + // "loading.bitstreams": "Loading bitstreams...", + "loading.bitstreams": "Файли вантажаться...", + + // "loading.browse-by": "Loading items...", + "loading.browse-by": "Документи вантажаться...", + + // "loading.browse-by-page": "Loading page...", + "loading.browse-by-page": "Сторінка вантажится...", + + // "loading.collection": "Loading collection...", + "loading.collection": "Зібрання вантажиться...", + + // "loading.collections": "Loading collections...", + "loading.collections": "Зібрання вантажаться...", + + // "loading.content-source": "Loading content source...", + "loading.content-source": "Джерело даних вантажиться...", + + // "loading.community": "Loading community...", + "loading.community": "Фонд вантажиться...", + + // "loading.default": "Loading...", + "loading.default": "Вантажиться...", + + // "loading.item": "Loading item...", + "loading.item": "Документ вантажиться...", + + // "loading.items": "Loading items...", + "loading.items": "Документи вантажаться...", + + // "loading.mydspace-results": "Loading items...", + "loading.mydspace-results": "Документи вантажаться..", + + // "loading.objects": "Loading...", + "loading.objects": "Вантажиться...", + + // "loading.recent-submissions": "Loading recent submissions...", + "loading.recent-submissions": "Вантажаться останні підписки...", + + // "loading.search-results": "Loading search results...", + "loading.search-results": "Результати вантажаться...", + + // "loading.sub-collections": "Loading sub-collections...", + "loading.sub-collections": "Підзібрання вантажаться...", + + // "loading.sub-communities": "Loading sub-communities...", + "loading.sub-communities": "Підфонди вантажаться...", + + // "loading.top-level-communities": "Loading top-level communities...", + "loading.top-level-communities": "Фонди верхнього рівня вантажаться...", + + + + // "login.form.email": "Email address", + "login.form.email": "Email", + + // "login.form.forgot-password": "Have you forgotten your password?", + "login.form.forgot-password": "Забули пароль?", + + // "login.form.header": "Please log in to DSpace", + "login.form.header": "Увійдіть у репозитарій", + + // "login.form.new-user": "New user? Click here to register.", + "login.form.new-user": "Новий користувач? Зареєструйтесь.", + + // "login.form.or-divider": "or", + "login.form.or-divider": "або", + + // "login.form.password": "Password", + "login.form.password": "Пароль", + + // "login.form.shibboleth": "Log in with Shibboleth", + "login.form.shibboleth": "Увійти через Shibboleth/наразі не підримується/", + + // "login.form.submit": "Log in", + "login.form.submit": "Увійти", + + // "login.title": "Login", + "login.title": "Користувач", + + // "login.breadcrumbs": "Login", + "login.breadcrumbs": "Користувач", + + + + // "logout.form.header": "Log out from DSpace", + "logout.form.header": "Вийти з репозиторію", + + // "logout.form.submit": "Log out", + "logout.form.submit": "Вийти", + + // "logout.title": "Logout", + "logout.title": "Вийти", + + + + // "menu.header.admin": "Admin", + "menu.header.admin": "Адмін", + + // "menu.header.image.logo": "Repository logo", + "menu.header.image.logo": "Логотип репозиторію", + + + + // "menu.section.access_control": "Access Control", + "menu.section.access_control": "Контроль доступу", + + // "menu.section.access_control_authorizations": "Authorizations", + "menu.section.access_control_authorizations": "Авторизація", + + // "menu.section.access_control_groups": "Groups", + "menu.section.access_control_groups": "Групи", + + // "menu.section.access_control_people": "People", + "menu.section.access_control_people": "Користувачі", + + + + // "menu.section.admin_search": "Admin Search", + "menu.section.admin_search": "Пошук адміністратора", + + + + // "menu.section.browse_community": "This Community", + "menu.section.browse_community": "Цей фонд", + + // "menu.section.browse_community_by_author": "By Author", + "menu.section.browse_community_by_author": "За автором", + + // "menu.section.browse_community_by_issue_date": "By Issue Date", + "menu.section.browse_community_by_issue_date": "За датою видання", + + // "menu.section.browse_community_by_title": "By Title", + "menu.section.browse_community_by_title": "За назвою", + + // "menu.section.browse_global": "All of DSpace", + "menu.section.browse_global": "Пошук за критеріями", + + // "menu.section.browse_global_by_author": "By Author", + "menu.section.browse_global_by_author": "За автором", + + // "menu.section.browse_global_by_dateissued": "By Issue Date", + "menu.section.browse_global_by_dateissued": "За датою видання", + + // "menu.section.browse_global_by_subject": "By Subject", + "menu.section.browse_global_by_subject": "За ключовими словами", + + // "menu.section.browse_global_by_title": "By Title", + "menu.section.browse_global_by_title": "За назвою", + + // "menu.section.browse_global_communities_and_collections": "Communities & Collections", + "menu.section.browse_global_communities_and_collections": "Фонди та зібрання", + + + + // "menu.section.control_panel": "Control Panel", + "menu.section.control_panel": "Панель управління", + + // "menu.section.curation_task": "Curation Task", + "menu.section.curation_task": "Поточні завдання", + + + + // "menu.section.edit": "Edit", + "menu.section.edit": "Редагувати", + + // "menu.section.edit_collection": "Collection", + "menu.section.edit_collection": "Зібрання", + + // "menu.section.edit_community": "Community", + "menu.section.edit_community": "Фонд", + + // "menu.section.edit_item": "Item", + "menu.section.edit_item": "Документ", + + + + // "menu.section.export": "Export", + "menu.section.export": "Експорт", + + // "menu.section.export_collection": "Collection", + "menu.section.export_collection": "Зібрання", + + // "menu.section.export_community": "Community", + "menu.section.export_community": "Фонд", + + // "menu.section.export_item": "Item", + "menu.section.export_item": "Документ", + + // "menu.section.export_metadata": "Metadata", + "menu.section.export_metadata": "Метадані", + + + + // "menu.section.icon.access_control": "Access Control menu section", + "menu.section.icon.access_control": "Меню контролю доступу", + + // "menu.section.icon.admin_search": "Admin search menu section", + "menu.section.icon.admin_search": "Меню пошуку адміна", + + // "menu.section.icon.control_panel": "Control Panel menu section", + "menu.section.icon.control_panel": "Меню панелі управління", + + // "menu.section.icon.curation_task": "Curation Task menu section", + "menu.section.icon.curation_task": "Меню поточних завдань", + + // "menu.section.icon.edit": "Edit menu section", + "menu.section.icon.edit": "Редагувати розділ меню", + + // "menu.section.icon.export": "Export menu section", + "menu.section.icon.export": "Експорт розділу меню", + + // "menu.section.icon.find": "Find menu section", + "menu.section.icon.find": "Знайти розділ меню", + + // "menu.section.icon.import": "Import menu section", + "menu.section.icon.import": "Імпорт розділу меню", + + // "menu.section.icon.new": "New menu section", + "menu.section.icon.new": "Новий розділ меню", + + // "menu.section.icon.pin": "Pin sidebar", + "menu.section.icon.pin": "Закріпити бічну панель", + + // "menu.section.icon.processes": "Processes menu section", + + "menu.section.icon.processes": "Процеси розділу меню", + + // "menu.section.icon.registries": "Registries menu section", + "menu.section.icon.registries": "Реєстр розділів меню", + + // "menu.section.icon.statistics_task": "Statistics Task menu section", + "menu.section.icon.statistics_task": "Статистика розділу меню", + + // "menu.section.icon.unpin": "Unpin sidebar", + "menu.section.icon.unpin": "Відкріпити бічну панель", + + + + // "menu.section.import": "Import", + "menu.section.import": "Імпорт", + + // "menu.section.import_batch": "Batch Import (ZIP)", + "menu.section.import_batch": "Імпорт контейнера файлів (ZIP)", + + // "menu.section.import_metadata": "Metadata", + "menu.section.import_metadata": "Метадані", + + + + // "menu.section.new": "New", + "menu.section.new": "Новий", + + // "menu.section.new_collection": "Collection", + "menu.section.new_collection": "Зібрання", + + // "menu.section.new_community": "Community", + "menu.section.new_community": "Фонд", + + // "menu.section.new_item": "Item", + "menu.section.new_item": "Документ", + + // "menu.section.new_item_version": "Item Version", + "menu.section.new_item_version": "Версія документа", + + // "menu.section.new_process": "Process", + + "menu.section.new_process": "Процес", + + + + // "menu.section.pin": "Pin sidebar", + "menu.section.pin": "Закріпити бічне меню", + + // "menu.section.unpin": "Unpin sidebar", + "menu.section.unpin": "Відкріпити бічне меню", + + + + // "menu.section.processes": "Processes", + "menu.section.processes": "Процеси", + + + + // "menu.section.registries": "Registries", + "menu.section.registries": "Реєстри", + + // "menu.section.registries_format": "Format", + "menu.section.registries_format": "Формати", + + // "menu.section.registries_metadata": "Metadata", + "menu.section.registries_metadata": "Метадані", + + + + // "menu.section.statistics": "Statistics", + "menu.section.statistics": "Статистика", + + // "menu.section.statistics_task": "Statistics Task", + "menu.section.statistics_task": "Завдання статистики", + + + + // "menu.section.toggle.access_control": "Toggle Access Control section", + "menu.section.toggle.access_control": "Переключити розділ контролю доступу", + + // "menu.section.toggle.control_panel": "Toggle Control Panel section", + "menu.section.toggle.control_panel": "Переключити панель контролю доступу", + + // "menu.section.toggle.curation_task": "Toggle Curation Task section", + "menu.section.toggle.curation_task": "Переключити розділ завдань", + + // "menu.section.toggle.edit": "Toggle Edit section", + "menu.section.toggle.edit": "Переключити розділ редагування", + + // "menu.section.toggle.export": "Toggle Export section", + "menu.section.toggle.export": "Переключити розділ експорту", + + // "menu.section.toggle.find": "Toggle Find section", + "menu.section.toggle.find": "Переключити розділ пошуку", + + // "menu.section.toggle.import": "Toggle Import section", + "menu.section.toggle.import": "Переключити розділ імпорту", + + // "menu.section.toggle.new": "Toggle New section", + "menu.section.toggle.new": "Переключити новий розділ", + + // "menu.section.toggle.registries": "Toggle Registries section", + "menu.section.toggle.registries": "Переключити розділ реєстрів", + + // "menu.section.toggle.statistics_task": "Toggle Statistics Task section", + "menu.section.toggle.statistics_task": "Переключити розділ статистики", + + + // "menu.section.workflow": "Administer Workflow", + + "menu.section.workflow": "Керування процесу подачі документа", + + + // "mydspace.description": "", + "mydspace.description": "", + + // "mydspace.general.text-here": "here", + + "mydspace.general.text-here": "тут", + + // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.", + "mydspace.messages.controller-help": "Виберіть цей параметр, щоб надіслати повідомлення відправнику елемента.", + + // "mydspace.messages.description-placeholder": "Insert your message here...", + "mydspace.messages.description-placeholder": "Введіть своє повідомлення ...", + + // "mydspace.messages.hide-msg": "Hide message", + "mydspace.messages.hide-msg": "Приховати повідомлення", + + // "mydspace.messages.mark-as-read": "Mark as read", + "mydspace.messages.mark-as-read": "Позначити як прочитане", + + // "mydspace.messages.mark-as-unread": "Mark as unread", + "mydspace.messages.mark-as-unread": "Позначти як непрочитане", + + // "mydspace.messages.no-content": "No content.", + "mydspace.messages.no-content": "Нема змісту.", + + // "mydspace.messages.no-messages": "No messages yet.", + "mydspace.messages.no-messages": "Повідомлень немає.", + + // "mydspace.messages.send-btn": "Send", + "mydspace.messages.send-btn": "Надіслати", + + // "mydspace.messages.show-msg": "Show message", + "mydspace.messages.show-msg": "Показати повідомлення", + + // "mydspace.messages.subject-placeholder": "Subject...", + "mydspace.messages.subject-placeholder": "Тема...", + + // "mydspace.messages.submitter-help": "Select this option to send a message to controller.", + "mydspace.messages.submitter-help": "Виберіть цю опцію, щоб надіслати повідомлення на перевірку.", + + // "mydspace.messages.title": "Messages", + "mydspace.messages.title": "Повідомлення", + + // "mydspace.messages.to": "To", + "mydspace.messages.to": "До", + + // "mydspace.new-submission": "New submission", + "mydspace.new-submission": "Надійшли нові документи", + + // "mydspace.new-submission-external": "Import metadata from external source", + + "mydspace.new-submission-external": "Імпортувати метадані зі зовнішнього джерела", + + // "mydspace.new-submission-external-short": "Import metadata", + + "mydspace.new-submission-external-short": "Імпортувати метадані", + + // "mydspace.results.head": "Your submissions", + "mydspace.results.head": "Ваші відправлені документи", + + // "mydspace.results.no-abstract": "No Abstract", + "mydspace.results.no-abstract": "Анотація відсутня", + + // "mydspace.results.no-authors": "No Authors", + "mydspace.results.no-authors": "Автори відсутні", + + // "mydspace.results.no-collections": "No Collections", + "mydspace.results.no-collections": "Відсутні зібрання", + + // "mydspace.results.no-date": "No Date", + "mydspace.results.no-date": "Відсутня дата", + + // "mydspace.results.no-files": "No Files", + "mydspace.results.no-files": "Відсутні файли", + + // "mydspace.results.no-results": "There were no items to show", + "mydspace.results.no-results": "Документів не знайдено", + + // "mydspace.results.no-title": "No title", + "mydspace.results.no-title": "Назва відсутня", + + // "mydspace.results.no-uri": "No Uri", + "mydspace.results.no-uri": "Відсутнє покликання", + + // "mydspace.show.workflow": "All tasks", + "mydspace.show.workflow": "Всі завдання", + + // "mydspace.show.workspace": "Your Submissions", + "mydspace.show.workspace": "Ваші надіслані документи ", + + // "mydspace.status.archived": "Archived", + "mydspace.status.archived": "Заархівовані", + + // "mydspace.status.validation": "Validation", + "mydspace.status.validation": "Перевірка", + + // "mydspace.status.waiting-for-controller": "Waiting for controller", + "mydspace.status.waiting-for-controller": "Чекаємо контролера", + + // "mydspace.status.workflow": "Workflow", + "mydspace.status.workflow": "Робочий процес", + + // "mydspace.status.workspace": "Workspace", + "mydspace.status.workspace": "Робоче середовище", + + // "mydspace.title": "MyDSpace", + "mydspace.title": "Моє середовище", + + // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", + "mydspace.upload.upload-failed": "Помилка створення нового робочого середовища. Перш ніж повторити спробу, перевірте завантажений вміст.", + + // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.", + + "mydspace.upload.upload-failed-manyentries": "Файл неможливо опрацювати. Виявлено забагато звернень, але дозволено лише одне для файлу..", + + // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.", + + "mydspace.upload.upload-failed-moreonefile": "Запит неможливо працювати. Дозволений тільки один файл", + + // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.", + "mydspace.upload.upload-multiple-successful": "{{qty}} нових робочих середовищ створено.", + + // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.", + "mydspace.upload.upload-successful": "Створено нове робоче середовище. Клацніть {{here}} для редагування.", + + // "mydspace.view-btn": "View", + "mydspace.view-btn": "Перегляд", + + + + // "nav.browse.header": "All of DSpace", + "nav.browse.header": "Пошук за критеріями", + + // "nav.community-browse.header": "By Community", + "nav.community-browse.header": "У фонді", + + // "nav.language": "Language switch", + "nav.language": "Змінити мову", + + // "nav.login": "Log In", + "nav.login": "Увійти", + + // "nav.logout": "Log Out", + "nav.logout": "Вийти", + + // "nav.mydspace": "MyDSpace", + "nav.mydspace": "Моє середовище", + + // "nav.profile": "Profile", + "nav.profile": "Профіль", + + // "nav.search": "Search", + "nav.search": "Пошук", + + // "nav.statistics.header": "Statistics", + "nav.statistics.header": "Статистика", + + // "nav.stop-impersonating": "Stop impersonating EPerson", + + "nav.stop-impersonating": "Припиніть видавати себе за користувача", + + + + // "orgunit.listelement.badge": "Organizational Unit", + "orgunit.listelement.badge": "Організаціна одиниця", + + // "orgunit.page.city": "City", + "orgunit.page.city": "Місто", + + // "orgunit.page.country": "Country", + "orgunit.page.country": "Країна", + + // "orgunit.page.dateestablished": "Date established", + "orgunit.page.dateestablished": "Дата встановлення", + + // "orgunit.page.description": "Description", + "orgunit.page.description": "Опис", + + // "orgunit.page.edit": "Edit this item", + + "orgunit.page.edit": "Редагувати цей документ", + + // "orgunit.page.id": "ID", + "orgunit.page.id": "ID", + + // "orgunit.page.titleprefix": "Organizational Unit: ", + "orgunit.page.titleprefix": "Організаціна одиниця: ", + + + + // "pagination.results-per-page": "Results Per Page", + "pagination.results-per-page": "Результатів на сторінці", + + // "pagination.showing.detail": "{{ range }} of {{ total }}", + "pagination.showing.detail": "{{ range }} з {{ total }}", + + // "pagination.showing.label": "Now showing ", + "pagination.showing.label": "Зараз показуємо ", + + // "pagination.sort-direction": "Sort Options", + "pagination.sort-direction": "Налаштування сортування", + + + + // "person.listelement.badge": "Person", + "person.listelement.badge": "Користувач", + + // "person.listelement.no-title": "No name found", + + "person.listelement.no-title": "Ім'я не знайдено", + + // "person.page.birthdate": "Birth Date", + "person.page.birthdate": "Дата народження", + + // "person.page.edit": "Edit this item", + + "person.page.edit": "Редагувати документ", + + // "person.page.email": "Email Address", + "person.page.email": "Email", + + // "person.page.firstname": "First Name", + "person.page.firstname": "Ім'я", + + // "person.page.jobtitle": "Job Title", + "person.page.jobtitle": "Посада", + + // "person.page.lastname": "Last Name", + "person.page.lastname": "Прізвище", + + // "person.page.link.full": "Show all metadata", + "person.page.link.full": "Показати всі метадані", + + // "person.page.orcid": "ORCID", + "person.page.orcid": "ORCID", + + // "person.page.staffid": "Staff ID", + "person.page.staffid": "Персональний ID", + + // "person.page.titleprefix": "Person: ", + "person.page.titleprefix": "Користувач: ", + + // "person.search.results.head": "Person Search Results", + "person.search.results.head": "Результати пошуку користувача", + + // "person.search.title": "DSpace Angular :: Person Search", + "person.search.title": "Репозиторій :: Користувацький пошук", + + + + // "process.new.select-parameters": "Parameters", + "process.new.select-parameters": "Параметри", + + // "process.new.cancel": "Cancel", + "process.new.cancel": "Відмінити", + + // "process.new.submit": "Submit", + "process.new.submit": "Надіслати", + + // "process.new.select-script": "Script", + "process.new.select-script": "Скрипт", + + // "process.new.select-script.placeholder": "Choose a script...", + "process.new.select-script.placeholder": "Виберіть скрипт...", + + // "process.new.select-script.required": "Script is required", + "process.new.select-script.required": "Потрібно вибрати скрипт", + + // "process.new.parameter.file.upload-button": "Select file...", + "process.new.parameter.file.upload-button": "Виберіть файл...", + + // "process.new.parameter.file.required": "Please select a file", + "process.new.parameter.file.required": "Виберіть файл", + + // "process.new.parameter.string.required": "Parameter value is required", + "process.new.parameter.string.required": "Цей параметр є обв'язковим", + + // "process.new.parameter.type.value": "value", + "process.new.parameter.type.value": "значення", + + // "process.new.parameter.type.file": "file", + "process.new.parameter.type.file": "файл", + + // "process.new.parameter.required.missing": "The following parameters are required but still missing:", + "process.new.parameter.required.missing": "Наступні параметри є обов’язковими, але все ще відсутні:", + + // "process.new.notification.success.title": "Success", + "process.new.notification.success.title": "Успіх", + + // "process.new.notification.success.content": "The process was successfully created", + "process.new.notification.success.content": "Процес успішно запущено", + + // "process.new.notification.error.title": "Error", + "process.new.notification.error.title": "Виникла якась помилка, бодай би вона скисла", + + // "process.new.notification.error.content": "An error occurred while creating this process", + "process.new.notification.error.content": "Виникла помилка при створенні процесу", + + // "process.new.header": "Create a new process", + "process.new.header": "Створити новий процес", + + // "process.new.title": "Create a new process", + "process.new.title": "Створити новий процес", + + // "process.new.breadcrumbs": "Create a new process", + "process.new.breadcrumbs": "Створити новий процес", + + + + // "process.detail.arguments" : "Arguments", + "process.detail.arguments" : "Аргументи", + + // "process.detail.arguments.empty" : "This process doesn't contain any arguments", + "process.detail.arguments.empty" : "Процес не містить жодних аргументів", + + // "process.detail.back" : "Back", + "process.detail.back" : "Повернутись", + + // "process.detail.output" : "Process Output", + "process.detail.output" : "Прооцес завершено", + + // "process.detail.logs.button": "Retrieve process output", + "process.detail.logs.button": "Отримати вихідні дані процесу", + + // "process.detail.logs.loading": "Retrieving", + "process.detail.logs.loading": "Отримання", + + // "process.detail.logs.none": "This process has no output", + "process.detail.logs.none": "Процес не генерує вихідних даних", + + // "process.detail.output-files" : "Output Files", + "process.detail.output-files" : "Вихідні файли", + + // "process.detail.output-files.empty" : "This process doesn't contain any output files", + "process.detail.output-files.empty" : "Процес не містить жодних вихдних файлів", + + // "process.detail.script" : "Script", + "process.detail.script" : "Скрипт", + + // "process.detail.title" : "Process: {{ id }} - {{ name }}", + "process.detail.title" : "Процеси: {{ id }} - {{ name }}", + + // "process.detail.start-time" : "Start time", + "process.detail.start-time" : "Дата старту", + + // "process.detail.end-time" : "Finish time", + "process.detail.end-time" : "Дата завершення", + + // "process.detail.status" : "Status", + "process.detail.status" : "Статус", + + // "process.detail.create" : "Create similar process", + "process.detail.create" : "Створіть аналогічний процес", + + + + // "process.overview.table.finish" : "Finish time", + "process.overview.table.finish" : "Дата завершення", + + // "process.overview.table.id" : "Process ID", + "process.overview.table.id" : "ID процесу", + + // "process.overview.table.name" : "Name", + "process.overview.table.name" : "Назва", + + // "process.overview.table.start" : "Start time", + "process.overview.table.start" : "Дата старту", + + // "process.overview.table.status" : "Status", + "process.overview.table.status" : "Статус", + + // "process.overview.table.user" : "User", + "process.overview.table.user" : "Користувач", + + // "process.overview.title": "Processes Overview", + "process.overview.title": "Огляд процесів", + + // "process.overview.breadcrumbs": "Processes Overview", + "process.overview.breadcrumbs": "Огляд процесів", + + // "process.overview.new": "New", + "process.overview.new": "Новий", + + + // "profile.breadcrumbs": "Update Profile", + "profile.breadcrumbs": "Оновити профіль", + + // "profile.card.identify": "Identify", + "profile.card.identify": "Ідентифікувати", + + // "profile.card.security": "Security", + "profile.card.security": "Безпека", + + // "profile.form.submit": "Update Profile", + "profile.form.submit": "Оновити профіль", + + // "profile.groups.head": "Authorization groups you belong to", + "profile.groups.head": "Групи до яких Ви належите", + + // "profile.head": "Update Profile", + "profile.head": "Оновити профіль", + + // "profile.metadata.form.error.firstname.required": "First Name is required", + "profile.metadata.form.error.firstname.required": "Ім'я є обов'язковим полем", + + // "profile.metadata.form.error.lastname.required": "Last Name is required", + "profile.metadata.form.error.lastname.required": "Прізвище є обов'язковим полем", + + // "profile.metadata.form.label.email": "Email Address", + "profile.metadata.form.label.email": "Email", + + // "profile.metadata.form.label.firstname": "First Name", + "profile.metadata.form.label.firstname": "Ім'я", + + // "profile.metadata.form.label.language": "Language", + "profile.metadata.form.label.language": "Мова", + + // "profile.metadata.form.label.lastname": "Last Name", + "profile.metadata.form.label.lastname": "Прізвище", + + // "profile.metadata.form.label.phone": "Contact Telephone", + "profile.metadata.form.label.phone": "Номер телефону", + + // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.", + "profile.metadata.form.notifications.success.content": "Зміни до профілю збережені.", + + // "profile.metadata.form.notifications.success.title": "Profile saved", + "profile.metadata.form.notifications.success.title": "Профіль збережено", + + // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.", + "profile.notifications.warning.no-changes.content": "Не було змін до профілю.", + + // "profile.notifications.warning.no-changes.title": "No changes", + "profile.notifications.warning.no-changes.title": "Без змін", + + // "profile.security.form.error.matching-passwords": "The passwords do not match.", + "profile.security.form.error.matching-passwords": "Паролі не співпадають.", + + // "profile.security.form.error.password-length": "The password should be at least 6 characters long.", + "profile.security.form.error.password-length": "Довжина пароля повинна становити не менше 6 символів.", + + // "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": "За бажанням ви можете ввести новий пароль у поле нижче та підтвердити його, ввівши його ще раз у друге поле. Він має містити щонайменше шість символів.", + + // "profile.security.form.label.password": "Password", + "profile.security.form.label.password": "Пароль", + + // "profile.security.form.label.passwordrepeat": "Retype to confirm", + "profile.security.form.label.passwordrepeat": "Повторіть", + + // "profile.security.form.notifications.success.content": "Your changes to the password were saved.", + "profile.security.form.notifications.success.content": "Зміни до паролю збережені.", + + // "profile.security.form.notifications.success.title": "Password saved", + "profile.security.form.notifications.success.title": "Пароль збережено", + + // "profile.security.form.notifications.error.title": "Error changing passwords", + "profile.security.form.notifications.error.title": "Помилка зміни пароля", + + // "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": "Пароль повинен містити щонайменше 6 символів.", + + // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.", + "profile.security.form.notifications.error.not-same": "Паролі не співпадають.", + + // "profile.title": "Update Profile", + "profile.title": "Оновити профіль", + + + + // "project.listelement.badge": "Research Project", + "project.listelement.badge": "Дослідницький проект", + + // "project.page.contributor": "Contributors", + "project.page.contributor": "Дописувачі", + + // "project.page.description": "Description", + "project.page.description": "Опис", + + // "project.page.edit": "Edit this item", + + "project.page.edit": "Редагувати документ", + + // "project.page.expectedcompletion": "Expected Completion", + "project.page.expectedcompletion": "Очікуване завершеня", + + // "project.page.funder": "Funders", + "project.page.funder": "Фундатори", + + // "project.page.id": "ID", + "project.page.id": "ID", + + // "project.page.keyword": "Keywords", + "project.page.keyword": "Ключові слова", + + // "project.page.status": "Status", + "project.page.status": "Статус", + + // "project.page.titleprefix": "Research Project: ", + "project.page.titleprefix": "Досліницький проект: ", + + // "project.search.results.head": "Project Search Results", + "project.search.results.head": "Результати пошуку за проектом", + + + + // "publication.listelement.badge": "Publication", + "publication.listelement.badge": "Публікація", + + // "publication.page.description": "Description", + "publication.page.description": "Опис", + + // "publication.page.edit": "Edit this item", + "publication.page.edit": "Редагувати документ", + + // "publication.page.journal-issn": "Journal ISSN", + "publication.page.journal-issn": "ISSN", + + // "publication.page.journal-title": "Journal Title", + "publication.page.journal-title": "Назва видання", + + // "publication.page.publisher": "Publisher", + "publication.page.publisher": "Видання", + + // "publication.page.titleprefix": "Publication: ", + "publication.page.titleprefix": "Публікація: ", + + // "publication.page.volume-title": "Volume Title", + "publication.page.volume-title": "Назва тому", + + // "publication.search.results.head": "Publication Search Results", + "publication.search.results.head": "Результати пошуку", + + // "publication.search.title": "DSpace Angular :: Publication Search", + "publication.search.title": "Репозиторій :: пощук публікацій", + + + // "register-email.title": "New user registration", + "register-email.title": "Реєстрація нового користувача", + + // "register-page.create-profile.header": "Create Profile", + "register-page.create-profile.header": "Створити профіль", + + // "register-page.create-profile.identification.header": "Identify", + "register-page.create-profile.identification.header": "Ідентифікувати", + + // "register-page.create-profile.identification.email": "Email Address", + "register-page.create-profile.identification.email": "Email", + + // "register-page.create-profile.identification.first-name": "First Name *", + "register-page.create-profile.identification.first-name": "Ім'я *", + + // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name", + "register-page.create-profile.identification.first-name.error": "Заповніть поле імені", + + // "register-page.create-profile.identification.last-name": "Last Name *", + + "register-page.create-profile.identification.last-name": "Прізвище *", + + // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name", + + "register-page.create-profile.identification.last-name.error": "Заповніть поле прізвища", + + // "register-page.create-profile.identification.contact": "Contact Telephone", + + "register-page.create-profile.identification.contact": "Номер телефону", + + // "register-page.create-profile.identification.language": "Language", + + "register-page.create-profile.identification.language": "Мова", + + // "register-page.create-profile.security.header": "Security", + + "register-page.create-profile.security.header": "Безпека", + + // "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": "Будь ласка, введіть пароль у поле нижче та підтвердьте його, ввівши його ще раз у друге поле. Він має містити щонайменше шість символів.", + + // "register-page.create-profile.security.label.password": "Password *", + + "register-page.create-profile.security.label.password": "Пароль *", + + // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *", + + "register-page.create-profile.security.label.passwordrepeat": "Повторіть для ідтвердження *", + + // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.", + + "register-page.create-profile.security.error.empty-password": "Введіть пароль у поле нижче.", + + // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.", + + "register-page.create-profile.security.error.matching-passwords": "Паролі не співпадають.", + + // "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": "Довжина пароля повинна бути не менше 6 символів.", + + // "register-page.create-profile.submit": "Complete Registration", + + "register-page.create-profile.submit": "Повна реєстрація", + + // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.", + + "register-page.create-profile.submit.error.content": "Щось пішло не так при реєстрації нового користувача.", + + // "register-page.create-profile.submit.error.head": "Registration failed", + + "register-page.create-profile.submit.error.head": "Реєстрація не вдалась", + + // "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": "Реєстрація пройшла успішно. Ви увійшли як новий користувач.", + + // "register-page.create-profile.submit.success.head": "Registration completed", + + "register-page.create-profile.submit.success.head": "Реєстрацію завершено", + + + // "register-page.registration.header": "New user registration", + + "register-page.registration.header": "Реєстрація нового користувача", + + // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.", + + "register-page.registration.info": "Зареєструйтесь для отримання сповіщень про нові надходження та отримайте можливіть надсилати нові документи у репозиторій.", + + // "register-page.registration.email": "Email Address *", + + "register-page.registration.email": "Email *", + + // "register-page.registration.email.error.required": "Please fill in an email address", + + "register-page.registration.email.error.required": "Заповніть поле email", + + // "register-page.registration.email.error.pattern": "Please fill in a valid email address", + + "register-page.registration.email.error.pattern": "Введіть правильну емейл адресу", + + // "register-page.registration.email.hint": "This address will be verified and used as your login name.", + + "register-page.registration.email.hint": "Використовуйие цю адресу щоб увійти у репозиторій. Але перед тим вона буде перевірена", + + // "register-page.registration.submit": "Register", + + "register-page.registration.submit": "Реєстрація", + + // "register-page.registration.success.head": "Verification email sent", + + "register-page.registration.success.head": "email для підтвердження Вам надіслано", + + // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", + + "register-page.registration.success.content": "email для підтвердження Вам надіслано на вказану скриньку {{ email }}. Там Ви знайдете покликання для підтвердження адреми та подальші кроки.", + + // "register-page.registration.error.head": "Error when trying to register email", + + "register-page.registration.error.head": "Виникла помилка при реєстрації email", + + // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}", + + "register-page.registration.error.content": "Виникла помилка при реєстрації email: {{ 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": "Не вдалося знайти відповідний тип відносин {{ type }} між двома документами", + + // "relationships.add.error.server.content": "The server returned an error", + + "relationships.add.error.server.content": "Сервер повідомив про помилку", + + // "relationships.add.error.title": "Unable to add relationship", + + "relationships.add.error.title": "Неможливо додати зв'язок", + + // "relationships.isAuthorOf": "Authors", + "relationships.isAuthorOf": "Автори", + + // "relationships.isAuthorOf.Person": "Authors (persons)", + + "relationships.isAuthorOf.Person": "Автори", + + // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)", + + "relationships.isAuthorOf.OrgUnit": "Автори (структурна одиниця, наприклад університет)", + + // "relationships.isIssueOf": "Journal Issues", + "relationships.isIssueOf": "Випуски видання", + + // "relationships.isJournalIssueOf": "Journal Issue", + "relationships.isJournalIssueOf": "Випуск видання", + + // "relationships.isJournalOf": "Journals", + "relationships.isJournalOf": "Видання", + + // "relationships.isOrgUnitOf": "Organizational Units", + "relationships.isOrgUnitOf": "Структурні одиниці", + + // "relationships.isPersonOf": "Authors", + "relationships.isPersonOf": "Автори", + + // "relationships.isProjectOf": "Research Projects", + "relationships.isProjectOf": "Дослідницькі проекти", + + // "relationships.isPublicationOf": "Publications", + "relationships.isPublicationOf": "Публікації", + + // "relationships.isPublicationOfJournalIssue": "Articles", + "relationships.isPublicationOfJournalIssue": "Публікації", + + // "relationships.isSingleJournalOf": "Journal", + "relationships.isSingleJournalOf": "Видання", + + // "relationships.isSingleVolumeOf": "Journal Volume", + "relationships.isSingleVolumeOf": "Том видання", + + // "relationships.isVolumeOf": "Journal Volumes", + "relationships.isVolumeOf": "Томи видання", + + // "relationships.isContributorOf": "Contributors", + "relationships.isContributorOf": "Дописувачі", + + + + // "resource-policies.add.button": "Add", + + "resource-policies.add.button": "Додати", + + // "resource-policies.add.for.": "Add a new policy", + + "resource-policies.add.for.": "Додати нову політику", + + // "resource-policies.add.for.bitstream": "Add a new Bitstream policy", + + "resource-policies.add.for.bitstream": "Додати нову політику для файлу", + + // "resource-policies.add.for.bundle": "Add a new Bundle policy", + + "resource-policies.add.for.bundle": "AДодати нову політику для контейнеру файлів", + + // "resource-policies.add.for.item": "Add a new Item policy", + + "resource-policies.add.for.item": "Додати нову політику для документа", + + // "resource-policies.add.for.community": "Add a new Community policy", + + "resource-policies.add.for.community": "Додати нову політику для фонду", + + // "resource-policies.add.for.collection": "Add a new Collection policy", + + "resource-policies.add.for.collection": "Додати нову політику для зібрання", + + // "resource-policies.create.page.heading": "Create new resource policy for ", + + "resource-policies.create.page.heading": "Створити нову ресурсну політику для ", + + // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.", + + "resource-policies.create.page.failure.content": "Виникла помилка при створенні ресурсної політики.", + + // "resource-policies.create.page.success.content": "Operation successful", + + "resource-policies.create.page.success.content": "Операція пройшла успішно", + + // "resource-policies.create.page.title": "Create new resource policy", + + "resource-policies.create.page.title": "Створити нову ресурсну політику", + + // "resource-policies.delete.btn": "Delete selected", + + "resource-policies.delete.btn": "Видалити вибране", + + // "resource-policies.delete.btn.title": "Delete selected resource policies", + + "resource-policies.delete.btn.title": "Видалити вибрані ресурсні політики", + + // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.", + + "resource-policies.delete.failure.content": "Виникла помилка при видаленні вибраних ресурсних політик.", + + // "resource-policies.delete.success.content": "Операція пройшла успішно", + + "resource-policies.delete.success.content": "Операція пройшла успішно", + + // "resource-policies.edit.page.heading": "Edit resource policy ", + + "resource-policies.edit.page.heading": "Редагувати ресурсну політику ", + + // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.", + + "resource-policies.edit.page.failure.content": "Виникла помилка при редагуванні ресурсної політики.", + + // "resource-policies.edit.page.success.content": "Operation successful", + + "resource-policies.edit.page.success.content": "Операція пройшла успішно", + + // "resource-policies.edit.page.title": "Edit resource policy", + + "resource-policies.edit.page.title": "Редагувати ресурсну політику", + + // "resource-policies.form.action-type.label": "Select the action type", + + "resource-policies.form.action-type.label": "Виберіть тип дії", + + // "resource-policies.form.action-type.required": "You must select the resource policy action.", + + "resource-policies.form.action-type.required": "Ви повинні вибрати дію політики ресурсів.", + + // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission", + + "resource-policies.form.eperson-group-list.label": "Особа чи група, якій буде надано дозвіл", + + // "resource-policies.form.eperson-group-list.select.btn": "Select", + + "resource-policies.form.eperson-group-list.select.btn": "Вибрати", + + // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson", + + "resource-policies.form.eperson-group-list.tab.eperson": "Вибрати користувача", + + // "resource-policies.form.eperson-group-list.tab.group": "Search for a group", + + "resource-policies.form.eperson-group-list.tab.group": "Шукати групу", + + // "resource-policies.form.eperson-group-list.table.headers.action": "Action", + + "resource-policies.form.eperson-group-list.table.headers.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", + + "resource-policies.form.eperson-group-list.table.headers.name": "Назва", + + // "resource-policies.form.date.end.label": "End Date", + + "resource-policies.form.date.end.label": "Кінцева дата", + + // "resource-policies.form.date.start.label": "Start Date", + + "resource-policies.form.date.start.label": "Дата початку", + + // "resource-policies.form.description.label": "Description", + + "resource-policies.form.description.label": "Опис", + + // "resource-policies.form.name.label": "Name", + + "resource-policies.form.name.label": "Назва", + + // "resource-policies.form.policy-type.label": "Select the policy type", + + "resource-policies.form.policy-type.label": "Виберіть тип політики", + + // "resource-policies.form.policy-type.required": "You must select the resource policy type.", + + "resource-policies.form.policy-type.required": "Спочатку ви повинні вибрати тип політики ресурсів.", + + // "resource-policies.table.headers.action": "Action", + + "resource-policies.table.headers.action": "Дія", + + // "resource-policies.table.headers.date.end": "End Date", + + "resource-policies.table.headers.date.end": "Кінцева дата", + + // "resource-policies.table.headers.date.start": "Start Date", + + "resource-policies.table.headers.date.start": "Дата початку", + + // "resource-policies.table.headers.edit": "Edit", + + "resource-policies.table.headers.edit": "Редагувати", + + // "resource-policies.table.headers.edit.group": "Edit group", + + "resource-policies.table.headers.edit.group": "Редагувати групу", + + // "resource-policies.table.headers.edit.policy": "Edit policy", + + "resource-policies.table.headers.edit.policy": "Редагувати політику", + + // "resource-policies.table.headers.eperson": "EPerson", + + "resource-policies.table.headers.eperson": "Користувач", + + // "resource-policies.table.headers.group": "Group", + + "resource-policies.table.headers.group": "Група", + + // "resource-policies.table.headers.id": "ID", + + "resource-policies.table.headers.id": "ID", + + // "resource-policies.table.headers.name": "Name", + + "resource-policies.table.headers.name": "Назва", + + // "resource-policies.table.headers.policyType": "type", + + "resource-policies.table.headers.policyType": "Тип", + + // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream", + + "resource-policies.table.headers.title.for.bitstream": "Політики для файла", + + // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle", + + "resource-policies.table.headers.title.for.bundle": "Політики для контейнера файлів", + + // "resource-policies.table.headers.title.for.item": "Policies for Item", + + "resource-policies.table.headers.title.for.item": "Політики для документа", + + // "resource-policies.table.headers.title.for.community": "Policies for Community", + + "resource-policies.table.headers.title.for.community": "Політики для фонду", + + // "resource-policies.table.headers.title.for.collection": "Policies for Collection", + + "resource-policies.table.headers.title.for.collection": "Політики для зібрання", + + + + // "search.description": "", + "search.description": "", + + // "search.switch-configuration.title": "Show", + "search.switch-configuration.title": "Показати", + + // "search.title": "DSpace Angular :: Search", + "search.title": "Репозиторій :: Пошук", + + // "search.breadcrumbs": "Search", + "search.breadcrumbs": "Шукати", + + + // "search.filters.applied.f.author": "Author", + "search.filters.applied.f.author": "Автор", + + // "search.filters.applied.f.dateIssued.max": "End date", + "search.filters.applied.f.dateIssued.max": "Кінцева дата", + + // "search.filters.applied.f.dateIssued.min": "Start date", + "search.filters.applied.f.dateIssued.min": "Дата початку", + + // "search.filters.applied.f.dateSubmitted": "Date submitted", + "search.filters.applied.f.dateSubmitted": "Дата надсилання", + + // "search.filters.applied.f.discoverable": "Private", + "search.filters.applied.f.discoverable": "Закритий", + + // "search.filters.applied.f.entityType": "Item Type", + "search.filters.applied.f.entityType": "Тип документа", + + // "search.filters.applied.f.has_content_in_original_bundle": "Has files", + "search.filters.applied.f.has_content_in_original_bundle": "Містить файли", + + // "search.filters.applied.f.itemtype": "Type", + "search.filters.applied.f.itemtype": "Тип", + + // "search.filters.applied.f.namedresourcetype": "Status", + "search.filters.applied.f.namedresourcetype": "Статус", + + // "search.filters.applied.f.subject": "Subject", + "search.filters.applied.f.subject": "Ключові слова", + + // "search.filters.applied.f.submitter": "Submitter", + "search.filters.applied.f.submitter": "Надсилач", + + // "search.filters.applied.f.jobTitle": "Job Title", + "search.filters.applied.f.jobTitle": "Посада", + + // "search.filters.applied.f.birthDate.max": "End birth date", + "search.filters.applied.f.birthDate.max": "End birth date", + + // "search.filters.applied.f.birthDate.min": "Start birth date", + "search.filters.applied.f.birthDate.min": "Start birth date", + + // "search.filters.applied.f.withdrawn": "Withdrawn", + "search.filters.applied.f.withdrawn": "Вилучено", + + + + // "search.filters.filter.author.head": "Author", + "search.filters.filter.author.head": "Автор", + + // "search.filters.filter.author.placeholder": "Author name", + "search.filters.filter.author.placeholder": "Ім'я автора", + + // "search.filters.filter.birthDate.head": "Birth Date", + "search.filters.filter.birthDate.head": "Дата народження", + + // "search.filters.filter.birthDate.placeholder": "Birth Date", + "search.filters.filter.birthDate.placeholder": "Дата народження", + + // "search.filters.filter.creativeDatePublished.head": "Date Published", + "search.filters.filter.creativeDatePublished.head": "Дата публікації", + + // "search.filters.filter.creativeDatePublished.placeholder": "Date Published", + "search.filters.filter.creativeDatePublished.placeholder": "Дата публікації", + + // "search.filters.filter.creativeWorkEditor.head": "Editor", + "search.filters.filter.creativeWorkEditor.head": "Редактор", + + // "search.filters.filter.creativeWorkEditor.placeholder": "Editor", + "search.filters.filter.creativeWorkEditor.placeholder": "Редактор", + + // "search.filters.filter.creativeWorkKeywords.head": "Subject", + "search.filters.filter.creativeWorkKeywords.head": "Ключові слова", + + // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject", + "search.filters.filter.creativeWorkKeywords.placeholder": "Ключові слова", + + // "search.filters.filter.creativeWorkPublisher.head": "Publisher", + "search.filters.filter.creativeWorkPublisher.head": "Видавець", + + // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher", + "search.filters.filter.creativeWorkPublisher.placeholder": "Видавець", + + // "search.filters.filter.dateIssued.head": "Date", + "search.filters.filter.dateIssued.head": "Дата", + + // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date", + "search.filters.filter.dateIssued.max.placeholder": "Мінімальна дата", + + // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date", + "search.filters.filter.dateIssued.min.placeholder": "Максимальна дата", + + // "search.filters.filter.dateSubmitted.head": "Date submitted", + "search.filters.filter.dateSubmitted.head": "Дата надсилання", + + // "search.filters.filter.dateSubmitted.placeholder": "Date submitted", + "search.filters.filter.dateSubmitted.placeholder": "Дата надсилання", + + // "search.filters.filter.discoverable.head": "Private", + "search.filters.filter.discoverable.head": "Закритий", + + // "search.filters.filter.withdrawn.head": "Withdrawn", + "search.filters.filter.withdrawn.head": "Вилучено", + + // "search.filters.filter.entityType.head": "Item Type", + "search.filters.filter.entityType.head": "Тип документа", + + // "search.filters.filter.entityType.placeholder": "Item Type", + "search.filters.filter.entityType.placeholder": "Тип документа", + + // "search.filters.filter.has_content_in_original_bundle.head": "Has files", + "search.filters.filter.has_content_in_original_bundle.head": "Містить файли", + + // "search.filters.filter.itemtype.head": "Type", + "search.filters.filter.itemtype.head": "Тип", + + // "search.filters.filter.itemtype.placeholder": "Type", + "search.filters.filter.itemtype.placeholder": "Тип", + + // "search.filters.filter.jobTitle.head": "Job Title", + "search.filters.filter.jobTitle.head": "Посада", + + // "search.filters.filter.jobTitle.placeholder": "Job Title", + "search.filters.filter.jobTitle.placeholder": "Посада", + + // "search.filters.filter.knowsLanguage.head": "Known language", + "search.filters.filter.knowsLanguage.head": "Known language", + + // "search.filters.filter.knowsLanguage.placeholder": "Known language", + "search.filters.filter.knowsLanguage.placeholder": "Known language", + + // "search.filters.filter.namedresourcetype.head": "Status", + "search.filters.filter.namedresourcetype.head": "Статус", + + // "search.filters.filter.namedresourcetype.placeholder": "Status", + "search.filters.filter.namedresourcetype.placeholder": "Статус", + + // "search.filters.filter.objectpeople.head": "People", + "search.filters.filter.objectpeople.head": "Користувачі", + + // "search.filters.filter.objectpeople.placeholder": "People", + "search.filters.filter.objectpeople.placeholder": "Користувачі", + + // "search.filters.filter.organizationAddressCountry.head": "Country", + "search.filters.filter.organizationAddressCountry.head": "Країна", + + // "search.filters.filter.organizationAddressCountry.placeholder": "Country", + "search.filters.filter.organizationAddressCountry.placeholder": "Країна", + + // "search.filters.filter.organizationAddressLocality.head": "City", + "search.filters.filter.organizationAddressLocality.head": "Місто", + + // "search.filters.filter.organizationAddressLocality.placeholder": "City", + "search.filters.filter.organizationAddressLocality.placeholder": "Місто", + + // "search.filters.filter.organizationFoundingDate.head": "Date Founded", + "search.filters.filter.organizationFoundingDate.head": "Дата заснування", + + // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded", + "search.filters.filter.organizationFoundingDate.placeholder": "Дата заснування", + + // "search.filters.filter.scope.head": "Scope", + "search.filters.filter.scope.head": "Область застосування", + + // "search.filters.filter.scope.placeholder": "Scope filter", + "search.filters.filter.scope.placeholder": "Фільтр області застосування", + + // "search.filters.filter.show-less": "Collapse", + "search.filters.filter.show-less": "Згорнути", + + // "search.filters.filter.show-more": "Show more", + "search.filters.filter.show-more": "Детальніше", + + // "search.filters.filter.subject.head": "Subject", + "search.filters.filter.subject.head": "Ключові слова", + + // "search.filters.filter.subject.placeholder": "Subject", + "search.filters.filter.subject.placeholder": "Ключові слова", + + // "search.filters.filter.submitter.head": "Submitter", + "search.filters.filter.submitter.head": "Користувач, який надсилає", + + // "search.filters.filter.submitter.placeholder": "Submitter", + "search.filters.filter.submitter.placeholder": "Користувач, який надсилає", + + + + // "search.filters.entityType.JournalIssue": "Journal Issue", + "search.filters.entityType.JournalIssue": "Випуск видання", + + // "search.filters.entityType.JournalVolume": "Journal Volume", + "search.filters.entityType.JournalVolume": "Том видання", + + // "search.filters.entityType.OrgUnit": "Organizational Unit", + "search.filters.entityType.OrgUnit": "Структурна одиниця", + + // "search.filters.has_content_in_original_bundle.true": "Yes", + "search.filters.has_content_in_original_bundle.true": "Так", + + // "search.filters.has_content_in_original_bundle.false": "No", + "search.filters.has_content_in_original_bundle.false": "Ні", + + // "search.filters.discoverable.true": "No", + "search.filters.discoverable.true": "Ні", + + // "search.filters.discoverable.false": "Yes", + "search.filters.discoverable.false": "Так", + + // "search.filters.withdrawn.true": "Yes", + "search.filters.withdrawn.true": "Так", + + // "search.filters.withdrawn.false": "No", + "search.filters.withdrawn.false": "Ні", + + + // "search.filters.head": "Filters", + "search.filters.head": "Фільтри", + + // "search.filters.reset": "Reset filters", + "search.filters.reset": "Скинути фільтри", + + + + // "search.form.search": "Search", + "search.form.search": "Пошук", + + // "search.form.search_dspace": "Search DSpace", + "search.form.search_dspace": "Пошук у репозиторії", + + // "search.form.search_mydspace": "Search MyDSpace", + "search.form.search_mydspace": "Шукати у своїх документах", + + + + // "search.results.head": "Search Results", + "search.results.head": "Результати пошуку", + + // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting", + "search.results.no-results": "Ваш пошук не дав результатів. Вам важко знайти те, що ви шукаєте? Спробуйте поставити", + + // "search.results.no-results-link": "quotes around it", + "search.results.no-results-link": "лапки навколо запиту", + + // "search.results.empty": "Your search returned no results.", + "search.results.empty": "Ваш пошук не дав результатів.", + + + + // "search.sidebar.close": "Back to results", + "search.sidebar.close": "Повернутись до результатів", + + // "search.sidebar.filters.title": "Filters", + "search.sidebar.filters.title": "Фільтри", + + // "search.sidebar.open": "Search Tools", + "search.sidebar.open": "Засоби пошуку", + + // "search.sidebar.results": "results", + "search.sidebar.results": "результатів", + + // "search.sidebar.settings.rpp": "Results per page", + "search.sidebar.settings.rpp": "Результатів на сторінку", + + // "search.sidebar.settings.sort-by": "Sort By", + "search.sidebar.settings.sort-by": "Сортувати за", + + // "search.sidebar.settings.title": "Settings", + "search.sidebar.settings.title": "Налаштування", + + + + // "search.view-switch.show-detail": "Show detail", + "search.view-switch.show-detail": "Показати деталі", + + // "search.view-switch.show-grid": "Show as grid", + "search.view-switch.show-grid": "Показати у вигляді матриці", + + // "search.view-switch.show-list": "Show as list", + "search.view-switch.show-list": "Показати як список", + + + + // "sorting.ASC": "Ascending", + + "sorting.ASC": "У порядку збільшення", + + // "sorting.DESC": "Descending", + + "sorting.DESC": "У порядку зменшення", + + // "sorting.dc.title.ASC": "Title Ascending", + "sorting.dc.title.ASC": "У порядку збільшення за назвою", + + // "sorting.dc.title.DESC": "Title Descending", + "sorting.dc.title.DESC": "У порядку зменшення за назвою", + + // "sorting.score.DESC": "Relevance", + "sorting.score.DESC": "Актуальність", + + + + // "statistics.title": "Statistics", + + "statistics.title": "Статистика", + + // "statistics.header": "Statistics for {{ scope }}", + + "statistics.header": "Статистика для {{ scope }}", + + // "statistics.breadcrumbs": "Statistics", + + "statistics.breadcrumbs": "Статистика", + + // "statistics.page.no-data": "No data available", + + "statistics.page.no-data": "Дані відсутні", + + // "statistics.table.no-data": "No data available", + + "statistics.table.no-data": "Дані відсутні", + + // "statistics.table.title.TotalVisits": "Total visits", + + "statistics.table.title.TotalVisits": "Всього відвідувань", + + // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month", + + "statistics.table.title.TotalVisitsPerMonth": "Всього відвідувань за місяць", + + // "statistics.table.title.TotalDownloads": "File Visits", + + "statistics.table.title.TotalDownloads": "Скачувань файлів", + + // "statistics.table.title.TopCountries": "Top country views", + + "statistics.table.title.TopCountries": "Топ за країнами", + + // "statistics.table.title.TopCities": "Top city views", + + "statistics.table.title.TopCities": "Топ за містами", + + // "statistics.table.header.views": "Views", + + "statistics.table.header.views": "Перегляди", + + + + // "submission.edit.title": "Edit Submission", + "submission.edit.title": "Редагувати внесення нового документа", + + // "submission.general.cannot_submit": "You have not the privilege to make a new submission.", + "submission.general.cannot_submit": "У Вас немає повноважень щоб внести новий документ.", + + // "submission.general.deposit": "Deposit", + "submission.general.deposit": "Депозит", + + // "submission.general.discard.confirm.cancel": "Cancel", + "submission.general.discard.confirm.cancel": "Відмінити", + + // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?", + "submission.general.discard.confirm.info": "Цю операцію неможливо відмінити. Ви впевнені?", + + // "submission.general.discard.confirm.submit": "Yes, I'm sure", + "submission.general.discard.confirm.submit": "Так, я впевнений", + + // "submission.general.discard.confirm.title": "Discard submission", + "submission.general.discard.confirm.title": "Скасувати надсилання документа", + + // "submission.general.discard.submit": "Discard", + "submission.general.discard.submit": "Скасувати", + + // "submission.general.save": "Save", + "submission.general.save": "Зберегти", + + // "submission.general.save-later": "Save for later", + "submission.general.save-later": "Зберегти на потім", + + + // "submission.import-external.page.title": "Import metadata from an external source", + + "submission.import-external.page.title": "Імпортувати метадані із зовнішніх джерел", + + // "submission.import-external.title": "Import metadata from an external source", + + "submission.import-external.title": "Імпортувати метадані із зовнішніх джерел", + + // "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": "Введіть запит вище, щоб знайти елементи з Інтернету для імпорту в репозиторій", + + // "submission.import-external.back-to-my-dspace": "Back to MyDSpace", + + "submission.import-external.back-to-my-dspace": "Повернутись до репозиторію", + + // "submission.import-external.search.placeholder": "Search the external source", + + "submission.import-external.search.placeholder": "Шукати зовнішнє джерело даних", + + // "submission.import-external.search.button": "Search", + + "submission.import-external.search.button": "Пошук", + + // "submission.import-external.search.button.hint": "Write some words to search", + + "submission.import-external.search.button.hint": "Напишіть ключові слова для пошуку", + + // "submission.import-external.search.source.hint": "Pick an external source", + + "submission.import-external.search.source.hint": "Виберіть зовнішнє джерело даних", + + // "submission.import-external.source.arxiv": "arXiv", + + "submission.import-external.source.arxiv": "arXiv", + + // "submission.import-external.source.loading": "Loading ...", + + "submission.import-external.source.loading": "Завантажуюсь ...", + + // "submission.import-external.source.sherpaJournal": "SHERPA Journals", + + "submission.import-external.source.sherpaJournal": "SHERPA видання", + + // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers", + + "submission.import-external.source.sherpaPublisher": "SHERPA видавці", + + // "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": "Бібліотека Congress Names", + + // "submission.import-external.preview.title": "Item Preview", + + "submission.import-external.preview.title": "Перегляд документа", + + // "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": "Наведені нижче метадані імпортовано із зовнішнього джерела. Їх буде попередньо заповнено, коли ви почнете надсилати документ у репозиторій.", + + // "submission.import-external.preview.button.import": "Start submission", + + "submission.import-external.preview.button.import": "Почати вносити документ", + + // "submission.import-external.preview.error.import.title": "Submission error", + + "submission.import-external.preview.error.import.title": "Виникла помилка при внесенні документа", + + // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.", + + "submission.import-external.preview.error.import.body": "Виникла помилка при імпорті даних.", + + // "submission.sections.describe.relationship-lookup.close": "Close", + "submission.sections.describe.relationship-lookup.close": "Закрити", + + // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection", + "submission.sections.describe.relationship-lookup.external-source.added": "Локальний запис успішно додано", + + // "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": "Імпорт віддаленого автора", + + // "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": "Імпорт віддаленого видання", + + // "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": "Імпорт віддаленого випуску видання", + + // "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": "Імпорт віддаленого тому видання", + + // "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": "Імпорт віддаленого автора", + + // "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": "Локального автора успішно додано до вибраних", + + // "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": "Локального автора успішно імпортовано та додано до вибраних", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority", + "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", + "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", + "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Відмінити", + + // "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": "Виберіть зібрання, до якого потрібно імпортувати нові записи", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities", + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Сутності", + + // "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": "Імпотрувати як нову локальну сутність", + + // "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": "Імпортувати з LC назвою", + + // "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": "Імпортувати з 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": "Імпортувати з Sherpa видання", + + // "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": "Імпортувати з Sherpa видання", + + // "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": "Імпортувати з 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": "Імпортувати з arXiv", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import", + "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Імпорт", + + // "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": "Імпорт віддаленого видання", + + // "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": "Нове видання успішно додане до вибраних", + + // "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": "Нове видання успішно імпортовано та додане до вибраних", + + // "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": "Імпорт віддаленого випуску видання", + + // "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": "Випуск видання успішно додане до вибраних", + + // "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": "Випуск видання успішно імпортовано та додане до вибраних", + + // "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": "Імпорт віддаленого тому видання", + + // "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": "Том видання успішно додано до вибраних", + + // "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": "Том видання успішно імпортовано та додано до вибраних", + + // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", + "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Виберіть локальний збіг", + + // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", + "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Видалити позначення для всіх", + + // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page", + "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Видалити позначення сторінки", + + // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...", + "submission.sections.describe.relationship-lookup.search-tab.loading": "Вантажиться...", + + // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query", + "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Пошуковий запит", + + // "submission.sections.describe.relationship-lookup.search-tab.search": "Go", + "submission.sections.describe.relationship-lookup.search-tab.search": "Вперед", + + // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all", + "submission.sections.describe.relationship-lookup.search-tab.select-all": "Виділити все", + + // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page", + "submission.sections.describe.relationship-lookup.search-tab.select-page": "Виділити сторінку", + + // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items", + "submission.sections.describe.relationship-lookup.selected": "Позначені {{ size }} документи", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Локальні автори ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Локальні видання ({{ count }})", + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Локальні проекти ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Локальні публікації ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Локальні автори ({{ 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": "Локальні структурні одиниці({{ 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": "Локальні пакети даних ({{ 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": "Локальні файли даних ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Локальні видання ({{ 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": "Локальні випуски видань ({{ 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": "Локальні випуски видань ({{ 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": "Локальні томи видань ({{ 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": "Локальні томи видань({{ 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 видання ({{ count }})", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "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": "LC назви ({{ 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", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Пошук фінансових агентств", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Пошук фінансування", + + // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units", + + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Пошук структурних одиниць", + + // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})", + "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Вибрані позиції ({{ count }})", + + // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues", + + "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Випуски видання", + + // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues", + + "submission.sections.describe.relationship-lookup.title.JournalIssue": "Випуски видання", + + // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes", + + "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Томи видання", + + // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes", + + "submission.sections.describe.relationship-lookup.title.JournalVolume": "Томи видання", + + // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals", + + "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Видання", + + // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors", + + "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Автори", + + // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency", + + "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Фінансова агенція", + + // "submission.sections.describe.relationship-lookup.title.Project": "Projects", + + "submission.sections.describe.relationship-lookup.title.Project": "Проекти", + + // "submission.sections.describe.relationship-lookup.title.Publication": "Publications", + + "submission.sections.describe.relationship-lookup.title.Publication": "Публікації", + + // "submission.sections.describe.relationship-lookup.title.Person": "Authors", + + "submission.sections.describe.relationship-lookup.title.Person": "Автори", + + // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units", + + "submission.sections.describe.relationship-lookup.title.OrgUnit": "Структурні одиниці", + + // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages", + + "submission.sections.describe.relationship-lookup.title.DataPackage": "Пакети даних", + + // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files", + + "submission.sections.describe.relationship-lookup.title.DataFile": "Файли даних", + + // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency", + "submission.sections.describe.relationship-lookup.title.Funding Agency": "Фінансова агенція", + + // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding", + + "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Фінансування", + + // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit", + + "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Головна структурна одиниця", + + // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown", + "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Перемкнути спадне меню", + + // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings", + "submission.sections.describe.relationship-lookup.selection-tab.settings": "Налаштування", + + // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.", + "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Ви нічого не вибрали", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors", + + "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Вибрані автори", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals", + + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Вибрані видання", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume", + + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Вибрані томи видання", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects", + + "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Вибрані проекти", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications", + + "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Вибрані публікації", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors", + + "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Вибрані автори", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units", + + "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Вибрані структурні одиниці", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages", + + "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Вибрані пакети даних", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files", + + "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "ВИбрані файли даних", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals", + "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Вибрані видання", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue", + + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Вибрані випуски", + // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume", + + "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Вибрані томи видання", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency", + + "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Вибрана фінансова агенція", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding", + + "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Вибране фінансування", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue", + + "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Вибрані випуски", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit", + + "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Вибрані структурні одиниці", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Результати пошуку", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Результати пошуку", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Результати пошуку", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results", + + "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Результати пошуку", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results", + "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Результати пошуку", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results", + + "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Результати пошуку", + + // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results", + + "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Результати пошуку", + + // "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": "Чи бажаєте ви зберегти \"{{ value }}\" як варіант імені для цього користувача, щоб ви та інші могли повторно використовувати його для майбутніх надсилань? Якщо ви цього не зробите, ви можете використовувати його для цього надсилання.", + + // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant", + "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Збережіть новий варіант імені", + + // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission", + "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Використовуйте тільки для даного надсилання документів", + + // "submission.sections.ccLicense.type": "License Type", + + "submission.sections.ccLicense.type": "Тип ліцензії", + + // "submission.sections.ccLicense.select": "Select a license type…", + + "submission.sections.ccLicense.select": "Биберіть тип ліцензії…", + + // "submission.sections.ccLicense.change": "Change your license type…", + + "submission.sections.ccLicense.change": "Змініть тип ліцензії…", + + // "submission.sections.ccLicense.none": "No licenses available", + + "submission.sections.ccLicense.none": "Нема ліцензії", + + // "submission.sections.ccLicense.option.select": "Select an option…", + + "submission.sections.ccLicense.option.select": "Виберіть опцію…", + + // "submission.sections.ccLicense.link": "You’ve selected the following license:", + + "submission.sections.ccLicense.link": "Ви вибрали ліцензію:", + + // "submission.sections.ccLicense.confirmation": "I grant the license above", + + "submission.sections.ccLicense.confirmation": "Я даю згоду на цю ліцензію", + + // "submission.sections.general.add-more": "Add more", + "submission.sections.general.add-more": "Додати більше", + + // "submission.sections.general.collection": "Collection", + "submission.sections.general.collection": "Зібрання", + + // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.", + "submission.sections.general.deposit_error_notice": "Під час надсилання елемента виникла проблема. Повторіть спробу пізніше.", + + // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.", + "submission.sections.general.deposit_success_notice": "Подання документа успшно збережено.", + + // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.", + "submission.sections.general.discard_error_notice": "Під час внесення документа виникла проблема. Повторіть спробу пізніше", + + // "submission.sections.general.discard_success_notice": "Submission discarded successfully.", + "submission.sections.general.discard_success_notice": "Подання успішно відхилено.", + + // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the {{sectionId}} section.", + "submission.sections.general.metadata-extracted": "Нові метадані видобуто та додано до {{sectionId}} секції.", + + // "submission.sections.general.metadata-extracted-new-section": "New {{sectionId}} section has been added to submission.", + "submission.sections.general.metadata-extracted-new-section": "Нова {{sectionId}} секція додана до подання документа.", + + // "submission.sections.general.no-collection": "No collection found", + "submission.sections.general.no-collection": "Зібрання не знайдено", + + // "submission.sections.general.no-sections": "No options available", + "submission.sections.general.no-sections": "Опції відсутні", + + // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.", + "submission.sections.general.save_error_notice": "Під час збереження документа виникла проблема. Повторіть спробу пізніше.", + + // "submission.sections.general.save_success_notice": "Submission saved successfully.", + "submission.sections.general.save_success_notice": "Подання успішно збережено.", + + // "submission.sections.general.search-collection": "Search for a collection", + "submission.sections.general.search-collection": "Пошук зібрання", + + // "submission.sections.general.sections_not_valid": "There are incomplete sections.", + "submission.sections.general.sections_not_valid": "Неповні розділи.", + + + + // "submission.sections.submit.progressbar.CClicense": "Creative commons license", + + "submission.sections.submit.progressbar.CClicense": "СС ліцензії", + + // "submission.sections.submit.progressbar.describe.recycle": "Recycle", + "submission.sections.submit.progressbar.describe.recycle": "Переробити", + + // "submission.sections.submit.progressbar.describe.stepcustom": "Describe", + "submission.sections.submit.progressbar.describe.stepcustom": "Описати", + + // "submission.sections.submit.progressbar.describe.stepone": "Describe", + "submission.sections.submit.progressbar.describe.stepone": "Описати", + + // "submission.sections.submit.progressbar.describe.steptwo": "Describe", + "submission.sections.submit.progressbar.describe.steptwo": "Описати", + + // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates", + "submission.sections.submit.progressbar.detect-duplicate": "Можливі дублікати", + + // "submission.sections.submit.progressbar.license": "Deposit license", + "submission.sections.submit.progressbar.license": "Ліцензія", + + // "submission.sections.submit.progressbar.upload": "Upload files", + "submission.sections.submit.progressbar.upload": "Завантажені файли", + + + + // "submission.sections.upload.delete.confirm.cancel": "Cancel", + "submission.sections.upload.delete.confirm.cancel": "Відмінити", + + // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?", + "submission.sections.upload.delete.confirm.info": "Ця операція не може бути відмінена. Ви впевнені?", + + // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure", + "submission.sections.upload.delete.confirm.submit": "Так, я впевнений", + + // "submission.sections.upload.delete.confirm.title": "Delete bitstream", + "submission.sections.upload.delete.confirm.title": "Видалити файл", + + // "submission.sections.upload.delete.submit": "Delete", + "submission.sections.upload.delete.submit": "Видалити", + + // "submission.sections.upload.drop-message": "Drop files to attach them to the item", + "submission.sections.upload.drop-message": "Перетягніть файли, щоб приєднати їх до документа", + + // "submission.sections.upload.form.access-condition-label": "Access condition type", + "submission.sections.upload.form.access-condition-label": "Умови доступу", + + // "submission.sections.upload.form.date-required": "Date is required.", + "submission.sections.upload.form.date-required": "Поле дати є обов\'язковим для заповнення.", + + // "submission.sections.upload.form.from-label": "Grant access from", + + "submission.sections.upload.form.from-label": "Надати доступ з", + + // "submission.sections.upload.form.from-placeholder": "From", + "submission.sections.upload.form.from-placeholder": "З", + + // "submission.sections.upload.form.group-label": "Group", + "submission.sections.upload.form.group-label": "Група", + + // "submission.sections.upload.form.group-required": "Group is required.", + "submission.sections.upload.form.group-required": "Група є обов\'язковою.", + + // "submission.sections.upload.form.until-label": "Grant access until", + + "submission.sections.upload.form.until-label": "Надати доступ до", + + // "submission.sections.upload.form.until-placeholder": "Until", + "submission.sections.upload.form.until-placeholder": "До", + + // "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": "Завантажені файли зібрань {{collectionName}} будуть доступні групам:", + + // "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": "Зверніть увагу, що завантажені файли в {{collectionName}} зібрання будуть доступні, для користувачів, що входять у групу(и):", + + // "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": "Тут ви знайдете всі файли, які зараз містяться в документі. Ви можете оновити метадані файлу та умови доступу або завантажити додаткові файли, просто перетягнувши їх сюди на сторінці", + + // "submission.sections.upload.no-entry": "No", + "submission.sections.upload.no-entry": "Ні", + + // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.", + "submission.sections.upload.no-file-uploaded": "Наразі файл не завантажено.", + + // "submission.sections.upload.save-metadata": "Save metadata", + "submission.sections.upload.save-metadata": "Зберегти метадані", + + // "submission.sections.upload.undo": "Cancel", + "submission.sections.upload.undo": "Відмінити", + + // "submission.sections.upload.upload-failed": "Upload failed", + "submission.sections.upload.upload-failed": "Помилка завантаження", + + // "submission.sections.upload.upload-successful": "Upload successful", + "submission.sections.upload.upload-successful": "Успішно завантажено", + + + + // "submission.submit.title": "Submission", + "submission.submit.title": "Надсилання документів", + + + + // "submission.workflow.generic.delete": "Delete", + "submission.workflow.generic.delete": "Видалити", + + // "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": "Якщо ви хочете видалити цей елемент, виберіть \"Видалити\". Потім вас попросять підтвердити це.", + + // "submission.workflow.generic.edit": "Edit", + "submission.workflow.generic.edit": "Редагувати", + + // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.", + "submission.workflow.generic.edit-help": "Виберіть цю опцію для зміни метаданих документа.", + + // "submission.workflow.generic.view": "View", + "submission.workflow.generic.view": "Перегляд", + + // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.", + "submission.workflow.generic.view-help": "Виберіть цю опцію для перегляду метаданих документа.", + + + + // "submission.workflow.tasks.claimed.approve": "Approve", + "submission.workflow.tasks.claimed.approve": "Затвердити", + + // "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": "Якщо ви переглянули документ і він підходить для включення в зібрання, виберіть \"Затвердити\".", + + // "submission.workflow.tasks.claimed.edit": "Edit", + "submission.workflow.tasks.claimed.edit": "Редагувати", + + // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", + "submission.workflow.tasks.claimed.edit_help": "Виберіть цю опцію для зміни метаданих документа.", + + // "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": "Будь ласка, введіть причину відхилення надсилання документа в полі нижче, вказавши, чи може заявник вирішити проблему та повторно подати.", + + // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject", + "submission.workflow.tasks.claimed.reject.reason.placeholder": "Опишіть причину відхилення", + + // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item", + "submission.workflow.tasks.claimed.reject.reason.submit": "Вдхилити документ", + + // "submission.workflow.tasks.claimed.reject.reason.title": "Reason", + "submission.workflow.tasks.claimed.reject.reason.title": "Причина", + + // "submission.workflow.tasks.claimed.reject.submit": "Reject", + "submission.workflow.tasks.claimed.reject.submit": "Відхилити", + + // "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": "Якщо ви переглянули документ і виявили, що він не підходить для включення в зібрання, виберіть \"Відхилити\". Після цього вас попросять ввести інформацію про причину відхилення і чи повинен автор щось змінити та повторно подати.", + + // "submission.workflow.tasks.claimed.return": "Return to pool", + "submission.workflow.tasks.claimed.return": "Повернути до черги", + + // "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": "Поверніть завдання до черги, щоб інший користувач міг виконати завдання.", + + + + // "submission.workflow.tasks.generic.error": "Error occurred during operation...", + "submission.workflow.tasks.generic.error": "Виникла помилка...", + + // "submission.workflow.tasks.generic.processing": "Processing...", + "submission.workflow.tasks.generic.processing": "Опрацювання...", + + // "submission.workflow.tasks.generic.submitter": "Submitter", + "submission.workflow.tasks.generic.submitter": "Користувач, котрий надсилає", + + // "submission.workflow.tasks.generic.success": "Operation successful", + "submission.workflow.tasks.generic.success": "Операція пройшла успішно", + + + + // "submission.workflow.tasks.pool.claim": "Claim", + "submission.workflow.tasks.pool.claim": "Претензія", + + // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.", + "submission.workflow.tasks.pool.claim_help": "Доручіть собі це завдання.", + + // "submission.workflow.tasks.pool.hide-detail": "Hide detail", + "submission.workflow.tasks.pool.hide-detail": "Приховати деталі", + + // "submission.workflow.tasks.pool.show-detail": "Show detail", + "submission.workflow.tasks.pool.show-detail": "Показати деталі", + + + + // "title": "DSpace", + "title": "Репозиторій", + + + + // "vocabulary-treeview.header": "Hierarchical tree view", + + "vocabulary-treeview.header": "Перегляд деревовидної структури", + + // "vocabulary-treeview.load-more": "Load more", + + "vocabulary-treeview.load-more": "Детальніше", + + // "vocabulary-treeview.search.form.reset": "Reset", + + "vocabulary-treeview.search.form.reset": "Скинути", + + // "vocabulary-treeview.search.form.search": "Search", + + "vocabulary-treeview.search.form.search": "Шукати", + + // "vocabulary-treeview.search.no-result": "There were no items to show", + + "vocabulary-treeview.search.no-result": "Не знайдено жодних документів", + + // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index", + + "vocabulary-treeview.tree.description.nsi": "Norwegian Science індекс", + + // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories", + + "vocabulary-treeview.tree.description.srsc": "Категорії дослідницьких напрямків", + + + + // "uploader.browse": "browse", + "uploader.browse": "перегляд", + + // "uploader.drag-message": "Drag & Drop your files here", + "uploader.drag-message": "Перетягніть файли сюди", + + // "uploader.or": ", or ", + // TODO Source message changed - Revise the translation + "uploader.or": ", або", + + // "uploader.processing": "Processing", + "uploader.processing": "Опрацювання", + + // "uploader.queue-length": "Queue length", + "uploader.queue-length": "Довжина черги", + + // "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": "Виберіть типи, для яких ви хочете зберегти віртуальні метадані як справжні метадані", + + // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation", + "virtual-metadata.delete-item.modal-head": "Віртуальні метадані цього відношення", + + // "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": "Виберіть документи, для яких ви хочете зберегти віртуальні метадані як справжні метадані", + + + + // "workflowAdmin.search.results.head": "Administer Workflow", + "workflowAdmin.search.results.head": "Робочий процес адміністратора", + + + + // "workflow-item.delete.notification.success.title": "Deleted", + + "workflow-item.delete.notification.success.title": "Видалено", + + // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted", + + "workflow-item.delete.notification.success.content": "Робочий процес внесення документа був успішно видалений", + + // "workflow-item.delete.notification.error.title": "Something went wrong", + + "workflow-item.delete.notification.error.title": "Щось пішло не так", + + // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted", + + "workflow-item.delete.notification.error.content": "Документ з робочого процесу не може бути видалений", + + // "workflow-item.delete.title": "Delete workflow item", + + "workflow-item.delete.title": "Видалити документ з робочого процесу", + + // "workflow-item.delete.header": "Delete workflow item", + + "workflow-item.delete.header": "Видалити документ з робочого процесу", + + // "workflow-item.delete.button.cancel": "Cancel", + + "workflow-item.delete.button.cancel": "Відмінити", + + // "workflow-item.delete.button.confirm": "Delete", + + "workflow-item.delete.button.confirm": "Видалити", + + + // "workflow-item.send-back.notification.success.title": "Sent back to submitter", + + "workflow-item.send-back.notification.success.title": "Відіслати назад до користувача, котрий надіслав цей документ", + + // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter", + + "workflow-item.send-back.notification.success.content": "Цей документ був відісланий назад до користувача, котрий надіслав цей документ", + + // "workflow-item.send-back.notification.error.title": "Something went wrong", + + "workflow-item.send-back.notification.error.title": "Щось пішло не так", + + // "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": "Цей документ НЕ може біти відісланий назад до користувача, котрий надіслав цей документ", + + // "workflow-item.send-back.title": "Send workflow item back to submitter", + + "workflow-item.send-back.title": "Надіслати документ назад до користувача, котрий його надіслав", + + // "workflow-item.send-back.header": "Send workflow item back to submitter", + + "workflow-item.send-back.header": "Надіслати документ назад до користувача, котрий його надіслав", + + // "workflow-item.send-back.button.cancel": "Cancel", + + "workflow-item.send-back.button.cancel": "Відмінити", + + // "workflow-item.send-back.button.confirm": "Send back" + + "workflow-item.send-back.button.confirm": "Надіслати назад" + + +} From c6fd55baf49878f1e7deb9466505ec86542cf2c8 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Wed, 2 Nov 2022 12:55:21 +0100 Subject: [PATCH 101/758] 96062: Alter test to match themed component --- .../collection-selector.component.spec.ts | 7 +++++-- ...submission-import-external-collection.component.spec.ts | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts index ce54d326fc8..af043b447bf 100644 --- a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts +++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts @@ -128,10 +128,13 @@ describe('CollectionSelectorComponent', () => { beforeEach(() => { scheduler = getTestScheduler(); - fixture = TestBed.createComponent(CollectionSelectorComponent); + fixture = TestBed.overrideComponent(CollectionSelectorComponent, { + set: { + template: '' + } + }).createComponent(CollectionSelectorComponent); component = fixture.componentInstance; fixture.detectChanges(); - }); it('should create', () => { 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 4f3c54b6428..9edab06c6f7 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 @@ -122,7 +122,7 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => { fixture.detectChanges(); fixture.whenStable().then(() => { - const dropdownMenu = fixture.debugElement.query(By.css('ds-collection-dropdown')).nativeElement; + const dropdownMenu = fixture.debugElement.query(By.css('ds-themed-collection-dropdown')).nativeElement; expect(dropdownMenu.classList).toContain('d-none'); }); })); From 434e0cb9071b65720d871b2ca4b6e5631350265d Mon Sep 17 00:00:00 2001 From: nwoodward Date: Thu, 27 Oct 2022 16:11:03 -0500 Subject: [PATCH 102/758] fix function to match default value of websvc.opensearch.svccontext --- src/app/shared/rss-feed/rss.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts index 3fdb859bdce..0dd523c6bc0 100644 --- a/src/app/shared/rss-feed/rss.component.ts +++ b/src/app/shared/rss-feed/rss.component.ts @@ -114,7 +114,7 @@ export class RSSComponent implements OnInit, OnDestroy { * @returns The combine URL to opensearch */ formulateRoute(uuid: string, opensearch: string, sort: SortOptions, query: string): string { - let route = 'search?format=atom'; + let route = '?format=atom'; if (uuid) { route += `&scope=${uuid}`; } @@ -126,7 +126,7 @@ export class RSSComponent implements OnInit, OnDestroy { } else { route += `&query=*`; } - route = '/' + opensearch + '/' + route; + route = '/' + opensearch + route; return route; } From 2235072beaad9a82f657b8dbc72b0dffcfd90127 Mon Sep 17 00:00:00 2001 From: nwoodward Date: Thu, 27 Oct 2022 17:07:14 -0500 Subject: [PATCH 103/758] changed path in tests to match default value for websvc.opensearch.svccontext --- src/app/shared/rss-feed/rss.component.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts index fd7f2c53216..aa2a2a63bcd 100644 --- a/src/app/shared/rss-feed/rss.component.spec.ts +++ b/src/app/shared/rss-feed/rss.component.spec.ts @@ -96,17 +96,17 @@ describe('RssComponent', () => { }); it('should formulate the correct url given params in url', () => { - const route = comp.formulateRoute(uuid, 'opensearch', options, query); + const route = comp.formulateRoute(uuid, 'opensearch/search', options, query); expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test'); }); it('should skip uuid if its null', () => { - const route = comp.formulateRoute(null, 'opensearch', options, query); + const route = comp.formulateRoute(null, 'opensearch/search', options, query); expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=test'); }); it('should default to query * if none provided', () => { - const route = comp.formulateRoute(null, 'opensearch', options, null); + const route = comp.formulateRoute(null, 'opensearch/search', options, null); expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=*'); }); }); From 63011bc41dfc31c63fb1921e89bfd0f76b0ac8d6 Mon Sep 17 00:00:00 2001 From: nwoodward Date: Wed, 2 Nov 2022 10:38:55 -0500 Subject: [PATCH 104/758] removed sorting parameters from RSSComponent --- src/app/shared/rss-feed/rss.component.spec.ts | 16 ++++++---------- src/app/shared/rss-feed/rss.component.ts | 10 ++-------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts index aa2a2a63bcd..61b54a11251 100644 --- a/src/app/shared/rss-feed/rss.component.spec.ts +++ b/src/app/shared/rss-feed/rss.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { ConfigurationDataService } from '../../core/data/configuration-data.service'; import { RemoteData } from '../../core/data/remote-data'; import { GroupDataService } from '../../core/eperson/group-data.service'; @@ -23,7 +22,6 @@ import { RouterMock } from '../mocks/router.mock'; describe('RssComponent', () => { let comp: RSSComponent; - let options: SortOptions; let fixture: ComponentFixture; let uuid: string; let query: string; @@ -63,7 +61,6 @@ describe('RssComponent', () => { pageSize: 10, currentPage: 1 }), - sort: new SortOptions('dc.title', SortDirection.ASC), })); groupDataService = jasmine.createSpyObj('groupsDataService', { findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])), @@ -88,7 +85,6 @@ describe('RssComponent', () => { })); beforeEach(() => { - options = new SortOptions('dc.title', SortDirection.DESC); uuid = '2cfcf65e-0a51-4bcb-8592-b8db7b064790'; query = 'test'; fixture = TestBed.createComponent(RSSComponent); @@ -96,18 +92,18 @@ describe('RssComponent', () => { }); it('should formulate the correct url given params in url', () => { - const route = comp.formulateRoute(uuid, 'opensearch/search', options, query); - expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test'); + const route = comp.formulateRoute(uuid, 'opensearch/search', query); + expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&query=test'); }); it('should skip uuid if its null', () => { - const route = comp.formulateRoute(null, 'opensearch/search', options, query); - expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=test'); + const route = comp.formulateRoute(null, 'opensearch/search', query); + expect(route).toBe('/opensearch/search?format=atom&query=test'); }); it('should default to query * if none provided', () => { - const route = comp.formulateRoute(null, 'opensearch/search', options, null); - expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=*'); + const route = comp.formulateRoute(null, 'opensearch/search', null); + expect(route).toBe('/opensearch/search?format=atom&query=*'); }); }); diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts index 0dd523c6bc0..8a33aeeb689 100644 --- a/src/app/shared/rss-feed/rss.component.ts +++ b/src/app/shared/rss-feed/rss.component.ts @@ -12,7 +12,6 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser import { getFirstCompletedRemoteData } from '../../core/shared/operators'; import { environment } from '../../../../src/environments/environment'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SortOptions } from '../../core/cache/models/sort-options.model'; import { PaginationService } from '../../core/pagination/pagination.service'; import { Router } from '@angular/router'; import { map, switchMap } from 'rxjs/operators'; @@ -39,7 +38,6 @@ export class RSSComponent implements OnInit, OnDestroy { uuid: string; configuration$: Observable; - sortOption$: Observable; subs: Subscription[] = []; @@ -93,7 +91,7 @@ export class RSSComponent implements OnInit, OnDestroy { return null; } this.uuid = this.groupDataService.getUUIDFromString(this.router.url); - const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.sort, searchOptions.query); + const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.query); this.addLinks(route); this.linkHeadService.addTag({ href: environment.rest.baseUrl + '/' + openSearchUri + '/service', @@ -109,18 +107,14 @@ export class RSSComponent implements OnInit, OnDestroy { * Function created a route given the different params available to opensearch * @param uuid The uuid if a scope is present * @param opensearch openSearch uri - * @param sort The sort options for the opensearch request * @param query The query string that was provided in the search * @returns The combine URL to opensearch */ - formulateRoute(uuid: string, opensearch: string, sort: SortOptions, query: string): string { + formulateRoute(uuid: string, opensearch: string, query: string): string { let route = '?format=atom'; if (uuid) { route += `&scope=${uuid}`; } - if (sort && sort.direction && sort.field && sort.field !== 'id') { - route += `&sort=${sort.field}&sort_direction=${sort.direction}`; - } if (query) { route += `&query=${query}`; } else { From 9c05a116a847171a1068039bdf899b9d91592739 Mon Sep 17 00:00:00 2001 From: Toni Prieto Date: Wed, 2 Nov 2022 18:28:24 +0100 Subject: [PATCH 105/758] Fix use case with cc.license.jurisdiction key commented out --- .../cc-license/submission-section-cc-licenses.component.html | 2 +- .../cc-license/submission-section-cc-licenses.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html index f10cd04b60a..0796da5a64a 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html @@ -81,7 +81,7 @@
- + {{ option.label }} diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts index 0e435e7d274..c8cd898f966 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts @@ -167,7 +167,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent * @param field the field for which to get the selected option value. */ getSelectedOption(ccLicense: SubmissionCcLicence, field: Field): Option { - if (field.id === 'jurisdiction' && this.defaultJurisdiction !== 'none') { + if (field.id === 'jurisdiction' && this.defaultJurisdiction !== undefined && this.defaultJurisdiction !== 'none') { return field.enums.find(option => option.id === this.defaultJurisdiction); } return this.data.ccLicense.fields[field.id]; @@ -274,7 +274,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent getFirstCompletedRemoteData(), getRemoteDataPayload() ).subscribe((remoteData) => { - if (remoteData.values.length === 0) { + if (remoteData === undefined || remoteData.values.length === 0) { // No value configured, use blank value (International jurisdiction) this.defaultJurisdiction = ''; } else { From 98ea3ebbff1a3bb74bcd72769d4c89a51f9b978a Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Thu, 3 Nov 2022 15:33:49 +0530 Subject: [PATCH 106/758] [DSC-807-MAIN] Aggiornare labels nella sezione Health della demo --- src/assets/i18n/en.json5 | 8 ++++---- src/assets/i18n/es.json5 | 8 ++++---- src/assets/i18n/hi.json5 | 8 ++++---- src/assets/i18n/kk.json5 | 16 ++++++++-------- src/assets/i18n/pt-BR.json5 | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 1c9caeba9b6..a806588701f 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1687,13 +1687,13 @@ "health-page.section.geoIp.title": "GeoIp", - "health-page.section.solrAuthorityCore.title": "Sor: authority core", + "health-page.section.solrAuthorityCore.title": "Solr: authority core", - "health-page.section.solrOaiCore.title": "Sor: oai core", + "health-page.section.solrOaiCore.title": "Solr: oai core", - "health-page.section.solrSearchCore.title": "Sor: search core", + "health-page.section.solrSearchCore.title": "Solr: search core", - "health-page.section.solrStatisticsCore.title": "Sor: statistics core", + "health-page.section.solrStatisticsCore.title": "Solr: statistics core", "health-page.section-info.app.title": "Application Backend", diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index 023baad6de2..02169514c45 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -2430,16 +2430,16 @@ // "health-page.section.geoIp.title": "GeoIp", "health-page.section.geoIp.title": "GeoIp", - // "health-page.section.solrAuthorityCore.title": "Sor: authority core", + // "health-page.section.solrAuthorityCore.title": "Solr: authority core", "health-page.section.solrAuthorityCore.title": "Solr: authority core", - // "health-page.section.solrOaiCore.title": "Sor: oai core", + // "health-page.section.solrOaiCore.title": "Solr: oai core", "health-page.section.solrOaiCore.title": "Solr: oai core", - // "health-page.section.solrSearchCore.title": "Sor: search core", + // "health-page.section.solrSearchCore.title": "Solr: search core", "health-page.section.solrSearchCore.title": "Solr: search core", - // "health-page.section.solrStatisticsCore.title": "Sor: statistics core", + // "health-page.section.solrStatisticsCore.title": "Solr: statistics core", "health-page.section.solrStatisticsCore.title": "Solr: statistics core", // "health-page.section-info.app.title": "Application Backend", diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5 index 13d0b10cb29..4a59dc1b1b1 100644 --- a/src/assets/i18n/hi.json5 +++ b/src/assets/i18n/hi.json5 @@ -1569,13 +1569,13 @@ "health-page.section.no-issues": "कोई समस्या नहीं मिली", - "health-page.section.solrAuthorityCore.title": "Sor: प्राधिकरण कोर", + "health-page.section.solrAuthorityCore.title": "Solr: प्राधिकरण कोर", - "health-page.section.solrOaiCore.title": "Sor: oai कोर", + "health-page.section.solrOaiCore.title": "Solr: oai कोर", - "health-page.section.solrSearchCore.title": "Sor: मूल खोज", + "health-page.section.solrSearchCore.title": "Solr: मूल खोज", - "health-page.section.solrStatisticsCore.title": "Sor: सांख्यिकी कोर", + "health-page.section.solrStatisticsCore.title": "Solr: सांख्यिकी कोर", "health-page.status": "स्थिति", diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index 66db055f50b..8e46ee73cec 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -2445,17 +2445,17 @@ // "health-page.section.geoIp.title": "GeoIp", "health-page.section.geoIp.title": "GeoIp", - // "health-page.section.solrAuthorityCore.title": "Sor: authority core", - "health-page.section.solrAuthorityCore.title": "Sor: биліктің өзегі", + // "health-page.section.solrAuthorityCore.title": "Solr: authority core", + "health-page.section.solrAuthorityCore.title": "Solr: биліктің өзегі", - // "health-page.section.solrOaiCore.title": "Sor: oai core", - "health-page.section.solrOaiCore.title": "Sor: oai өзегі", + // "health-page.section.solrOaiCore.title": "Solr: oai core", + "health-page.section.solrOaiCore.title": "Solr: oai өзегі", - // "health-page.section.solrSearchCore.title": "Sor: search core", - "health-page.section.solrSearchCore.title": "Sor: іздеу өзегі", + // "health-page.section.solrSearchCore.title": "Solr: search core", + "health-page.section.solrSearchCore.title": "Solr: іздеу өзегі", - // "health-page.section.solrStatisticsCore.title": "Sor: statistics core", - "health-page.section.solrStatisticsCore.title": "Sor: статистиканың өзегі", + // "health-page.section.solrStatisticsCore.title": "Solr: statistics core", + "health-page.section.solrStatisticsCore.title": "Solr: статистиканың өзегі", // "health-page.section-info.app.title": "Application Backend", "health-page.section-info.app.title": "Қосымшаның серверлік бөлігі", diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index 04b66d41d90..77b06a6566a 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -2378,17 +2378,17 @@ // "health-page.section.geoIp.title": "GeoIp", "health-page.section.geoIp.title": "GeoIp", - // "health-page.section.solrAuthorityCore.title": "Sor: authority core", + // "health-page.section.solrAuthorityCore.title": "Solr: authority core", "health-page.section.solrAuthorityCore.title": "Solr: authority core", - // "health-page.section.solrOaiCore.title": "Sor: oai core", + // "health-page.section.solrOaiCore.title": "Solr: oai core", "health-page.section.solrOaiCore.title": "Solr: oai core", - // "health-page.section.solrSearchCore.title": "Sor: search core", + // "health-page.section.solrSearchCore.title": "Solr: search core", "health-page.section.solrSearchCore.title": "Solr: core pesquisa", - // "health-page.section.solrStatisticsCore.title": "Sor: statistics core", - "health-page.section.solrStatisticsCore.title": "Soilr: estatisticas core", + // "health-page.section.solrStatisticsCore.title": "Solr: statistics core", + "health-page.section.solrStatisticsCore.title": "Solr: estatisticas core", // "health-page.section-info.app.title": "Application Backend", "health-page.section-info.app.title": "Aplicação de Backend", From 5c2c60db8b0e4757a2518b4c81c9cfe89c85e1bf Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 3 Nov 2022 15:08:16 +0100 Subject: [PATCH 107/758] [CST-7376] fix issue with timezone within the test class --- src/app/shared/date.util.spec.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/shared/date.util.spec.ts b/src/app/shared/date.util.spec.ts index d7c418e8aea..992a3f31fa0 100644 --- a/src/app/shared/date.util.spec.ts +++ b/src/app/shared/date.util.spec.ts @@ -22,7 +22,7 @@ describe('Date Utils', () => { }); it('should convert NgbDateStruct to YYYY-MM-DDThh:mm:ssZ string', () => { // NOTE: month is zero indexed which is why it increases by one - const date = new Date(2022, 5, 3); + const date = new Date(Date.UTC(2022, 5, 3)) expect(dateToISOFormat(dateToNgbDateStruct(date))).toEqual('2022-06-03T00:00:00Z'); }); }); @@ -30,22 +30,22 @@ describe('Date Utils', () => { describe('dateToString', () => { it('should convert Date to YYYY-MM-DD string', () => { // NOTE: month is zero indexed which is why it increases by one - expect(dateToString(new Date(2022, 5, 3))).toEqual('2022-06-03'); + expect(dateToString(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03'); }); it('should convert Date with time to YYYY-MM-DD string', () => { // NOTE: month is zero indexed which is why it increases by one - expect(dateToString(new Date(2022, 5, 3, 3, 24, 0))).toEqual('2022-06-03'); + expect(dateToString(new Date(Date.UTC(2022, 5, 3, 3, 24, 0)))).toEqual('2022-06-03'); }); it('should convert Month only to YYYY-MM-DD string', () => { // NOTE: month is zero indexed which is why it increases by one - expect(dateToString(new Date(2022, 5))).toEqual('2022-06-01'); + expect(dateToString(new Date(Date.UTC(2022, 5)))).toEqual('2022-06-01'); }); it('should convert ISO Date to YYYY-MM-DD string', () => { expect(dateToString(new Date('2022-06-03T03:24:00Z'))).toEqual('2022-06-03'); }); it('should convert NgbDateStruct to YYYY-MM-DD string', () => { // NOTE: month is zero indexed which is why it increases by one - const date = new Date(2022, 5, 3); + const date = new Date(Date.UTC(2022, 5, 3)); expect(dateToString(dateToNgbDateStruct(date))).toEqual('2022-06-03'); }); }); From da6da6209b2c362601620dd32b53951062ddc467 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 3 Nov 2022 15:46:36 +0100 Subject: [PATCH 108/758] [CST-7376] fix lint error --- src/app/shared/date.util.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/date.util.spec.ts b/src/app/shared/date.util.spec.ts index 992a3f31fa0..4576ea497c5 100644 --- a/src/app/shared/date.util.spec.ts +++ b/src/app/shared/date.util.spec.ts @@ -22,7 +22,7 @@ describe('Date Utils', () => { }); it('should convert NgbDateStruct to YYYY-MM-DDThh:mm:ssZ string', () => { // NOTE: month is zero indexed which is why it increases by one - const date = new Date(Date.UTC(2022, 5, 3)) + const date = new Date(Date.UTC(2022, 5, 3)); expect(dateToISOFormat(dateToNgbDateStruct(date))).toEqual('2022-06-03T00:00:00Z'); }); }); From 6d1d446c0d23e939d4e3eb26100feeeae9ee6cbf Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 3 Nov 2022 15:03:47 -0500 Subject: [PATCH 109/758] Update to the latest version of all GitHub actions --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/docker.yml | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3dfb79ddc9b..c58e09edf24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,11 +32,11 @@ jobs: steps: # https://github.com/actions/checkout - name: Checkout codebase - uses: actions/checkout@v2 + uses: actions/checkout@v3 # https://github.com/actions/setup-node - name: Install Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} @@ -61,7 +61,7 @@ jobs: id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache Yarn dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: # Cache entire Yarn cache directory (see previous step) path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -88,7 +88,7 @@ jobs: # Upload coverage reports to Codecov (for one version of Node only) # https://github.com/codecov/codecov-action - name: Upload coverage to Codecov.io - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 if: matrix.node-version == '16.x' # Using docker-compose start backend using CI configuration @@ -103,7 +103,7 @@ jobs: # https://github.com/cypress-io/github-action # (NOTE: to run these e2e tests locally, just use 'ng e2e') - name: Run e2e tests (integration tests) - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v4 with: # Run tests in Chrome, headless mode browser: chrome @@ -119,7 +119,7 @@ jobs: # Cypress always creates a video of all e2e tests (whether they succeeded or failed) # Save those in an Artifact - name: Upload e2e test videos to Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: e2e-test-videos @@ -128,7 +128,7 @@ jobs: # If e2e tests fail, Cypress creates a screenshot of what happened # Save those in an Artifact - name: Upload e2e test failure screenshots to Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: e2e-test-screenshots diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 350fea6c344..908c5c34fdc 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -42,11 +42,11 @@ jobs: steps: # https://github.com/actions/checkout - name: Checkout codebase - uses: actions/checkout@v2 + uses: actions/checkout@v3 # https://github.com/docker/setup-buildx-action - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 # https://github.com/docker/setup-qemu-action - name: Set up QEMU emulation to build for multiple architectures @@ -56,7 +56,7 @@ jobs: - name: Login to DockerHub # Only login if not a PR, as PRs only trigger a Docker build and not a push if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_ACCESS_TOKEN }} @@ -68,7 +68,7 @@ jobs: # Get Metadata for docker_build step below - name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image id: meta_build - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: dspace/dspace-angular tags: ${{ env.IMAGE_TAGS }} @@ -77,7 +77,7 @@ jobs: # https://github.com/docker/build-push-action - name: Build and push 'dspace-angular' image id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . file: ./Dockerfile From 9e843e36fa53c4290459c110a31be884b8867e24 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Fri, 4 Nov 2022 10:43:16 +0100 Subject: [PATCH 110/758] [1950] [DURACOM-101] Regex validator improved feat: - New regexp to validate pattern used for regex validation; --- .../form/builder/parsers/field-parser.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts index 86a7d99e411..e2a907056e2 100644 --- a/src/app/shared/form/builder/parsers/field-parser.ts +++ b/src/app/shared/form/builder/parsers/field-parser.ts @@ -1,7 +1,7 @@ -import {Inject, InjectionToken} from '@angular/core'; +import { Inject, InjectionToken } from '@angular/core'; -import uniqueId from 'lodash/uniqueId'; -import {DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR} from '@ng-dynamic-forms/core'; +import { uniqueId } from 'lodash'; +import { DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR } from '@ng-dynamic-forms/core'; import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util'; import { FormFieldModel } from '../models/form-field.model'; @@ -22,6 +22,7 @@ export const SUBMISSION_ID: InjectionToken = new InjectionToken( export const CONFIG_DATA: InjectionToken = new InjectionToken('configData'); export const INIT_FORM_VALUES: InjectionToken = new InjectionToken('initFormValues'); export const PARSER_OPTIONS: InjectionToken = new InjectionToken('parserOptions'); +export const REGEX_FIELD_VALIDATOR: RegExp = new RegExp('(\\/?)(.+)\\1([gimsuy]*)', 'i'); export abstract class FieldParser { @@ -43,7 +44,7 @@ export abstract class FieldParser { public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any; public parse() { - if (((this.getInitValueCount() > 1 && !this.configData.repeatable) || (this.configData.repeatable)) + if (((this.getInitValueCount() > 1 && !this.configData.repeatable) || (this.configData.repeatable)) && (this.configData.input.type !== ParserType.List) && (this.configData.input.type !== ParserType.Tag) ) { @@ -315,6 +316,7 @@ export abstract class FieldParser { * fields in type bind, made up of a 'match' outcome (make this field visible), an 'operator' * (OR) and a 'when' condition (the bindValues array). * @param configuredTypeBindValues array of types from the submission definition (CONFIG_DATA) + * @param typeField * @private * @return DynamicFormControlRelation[] array with one relation in it, for type bind matching to show a field */ @@ -344,7 +346,13 @@ export abstract class FieldParser { } protected addPatternValidator(controlModel) { - const regex = new RegExp(this.configData.input.regex); + const validatorMatcher = this.configData.input.regex.match(REGEX_FIELD_VALIDATOR); + let regex; + if (validatorMatcher != null && validatorMatcher.length > 3) { + regex = new RegExp(validatorMatcher[2], validatorMatcher[3]); + } else { + regex = new RegExp(this.configData.input.regex); + } controlModel.validators = Object.assign({}, controlModel.validators, { pattern: regex }); controlModel.errorMessages = Object.assign( {}, From 2ed8f8bad85a5c57299e34e84f6da1ea2150e249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Fern=C3=A1ndez=20Celorio?= Date: Fri, 4 Nov 2022 10:40:29 +0000 Subject: [PATCH 111/758] Numbre of bitstreams in item page is now configurable --- config/config.example.yml | 7 ++++ .../full-file-section.component.ts | 33 ++++++++++--------- .../file-section/file-section.component.ts | 9 +++-- src/config/default-app-config.ts | 11 ++++++- src/config/item-config.interface.ts | 11 +++++++ src/environments/environment.test.ts | 11 ++++++- 6 files changed, 62 insertions(+), 20 deletions(-) diff --git a/config/config.example.yml b/config/config.example.yml index 27400f00411..52a07202308 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -207,6 +207,13 @@ item: undoTimeout: 10000 # 10 seconds # Show the item access status label in items lists showAccessStatuses: false + simpleView: + bitstreamPageSize: 5 + fullView: + # Number of entries in the bitstream list in the full item view page. + # Rounded to the nearest size in the list of selectable sizes on the + # settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. + bitstreamPageSize: 5 # Collection Page Config collection: diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts index e21c1a32eb3..89134a321e3 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Inject, Input, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; @@ -14,6 +14,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat import { TranslateService } from '@ngx-translate/core'; import { hasValue, isEmpty } from '../../../../shared/empty.util'; import { PaginationService } from '../../../../core/pagination/pagination.service'; +import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; /** * This component renders the file section of the item @@ -34,26 +35,28 @@ export class FullFileSectionComponent extends FileSectionComponent implements On originals$: Observable>>; licenses$: Observable>>; - pageSize = 5; - originalOptions = Object.assign(new PaginationComponentOptions(), { - id: 'obo', - currentPage: 1, - pageSize: this.pageSize - }); - - licenseOptions = Object.assign(new PaginationComponentOptions(), { - id: 'lbo', - currentPage: 1, - pageSize: this.pageSize - }); + originalOptions: PaginationComponentOptions; + licenseOptions: PaginationComponentOptions; constructor( bitstreamDataService: BitstreamDataService, protected notificationsService: NotificationsService, protected translateService: TranslateService, - protected paginationService: PaginationService + protected paginationService: PaginationService, + @Inject(APP_CONFIG) protected appConfig: AppConfig ) { - super(bitstreamDataService, notificationsService, translateService); + super(bitstreamDataService, notificationsService, translateService, appConfig); + this.originalOptions = Object.assign(new PaginationComponentOptions(), { + id: 'obo', + currentPage: 1, + pageSize: this.appConfig.item.fullView.bitstreamPageSize + }); + + this.licenseOptions = Object.assign(new PaginationComponentOptions(), { + id: 'lbo', + currentPage: 1, + pageSize: this.appConfig.item.fullView.bitstreamPageSize + }); } ngOnInit(): void { diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts index d28b5799963..a0e40376e5b 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Inject, Input, OnInit } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { BitstreamDataService } from '../../../../core/data/bitstream-data.service'; @@ -10,6 +10,7 @@ import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; /** * This component renders the file section of the item @@ -35,13 +36,15 @@ export class FileSectionComponent implements OnInit { isLastPage: boolean; - pageSize = 5; + pageSize: number; constructor( protected bitstreamDataService: BitstreamDataService, protected notificationsService: NotificationsService, - protected translateService: TranslateService + protected translateService: TranslateService, + @Inject(APP_CONFIG) protected appConfig: AppConfig ) { + this.pageSize = this.appConfig.item.simpleView.bitstreamPageSize } ngOnInit(): void { diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index f489abc53b9..3940ea1c191 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -245,7 +245,16 @@ export class DefaultAppConfig implements AppConfig { undoTimeout: 10000 // 10 seconds }, // Show the item access status label in items lists - showAccessStatuses: false + showAccessStatuses: false, + simpleView: { + bitstreamPageSize: 5 + }, + fullView: { + // Number of entries in the bitstream list in the full item view page. + // Rounded to the nearest size in the list of selectable sizes on the + // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. + bitstreamPageSize: 5 + } }; // Collection Page Config diff --git a/src/config/item-config.interface.ts b/src/config/item-config.interface.ts index f842c37c053..1351911334d 100644 --- a/src/config/item-config.interface.ts +++ b/src/config/item-config.interface.ts @@ -6,4 +6,15 @@ export interface ItemConfig extends Config { }; // This is used to show the access status label of items in results lists showAccessStatuses: boolean; + + simpleView: { + bitstreamPageSize: number; + }; + + fullView: { + // Number of entries in the bitstream list in the full item view page. + // Rounded to the nearest size in the list of selectable sizes on the + // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. + bitstreamPageSize: number; + } } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index edd1cb91090..7410b17f372 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -229,7 +229,16 @@ export const environment: BuildConfig = { undoTimeout: 10000 // 10 seconds }, // Show the item access status label in items lists - showAccessStatuses: false + showAccessStatuses: false, + simpleView: { + bitstreamPageSize: 5 + }, + fullView: { + // Number of entries in the bitstream list in the full item view page. + // Rounded to the nearest size in the list of selectable sizes on the + // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. + bitstreamPageSize: 5 + } }, collection: { edit: { From 87a211ca669b4f882a56661572887f49ae8fcbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Fern=C3=A1ndez=20Celorio?= Date: Mon, 7 Nov 2022 12:20:00 +0100 Subject: [PATCH 112/758] Tests fixed --- .../file-section/full-file-section.component.spec.ts | 5 ++++- .../file-section/file-section.component.spec.ts | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts index 396e6c32160..3a8e45475de 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts @@ -21,6 +21,8 @@ import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-o import { PaginationService } from '../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; import { FindListOptions } from '../../../../core/data/find-list-options.model'; +import { APP_CONFIG } from 'src/config/app-config.interface'; +import { environment } from 'src/environments/environment'; describe('FullFileSectionComponent', () => { let comp: FullFileSectionComponent; @@ -72,7 +74,8 @@ describe('FullFileSectionComponent', () => { providers: [ { provide: BitstreamDataService, useValue: bitstreamDataService }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: APP_CONFIG, useValue: environment }, ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts index 2d185aef9ca..83f92d5af8b 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts @@ -17,6 +17,8 @@ import { MetadataFieldWrapperComponent } from '../../../field-components/metadat import { createPaginatedList } from '../../../../shared/testing/utils.test'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { APP_CONFIG } from 'src/config/app-config.interface'; +import { environment } from 'src/environments/environment'; describe('FileSectionComponent', () => { let comp: FileSectionComponent; @@ -65,7 +67,8 @@ describe('FileSectionComponent', () => { declarations: [FileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent], providers: [ { provide: BitstreamDataService, useValue: bitstreamDataService }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() } + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: APP_CONFIG, useValue: environment } ], schemas: [NO_ERRORS_SCHEMA] From 1e523382d06633aaf0c88b700b2a953aeedd9423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Fern=C3=A1ndez=20Celorio?= Date: Mon, 7 Nov 2022 16:50:46 +0100 Subject: [PATCH 113/758] Fix lint error --- .../field-components/file-section/file-section.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts index a0e40376e5b..2907a334828 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts @@ -44,7 +44,7 @@ export class FileSectionComponent implements OnInit { protected translateService: TranslateService, @Inject(APP_CONFIG) protected appConfig: AppConfig ) { - this.pageSize = this.appConfig.item.simpleView.bitstreamPageSize + this.pageSize = this.appConfig.item.simpleView.bitstreamPageSize; } ngOnInit(): void { From 6c226be7e80e3364faba8dc0313dde5fd89ab33a Mon Sep 17 00:00:00 2001 From: Pierre Lasou Date: Mon, 7 Nov 2022 13:31:45 -0500 Subject: [PATCH 114/758] Changes to fr.json5 New commit to include changes after review of commit 3bf13c09617a1af4b4dff3b18380b55848c1bb2a --- src/assets/i18n/fr.json5 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index f2e28184a59..11d15ec6db0 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -4027,10 +4027,10 @@ "process.overview.delete": "Supprimer {{count}} processus", // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.", - "process.overview.delete.processing": "{{count}} processus sont en train d'être supprimer. Patientez jusqu'à ce que la suppression soit terminée. Notez que cela peut prendre un certain temps.", + "process.overview.delete.processing": "{{count}} processus sont en train d'être supprimés. Patientez jusqu'à ce que la suppression soit terminée. Notez que cela peut prendre un certain temps.", // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?", - "process.overview.delete.body": "Êtes vous sûr de vouloir supprimer {{count}} processus?", + "process.overview.delete.body": "Êtes-vous certain-e de vouloir supprimer {{count}} processus?", // "process.overview.delete.header": "Delete processes", "process.overview.delete.header": "Supprimer les processus", @@ -4039,7 +4039,7 @@ "process.bulk.delete.error.head": "Erreur lors de la suppression de processus", // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ", - "process.bulk.delete.error.body": "Le processus numéro {{processId}} n'a pu être supprimé. Les processus restants continuent à être supprimés. ", + "process.bulk.delete.error.body": "Le processus numéro {{processId}} n'a pu être supprimé. Les processus restants continueront à être supprimés. ", // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted", "process.bulk.delete.success": "{{count}} processus ont été supprimés.", @@ -5767,13 +5767,13 @@ "submission.sections.sherpa.publisher.policy": "Politique de l'éditeur", // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.", - "submission.sections.sherpa.publisher.policy.description": "L'information ci-dessous provient de Sherpa Romeo. Elle vous permet de savoir quelle version vous êtes autorisé-e à déposer et si une restriction de diffusion (embargo) doit être appliquée. Si vous avez des questions, contactez votre administrateur en utilisant le formulaire en pied de page.", + "submission.sections.sherpa.publisher.policy.description": "L'information ci-dessous provient de Sherpa Romeo. Elle vous permet de savoir quelle version vous êtes autorisé-e à déposer et si une restriction de diffusion (embargo) doit être appliquée. Si vous avez des questions, contactez votre administrateur-trice en utilisant le formulaire en pied de page.", // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view", "submission.sections.sherpa.publisher.policy.openaccess": "Les voies de libre accès autorisées par la politique de cette revue sont listées ci-dessous par version d'article. Cliquez sur l'une des voies pour plus de détails.", // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:", - "submission.sections.sherpa.publisher.policy.more.information": "Pour plus d'information, cliquez sur le lien suivant:", + "submission.sections.sherpa.publisher.policy.more.information": "Pour plus d'information, cliquez sur le lien suivant :", // "submission.sections.sherpa.publisher.policy.version": "Version", "submission.sections.sherpa.publisher.policy.version": "Version", @@ -5788,7 +5788,7 @@ "submission.sections.sherpa.publisher.policy.nolocation": "Aucun", // "submission.sections.sherpa.publisher.policy.license": "License", - "submission.sections.sherpa.publisher.policy.license": "License", + "submission.sections.sherpa.publisher.policy.license": "Licence", // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites", "submission.sections.sherpa.publisher.policy.prerequisites": "Prérequis", @@ -5909,7 +5909,7 @@ "submission.workspace.generic.view": "Voir", // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.", - "submission.workspace.generic.view-help": "Sélecionner cette option pour voir les métadonnées de l'item.", + "submission.workspace.generic.view-help": "Sélectionner cette option pour voir les métadonnées de l'item.", // "thumbnail.default.alt": "Thumbnail Image", "thumbnail.default.alt": "Vignette d'image", From f7e78dccd129458c6f4828e8ac1fe309d925a64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Fern=C3=A1ndez=20Celorio?= Date: Mon, 7 Nov 2022 19:27:54 +0000 Subject: [PATCH 115/758] Use the same property for both item pages --- config/config.example.yml | 6 ++--- .../full-file-section.component.ts | 24 +++++++++---------- .../file-section/file-section.component.ts | 2 +- src/config/default-app-config.ts | 9 +++---- src/config/item-config.interface.ts | 10 +++----- src/environments/environment.test.ts | 9 +++---- 6 files changed, 23 insertions(+), 37 deletions(-) diff --git a/config/config.example.yml b/config/config.example.yml index 52a07202308..bb4c691f6bb 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -207,13 +207,11 @@ item: undoTimeout: 10000 # 10 seconds # Show the item access status label in items lists showAccessStatuses: false - simpleView: - bitstreamPageSize: 5 - fullView: + bitstream: # Number of entries in the bitstream list in the full item view page. # Rounded to the nearest size in the list of selectable sizes on the # settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. - bitstreamPageSize: 5 + pageSize: 5 # Collection Page Config collection: diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts index 89134a321e3..3be0d58c819 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts @@ -35,8 +35,17 @@ export class FullFileSectionComponent extends FileSectionComponent implements On originals$: Observable>>; licenses$: Observable>>; - originalOptions: PaginationComponentOptions; - licenseOptions: PaginationComponentOptions; + originalOptions = Object.assign(new PaginationComponentOptions(), { + id: 'obo', + currentPage: 1, + pageSize: this.appConfig.item.bitstream.pageSize + }); + + licenseOptions = Object.assign(new PaginationComponentOptions(), { + id: 'lbo', + currentPage: 1, + pageSize: this.appConfig.item.bitstream.pageSize + }); constructor( bitstreamDataService: BitstreamDataService, @@ -46,17 +55,6 @@ export class FullFileSectionComponent extends FileSectionComponent implements On @Inject(APP_CONFIG) protected appConfig: AppConfig ) { super(bitstreamDataService, notificationsService, translateService, appConfig); - this.originalOptions = Object.assign(new PaginationComponentOptions(), { - id: 'obo', - currentPage: 1, - pageSize: this.appConfig.item.fullView.bitstreamPageSize - }); - - this.licenseOptions = Object.assign(new PaginationComponentOptions(), { - id: 'lbo', - currentPage: 1, - pageSize: this.appConfig.item.fullView.bitstreamPageSize - }); } ngOnInit(): void { diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts index 2907a334828..08e792fc8b7 100644 --- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts +++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts @@ -44,7 +44,7 @@ export class FileSectionComponent implements OnInit { protected translateService: TranslateService, @Inject(APP_CONFIG) protected appConfig: AppConfig ) { - this.pageSize = this.appConfig.item.simpleView.bitstreamPageSize; + this.pageSize = this.appConfig.item.bitstream.pageSize; } ngOnInit(): void { diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 3940ea1c191..f87a5b868b8 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -246,14 +246,11 @@ export class DefaultAppConfig implements AppConfig { }, // Show the item access status label in items lists showAccessStatuses: false, - simpleView: { - bitstreamPageSize: 5 - }, - fullView: { - // Number of entries in the bitstream list in the full item view page. + bitstream: { + // Number of entries in the bitstream list in the item view page. // Rounded to the nearest size in the list of selectable sizes on the // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. - bitstreamPageSize: 5 + pageSize: 5 } }; diff --git a/src/config/item-config.interface.ts b/src/config/item-config.interface.ts index 1351911334d..35cb5260aea 100644 --- a/src/config/item-config.interface.ts +++ b/src/config/item-config.interface.ts @@ -7,14 +7,10 @@ export interface ItemConfig extends Config { // This is used to show the access status label of items in results lists showAccessStatuses: boolean; - simpleView: { - bitstreamPageSize: number; - }; - - fullView: { - // Number of entries in the bitstream list in the full item view page. + bitstream: { + // Number of entries in the bitstream list in the item view page. // Rounded to the nearest size in the list of selectable sizes on the // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. - bitstreamPageSize: number; + pageSize: number; } } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 7410b17f372..ec49ff60091 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -230,14 +230,11 @@ export const environment: BuildConfig = { }, // Show the item access status label in items lists showAccessStatuses: false, - simpleView: { - bitstreamPageSize: 5 - }, - fullView: { - // Number of entries in the bitstream list in the full item view page. + bitstream: { + // Number of entries in the bitstream list in the item view page. // Rounded to the nearest size in the list of selectable sizes on the // settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. - bitstreamPageSize: 5 + pageSize: 5 } }, collection: { From cc86ba539fc0d66ddcaf0777c2a0fb1e3476b15f Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Mon, 24 Oct 2022 16:59:51 -0500 Subject: [PATCH 116/758] Turn on no-unused-imports rule and remove all unused imports --- .eslintrc.json | 4 ++-- .../metadata-import-page.component.ts | 6 +----- .../bitstream-formats/bitstream-formats.component.ts | 3 +-- .../metadata-registry/metadata-registry.component.spec.ts | 3 --- .../metadata-schema/metadata-schema.component.spec.ts | 3 --- .../admin/admin-sidebar/admin-sidebar.component.spec.ts | 1 - src/app/app.component.ts | 1 - .../bitstream-page/legacy-bitstream-url.resolver.spec.ts | 2 +- src/app/browse-by/browse-by-guard.spec.ts | 1 - .../collection-item-mapper.component.spec.ts | 4 ++-- .../collection-source/collection-source.component.ts | 3 +-- .../community-page-sub-collection-list.component.spec.ts | 4 ---- .../community-page-sub-community-list.component.spec.ts | 3 --- src/app/core/auth/selectors.ts | 1 - src/app/core/shared/hal-endpoint.service.spec.ts | 2 +- src/app/core/shared/search/search.service.ts | 1 - src/app/correlation-id/correlation-id.service.spec.ts | 2 +- src/app/curation-form/curation-form.component.ts | 2 +- .../top-level-community-list.component.spec.ts | 3 --- .../item-authorizations.component.spec.ts | 7 ++----- ...aginated-drag-and-drop-bitstream-list.component.spec.ts | 3 --- .../file-section/full-file-section.component.spec.ts | 3 --- .../simple/item-types/shared/item.component.spec.ts | 1 - .../my-dspace-page/my-dspace-configuration.service.spec.ts | 4 ---- .../process-page/detail/process-detail.component.spec.ts | 1 - src/app/register-page/registration.guard.spec.ts | 1 - .../delete-comcol-page.component.spec.ts | 1 - .../ds-dynamic-type-bind-relation.service.spec.ts | 2 +- .../shared/interfaces/modal-before-dismiss.interface.ts | 1 - src/app/shared/menu/menu-item/link-menu-item.component.ts | 2 +- src/app/shared/menu/menu-item/text-menu-item.component.ts | 2 +- .../approve/claimed-task-actions-approve.component.spec.ts | 2 +- .../listable-object/listable-object.decorator.spec.ts | 1 - .../sidebar-search-list-element.component.spec.ts | 1 - ...abstract-paginated-drag-and-drop-list.component.spec.ts | 2 -- src/app/shared/pagination/pagination.component.spec.ts | 3 +-- .../search-label/search-label.component.spec.ts | 2 -- .../starts-with/date/starts-with-date.component.spec.ts | 3 --- .../starts-with/text/starts-with-text.component.spec.ts | 6 +----- src/app/shared/testing/group-mock.ts | 1 - ...submission-import-external-collection.component.spec.ts | 2 +- .../submission/submit/submission-submit.component.spec.ts | 2 +- 42 files changed, 21 insertions(+), 81 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 44f53ecb585..b95b54b979a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -6,7 +6,7 @@ "eslint-plugin-import", "eslint-plugin-jsdoc", "eslint-plugin-deprecation", - "eslint-plugin-unused-imports", + "unused-imports", "eslint-plugin-lodash" ], "overrides": [ @@ -205,7 +205,7 @@ "import/order": "off", "import/no-deprecated": "warn", "import/no-namespace": "error", - + "unused-imports/no-unused-imports": "error", "lodash/import-scope": [ "error", "method" diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts index deb16c0d732..4236d152dcb 100644 --- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts +++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts @@ -1,12 +1,8 @@ import { Location } from '@angular/common'; -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable } from 'rxjs'; -import { map, switchMap } from 'rxjs/operators'; -import { AuthService } from '../../core/auth/auth.service'; import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; import { ProcessParameter } from '../../process-page/processes/process-parameter.model'; import { isNotEmpty } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 7fcc86e25d1..162bf2bdb28 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -1,12 +1,11 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import {combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, zip} from 'rxjs'; +import { combineLatest as observableCombineLatest, Observable} from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { BitstreamFormat } from '../../../core/shared/bitstream-format.model'; import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service'; import { map, mergeMap, switchMap, take, toArray } from 'rxjs/operators'; -import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 74bfc5f0a49..944288a7a51 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -19,10 +19,7 @@ import { RestResponse } from '../../../core/cache/response.models'; import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { PaginationService } from '../../../core/pagination/pagination.service'; -import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; describe('MetadataRegistryComponent', () => { let comp: MetadataRegistryComponent; diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index d63b4ed84f5..2b660a63634 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -23,11 +23,8 @@ import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; import { MetadataField } from '../../../core/metadata/metadata-field.model'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { VarDirective } from '../../../shared/utils/var.directive'; -import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; describe('MetadataSchemaComponent', () => { let comp: MetadataSchemaComponent; diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts index cbcfae43d8c..88efd2a711e 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts @@ -16,7 +16,6 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { RouterTestingModule } from '@angular/router/testing'; import { ActivatedRoute } from '@angular/router'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import createSpy = jasmine.createSpy; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { Item } from '../../core/shared/item.model'; diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 40a7e38606e..ba7b7382278 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -31,7 +31,6 @@ import { models } from './core/core.module'; import { ThemeService } from './shared/theme-support/theme.service'; import { IdleModalComponent } from './shared/idle-modal/idle-modal.component'; import { distinctNext } from './core/shared/distinct-next'; -import { ModalBeforeDismiss } from './shared/interfaces/modal-before-dismiss.interface'; @Component({ selector: 'ds-app', diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts index 045582cb26e..aec8cd22f44 100644 --- a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts +++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts @@ -1,5 +1,5 @@ import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver'; -import { of as observableOf, EMPTY } from 'rxjs'; +import { EMPTY } from 'rxjs'; import { BitstreamDataService } from '../core/data/bitstream-data.service'; import { RemoteData } from '../core/data/remote-data'; import { TestScheduler } from 'rxjs/testing'; diff --git a/src/app/browse-by/browse-by-guard.spec.ts b/src/app/browse-by/browse-by-guard.spec.ts index fc483d87e23..933c95a3cb0 100644 --- a/src/app/browse-by/browse-by-guard.spec.ts +++ b/src/app/browse-by/browse-by-guard.spec.ts @@ -1,7 +1,6 @@ import { first } from 'rxjs/operators'; import { BrowseByGuard } from './browse-by-guard'; import { of as observableOf } from 'rxjs'; -import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { BrowseDefinition } from '../core/shared/browse-definition.model'; import { BrowseByDataType } from './browse-by-switcher/browse-by-decorator'; diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts index 8304b01daaa..db844b588f9 100644 --- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts +++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts @@ -16,7 +16,7 @@ import { Collection } from '../../core/shared/collection.model'; import { RemoteData } from '../../core/data/remote-data'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; -import { ChangeDetectionStrategy, EventEmitter } from '@angular/core'; +import { EventEmitter } from '@angular/core'; import { HostWindowService } from '../../shared/host-window.service'; import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub'; import { By } from '@angular/platform-browser'; @@ -41,7 +41,7 @@ import { } from '../../shared/remote-data.utils'; import { createPaginatedList } from '../../shared/testing/utils.test'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { MyDSpacePageComponent, SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; +import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub'; import { GroupDataService } from '../../core/eperson/group-data.service'; import { LinkHeadService } from '../../core/services/link-head.service'; 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 51e8d926eb8..512faa53118 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 @@ -8,8 +8,7 @@ import { DynamicInputModel, DynamicOptionControlModel, DynamicRadioGroupModel, - DynamicSelectModel, - DynamicTextAreaModel + DynamicSelectModel } from '@ng-dynamic-forms/core'; import { Location } from '@angular/common'; import { TranslateService } from '@ngx-translate/core'; diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts index 6a9de52f1f2..bca3c42a950 100644 --- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts +++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts @@ -17,9 +17,6 @@ import { PageInfo } from '../../core/shared/page-info.model'; import { HostWindowService } from '../../shared/host-window.service'; import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub'; import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service'; -import { PaginationComponentOptions } from '../../shared/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 { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { ThemeService } from '../../shared/theme-support/theme.service'; @@ -29,7 +26,6 @@ import { GroupDataService } from '../../core/eperson/group-data.service'; import { LinkHeadService } from '../../core/services/link-head.service'; import { ConfigurationDataService } from '../../core/data/configuration-data.service'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; -import { SearchServiceStub } from '../../shared/testing/search-service.stub'; import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; import { createPaginatedList } from '../../shared/testing/utils.test'; import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub'; diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts index c75c5b6f6c3..0a14fe6dd14 100644 --- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts +++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts @@ -17,9 +17,6 @@ import { HostWindowService } from '../../shared/host-window.service'; import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub'; import { CommunityDataService } from '../../core/data/community-data.service'; import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service'; -import { PaginationComponentOptions } from '../../shared/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 { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { ThemeService } from '../../shared/theme-support/theme.service'; diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts index 1d002b39082..ce8d38d6ba5 100644 --- a/src/app/core/auth/selectors.ts +++ b/src/app/core/auth/selectors.ts @@ -7,7 +7,6 @@ import { createSelector } from '@ngrx/store'; * notation packages up all of the exports into a single object. */ import { AuthState } from './auth.reducer'; -import { AppState } from '../../app.reducer'; import { CoreState } from '../core-state.model'; import { coreSelector } from '../core.selectors'; diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts index 78a296496a7..56e890b3189 100644 --- a/src/app/core/shared/hal-endpoint.service.spec.ts +++ b/src/app/core/shared/hal-endpoint.service.spec.ts @@ -3,7 +3,7 @@ import { getMockRequestService } from '../../shared/mocks/request.service.mock'; import { RequestService } from '../data/request.service'; import { HALEndpointService } from './hal-endpoint.service'; import { EndpointMapRequest } from '../data/request.models'; -import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs'; +import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs'; import { environment } from '../../../environments/environment'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts index 2b1c6a573b9..9befd8ea134 100644 --- a/src/app/core/shared/search/search.service.ts +++ b/src/app/core/shared/search/search.service.ts @@ -3,7 +3,6 @@ import { combineLatest as observableCombineLatest, Observable } from 'rxjs'; import { Injectable, OnDestroy } from '@angular/core'; import { map, switchMap, take } from 'rxjs/operators'; import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; -import { PaginatedList } from '../../data/paginated-list.model'; import { ResponseParsingService } from '../../data/parsing.service'; import { RemoteData } from '../../data/remote-data'; import { GetRequest } from '../../data/request.models'; diff --git a/src/app/correlation-id/correlation-id.service.spec.ts b/src/app/correlation-id/correlation-id.service.spec.ts index 64a4d1068a1..816c3694a5c 100644 --- a/src/app/correlation-id/correlation-id.service.spec.ts +++ b/src/app/correlation-id/correlation-id.service.spec.ts @@ -1,7 +1,7 @@ import { CorrelationIdService } from './correlation-id.service'; import { CookieServiceMock } from '../shared/mocks/cookie.service.mock'; import { UUIDService } from '../core/shared/uuid.service'; -import { MockStore, provideMockStore } from '@ngrx/store/testing'; +import { MockStore } from '@ngrx/store/testing'; import { TestBed } from '@angular/core/testing'; import { Store, StoreModule } from '@ngrx/store'; import { appReducers, AppState, storeModuleConfig } from '../app.reducer'; diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts index 422c9550373..4b67580e770 100644 --- a/src/app/curation-form/curation-form.component.ts +++ b/src/app/curation-form/curation-form.component.ts @@ -5,7 +5,7 @@ import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { find, map } from 'rxjs/operators'; import { NotificationsService } from '../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../shared/empty.util'; +import { hasValue, isEmpty, isNotEmpty } from '../shared/empty.util'; import { RemoteData } from '../core/data/remote-data'; import { Router } from '@angular/router'; import { ProcessDataService } from '../core/data/processes/process-data.service'; diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts index 5dbf1ff8a27..d1a3d3631f1 100644 --- a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts +++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts @@ -17,9 +17,6 @@ import { HostWindowService } from '../../shared/host-window.service'; import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub'; import { CommunityDataService } from '../../core/data/community-data.service'; import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service'; -import { of as observableOf } from 'rxjs'; -import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { PaginationService } from '../../core/pagination/pagination.service'; import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { ThemeService } from '../../shared/theme-support/theme.service'; diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts index 2fe8a562c67..5d2afbaf4ce 100644 --- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts @@ -1,12 +1,11 @@ -import { Observable } from 'rxjs/internal/Observable'; import { waitForAsync, ComponentFixture, inject, TestBed } from '@angular/core/testing'; import { Component, NO_ERRORS_SCHEMA } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; -import { ItemAuthorizationsComponent, BitstreamMapValue } from './item-authorizations.component'; +import { ItemAuthorizationsComponent } from './item-authorizations.component'; import { Bitstream } from '../../../core/shared/bitstream.model'; import { Bundle } from '../../../core/shared/bundle.model'; import { Item } from '../../../core/shared/item.model'; @@ -14,8 +13,6 @@ import { LinkService } from '../../../core/cache/builders/link.service'; import { getMockLinkService } from '../../../shared/mocks/link-service.mock'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test'; -import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model'; -import { PageInfo } from '../../../core/shared/page-info.model'; describe('ItemAuthorizationsComponent test suite', () => { let comp: ItemAuthorizationsComponent; diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts index 133b13cb279..7317eb93be0 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts @@ -17,10 +17,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote- import { createPaginatedList } from '../../../../../shared/testing/utils.test'; import { RequestService } from '../../../../../core/data/request.service'; import { PaginationService } from '../../../../../core/pagination/pagination.service'; -import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../../../../core/cache/models/sort-options.model'; import { PaginationServiceStub } from '../../../../../shared/testing/pagination-service.stub'; -import { FindListOptions } from '../../../../../core/data/find-list-options.model'; describe('PaginatedDragAndDropBitstreamListComponent', () => { let comp: PaginatedDragAndDropBitstreamListComponent; diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts index 396e6c32160..1059ed12da3 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts @@ -16,11 +16,8 @@ import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock'; import { By } from '@angular/platform-browser'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; -import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model'; import { PaginationService } from '../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; -import { FindListOptions } from '../../../../core/data/find-list-options.model'; describe('FullFileSectionComponent', () => { let comp: FullFileSectionComponent; diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts index b14e56a58e1..c479f048090 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts @@ -28,7 +28,6 @@ import { TruncatableService } from '../../../../shared/truncatable/truncatable.s import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component'; import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils'; -import { ItemComponent } from './item.component'; import { createPaginatedList } from '../../../../shared/testing/utils.test'; import { RouteService } from '../../../../core/services/route.service'; import { MetadataValue } from '../../../../core/shared/metadata.models'; diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts index b87c77c5e99..669a97764a5 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts @@ -11,10 +11,6 @@ import { cold, hot } from 'jasmine-marbles'; import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type'; import { PaginationServiceStub } from '../shared/testing/pagination-service.stub'; import { Context } from '../core/shared/context.model'; -import { LinkService } from '../core/cache/builders/link.service'; -import { HALEndpointService } from '../core/shared/hal-endpoint.service'; -import { RequestService } from '../core/data/request.service'; -import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service'; import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub'; import { getMockRemoteDataBuildService } from '../shared/mocks/remote-data-build.service.mock'; diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts index e4ab7d1082d..8749553eaeb 100644 --- a/src/app/process-page/detail/process-detail.component.spec.ts +++ b/src/app/process-page/detail/process-detail.component.spec.ts @@ -15,7 +15,6 @@ import { } from '@angular/core/testing'; import { VarDirective } from '../../shared/utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; -import { RouterTestingModule } from '@angular/router/testing'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component'; import { Process } from '../processes/process.model'; diff --git a/src/app/register-page/registration.guard.spec.ts b/src/app/register-page/registration.guard.spec.ts index 89eaff7a028..9fb8dd3a338 100644 --- a/src/app/register-page/registration.guard.spec.ts +++ b/src/app/register-page/registration.guard.spec.ts @@ -2,7 +2,6 @@ import { RegistrationGuard } from './registration.guard'; import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; import { AuthService } from '../core/auth/auth.service'; -import { Location } from '@angular/common'; import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts index bc73e4134b5..1040e31c579 100644 --- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts +++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts @@ -11,7 +11,6 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { DeleteComColPageComponent } from './delete-comcol-page.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; -import { RequestService } from '../../../../core/data/request.service'; import { getTestScheduler } from 'jasmine-marbles'; import { ComColDataService } from '../../../../core/data/comcol-data.service'; import { createFailedRemoteDataObject$, createNoContentRemoteDataObject$ } from '../../../remote-data.utils'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts index f8bc7ea8867..7f0c7e2e359 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts @@ -10,7 +10,7 @@ import { } from '@ng-dynamic-forms/core'; import { - mockInputWithTypeBindModel, MockRelationModel, mockDcTypeInputModel + mockInputWithTypeBindModel, MockRelationModel } from '../../../mocks/form-models.mock'; import {DsDynamicTypeBindRelationService} from './ds-dynamic-type-bind-relation.service'; import {FormFieldMetadataValueObject} from '../models/form-field-metadata-value.model'; diff --git a/src/app/shared/interfaces/modal-before-dismiss.interface.ts b/src/app/shared/interfaces/modal-before-dismiss.interface.ts index fca28e1cffa..f884432fb8b 100644 --- a/src/app/shared/interfaces/modal-before-dismiss.interface.ts +++ b/src/app/shared/interfaces/modal-before-dismiss.interface.ts @@ -1,4 +1,3 @@ -import { NgbModalConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap'; /** * If a component implementing this interface is used to create a modal (i.e. it is passed to {@link NgbModal#open}), diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.ts b/src/app/shared/menu/menu-item/link-menu-item.component.ts index c9a60f0c286..78d5b2fc6f0 100644 --- a/src/app/shared/menu/menu-item/link-menu-item.component.ts +++ b/src/app/shared/menu/menu-item/link-menu-item.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, Input, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { LinkMenuItemModel } from './models/link.model'; import { rendersMenuItemForType } from '../menu-item.decorator'; import { isNotEmpty } from '../../empty.util'; diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.ts b/src/app/shared/menu/menu-item/text-menu-item.component.ts index af690d198c4..25549f53a89 100644 --- a/src/app/shared/menu/menu-item/text-menu-item.component.ts +++ b/src/app/shared/menu/menu-item/text-menu-item.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, Input } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { TextMenuItemModel } from './models/text.model'; import { rendersMenuItemForType } from '../menu-item.decorator'; import { MenuItemType } from '../menu-item-type.model'; diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts index ce67da1349b..f43316c4e15 100644 --- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.spec.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { of, of as observableOf } from 'rxjs'; 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 eb5219fab8a..f7d00510f68 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 @@ -1,5 +1,4 @@ /* eslint-disable max-classes-per-file */ -import { Item } from '../../../../core/shared/item.model'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { DEFAULT_VIEW_MODE, getListableObjectComponent, listableObjectComponent } from './listable-object.decorator'; import { Context } from '../../../../core/shared/context.model'; diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts index 897ec43491a..226c1be33ef 100644 --- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts +++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts @@ -11,7 +11,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { HALResource } from '../../../core/shared/hal-resource.model'; import { ChildHALResource } from '../../../core/shared/child-hal-resource.model'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; -import { DSONameServiceMock } from '../../mocks/dso-name.service.mock'; export function createSidebarSearchListElementTests( componentClass: any, diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts index 7db53425d5b..bac6b89583f 100644 --- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts +++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts @@ -11,8 +11,6 @@ import { createSuccessfulRemoteDataObject } from '../remote-data.utils'; import { createPaginatedList } from '../testing/utils.test'; import { ObjectValuesPipe } from '../utils/object-values-pipe'; import { PaginationService } from '../../core/pagination/pagination.service'; -import { PaginationComponentOptions } from '../pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; import { FieldUpdates } from '../../core/data/object-updates/field-updates.model'; diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts index 2d913da8a32..30ace4b2b9b 100644 --- a/src/app/shared/pagination/pagination.component.spec.ts +++ b/src/app/shared/pagination/pagination.component.spec.ts @@ -32,8 +32,7 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options import { createTestComponent } from '../testing/utils.test'; import { storeModuleConfig } from '../../app.reducer'; import { PaginationService } from '../../core/pagination/pagination.service'; -import { BehaviorSubject, of as observableOf } from 'rxjs'; -import { PaginationServiceStub } from '../testing/pagination-service.stub'; +import { BehaviorSubject } from 'rxjs'; import { FindListOptions } from '../../core/data/find-list-options.model'; function expectPages(fixture: ComponentFixture, pagesDef: string[]): void { diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts index 50bcbc69381..b2be2ae53f0 100644 --- a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts +++ b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts @@ -12,11 +12,9 @@ import { SearchServiceStub } from '../../../testing/search-service.stub'; import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub'; 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 { PaginationService } from '../../../../core/pagination/pagination.service'; import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service'; import { PaginationServiceStub } from '../../../testing/pagination-service.stub'; -import { FindListOptions } from '../../../../core/data/find-list-options.model'; describe('SearchLabelComponent', () => { let comp: SearchLabelComponent; diff --git a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts index 3cd22a625ff..2407f21fdf3 100644 --- a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts +++ b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts @@ -11,11 +11,8 @@ import { StartsWithDateComponent } from './starts-with-date.component'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { EnumKeysPipe } from '../../utils/enum-keys-pipe'; import { RouterStub } from '../../testing/router.stub'; -import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../testing/pagination-service.stub'; -import { FindListOptions } from '../../../core/data/find-list-options.model'; describe('StartsWithDateComponent', () => { let comp: StartsWithDateComponent; diff --git a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts index c08ef5cfdcf..b717c72d76b 100644 --- a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts +++ b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { CommonModule } from '@angular/common'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -8,12 +8,8 @@ import { EnumKeysPipe } from '../../utils/enum-keys-pipe'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; import { StartsWithTextComponent } from './starts-with-text.component'; -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 { FindListOptions } from '../../../core/data/find-list-options.model'; describe('StartsWithTextComponent', () => { let comp: StartsWithTextComponent; diff --git a/src/app/shared/testing/group-mock.ts b/src/app/shared/testing/group-mock.ts index a6db4c922e5..0d6f924c01a 100644 --- a/src/app/shared/testing/group-mock.ts +++ b/src/app/shared/testing/group-mock.ts @@ -1,6 +1,5 @@ import { Group } from '../../core/eperson/models/group.model'; import { EPersonMock } from './eperson.mock'; -import { of } from 'rxjs'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; export const GroupMock2: Group = Object.assign(new Group(), { 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 4f3c54b6428..0f0ee579a10 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,4 +1,4 @@ -import { Component, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { Component, 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'; diff --git a/src/app/submission/submit/submission-submit.component.spec.ts b/src/app/submission/submit/submission-submit.component.spec.ts index 1b76082d1b3..da569e4e5d7 100644 --- a/src/app/submission/submit/submission-submit.component.spec.ts +++ b/src/app/submission/submit/submission-submit.component.spec.ts @@ -1,4 +1,4 @@ -import { waitForAsync, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { ActivatedRoute, Router } from '@angular/router'; import { NO_ERRORS_SCHEMA, ViewContainerRef } from '@angular/core'; From 3deb5f6eb7e00b9d4d66e3096c3304a5c3d26662 Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Thu, 10 Nov 2022 20:53:56 +0530 Subject: [PATCH 117/758] [DSC-818] Add bulk export page and link it to side menu --- .../data/processes/script-data.service.ts | 1 + src/app/menu.resolver.ts | 17 ++ .../export-collection-menu.component.ts | 4 +- .../dso-selector-modal-wrapper.component.ts | 1 + .../export-excel-selector.component.ts | 4 +- ...rt-metadata-xls-selector.component.spec.ts | 180 ++++++++++++++++++ .../export-metadata-xls-selector.component.ts | 105 ++++++++++ src/app/shared/shared.module.ts | 3 + src/assets/i18n/en.json5 | 14 +- 9 files changed, 324 insertions(+), 5 deletions(-) create mode 100644 src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.spec.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.ts diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts index fb6dc813084..ce4f9196aab 100644 --- a/src/app/core/data/processes/script-data.service.ts +++ b/src/app/core/data/processes/script-data.service.ts @@ -25,6 +25,7 @@ import { CoreState } from '../../core-state.model'; export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import'; export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export'; +export const COLLECTION_EXPORT_SCRIPT_NAME = 'collection-export'; export const ITEM_EXPORT_SCRIPT_NAME = 'item-export'; export const BULK_ITEM_EXPORT_SCRIPT_NAME = 'bulk-item-export'; export const BATCH_IMPORT_SCRIPT_NAME = 'import'; diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index 6c8522ba0b0..fa2e8771b77 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -48,6 +48,9 @@ import { Section } from './core/layout/models/section.model'; import { ExportBatchSelectorComponent } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component'; +import { + ExportMetadataXlsSelectorComponent +} from './shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component'; /** * Creates all of the app's menus @@ -511,6 +514,20 @@ export class MenuResolver implements Resolve { } as OnClickMenuItemModel, shouldPersistOnRouteChange: true }); + this.menuService.addSection(MenuID.ADMIN, { + id: 'export_metadata_xls', + parentID: 'export', + active: true, + visible: true, + model: { + type: MenuItemType.ONCLICK, + text: 'menu.section.export_metadata_xls', + function: () => { + this.modalService.open(ExportMetadataXlsSelectorComponent); + } + } as OnClickMenuItemModel, + shouldPersistOnRouteChange: true + }); this.menuService.addSection(MenuID.ADMIN, { id: 'export_batch', parentID: 'export', diff --git a/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts b/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts index e18694417e5..dccc68de169 100644 --- a/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts +++ b/src/app/shared/context-menu/export-collection/export-collection-menu.component.ts @@ -9,7 +9,7 @@ import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model' import { ContextMenuEntryComponent } from '../context-menu-entry.component'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ProcessParameter } from '../../../process-page/processes/process-parameter.model'; -import { ScriptDataService } from '../../../core/data/processes/script-data.service'; +import { COLLECTION_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../core/data/processes/script-data.service'; import { NotificationsService } from '../../notifications/notifications.service'; import { RequestService } from '../../../core/data/request.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; @@ -62,7 +62,7 @@ export class ExportCollectionMenuComponent extends ContextMenuEntryComponent { { name: '-c', value: this.contextMenuObject.id } ]; - this.scriptService.invoke('collection-export', stringParameters, []) + this.scriptService.invoke(COLLECTION_EXPORT_SCRIPT_NAME, stringParameters, []) .pipe(getFirstCompletedRemoteData()) .subscribe((rd: RemoteData) => { if (rd.isSuccess) { 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 28b4556e2d2..e6a11c40d55 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 @@ -10,6 +10,7 @@ export enum SelectorActionType { CREATE = 'create', EDIT = 'edit', EXPORT_METADATA = 'export-metadata', + EXPORT_METADATA_XLS = 'export-metadata-xls', IMPORT_ITEM = 'import-item', EXPORT_ITEM = 'export-item', IMPORT_BATCH = 'import-batch', diff --git a/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts index 3c7220492ae..d2d58717a2f 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts @@ -6,7 +6,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component'; import { TranslateService } from '@ngx-translate/core'; import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { ScriptDataService } from '../../../../core/data/processes/script-data.service'; +import { COLLECTION_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service'; import { RemoteData } from '../../../../core/data/remote-data'; import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; import { Process } from '../../../../process-page/processes/process.model'; @@ -45,7 +45,7 @@ export class ExportExcelSelectorComponent extends DSOSelectorModalWrapperCompone { name: '-c', value: dso.id } ]; - this.scriptService.invoke('collection-export', stringParameters, []) + this.scriptService.invoke(COLLECTION_EXPORT_SCRIPT_NAME, stringParameters, []) .pipe(getFirstCompletedRemoteData()) .subscribe((rd: RemoteData) => { if (rd.isSuccess) { diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.spec.ts new file mode 100644 index 00000000000..d8048fd6e5d --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.spec.ts @@ -0,0 +1,180 @@ +import { of as observableOf } from 'rxjs'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { DebugElement, NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; +import { NgbActiveModal, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { COLLECTION_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service'; +import { Collection } from '../../../../core/shared/collection.model'; +import { Item } from '../../../../core/shared/item.model'; +import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; +import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; +import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; +import { + createFailedRemoteDataObject$, + createSuccessfulRemoteDataObject, + createSuccessfulRemoteDataObject$ +} from '../../../remote-data.utils'; +import { ExportMetadataXlsSelectorComponent } from './export-metadata-xls-selector.component'; + +// No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents +@NgModule({ + imports: [NgbModalModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + exports: [], + declarations: [ConfirmationModalComponent], + providers: [] +}) +class ModelTestModule { +} + +describe('ExportMetadataXlsSelectorComponent', () => { + let component: ExportMetadataXlsSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + let modalRef; + + let router; + let notificationService: NotificationsServiceStub; + let scriptService; + + const mockItem = Object.assign(new Item(), { + id: 'fake-id', + uuid: 'fake-id', + handle: 'fake/handle', + lastModified: '2018' + }); + + const mockCollection: Collection = Object.assign(new Collection(), { + id: 'test-collection-1-1', + uuid: 'test-collection-1-1', + name: 'test-collection-1', + metadata: { + 'dc.identifier.uri': [ + { + language: null, + value: 'fake/test-collection-1' + } + ] + } + }); + + const itemRD = createSuccessfulRemoteDataObject(mockItem); + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + + beforeEach(waitForAsync(() => { + notificationService = new NotificationsServiceStub(); + router = jasmine.createSpyObj('router', { + navigateByUrl: jasmine.createSpy('navigateByUrl') + }); + scriptService = jasmine.createSpyObj('scriptService', + { + invoke: createSuccessfulRemoteDataObject$({ processId: '45' }) + } + ); + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule], + declarations: [ExportMetadataXlsSelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { provide: NotificationsService, useValue: notificationService }, + { provide: ScriptDataService, useValue: scriptService }, + { + provide: ActivatedRoute, + useValue: { + root: { + snapshot: { + data: { + dso: itemRD, + }, + }, + } + }, + }, + { + provide: Router, useValue: router + } + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ExportMetadataXlsSelectorComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + const modalService = TestBed.inject(NgbModal); + modalRef = modalService.open(ConfirmationModalComponent); + modalRef.componentInstance.response = observableOf(true); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + describe('if item is selected', () => { + let scriptRequestSucceeded; + beforeEach((done) => { + component.navigate(mockItem).subscribe((succeeded: boolean) => { + scriptRequestSucceeded = succeeded; + done(); + }); + }); + it('should not invoke collection-export script', () => { + expect(scriptService.invoke).not.toHaveBeenCalled(); + }); + }); + + describe('if collection is selected', () => { + let scriptRequestSucceeded; + beforeEach((done) => { + spyOn((component as any).modalService, 'open').and.returnValue(modalRef); + component.navigate(mockCollection).subscribe((succeeded: boolean) => { + scriptRequestSucceeded = succeeded; + done(); + }); + }); + it('should invoke the collection-export script with option -c uuid', () => { + const parameterValues: ProcessParameter[] = [ + Object.assign(new ProcessParameter(), { name: '-c', value: mockCollection.uuid }), + ]; + expect(scriptService.invoke).toHaveBeenCalledWith(COLLECTION_EXPORT_SCRIPT_NAME, parameterValues, []); + }); + it('success notification is shown', () => { + expect(scriptRequestSucceeded).toBeTrue(); + expect(notificationService.success).toHaveBeenCalled(); + }); + it('redirected to process page', () => { + expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45'); + }); + }); + + describe('if collection is selected; but script invoke fails', () => { + let scriptRequestSucceeded; + beforeEach((done) => { + spyOn((component as any).modalService, 'open').and.returnValue(modalRef); + jasmine.getEnv().allowRespy(true); + spyOn(scriptService, 'invoke').and.returnValue(createFailedRemoteDataObject$('Error', 500)); + component.navigate(mockCollection).subscribe((succeeded: boolean) => { + scriptRequestSucceeded = succeeded; + done(); + }); + }); + it('error notification is shown', () => { + expect(scriptRequestSucceeded).toBeFalse(); + expect(notificationService.error).toHaveBeenCalled(); + }); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.ts new file mode 100644 index 00000000000..9f1a4dfc9ee --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.ts @@ -0,0 +1,105 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { TranslateService } from '@ngx-translate/core'; +import { Observable, of as observableOf } from 'rxjs'; +import { map, switchMap } from 'rxjs/operators'; +import { COLLECTION_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service'; +import { Collection } from '../../../../core/shared/collection.model'; +import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model'; +import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; +import { isNotEmpty } from '../../../empty.util'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; +import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { Process } from '../../../../process-page/processes/process.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths'; + +/** + * Component to wrap a list of existing dso's inside a modal + * Used to choose a dso from to export metadata of + */ +@Component({ + selector: 'ds-export-metadata-xls-selector', + templateUrl: '../dso-selector-modal-wrapper.component.html', +}) +export class ExportMetadataXlsSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { + configuration = 'backend'; + objectType = DSpaceObjectType.DSPACEOBJECT; + selectorTypes = [DSpaceObjectType.COLLECTION]; + action = SelectorActionType.EXPORT_METADATA_XLS; + + constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router, + protected notificationsService: NotificationsService, protected translationService: TranslateService, + protected scriptDataService: ScriptDataService, + private modalService: NgbModal) { + super(activeModal, route); + } + + /** + * If the dso is a collection: start export-metadata-xls script & navigate to process if successful + * Otherwise show error message + */ + navigate(dso: DSpaceObject): Observable { + if (dso instanceof Collection) { + const modalRef = this.modalService.open(ConfirmationModalComponent); + modalRef.componentInstance.dso = dso; + modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata-xls.header'; + modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata-xls.info'; + modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata-xls.cancel'; + modalRef.componentInstance.confirmLabel = 'confirmation-modal.export-metadata-xls.confirm'; + modalRef.componentInstance.confirmIcon = 'fas fa-file-export'; + const resp$ = modalRef.componentInstance.response.pipe(switchMap((confirm: boolean) => { + if (confirm) { + const startScriptSucceeded$ = this.startScriptNotifyAndRedirect(dso); + return startScriptSucceeded$.pipe( + switchMap((r: boolean) => { + return observableOf(r); + }) + ); + } else { + const modalRefExport = this.modalService.open(ExportMetadataXlsSelectorComponent); + modalRefExport.componentInstance.dsoRD = createSuccessfulRemoteDataObject(dso); + } + })); + resp$.subscribe(); + return resp$; + } else { + return observableOf(false); + } + } + + /** + * Start export-metadata-xls script of dso & navigate to process if successful + * Otherwise show error message + * @param dso Dso to export + */ + private startScriptNotifyAndRedirect(dso: DSpaceObject): Observable { + const parameterValues: ProcessParameter[] = [ + Object.assign(new ProcessParameter(), { name: '-c', value: dso.uuid }), + ]; + return this.scriptDataService.invoke(COLLECTION_EXPORT_SCRIPT_NAME, parameterValues, []) + .pipe( + getFirstCompletedRemoteData(), + map((rd: RemoteData) => { + if (rd.hasSucceeded) { + const title = this.translationService.get('process.new.notification.success.title'); + const content = this.translationService.get('process.new.notification.success.content'); + this.notificationsService.success(title, content); + if (isNotEmpty(rd.payload)) { + this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId)); + } + return true; + } else { + const title = this.translationService.get('process.new.notification.error.title'); + const content = this.translationService.get('process.new.notification.error.content'); + this.notificationsService.error(title, content); + return false; + } + })); + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index c43d09aa9f3..992bd3cf10a 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -327,6 +327,7 @@ import { ItemCorrectionComponent } from './object-collection/shared/mydspace-ite import { MetricsModule } from './metric/metrics.module'; import { SearchChartBarHorizontalComponent } from './search/search-charts/search-chart/search-chart-bar-horizontal/search-chart-bar-horizontal.component'; import { ThumbnailService } from './thumbnail/thumbnail.service'; +import { ExportMetadataXlsSelectorComponent } from './dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component'; const MODULES = [ CommonModule, @@ -480,6 +481,7 @@ const COMPONENTS = [ CollectionDropdownComponent, EntityDropdownComponent, ExportMetadataSelectorComponent, + ExportMetadataXlsSelectorComponent, ImportBatchSelectorComponent, ExportBatchSelectorComponent, ConfirmationModalComponent, @@ -579,6 +581,7 @@ const ENTRY_COMPONENTS = [ BitstreamRequestACopyPageComponent, CurationFormComponent, ExportMetadataSelectorComponent, + ExportMetadataXlsSelectorComponent, ImportBatchSelectorComponent, ExportBatchSelectorComponent, ConfirmationModalComponent, diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index b38b4c6a56c..aae6dfecb01 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1762,6 +1762,8 @@ "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", + "dso-selector.export-metadata-xls.dspaceobject.head": "Export metadata from", + "dso-selector.import-item.item.head": "Import items", "dso-selector.import-item.sub-level": "Bulk import items in", @@ -1802,6 +1804,14 @@ "confirmation-modal.export-metadata.confirm": "Export", + "confirmation-modal.export-metadata-xls.header": "Export metadata for {{ dsoName }}", + + "confirmation-modal.export-metadata-xls.info": "Are you sure you want to export metadata for {{ dsoName }}", + + "confirmation-modal.export-metadata-xls.cancel": "Cancel", + + "confirmation-modal.export-metadata-xls.confirm": "Export", + "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}", "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}", @@ -3471,7 +3481,9 @@ "menu.section.export_item": "Item", - "menu.section.export_metadata": "Metadata", + "menu.section.export_metadata": "Metadata CSV", + + "menu.section.export_metadata_xls": "Metadata XLS", "menu.section.import_from_excel": "Import from excel", From 68ecf4815157ce8a2f859193d2075939640efa15 Mon Sep 17 00:00:00 2001 From: LisAtUP <117272473+LisAtUP@users.noreply.github.com> Date: Fri, 11 Nov 2022 12:20:30 +0200 Subject: [PATCH 118/758] Update el.json5 --- src/assets/i18n/el.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5 index e8ae4ab2e9d..35cad25fd21 100644 --- a/src/assets/i18n/el.json5 +++ b/src/assets/i18n/el.json5 @@ -76,7 +76,7 @@ "admin.access-control.groups.form.delete-group.modal.info": "Είστε βέβαιοι ότι θέλετε να διαγράψετε την ομάδα \"{{ dsoName }}\"", "admin.access-control.groups.form.groupCommunity": "Κοινότητα ή Συλλογή", "admin.access-control.groups.form.groupDescription": "Περιγραφή", - "admin.access-control.groups.form.groupName": "Ονομα ομάδας", + "admin.access-control.groups.form.groupName": "Όνομα ομάδας", "admin.access-control.groups.form.head.create": "Δημιουργία ομάδας", "admin.access-control.groups.form.head.edit": "Επεξεργασία ομάδας", "admin.access-control.groups.form.members-list.button.see-all": "Περιήγηση σε όλα", From f4e36aa261a4d0245cd3c304de118633de81baf5 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 11 Nov 2022 17:44:20 +0100 Subject: [PATCH 119/758] [DSC-818] renaming export-metadata to export-metadata-csv --- src/app/menu.resolver.ts | 12 ++++++------ .../dso-selector-modal-wrapper.component.ts | 2 +- .../export-batch-selector.component.ts | 2 +- ...port-metadata-csv-selector.component.spec.ts} | 12 ++++++------ .../export-metadata-csv-selector.component.ts} | 16 ++++++++-------- src/app/shared/shared.module.ts | 8 ++++---- src/assets/i18n/en.json5 | 12 ++++++------ 7 files changed, 32 insertions(+), 32 deletions(-) rename src/app/shared/dso-selector/modal-wrappers/{export-metadata-selector/export-metadata-selector.component.spec.ts => export-metadata-csv-selector/export-metadata-csv-selector.component.spec.ts} (94%) rename src/app/shared/dso-selector/modal-wrappers/{export-metadata-selector/export-metadata-selector.component.ts => export-metadata-csv-selector/export-metadata-csv-selector.component.ts} (93%) diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index fa2e8771b77..8604122f300 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -33,8 +33,8 @@ import { EditItemSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component'; import { - ExportMetadataSelectorComponent -} from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component'; + ExportMetadataCsvSelectorComponent +} from './shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component'; import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { @@ -431,7 +431,7 @@ export class MenuResolver implements Resolve { } /** - * Create menu sections dependent on whether or not the current user is a site administrator and on whether or not + * Create menu sections depending on whether or not the current user is a site administrator and on whether or not * the export scripts exist and the current user is allowed to execute them */ createExportMenuSections() { @@ -501,15 +501,15 @@ export class MenuResolver implements Resolve { shouldPersistOnRouteChange: true }); this.menuService.addSection(MenuID.ADMIN, { - id: 'export_metadata', + id: 'export_metadata_csv', parentID: 'export', active: true, visible: true, model: { type: MenuItemType.ONCLICK, - text: 'menu.section.export_metadata', + text: 'menu.section.export_metadata_csv', function: () => { - this.modalService.open(ExportMetadataSelectorComponent); + this.modalService.open(ExportMetadataCsvSelectorComponent); } } as OnClickMenuItemModel, shouldPersistOnRouteChange: true 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 e6a11c40d55..41a448e714b 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,7 @@ import { hasValue, isNotEmpty } from '../../empty.util'; export enum SelectorActionType { CREATE = 'create', EDIT = 'edit', - EXPORT_METADATA = 'export-metadata', + EXPORT_METADATA_CSV = 'export-metadata-csv', EXPORT_METADATA_XLS = 'export-metadata-xls', IMPORT_ITEM = 'import-item', EXPORT_ITEM = 'export-item', diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts index 8a48d8a474d..47c38b6f748 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts @@ -26,7 +26,7 @@ import { FeatureID } from '../../../../core/data/feature-authorization/feature-i * Used to choose a dso from to export metadata of */ @Component({ - selector: 'ds-export-metadata-selector', + selector: 'ds-export-metadata-csv-selector', templateUrl: '../dso-selector-modal-wrapper.component.html', }) export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component.spec.ts similarity index 94% rename from src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts rename to src/app/shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component.spec.ts index f6b3581df5b..9344b95f65a 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component.spec.ts @@ -19,7 +19,7 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; -import { ExportMetadataSelectorComponent } from './export-metadata-selector.component'; +import { ExportMetadataCsvSelectorComponent } from './export-metadata-csv-selector.component'; // No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents @NgModule({ @@ -38,9 +38,9 @@ import { ExportMetadataSelectorComponent } from './export-metadata-selector.comp class ModelTestModule { } -describe('ExportMetadataSelectorComponent', () => { - let component: ExportMetadataSelectorComponent; - let fixture: ComponentFixture; +describe('ExportMetadataCsvSelectorComponent', () => { + let component: ExportMetadataCsvSelectorComponent; + let fixture: ComponentFixture; let debugElement: DebugElement; let modalRef; @@ -97,7 +97,7 @@ describe('ExportMetadataSelectorComponent', () => { ); TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule], - declarations: [ExportMetadataSelectorComponent], + declarations: [ExportMetadataCsvSelectorComponent], providers: [ { provide: NgbActiveModal, useValue: modalStub }, { provide: NotificationsService, useValue: notificationService }, @@ -124,7 +124,7 @@ describe('ExportMetadataSelectorComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent(ExportMetadataSelectorComponent); + fixture = TestBed.createComponent(ExportMetadataCsvSelectorComponent); component = fixture.componentInstance; debugElement = fixture.debugElement; const modalService = TestBed.inject(NgbModal); diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component.ts similarity index 93% rename from src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts rename to src/app/shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component.ts index a04fc0a1cd2..a18474a7519 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component.ts @@ -25,13 +25,13 @@ import { getProcessDetailRoute } from '../../../../process-page/process-page-rou * Used to choose a dso from to export metadata of */ @Component({ - selector: 'ds-export-metadata-selector', + selector: 'ds-export-metadata-csv-selector', templateUrl: '../dso-selector-modal-wrapper.component.html', }) -export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { +export class ExportMetadataCsvSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { objectType = DSpaceObjectType.DSPACEOBJECT; selectorTypes = [DSpaceObjectType.COLLECTION, DSpaceObjectType.COMMUNITY]; - action = SelectorActionType.EXPORT_METADATA; + action = SelectorActionType.EXPORT_METADATA_CSV; constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router, protected notificationsService: NotificationsService, protected translationService: TranslateService, @@ -48,10 +48,10 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp if (dso instanceof Collection || dso instanceof Community) { const modalRef = this.modalService.open(ConfirmationModalComponent); modalRef.componentInstance.dso = dso; - modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata.header'; - modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata.info'; - modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata.cancel'; - modalRef.componentInstance.confirmLabel = 'confirmation-modal.export-metadata.confirm'; + modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata-csv.header'; + modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata-csv.info'; + modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata-csv.cancel'; + modalRef.componentInstance.confirmLabel = 'confirmation-modal.export-metadata-csv.confirm'; modalRef.componentInstance.confirmIcon = 'fas fa-file-export'; const resp$ = modalRef.componentInstance.response.pipe(switchMap((confirm: boolean) => { if (confirm) { @@ -62,7 +62,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp }) ); } else { - const modalRefExport = this.modalService.open(ExportMetadataSelectorComponent); + const modalRefExport = this.modalService.open(ExportMetadataCsvSelectorComponent); modalRefExport.componentInstance.dsoRD = createSuccessfulRemoteDataObject(dso); } })); diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 992bd3cf10a..dd463c3f71e 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -23,8 +23,8 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { MomentModule } from 'ngx-moment'; import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component'; import { - ExportMetadataSelectorComponent -} from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component'; + ExportMetadataCsvSelectorComponent +} from './dso-selector/modal-wrappers/export-metadata-csv-selector/export-metadata-csv-selector.component'; import { ExportBatchSelectorComponent } from './dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component'; @@ -480,7 +480,7 @@ const COMPONENTS = [ BitstreamRequestACopyPageComponent, CollectionDropdownComponent, EntityDropdownComponent, - ExportMetadataSelectorComponent, + ExportMetadataCsvSelectorComponent, ExportMetadataXlsSelectorComponent, ImportBatchSelectorComponent, ExportBatchSelectorComponent, @@ -580,7 +580,7 @@ const ENTRY_COMPONENTS = [ BitstreamDownloadPageComponent, BitstreamRequestACopyPageComponent, CurationFormComponent, - ExportMetadataSelectorComponent, + ExportMetadataCsvSelectorComponent, ExportMetadataXlsSelectorComponent, ImportBatchSelectorComponent, ExportBatchSelectorComponent, diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index aae6dfecb01..0c9a87762d7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1760,7 +1760,7 @@ "dso-selector.error.title": "An error occurred searching for a {{ type }}", - "dso-selector.export-metadata.dspaceobject.head": "Export metadata from", + "dso-selector.export-metadata-csv.dspaceobject.head": "Export metadata from", "dso-selector.export-metadata-xls.dspaceobject.head": "Export metadata from", @@ -1796,13 +1796,13 @@ "dso-selector.export-item.sub-level": "Export to excel items in", - "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", + "confirmation-modal.export-metadata-csv.header": "Export metadata for {{ dsoName }}", - "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}", + "confirmation-modal.export-metadata-csv.info": "Are you sure you want to export metadata for {{ dsoName }}", - "confirmation-modal.export-metadata.cancel": "Cancel", + "confirmation-modal.export-metadata-csv.cancel": "Cancel", - "confirmation-modal.export-metadata.confirm": "Export", + "confirmation-modal.export-metadata-csv.confirm": "Export", "confirmation-modal.export-metadata-xls.header": "Export metadata for {{ dsoName }}", @@ -3481,7 +3481,7 @@ "menu.section.export_item": "Item", - "menu.section.export_metadata": "Metadata CSV", + "menu.section.export_metadata_csv": "Metadata CSV", "menu.section.export_metadata_xls": "Metadata XLS", From e6065b7504867334690cc7748f1dacbb8c8ad769 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Wed, 16 Nov 2022 10:34:00 -0600 Subject: [PATCH 120/758] add captioning support for video/audio files --- .../core/shared/media-viewer-item.model.ts | 5 + .../media-viewer-video/caption-info.ts | 4 + .../media-viewer-video/language-helper.ts | 190 ++++++++++++++++++ .../media-viewer-video.component.html | 11 +- .../media-viewer-video.component.ts | 38 +++- .../media-viewer/media-viewer.component.ts | 1 + 6 files changed, 245 insertions(+), 4 deletions(-) create mode 100644 src/app/item-page/media-viewer/media-viewer-video/caption-info.ts create mode 100644 src/app/item-page/media-viewer/media-viewer-video/language-helper.ts diff --git a/src/app/core/shared/media-viewer-item.model.ts b/src/app/core/shared/media-viewer-item.model.ts index cd3a31bd0b7..38c53944d1f 100644 --- a/src/app/core/shared/media-viewer-item.model.ts +++ b/src/app/core/shared/media-viewer-item.model.ts @@ -14,6 +14,11 @@ export class MediaViewerItem { */ format: string; + /** + * Incoming Bitsream format mime type + */ + minetype: string; + /** * Incoming Bitsream thumbnail */ diff --git a/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts new file mode 100644 index 00000000000..011249027fe --- /dev/null +++ b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts @@ -0,0 +1,4 @@ +export class CaptionInfo { + constructor(public src: string, public srclang: string, public langLabel: string ) { + } +} diff --git a/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts new file mode 100644 index 00000000000..b27ab9983f9 --- /dev/null +++ b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts @@ -0,0 +1,190 @@ +export const languageHelper = { + ab: 'Abkhazian', + aa: 'Afar', + af: 'Afrikaans', + ak: 'Akan', + sq: 'Albanian', + am: 'Amharic', + ar: 'Arabic', + an: 'Aragonese', + hy: 'Armenian', + as: 'Assamese', + av: 'Avaric', + ae: 'Avestan', + ay: 'Aymara', + az: 'Azerbaijani', + bm: 'Bambara', + ba: 'Bashkir', + eu: 'Basque', + be: 'Belarusian', + bn: 'Bengali (Bangla)', + bh: 'Bihari', + bi: 'Bislama', + bs: 'Bosnian', + br: 'Breton', + bg: 'Bulgarian', + my: 'Burmese', + ca: 'Catalan', + ch: 'Chamorro', + ce: 'Chechen', + ny: 'Chichewa, Chewa, Nyanja', + zh: 'Chinese', + cv: 'Chuvash', + kw: 'Cornish', + co: 'Corsican', + cr: 'Cree', + hr: 'Croatian', + cs: 'Czech', + da: 'Danish', + dv: 'Divehi, Dhivehi, Maldivian', + nl: 'Dutch', + dz: 'Dzongkha', + en: 'English', + eo: 'Esperanto', + et: 'Estonian', + ee: 'Ewe', + fo: 'Faroese', + fj: 'Fijian', + fi: 'Finnish', + fr: 'French', + ff: 'Fula, Fulah, Pulaar, Pular', + gl: 'Galician', + gd: 'Gaelic (Scottish)', + gv: 'Gaelic (Manx)', + ka: 'Georgian', + de: 'German', + el: 'Greek', + gn: 'Guarani', + gu: 'Gujarati', + ht: 'Haitian Creole', + ha: 'Hausa', + he: 'Hebrew', + hz: 'Herero', + hi: 'Hindi', + ho: 'Hiri Motu', + hu: 'Hungarian', + is: 'Icelandic', + io: 'Ido', + ig: 'Igbo', + in: 'Indonesian', + ia: 'Interlingua', + ie: 'Interlingue', + iu: 'Inuktitut', + ik: 'Inupiak', + ga: 'Irish', + it: 'Italian', + ja: 'Japanese', + jv: 'Javanese', + kl: 'Kalaallisut, Greenlandic', + kn: 'Kannada', + kr: 'Kanuri', + ks: 'Kashmiri', + kk: 'Kazakh', + km: 'Khmer', + ki: 'Kikuyu', + rw: 'Kinyarwanda (Rwanda)', + rn: 'Kirundi', + ky: 'Kyrgyz', + kv: 'Komi', + kg: 'Kongo', + ko: 'Korean', + ku: 'Kurdish', + kj: 'Kwanyama', + lo: 'Lao', + la: 'Latin', + lv: 'Latvian (Lettish)', + li: 'Limburgish ( Limburger)', + ln: 'Lingala', + lt: 'Lithuanian', + lu: 'Luga-Katanga', + lg: 'Luganda, Ganda', + lb: 'Luxembourgish', + mk: 'Macedonian', + mg: 'Malagasy', + ms: 'Malay', + ml: 'Malayalam', + mt: 'Maltese', + mi: 'Maori', + mr: 'Marathi', + mh: 'Marshallese', + mo: 'Moldavian', + mn: 'Mongolian', + na: 'Nauru', + nv: 'Navajo', + ng: 'Ndonga', + nd: 'Northern Ndebele', + ne: 'Nepali', + no: 'Norwegian', + nb: 'Norwegian bokmål', + nn: 'Norwegian nynorsk', + oc: 'Occitan', + oj: 'Ojibwe', + cu: 'Old Church Slavonic, Old Bulgarian', + or: 'Oriya', + om: 'Oromo (Afaan Oromo)', + os: 'Ossetian', + pi: 'Pāli', + ps: 'Pashto, Pushto', + fa: 'Persian (Farsi)', + pl: 'Polish', + pt: 'Portuguese', + pa: 'Punjabi (Eastern)', + qu: 'Quechua', + rm: 'Romansh', + ro: 'Romanian', + ru: 'Russian', + se: 'Sami', + sm: 'Samoan', + sg: 'Sango', + sa: 'Sanskrit', + sr: 'Serbian', + sh: 'Serbo-Croatian', + st: 'Sesotho', + tn: 'Setswana', + sn: 'Shona', + ii: 'Sichuan Yi, Nuosu', + sd: 'Sindhi', + si: 'Sinhalese', + ss: 'Siswati (Swati)', + sk: 'Slovak', + sl: 'Slovenian', + so: 'Somali', + nr: 'Southern Ndebele', + es: 'Spanish', + su: 'Sundanese', + sw: 'Swahili (Kiswahili)', + sv: 'Swedish', + tl: 'Tagalog', + ty: 'Tahitian', + tg: 'Tajik', + ta: 'Tamil', + tt: 'Tatar', + te: 'Telugu', + th: 'Thai', + bo: 'Tibetan', + ti: 'Tigrinya', + to: 'Tonga', + ts: 'Tsonga', + tr: 'Turkish', + tk: 'Turkmen', + tw: 'Twi', + ug: 'Uyghur', + uk: 'Ukrainian', + ur: 'Urdu', + uz: 'Uzbek', + ve: 'Venda', + vi: 'Vietnamese', + vo: 'Volapük', + wa: 'Wallon', + cy: 'Welsh', + wo: 'Wolof', + fy: 'Western Frisian', + xh: 'Xhosa', + yi: 'Yiddish', + yo: 'Yoruba', + za: 'Zhuang, Chuang', + zu: 'Zulu' +}; + + + diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html index a4493e36fc0..5e744373930 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html +++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html @@ -1,4 +1,5 @@ +> + + + + + + + +
    diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html index 0fc6d19667d..16fda1caa83 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html @@ -4,12 +4,12 @@ -
    -
    @@ -18,7 +18,7 @@
    - From 4b0b6983a0d001c7ad598c1b5061c9b6eefbc44f Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 17 Nov 2022 16:50:30 +0200 Subject: [PATCH 125/758] 94391: Remove unused import --- src/app/shared/dso-page/dso-edit-menu.resolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 31e1baf76b3..749d5580a43 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -9,7 +9,7 @@ import { Item } from '../../core/shared/item.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model'; import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { map, mergeMap, switchMap, take } from 'rxjs/operators'; +import { map, switchMap } from 'rxjs/operators'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { URLCombiner } from '../../core/url-combiner/url-combiner'; import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; From f16e18fa634c7b9d66b5c36c7b785a7c42a43b29 Mon Sep 17 00:00:00 2001 From: Yury Bondarenko Date: Fri, 18 Nov 2022 11:08:43 +0100 Subject: [PATCH 126/758] Fix breaking import --- .../dso-edit-menu-expandable-section.component.spec.ts | 2 +- .../dso-edit-menu-section.component.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts index 444e647ee89..79ab35bd28c 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MenuServiceStub } from '../../../testing/menu-service.stub'; import { TranslateModule } from '@ngx-translate/core'; import { MenuService } from '../../../menu/menu.service'; -import { CSSVariableService } from '../../../sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../../sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub'; import { Router } from '@angular/router'; import { RouterStub } from '../../../testing/router.stub'; diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts index a0d5b7a88af..f0815c54150 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { MenuServiceStub } from '../../../testing/menu-service.stub'; import { TranslateModule } from '@ngx-translate/core'; import { MenuService } from '../../../menu/menu.service'; -import { CSSVariableService } from '../../../sass-helper/sass-helper.service'; +import { CSSVariableService } from '../../../sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub'; import { Router } from '@angular/router'; import { RouterStub } from '../../../testing/router.stub'; From 7d58a1eb0a6c2bd3e432fb4c4963cd6659c8a0bd Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Fri, 18 Nov 2022 15:14:55 +0530 Subject: [PATCH 127/758] [CST-7604] fixed text highlight on search page --- .../item-search-result-list-element.component.html | 4 ++-- ...item-search-result-list-element.component.spec.ts | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index 6b2951495d4..3a42eae1f50 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -19,9 +19,9 @@ + [innerHTML]="firstMetadataValue('dc.title') || 'Undefined'"> + [innerHTML]="firstMetadataValue('dc.title') || 'Undefined'"> diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index d1e6c27ba43..f85e4c23b51 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -205,6 +205,18 @@ describe('ItemSearchResultListElementComponent', () => { }); }); + describe('When the item has title', () => { + beforeEach(() => { + publicationListElementComponent.object = mockItemWithMetadata; + fixture.detectChanges(); + }); + + it('should show the title', () => { + const titleField = fixture.debugElement.query(By.css('.item-list-title')); + expect(titleField).not.toBeNull(); + }); + }); + describe('When the item has no title', () => { beforeEach(() => { publicationListElementComponent.object = mockItemWithoutMetadata; From 1ee3114432770db7a79562fd2199bb8fdb41051a Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Fri, 18 Nov 2022 18:09:26 +0530 Subject: [PATCH 128/758] [CST-7604] fixed text highlight on search page --- .../item/item-search-result-list-element.component.html | 4 ++-- .../item-search-result-list-element.component.spec.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index 3a42eae1f50..ad0206bd4ed 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -19,9 +19,9 @@ + [innerHTML]="firstMetadataValue('dc.title') ?? dsoTitle"> + [innerHTML]="firstMetadataValue('dc.title') ?? dsoTitle"> diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index f85e4c23b51..660377746ab 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -13,7 +13,7 @@ import { APP_CONFIG } from '../../../../../../../config/app-config.interface'; let publicationListElementComponent: ItemSearchResultListElementComponent; let fixture: ComponentFixture; - +const dcTitle = 'This is just another title'; const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: Object.assign(new Item(), { @@ -22,7 +22,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul 'dc.title': [ { language: 'en_US', - value: 'This is just another title' + value: dcTitle } ], 'dc.contributor.author': [ @@ -211,9 +211,9 @@ describe('ItemSearchResultListElementComponent', () => { fixture.detectChanges(); }); - it('should show the title', () => { + it('should show highlighted title', () => { const titleField = fixture.debugElement.query(By.css('.item-list-title')); - expect(titleField).not.toBeNull(); + expect(titleField.nativeNode.innerHTML).toEqual(dcTitle); }); }); From 9a695fedc7bb6992858cce5f2768ce2c9d08f902 Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Wed, 23 Nov 2022 20:33:11 +0530 Subject: [PATCH 129/758] [CST-7693] Missing Translations added --- .../create-community-parent-selector.component.html | 2 +- .../scope-selector-modal.component.html | 2 +- src/assets/i18n/en.json5 | 10 ++++++++++ .../create-community-parent-selector.component.html | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html index 84fdd34c01e..4a226729888 100644 --- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html @@ -9,7 +9,7 @@

    - or + {{'dso-selector.create.community.or-divider' | translate}}

    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 index bf5c15e9637..e7165a92136 100644 --- 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 @@ -9,7 +9,7 @@

    - or + {{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}

    diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index a806588701f..bf4b193ba1f 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1320,6 +1320,8 @@ "curation-task.task.vscan.label": "Virus Scan", + "curation-task.task.registerdoi.label": "Register DOI", + "curation.form.task-select.label": "Task:", @@ -1366,6 +1368,8 @@ "dso-selector.create.community.head": "New community", + "dso-selector.create.community.or-divider": "or", + "dso-selector.create.community.sub-level": "Create a new community in", "dso-selector.create.community.top-level": "Create a new top-level community", @@ -1400,6 +1404,8 @@ "dso-selector.set-scope.community.button": "Search all of DSpace", + "dso-selector.set-scope.community.or-divider": "or", + "dso-selector.set-scope.community.input-header": "Search for a community or collection", "dso-selector.claim.item.head": "Profile tips", @@ -4037,6 +4043,8 @@ "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author", + "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API", "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project", @@ -4081,6 +4089,8 @@ "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit", + "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication", + "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown", "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings", diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html index 84fdd34c01e..4a226729888 100644 --- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html +++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html @@ -9,7 +9,7 @@

    - or + {{'dso-selector.create.community.or-divider' | translate}}

    From e7607da0a2f2e6344d482723558f850cac919eff Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Thu, 24 Nov 2022 14:17:50 +0530 Subject: [PATCH 130/758] [CST-7694] fixed group edit issue for non permanent group --- .../group-form/group-form.component.spec.ts | 37 +++++++++++++++++++ .../group-form/group-form.component.ts | 4 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts index 09487a7eaad..a7a7cb5be46 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts @@ -266,6 +266,43 @@ describe('GroupFormComponent', () => { fixture.detectChanges(); }); + it('should edit with name and description operations', () => { + const operations = [{ + op: 'add', + path: '/metadata/dc.description', + value: 'testDescription' + }, { + op: 'replace', + path: '/name', + value: 'newGroupName' + }]; + expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations); + }); + + it('should edit with description operations', () => { + component.groupName.value = null; + component.onSubmit(); + fixture.detectChanges(); + const operations = [{ + op: 'add', + path: '/metadata/dc.description', + value: 'testDescription' + }]; + expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations); + }); + + it('should edit with name operations', () => { + component.groupDescription.value = null; + component.onSubmit(); + fixture.detectChanges(); + const operations = [{ + op: 'replace', + path: '/name', + value: 'newGroupName' + }]; + expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations); + }); + it('should emit the existing group using the correct new values', waitForAsync(() => { fixture.whenStable().then(() => { expect(component.submitForm.emit).toHaveBeenCalledWith(expected2); 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 b0178f12948..d84667f04e0 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 @@ -344,8 +344,8 @@ export class GroupFormComponent implements OnInit, OnDestroy { if (hasValue(this.groupDescription.value)) { operations = [...operations, { - op: 'replace', - path: '/metadata/dc.description/0/value', + op: 'add', + path: '/metadata/dc.description', value: this.groupDescription.value }]; } From 6e2279d155975700b442839d59aee6cd89d8fb3a Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Mon, 28 Nov 2022 11:25:50 +0100 Subject: [PATCH 131/758] [1950][DURACOM-101] Fixed linting --- src/app/shared/form/builder/parsers/field-parser.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts index e2a907056e2..d4468778976 100644 --- a/src/app/shared/form/builder/parsers/field-parser.ts +++ b/src/app/shared/form/builder/parsers/field-parser.ts @@ -1,6 +1,6 @@ import { Inject, InjectionToken } from '@angular/core'; -import { uniqueId } from 'lodash'; +import uniqueId from 'lodash/uniqueId'; import { DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR } from '@ng-dynamic-forms/core'; import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util'; @@ -22,7 +22,7 @@ export const SUBMISSION_ID: InjectionToken = new InjectionToken( export const CONFIG_DATA: InjectionToken = new InjectionToken('configData'); export const INIT_FORM_VALUES: InjectionToken = new InjectionToken('initFormValues'); export const PARSER_OPTIONS: InjectionToken = new InjectionToken('parserOptions'); -export const REGEX_FIELD_VALIDATOR: RegExp = new RegExp('(\\/?)(.+)\\1([gimsuy]*)', 'i'); +export const REGEX_FIELD_VALIDATOR = new RegExp('(\\/?)(.+)\\1([gimsuy]*)', 'i'); export abstract class FieldParser { From 9eb4a7e22ea01258df60178e76c44c0205a4c32d Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 29 Nov 2022 17:20:35 +0100 Subject: [PATCH 132/758] 95335: Removed duplicate i18n key --- 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 826e871efa8..10a37f2b2dc 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4811,7 +4811,5 @@ "person.orcid.registry.auth": "ORCID Authorizations", "home.recent-submissions.head": "Recent Submissions", - "idle-modal.extend-session": "Extend session", - "listable-notification-object.default-message": "This object couldn't be retrieved", } From 92f94c39b2374b83ef7f1243f66401c5162c6fb2 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 29 Nov 2022 18:02:13 +0100 Subject: [PATCH 133/758] 97075: Edit metadata redesign --- .../dso-edit-metadata-form.ts | 133 ++++++++++++++++++ .../dso-edit-metadata.component.html | 126 +++++++++++++++++ .../dso-edit-metadata.component.scss | 73 ++++++++++ .../dso-edit-metadata.component.ts | 99 +++++++++++++ .../metadata-field-selector.component.html | 18 +++ .../metadata-field-selector.component.scss | 0 .../metadata-field-selector.component.ts | 68 +++++++++ src/app/dso-shared/dso-shared.module.ts | 20 +++ .../edit-item-page/edit-item-page.module.ts | 4 +- .../edit-item-page.routing.module.ts | 3 +- src/styles/_bootstrap_variables_mapping.scss | 6 + 11 files changed, 548 insertions(+), 2 deletions(-) create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss create mode 100644 src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts create mode 100644 src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html create mode 100644 src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss create mode 100644 src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts create mode 100644 src/app/dso-shared/dso-shared.module.ts diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts new file mode 100644 index 00000000000..c059f5064f4 --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -0,0 +1,133 @@ +import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models'; +import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util'; + +export enum DsoEditMetadataChangeType { + UPDATE = 1, + ADD = 2, + REMOVE = 3 +} + +export class DsoEditMetadataValue { + originalValue: MetadataValue; + newValue: MetadataValue; + reinstatableValue: MetadataValue; + + editing = false; + change: DsoEditMetadataChangeType; + reinstatableChange: DsoEditMetadataChangeType; + + constructor(value: MetadataValue, added = false) { + this.originalValue = value; + this.newValue = Object.assign(new MetadataValue(), value); + if (added) { + this.change = DsoEditMetadataChangeType.ADD; + this.editing = true; + } + } + + confirmChanges() { + if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) { + if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) { + this.change = DsoEditMetadataChangeType.UPDATE; + } else { + this.change = undefined; + } + } + this.editing = false; + } + + hasChanges(): boolean { + return hasValue(this.change); + } + + discardAndMarkReinstatable(): void { + if (this.change === DsoEditMetadataChangeType.UPDATE) { + this.reinstatableValue = this.newValue; + } + this.reinstatableChange = this.change; + this.discard(); + } + + discard(): void { + this.change = undefined; + this.newValue = Object.assign(new MetadataValue(), this.originalValue); + this.editing = false; + } + + reinstate(): void { + this.newValue = this.reinstatableValue; + this.reinstatableValue = undefined; + this.change = this.reinstatableChange; + this.reinstatableChange = undefined; + } + + isReinstatable(): boolean { + return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange); + } +} + +export class DsoEditMetadataForm { + fieldKeys: string[]; + fields: { + [mdField: string]: DsoEditMetadataValue[], + }; + newValue: DsoEditMetadataValue; + + constructor(metadata: MetadataMap) { + this.fieldKeys = []; + this.fields = {}; + Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => { + this.fieldKeys.push(mdField); + this.fields[mdField] = values.map((value) => new DsoEditMetadataValue(value)); + }); + } + + add(): void { + if (hasNoValue(this.newValue)) { + this.newValue = new DsoEditMetadataValue(new MetadataValue(), true); + } + } + + setMetadataField(mdField: string) { + if (isEmpty(this.fields[mdField])) { + this.fieldKeys.push(mdField); + this.fields[mdField] = []; + } + this.fields[mdField].push(this.newValue); + this.newValue = undefined; + } + + remove(mdField: string, index: number) { + if (isNotEmpty(this.fields[mdField])) { + this.fields[mdField].splice(index, 1); + if (this.fields[mdField].length === 0) { + this.fieldKeys.splice(this.fieldKeys.indexOf(mdField), 1); + delete this.fields[mdField]; + } + } + } + + hasChanges(): boolean { + return Object.values(this.fields).some((values) => values.some((value) => value.hasChanges())); + } + + discard(): void { + Object.values(this.fields).forEach((values) => { + values.forEach((value) => { + value.discard(); + }); + }); + } + + reinstate(): void { + Object.values(this.fields).forEach((values) => { + values.forEach((value) => { + value.reinstate(); + }); + }); + } + + isReinstatable(): boolean { + return Object.values(this.fields).some((values) => values.some((value) => value.isReinstatable())); + } +} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html new file mode 100644 index 00000000000..abe671e6f32 --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -0,0 +1,126 @@ +
    +
    + + + + +
    + +
    +
    Field
    +
    +
    +
    Value
    +
    Lang
    +
    Edit
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    +
    + {{ mdField }} +
    +
    +
    +
    +
    {{ mdValue.newValue.value }}
    + +
    +
    +
    {{ mdValue.newValue.language }}
    + +
    +
    +
    + + + + + + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + + + +
    +
    +
    + diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss new file mode 100644 index 00000000000..a13afaf07e8 --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss @@ -0,0 +1,73 @@ +.lbl-cell { + min-width: 210px; + background-color: var(--bs-gray-100); + font-weight: bold; + + &.ds-success { + background-color: var(--bs-success-bg); + border: 1px solid var(--bs-success); + } +} + +.lbl-cell, +.ds-flex-cell { + padding: 1rem; + border: 1px solid var(--bs-gray-200); +} + +.ds-lang-cell { + min-width: 72px; +} + +.ds-edit-cell { + min-width: 173px; +} + +.ds-value-row { + background-color: white; + + &:active { + cursor: grabbing; + } + + &.ds-warning { + background-color: var(--bs-warning-bg); + + .ds-flex-cell { + border: 1px solid var(--bs-warning); + } + } + + &.ds-danger { + background-color: var(--bs-danger-bg); + + .ds-flex-cell { + border: 1px solid var(--bs-danger); + } + } + + &.ds-success { + background-color: var(--bs-success-bg); + + .ds-flex-cell { + border: 1px solid var(--bs-success); + } + } +} + +.ds-drop-list { + background-color: var(--bs-gray-500); +} + +.ds-field-row { + border: 1px solid var(--bs-gray-400); +} + + +.ds-header-row { + background-color: var(--bs-gray-100); +} + +.ds-drag-handle { + cursor: grab; +} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts new file mode 100644 index 00000000000..d961d9dce92 --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -0,0 +1,99 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { AlertType } from '../../shared/alert/aletr-type'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form'; +import { map, switchMap } from 'rxjs/operators'; +import { ActivatedRoute, Data } from '@angular/router'; +import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest'; +import { Subscription } from 'rxjs/internal/Subscription'; +import { RemoteData } from '../../core/data/remote-data'; +import { hasNoValue, hasValue } from '../../shared/empty.util'; +import { RegistryService } from '../../core/registry/registry.service'; +import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; +import { Observable } from 'rxjs/internal/Observable'; +import { followLink } from '../../shared/utils/follow-link-config.model'; +import { getFirstSucceededRemoteData, metadataFieldsToString } from '../../core/shared/operators'; + +@Component({ + selector: 'ds-dso-edit-metadata', + styleUrls: ['./dso-edit-metadata.component.scss'], + templateUrl: './dso-edit-metadata.component.html', +}) +export class DsoEditMetadataComponent implements OnInit, OnDestroy { + @Input() dso: DSpaceObject; + dsoType: string; + + form: DsoEditMetadataForm; + newMdField: string; + + isReinstatable: boolean; + hasChanges: boolean; + isEmpty: boolean; + + /** + * The AlertType enumeration for access in the component's template + * @type {AlertType} + */ + public AlertTypeEnum = AlertType; + + /** + * The DsoEditMetadataChangeType enumeration for access in the component's template + * @type {DsoEditMetadataChangeType} + */ + public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType; + + dsoUpdateSubscription: Subscription; + + constructor(protected route: ActivatedRoute) { + } + + ngOnInit(): void { + if (hasNoValue(this.dso)) { + this.dsoUpdateSubscription = observableCombineLatest([this.route.data, this.route.parent.data]).pipe( + map(([data, parentData]: [Data, Data]) => Object.assign({}, data, parentData)), + map((data: any) => data.dso) + ).subscribe((rd: RemoteData) => { + this.dso = rd.payload; + this.initForm(); + }); + } else { + this.initForm(); + } + } + + initForm(): void { + this.dsoType = typeof this.dso.type === 'string' ? this.dso.type as any : this.dso.type.value; + this.form = new DsoEditMetadataForm(this.dso.metadata); + this.onDebounce(); + } + + onDebounce(): void { + this.hasChanges = this.form.hasChanges(); + this.isReinstatable = this.form.isReinstatable(); + this.isEmpty = Object.keys(this.form.fields).length === 0; + } + + submit(): void { + + } + + add(): void { + this.newMdField = undefined; + this.form.add(); + } + + discard(): void { + this.form.discard(); + } + + reinstate(): void { + this.form.reinstate(); + } + + ngOnDestroy() { + if (hasValue(this.dsoUpdateSubscription)) { + this.dsoUpdateSubscription.unsubscribe(); + } + } + +} diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html new file mode 100644 index 00000000000..d2761e52a61 --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html @@ -0,0 +1,18 @@ +
    + +
    +
    +
    + + + +
    +
    +
    +
    diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts new file mode 100644 index 00000000000..63c27ef0627 --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -0,0 +1,68 @@ +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { startWith, switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { followLink } from '../../../shared/utils/follow-link-config.model'; +import { + getAllSucceededRemoteData, + getFirstSucceededRemoteData, + metadataFieldsToString +} from '../../../core/shared/operators'; +import { Observable } from 'rxjs/internal/Observable'; +import { RegistryService } from '../../../core/registry/registry.service'; +import { FormControl } from '@angular/forms'; +import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; +import { hasValue } from '../../../shared/empty.util'; +import { Subscription } from 'rxjs/internal/Subscription'; + +@Component({ + selector: 'ds-metadata-field-selector', + styleUrls: ['./metadata-field-selector.component.scss'], + templateUrl: './metadata-field-selector.component.html' +}) +export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { + @Input() mdField: string; + @Output() mdFieldChange = new EventEmitter(); + mdFieldOptions$: Observable; + + public input: FormControl = new FormControl(); + + query$: BehaviorSubject = new BehaviorSubject(null); + debounceTime = 500; + + subs: Subscription[] = []; + + constructor(protected registryService: RegistryService) { + } + + ngOnInit(): void { + this.subs.push( + this.input.valueChanges.pipe( + debounceTime(this.debounceTime), + ).subscribe((valueChange) => { + this.query$.next(valueChange); + this.mdField = valueChange; + this.mdFieldChange.emit(this.mdField); + }), + ); + this.mdFieldOptions$ = this.query$.pipe( + distinctUntilChanged(), + switchMap((query) => { + if (query !== null) { + return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe( + getAllSucceededRemoteData(), + metadataFieldsToString(), + ); + } else { + return [[]]; + } + }), + ); + } + + select(mdFieldOption: string) { + this.mdField = mdFieldOption; + } + + ngOnDestroy(): void { + this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + } +} diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts new file mode 100644 index 00000000000..263d394906a --- /dev/null +++ b/src/app/dso-shared/dso-shared.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../shared/shared.module'; +import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component'; +import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component'; + +@NgModule({ + imports: [ + SharedModule, + ], + declarations: [ + DsoEditMetadataComponent, + MetadataFieldSelectorComponent, + ], + exports: [ + DsoEditMetadataComponent, + ], +}) +export class DsoSharedModule { + +} 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 97901bd7c8e..71ab64fa33a 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 @@ -35,6 +35,7 @@ import { ItemVersionHistoryComponent } from './item-version-history/item-version import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component'; import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe'; import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module'; +import { DsoSharedModule } from '../../dso-shared/dso-shared.module'; /** @@ -48,7 +49,8 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource- EditItemPageRoutingModule, SearchPageModule, DragDropModule, - ResourcePoliciesModule + ResourcePoliciesModule, + DsoSharedModule, ], declarations: [ EditItemPageComponent, 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 2535e422168..bd8af3742e3 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 @@ -38,6 +38,7 @@ import { ItemPageBitstreamsGuard } from './item-page-bitstreams.guard'; import { ItemPageRelationshipsGuard } from './item-page-relationships.guard'; import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard'; import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard'; +import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component'; /** * Routing module that handles the routing for the Edit Item page administrator functionality @@ -75,7 +76,7 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua }, { path: 'metadata', - component: ItemMetadataComponent, + component: DsoEditMetadataComponent, data: { title: 'item.edit.tabs.metadata.title', showBreadcrumbs: true }, canActivate: [ItemPageMetadataGuard] }, diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss index 5a64be7e2a5..d352b24d38b 100644 --- a/src/styles/_bootstrap_variables_mapping.scss +++ b/src/styles/_bootstrap_variables_mapping.scss @@ -29,11 +29,17 @@ --bs-teal: #{$teal}; --bs-cyan: #{$cyan}; --bs-primary: #{$primary}; + --bs-primary-bg: #{lighten($primary, 30%)}; --bs-secondary: #{$secondary}; + --bs-secondary-bg: #{lighten($secondary, 30%)}; --bs-success: #{$success}; + --bs-success-bg: #{lighten($success, 30%)}; --bs-info: #{$info}; + --bs-info-bg: #{lighten($info, 30%)}; --bs-warning: #{$warning}; + --bs-warning-bg: #{lighten($warning, 30%)}; --bs-danger: #{$danger}; + --bs-danger-bg: #{lighten($danger, 30%)}; --bs-light: #{$light}; --bs-dark: #{$dark}; From 627da93e23ab242425fe0dfaefe7e7159a687d2c Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Wed, 30 Nov 2022 15:25:36 +0100 Subject: [PATCH 134/758] 97183 Workaround: reorder admin sidebar sections The issue described at https://github.com/DSpace/dspace-angular/issues/1643 was no longer reproducible: The menu component ultimately retrieves menu section information from the store, but in the `MenuComponent#ngOnInit` method, this information is piped through `distinctUntilChanged(compareArraysUsingIds())`, which discards an update that sets these menu elements to be visible. The behavior of this pipe is probably incorrect, but a proper fix is out of scope for the current task. For now, we work around the problem by adding top-level menu sections _after_ their children while initializing the menu section store, which side-steps this issue. --- src/app/menu.resolver.ts | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index 8630150c58f..60f2d1cca2a 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -171,17 +171,6 @@ export class MenuResolver implements Resolve { ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin]) => { const menuList = [ /* News */ - { - id: 'new', - active: false, - visible: true, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.new' - } as TextMenuItemModel, - icon: 'plus', - index: 0 - }, { id: 'new_community', parentID: 'new', @@ -232,6 +221,17 @@ export class MenuResolver implements Resolve { link: '/processes/new' } as LinkMenuItemModel, }, + { + id: 'new', + active: false, + visible: true, + model: { + type: MenuItemType.TEXT, + text: 'menu.section.new' + } as TextMenuItemModel, + icon: 'plus', + index: 0 + }, // TODO: enable this menu item once the feature has been implemented // { // id: 'new_item_version', @@ -246,17 +246,6 @@ export class MenuResolver implements Resolve { // }, /* Edit */ - { - id: 'edit', - active: false, - visible: true, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.edit' - } as TextMenuItemModel, - icon: 'pencil-alt', - index: 1 - }, { id: 'edit_community', parentID: 'edit', @@ -296,6 +285,17 @@ export class MenuResolver implements Resolve { } } as OnClickMenuItemModel, }, + { + id: 'edit', + active: false, + visible: true, + model: { + type: MenuItemType.TEXT, + text: 'menu.section.edit' + } as TextMenuItemModel, + icon: 'pencil-alt', + index: 1 + }, /* Statistics */ // TODO: enable this menu item once the feature has been implemented From 105f6cb9542926259c67aed08763b0330782ba8e Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 30 Nov 2022 17:49:19 +0100 Subject: [PATCH 135/758] 97075: Edit metadata redesign pt2 --- src/app/core/shared/operators.ts | 2 +- .../dso-edit-metadata-form.ts | 100 ++++++++++++++++-- .../dso-edit-metadata.component.html | 43 ++++---- .../dso-edit-metadata.component.scss | 6 +- .../dso-edit-metadata.component.ts | 59 +++++++++-- .../metadata-field-selector.component.ts | 14 ++- 6 files changed, 178 insertions(+), 46 deletions(-) diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts index ea2a0283eb5..2a68e44af86 100644 --- a/src/app/core/shared/operators.ts +++ b/src/app/core/shared/operators.ts @@ -349,7 +349,7 @@ export const metadataFieldsToString = () => map((schema: MetadataSchema) => ({ field, schema })) ); }); - return observableCombineLatest(fieldSchemaArray); + return isNotEmpty(fieldSchemaArray) ? observableCombineLatest(fieldSchemaArray) : [[]]; }), map((fieldSchemaArray: { field: MetadataField, schema: MetadataSchema }[]): string[] => { return fieldSchemaArray.map((fieldSchema: { field: MetadataField, schema: MetadataSchema }) => fieldSchema.schema.prefix + '.' + fieldSchema.field.toString()); diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index c059f5064f4..220a4561f6e 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -1,5 +1,10 @@ import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models'; import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util'; +import { Operation } from 'fast-json-patch'; +import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model'; +import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model'; +import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model'; +import { MetadataPatchOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model'; export enum DsoEditMetadataChangeType { UPDATE = 1, @@ -55,10 +60,14 @@ export class DsoEditMetadataValue { } reinstate(): void { - this.newValue = this.reinstatableValue; - this.reinstatableValue = undefined; - this.change = this.reinstatableChange; - this.reinstatableChange = undefined; + if (hasValue(this.reinstatableValue)) { + this.newValue = this.reinstatableValue; + this.reinstatableValue = undefined; + } + if (hasValue(this.reinstatableChange)) { + this.change = this.reinstatableChange; + this.reinstatableChange = undefined; + } } isReinstatable(): boolean { @@ -67,16 +76,23 @@ export class DsoEditMetadataValue { } export class DsoEditMetadataForm { + originalFieldKeys: string[]; fieldKeys: string[]; fields: { [mdField: string]: DsoEditMetadataValue[], }; + reinstatableNewValues: { + [mdField: string]: DsoEditMetadataValue[], + }; newValue: DsoEditMetadataValue; constructor(metadata: MetadataMap) { + this.originalFieldKeys = []; this.fieldKeys = []; this.fields = {}; + this.reinstatableNewValues = {}; Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => { + this.originalFieldKeys.push(mdField); this.fieldKeys.push(mdField); this.fields[mdField] = values.map((value) => new DsoEditMetadataValue(value)); }); @@ -89,12 +105,17 @@ export class DsoEditMetadataForm { } setMetadataField(mdField: string) { + this.newValue.editing = false; + this.addValueToField(this.newValue, mdField); + this.newValue = undefined; + } + + private addValueToField(value: DsoEditMetadataValue, mdField: string) { if (isEmpty(this.fields[mdField])) { this.fieldKeys.push(mdField); this.fields[mdField] = []; } - this.fields[mdField].push(this.newValue); - this.newValue = undefined; + this.fields[mdField].push(value); } remove(mdField: string, index: number) { @@ -112,11 +133,31 @@ export class DsoEditMetadataForm { } discard(): void { - Object.values(this.fields).forEach((values) => { - values.forEach((value) => { - value.discard(); + Object.entries(this.fields).forEach(([field, values]) => { + let removeFromIndex = -1; + values.forEach((value, index) => { + if (value.change === DsoEditMetadataChangeType.ADD) { + if (isEmpty(this.reinstatableNewValues[field])) { + this.reinstatableNewValues[field] = []; + } + this.reinstatableNewValues[field].push(value); + if (removeFromIndex === -1) { + removeFromIndex = index; + } + } else { + value.discardAndMarkReinstatable(); + } }); + if (removeFromIndex > -1) { + this.fields[field].splice(removeFromIndex, this.fields[field].length - removeFromIndex); + } + }); + this.fieldKeys.forEach((field) => { + if (this.originalFieldKeys.indexOf(field) < 0) { + delete this.fields[field]; + } }); + this.fieldKeys = [...this.originalFieldKeys]; } reinstate(): void { @@ -125,9 +166,48 @@ export class DsoEditMetadataForm { value.reinstate(); }); }); + Object.entries(this.reinstatableNewValues).forEach(([field, values]) => { + values.forEach((value) => { + this.addValueToField(value, field); + }); + }); + this.reinstatableNewValues = {}; } isReinstatable(): boolean { - return Object.values(this.fields).some((values) => values.some((value) => value.isReinstatable())); + return isNotEmpty(this.reinstatableNewValues) || + Object.values(this.fields) + .some((values) => values + .some((value) => value.isReinstatable())); + } + + getOperations(): Operation[] { + const operations: Operation[] = []; + Object.entries(this.fields).forEach(([field, values]) => { + values.forEach((value, place) => { + if (value.hasChanges()) { + let operation: MetadataPatchOperation; + if (value.change === DsoEditMetadataChangeType.UPDATE) { + operation = new MetadataPatchReplaceOperation(field, place, { + value: value.newValue.value, + language: value.newValue.language, + }); + } else if (value.change === DsoEditMetadataChangeType.REMOVE) { + operation = new MetadataPatchRemoveOperation(field, place); + } else if (value.change === DsoEditMetadataChangeType.ADD) { + operation = new MetadataPatchAddOperation(field, { + value: value.newValue.value, + language: value.newValue.language, + }); + } else { + console.warn('Illegal metadata change state detected for', value); + } + if (hasValue(operation)) { + operations.push(operation.toOperation()); + } + } + }); + }); + return operations; } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index abe671e6f32..27cf706a1a8 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -1,19 +1,19 @@
    - - - - @@ -36,7 +36,7 @@
    - +
    @@ -44,16 +44,16 @@
    - -
    @@ -63,15 +63,15 @@
    - {{ mdField }} + {{ mdField }}
    {{ mdValue.newValue.value }}
    - +
    {{ mdValue.newValue.language }}
    @@ -80,23 +80,24 @@
    -
    @@ -110,14 +111,14 @@
    - - -
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss index a13afaf07e8..8e038d7ef86 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss @@ -1,5 +1,6 @@ .lbl-cell { min-width: 210px; + max-width: 210px; background-color: var(--bs-gray-100); font-weight: bold; @@ -16,7 +17,8 @@ } .ds-lang-cell { - min-width: 72px; + min-width: 90px; + max-width: 90px; } .ds-edit-cell { @@ -68,6 +70,6 @@ background-color: var(--bs-gray-100); } -.ds-drag-handle { +.ds-drag-handle:not(.disabled) { cursor: grab; } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index d961d9dce92..5f837e1b80c 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, Injector, Input, OnDestroy, OnInit } from '@angular/core'; import { AlertType } from '../../shared/alert/aletr-type'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form'; @@ -12,7 +12,17 @@ import { RegistryService } from '../../core/registry/registry.service'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { Observable } from 'rxjs/internal/Observable'; import { followLink } from '../../shared/utils/follow-link-config.model'; -import { getFirstSucceededRemoteData, metadataFieldsToString } from '../../core/shared/operators'; +import { + getFirstCompletedRemoteData, + getFirstSucceededRemoteData, + metadataFieldsToString +} from '../../core/shared/operators'; +import { UpdateDataService } from '../../core/data/update-data.service'; +import { getDataServiceFor } from '../../core/cache/builders/build-decorators'; +import { ResourceType } from '../../core/shared/resource-type'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { DataService } from '../../core/data/data.service'; @Component({ selector: 'ds-dso-edit-metadata', @@ -21,6 +31,7 @@ import { getFirstSucceededRemoteData, metadataFieldsToString } from '../../core/ }) export class DsoEditMetadataComponent implements OnInit, OnDestroy { @Input() dso: DSpaceObject; + updateDataService: UpdateDataService; dsoType: string; form: DsoEditMetadataForm; @@ -29,6 +40,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { isReinstatable: boolean; hasChanges: boolean; isEmpty: boolean; + saving$: BehaviorSubject = new BehaviorSubject(false); /** * The AlertType enumeration for access in the component's template @@ -44,7 +56,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { dsoUpdateSubscription: Subscription; - constructor(protected route: ActivatedRoute) { + constructor(protected route: ActivatedRoute, + protected notificationsService: NotificationsService, + protected translateService: TranslateService, + protected parentInjector: Injector) { } ngOnInit(): void { @@ -54,27 +69,55 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { map((data: any) => data.dso) ).subscribe((rd: RemoteData) => { this.dso = rd.payload; + this.initDataService(); this.initForm(); }); } else { + this.initDataService(); this.initForm(); } } + initDataService(): void { + let type: ResourceType; + if (typeof this.dso.type === 'string') { + type = new ResourceType(this.dso.type); + } else { + type = this.dso.type; + } + const provider = getDataServiceFor(type); + this.updateDataService = Injector.create({ + providers: [], + parent: this.parentInjector + }).get(provider); + this.dsoType = type.value; + } + initForm(): void { - this.dsoType = typeof this.dso.type === 'string' ? this.dso.type as any : this.dso.type.value; this.form = new DsoEditMetadataForm(this.dso.metadata); - this.onDebounce(); + this.onValueSaved(); } - onDebounce(): void { + onValueSaved(): void { this.hasChanges = this.form.hasChanges(); this.isReinstatable = this.form.isReinstatable(); this.isEmpty = Object.keys(this.form.fields).length === 0; } submit(): void { - + this.saving$.next(true); + this.updateDataService.patch(this.dso, this.form.getOperations()).pipe( + getFirstCompletedRemoteData() + ).subscribe((rd: RemoteData) => { + this.saving$.next(false); + if (rd.hasFailed) { + this.notificationsService.error('error', rd.errorMessage); + } else { + this.notificationsService.success('saved', 'saved'); + this.dso = rd.payload; + this.initForm(); + } + }); } add(): void { @@ -84,10 +127,12 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { discard(): void { this.form.discard(); + this.onValueSaved(); } reinstate(): void { this.form.reinstate(); + this.onValueSaved(); } ngOnDestroy() { diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index 63c27ef0627..17050a76bab 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -1,9 +1,8 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { startWith, switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { getAllSucceededRemoteData, - getFirstSucceededRemoteData, metadataFieldsToString } from '../../../core/shared/operators'; import { Observable } from 'rxjs/internal/Observable'; @@ -26,7 +25,8 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { public input: FormControl = new FormControl(); query$: BehaviorSubject = new BehaviorSubject(null); - debounceTime = 500; + debounceTime = 300; + selectedValueLoading = false; subs: Subscription[] = []; @@ -38,7 +38,10 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { this.input.valueChanges.pipe( debounceTime(this.debounceTime), ).subscribe((valueChange) => { - this.query$.next(valueChange); + if (!this.selectedValueLoading) { + this.query$.next(valueChange); + } + this.selectedValueLoading = false; this.mdField = valueChange; this.mdFieldChange.emit(this.mdField); }), @@ -59,7 +62,8 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { } select(mdFieldOption: string) { - this.mdField = mdFieldOption; + this.selectedValueLoading = true; + this.input.setValue(mdFieldOption); } ngOnDestroy(): void { From 9ff1a6a642930fd6852079f3c5f777471a9a92e7 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 16 Dec 2021 09:51:40 +0100 Subject: [PATCH 136/758] taskid 85843 Add a tree to browse hierarchical facets on the search page - overrides --- .../vocabulary-treeview.component.ts | 10 ++-- .../okr-vocabulary-treeview.component.scss | 0 .../okr-vocabulary-treeview.component.ts | 47 +++++++++++++++++++ 3 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss create mode 100644 src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts index 41ba7751716..f9e4d04f3b6 100644 --- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts +++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts @@ -98,7 +98,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit { /** * Array to track all subscriptions and unsubscribe them onDestroy */ - private subs: Subscription[] = []; + protected subs: Subscription[] = []; /** * Initialize instance variables @@ -110,9 +110,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit { */ constructor( public activeModal: NgbActiveModal, - private vocabularyTreeviewService: VocabularyTreeviewService, - private store: Store, - private translate: TranslateService + protected vocabularyTreeviewService: VocabularyTreeviewService, + protected store: Store, + protected translate: TranslateService ) { this.treeFlattener = new VocabularyTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren); @@ -301,7 +301,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit { /** * Return an id for a given {@link VocabularyEntry} */ - private getEntryId(entry: VocabularyEntry): string { + protected getEntryId(entry: VocabularyEntry): string { return entry.authority || entry.otherInformation.id || undefined; } } diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts new file mode 100644 index 00000000000..f340cdfccfa --- /dev/null +++ b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts @@ -0,0 +1,47 @@ +import { Component } from '@angular/core'; +import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component'; +import { filter, find, startWith } from 'rxjs/operators'; +import { PageInfo } from '../../../../../app/core/shared/page-info.model'; + +/** + * Component that show a hierarchical vocabulary in a tree view + */ +@Component({ + selector: 'ds-okr-vocabulary-treeview', + templateUrl: '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.html', + styleUrls: [ + './okr-vocabulary-treeview.component.scss', + '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.scss', + ] +}) +export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent { + + /** + * Initialize the component, setting up the data to build the tree + */ + ngOnInit(): void { + this.subs.push( + this.vocabularyTreeviewService.getData().subscribe((data) => { + this.dataSource.data = data; + }) + ); + + const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name; + this.description = this.translate.get(descriptionLabel).pipe( + filter((msg) => msg !== descriptionLabel), + startWith('') + ); + + // set isAuthenticated + this.isAuthenticated = this.store.pipe(select(isAuthenticated)); + + this.loading = this.vocabularyTreeviewService.isLoading(); + + this.isAuthenticated.pipe( + find((isAuth) => isAuth) + ).subscribe(() => { + const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null; + this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId); + }); + } +} From d5578accea27a941b7d11c9f26b8fa7398e8519c Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 16 Dec 2021 09:52:43 +0100 Subject: [PATCH 137/758] taskid 85843 Add a tree to browse hierarchical facets on the search page --- .../search-hierarchy-filter.component.ts | 2 +- .../okr-vocabulary-treeview.component.ts | 15 +- ...okr-search-hierarchy-filter.component.html | 7 + ...okr-search-hierarchy-filter.component.scss | 0 ...-search-hierarchy-filter.component.spec.ts | 156 ++++++++++++++++++ .../okr-search-hierarchy-filter.component.ts | 106 ++++++++++++ src/themes/okr/entry-components.ts | 63 +++++++ 7 files changed, 337 insertions(+), 12 deletions(-) create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts create mode 100644 src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts create mode 100644 src/themes/okr/entry-components.ts diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts index d2f3de2dc3e..7aa81116de4 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts @@ -13,6 +13,6 @@ import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/se /** * Component that represents a hierarchy facet for a specific filter configuration */ -@renderFacetFor(FilterType.hierarchy) +// @renderFacetFor(FilterType.hierarchy) export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit { } diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts index f340cdfccfa..f33f7d89e96 100644 --- a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts +++ b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts @@ -1,10 +1,11 @@ import { Component } from '@angular/core'; import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component'; -import { filter, find, startWith } from 'rxjs/operators'; +import { filter, startWith } from 'rxjs/operators'; import { PageInfo } from '../../../../../app/core/shared/page-info.model'; /** - * Component that show a hierarchical vocabulary in a tree view + * Component that show a hierarchical vocabulary in a tree view. + * Worldbank customization which omits the authentication check. */ @Component({ selector: 'ds-okr-vocabulary-treeview', @@ -32,16 +33,8 @@ export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent startWith('') ); - // set isAuthenticated - this.isAuthenticated = this.store.pipe(select(isAuthenticated)); - this.loading = this.vocabularyTreeviewService.isLoading(); - this.isAuthenticated.pipe( - find((isAuth) => isAuth) - ).subscribe(() => { - const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null; - this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId); - }); + this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), null); } } diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html new file mode 100644 index 00000000000..e62006538b4 --- /dev/null +++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html @@ -0,0 +1,7 @@ + + +
    + {{'search.filters.filter.show-tree' | translate: {name: filterConfig.name} }} +
    diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts new file mode 100644 index 00000000000..ce4caa23ebd --- /dev/null +++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts @@ -0,0 +1,156 @@ +import { OkrSearchHierarchyFilterComponent } from './okr-search-hierarchy-filter.component'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { By } from '@angular/platform-browser'; +import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service'; +import { of as observableOf } from 'rxjs'; +import { RemoteData } from '../../../../../../../../app/core/data/remote-data'; +import { RequestEntryState } from '../../../../../../../../app/core/data/request.reducer'; +import { TranslateModule } from '@ngx-translate/core'; +import { RouterStub } from '../../../../../../../../app/shared/testing/router.stub'; +import { buildPaginatedList } from '../../../../../../../../app/core/data/paginated-list.model'; +import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model'; +import { CommonModule } from '@angular/common'; +import { SearchService } from '../../../../../../../../app/core/shared/search/search.service'; +import { + FILTER_CONFIG, + IN_PLACE_SEARCH, + SearchFilterService +} from '../../../../../../../../app/core/shared/search/search-filter.service'; +import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service'; +import { Router } from '@angular/router'; +import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationServiceStub } from '../../../../../../../../app/shared/testing/search-configuration-service.stub'; +import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model'; +import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model'; + +describe('OkrSearchHierarchyFilterComponent', () => { + + let fixture: ComponentFixture; + let showVocabularyTreeLink: DebugElement; + + const testSearchLink = 'test-search'; + const testSearchFilter = 'test-search-filter'; + const okrVocabularyTreeViewComponent = { + select: new EventEmitter(), + }; + + const searchService = { + getSearchLink: () => testSearchLink, + getFacetValuesFor: () => observableOf([]), + }; + const searchFilterService = { + getPage: () => observableOf(0), + }; + const router = new RouterStub(); + const ngbModal = jasmine.createSpyObj('modal', { + open: { + componentInstance: okrVocabularyTreeViewComponent, + } + }); + const vocabularyService = { + searchTopEntries: () => undefined, + }; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + NgbModule, + TranslateModule.forRoot(), + ], + declarations: [ + OkrSearchHierarchyFilterComponent, + ], + providers: [ + { provide: SearchService, useValue: searchService }, + { provide: SearchFilterService, useValue: searchFilterService }, + { provide: RemoteDataBuildService, useValue: {} }, + { provide: Router, useValue: router }, + { provide: NgbModal, useValue: ngbModal }, + { provide: VocabularyService, useValue: vocabularyService }, + { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() }, + { provide: IN_PLACE_SEARCH, useValue: false }, + { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + }); + + function init() { + fixture = TestBed.createComponent(OkrSearchHierarchyFilterComponent); + fixture.detectChanges(); + showVocabularyTreeLink = fixture.debugElement.query(By.css('div#show-test-search-filter-tree')); + } + + describe('if the vocabulary doesn\'t exist', () => { + + beforeEach(() => { + spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData( + undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404 + ))); + init(); + }); + + it('should not show the vocabulary tree link', () => { + expect(showVocabularyTreeLink).toBeNull(); + }); + }); + + describe('if the vocabulary exists', () => { + + beforeEach(() => { + spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData( + undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200 + ))); + init(); + }); + + it('should show the vocabulary tree link', () => { + expect(showVocabularyTreeLink).toBeTruthy(); + }); + + describe('when clicking the vocabulary tree link', () => { + + beforeEach(async () => { + showVocabularyTreeLink.nativeElement.click(); + }); + + it('should open the vocabulary tree modal', () => { + expect(ngbModal.open).toHaveBeenCalled(); + }); + + describe('when selecting a value from the vocabulary tree', () => { + + const alreadySelectedValues = [ + 'already-selected-value-1', + 'already-selected-value-2', + ]; + const newSelectedValue = 'new-selected-value'; + + beforeEach(() => { + fixture.componentInstance.selectedValues$ = observableOf( + alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value })) + ); + okrVocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), { + value: newSelectedValue, + })); + }); + + it('should add a new search filter to the existing search filters', () => { + expect(router.navigate).toHaveBeenCalledWith([testSearchLink], { + queryParams: { + [`f.${testSearchFilter}`]: [ + ...alreadySelectedValues, + newSelectedValue, + ].map((value => `${value},equals`)), + }, + queryParamsHandling: 'merge', + }); + }); + }); + }); + }); +}); diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts new file mode 100644 index 00000000000..c637f576eb2 --- /dev/null +++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts @@ -0,0 +1,106 @@ +import { Component, Inject } from '@angular/core'; +import { renderFacetFor } from 'src/app/shared/search/search-filters/search-filter/search-filter-type-decorator'; +import { FilterType } from '../../../../../../../../app/shared/search/filter-type.model'; +import { facetLoad } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component'; +import { SearchHierarchyFilterComponent } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { OkrVocabularyTreeviewComponent } from '../../../../okr-vocabulary-treeview/okr-vocabulary-treeview.component'; +import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { SearchService } from '../../../../../../../../app/core/shared/search/search.service'; +import { + FILTER_CONFIG, + IN_PLACE_SEARCH, + SearchFilterService +} from '../../../../../../../../app/core/shared/search/search-filter.service'; +import { Router } from '@angular/router'; +import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationService } from '../../../../../../../../app/core/shared/search/search-configuration.service'; +import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model'; +import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model'; +import { getFacetValueForType } from '../../../../../../../../app/shared/search/search.utils'; +import { filter, map, take } from 'rxjs/operators'; +import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service'; +import { Observable } from 'rxjs'; +import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model'; + +/** + * Component that represents a hierarchy facet for a specific filter configuration. + * Worldbank customization which features a link at the bottom to open a vocabulary popup, + */ +@Component({ + selector: 'ds-okr-search-hierarchy-filter', + styleUrls: ['./okr-search-hierarchy-filter.component.scss'], + templateUrl: './okr-search-hierarchy-filter.component.html', + animations: [facetLoad] +}) +@renderFacetFor(FilterType.hierarchy) +export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComponent { + + constructor(protected searchService: SearchService, + protected filterService: SearchFilterService, + protected rdbs: RemoteDataBuildService, + protected router: Router, + protected modalService: NgbModal, + protected vocabularyService: VocabularyService, + @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService, + @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean, + @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig, + ) { + super( + searchService, + filterService, + rdbs, + router, + searchConfigService, + inPlaceSearch, + filterConfig, + ); + } + + vocabularyExists$: Observable; + + ngOnInit() { + super.ngOnInit(); + this.vocabularyExists$ = this.vocabularyService.searchTopEntries( + this.filterConfig.name, new PageInfo(), true, false, + ).pipe( + filter(rd => rd.hasCompleted), + take(1), + map(rd => { + return rd.hasSucceeded; + }), + ); + } + + /** + * Open the vocabulary tree modal popup. + * When an entry is selected, add the filter query to the search options. + */ + showVocabularyTree() { + const modalRef: NgbModalRef = this.modalService.open(OkrVocabularyTreeviewComponent, { + size: 'lg', + windowClass: 'treeview' + }); + modalRef.componentInstance.vocabularyOptions = { + name: this.filterConfig.name, + closed: true + }; + modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => { + this.selectedValues$ + .pipe(take(1)) + .subscribe((selectedValues) => { + this.router.navigate( + [this.searchService.getSearchLink()], + { + queryParams: { + [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}] + .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)), + }, + queryParamsHandling: 'merge', + }, + ); + }); + }); + } +} diff --git a/src/themes/okr/entry-components.ts b/src/themes/okr/entry-components.ts new file mode 100644 index 00000000000..bfc93ad2164 --- /dev/null +++ b/src/themes/okr/entry-components.ts @@ -0,0 +1,63 @@ +import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component'; +import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; +import { PersonSearchResultListElementComponent } from './app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component'; +import { JournalSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component'; +import { JournalIssueSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component'; +import { JournalVolumeSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component'; +import { CitationsSectionComponent } from './app/item-page/field-components/citation/citations-section.component'; +import { CcIconsComponent } from './app/item-page/field-components/cc-icons/cc-icons.component'; +import { AltmetricDonutComponent } from './app/item-page/field-components/citation/altmetric-donut/altmetric-donut.component'; +import { ItemPageWbDateFieldComponent } from './app/item-page/field-components/specific-field/wb-date/item-page-wb-date-field.component'; +import { ItemPageWbGenericWithFallbackComponent } from './app/item-page/field-components/specific-field/wb-generic-with-fallback/item-page-wb-generic-with-fallback.component'; +import { ItemPageWbExternalContentComponent } from './app/item-page/field-components/specific-field/wb-external-content/item-page-wb-external-content.component'; +import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component'; +import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component'; +import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component'; +import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component'; +import { JournalVolumeGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component'; +import { JournalVolumeSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component'; +import { JournalIssueSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component'; +import { JournalIssueGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component'; +import { JournalVolumeSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component'; +import { JournalIssueSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component'; +import { JournalIssueListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component'; +import { JournalVolumeListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component'; +import { FeaturedPublicationsListElementComponent } from './app/featured-publications/featured-publications-list-element/featured-publications-list-element.component'; +import { ClaimedTaskActionsMarkDuplicateComponent } from './app/shared/mydspace-actions/claimed-task/mark-duplicate/claimed-task-actions-mark-duplicate.component'; +import { ClaimedTaskActionsReportProblemComponent } from './app/shared/mydspace-actions/claimed-task/report-problem/claimed-task-actions-report-problem.component'; +import { SingleStatletTableComponent } from './app/atmire-cua/statlets/shared/single-statlet/graph-types/single-statlet-table/single-statlet-table.component'; +import { OkrSearchHierarchyFilterComponent } from './app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component'; +import { OkrVocabularyTreeviewComponent } from './app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component'; + +export const ENTRY_COMPONENTS = [ + PublicationComponent, + ItemSearchResultListElementComponent, + PersonSearchResultListElementComponent, + JournalSearchResultListElementComponent, + JournalVolumeSearchResultListElementComponent, + JournalIssueSearchResultListElementComponent, + UntypedItemComponent, + AltmetricDonutComponent, + CitationsSectionComponent, + CcIconsComponent, + ItemPageWbDateFieldComponent, + ItemPageWbGenericWithFallbackComponent, + ItemPageWbExternalContentComponent, + JournalComponent, + JournalIssueComponent, + JournalVolumeComponent, + JournalVolumeGridElementComponent, + JournalVolumeSearchResultGridElementComponent, + JournalIssueSearchResultGridElementComponent, + JournalIssueGridElementComponent, + JournalVolumeSidebarSearchListElementComponent, + JournalIssueSidebarSearchListElementComponent, + JournalIssueListElementComponent, + JournalVolumeListElementComponent, + FeaturedPublicationsListElementComponent, + ClaimedTaskActionsMarkDuplicateComponent, + ClaimedTaskActionsReportProblemComponent, + SingleStatletTableComponent, + OkrSearchHierarchyFilterComponent, + OkrVocabularyTreeviewComponent, +]; From bc3ab46e8eae70e2a3b25fe1bbddd5f8c51fecf2 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 16 Dec 2021 13:14:13 +0100 Subject: [PATCH 138/758] taskid 85843 Add a tree to browse hierarchical facets on the search page - fix import issue --- .../okr-search-hierarchy-filter.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts index c637f576eb2..7d4e41894ce 100644 --- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts +++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { renderFacetFor } from 'src/app/shared/search/search-filters/search-filter/search-filter-type-decorator'; +import { renderFacetFor } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-filter-type-decorator'; import { FilterType } from '../../../../../../../../app/shared/search/filter-type.model'; import { facetLoad } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component'; import { SearchHierarchyFilterComponent } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component'; From 2fab8415626e0e96ed9019d9ce390c70ccff09f6 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 16 Dec 2021 14:12:27 +0100 Subject: [PATCH 139/758] taskid 85843 Add a tree to browse hierarchical facets on the search page - i18n updates --- .../okr-search-hierarchy-filter.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html index e62006538b4..dd50528bb66 100644 --- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html +++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html @@ -2,6 +2,7 @@
    - {{'search.filters.filter.show-tree' | translate: {name: filterConfig.name} }} + {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate)} }}
    From 3b7d962671deb967241e52071a0f8b6d8d0e756e Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 23 Dec 2021 11:43:59 +0100 Subject: [PATCH 140/758] taskid 85843 Add a tree to browse hierarchical facets on the search page - feedback --- .../okr-vocabulary-treeview.component.ts | 11 ++++++----- .../okr-search-hierarchy-filter.component.html | 8 ++++---- .../okr-search-hierarchy-filter.component.spec.ts | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts index f33f7d89e96..c9ef159f81a 100644 --- a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts +++ b/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts @@ -1,7 +1,8 @@ import { Component } from '@angular/core'; import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component'; -import { filter, startWith } from 'rxjs/operators'; +import { filter, map, startWith } from 'rxjs/operators'; import { PageInfo } from '../../../../../app/core/shared/page-info.model'; +import { lowerCase } from 'lodash'; /** * Component that show a hierarchical vocabulary in a tree view. @@ -27,10 +28,10 @@ export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent }) ); - const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name; - this.description = this.translate.get(descriptionLabel).pipe( - filter((msg) => msg !== descriptionLabel), - startWith('') + this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe( + map((type) => lowerCase(type)), + ).subscribe( + (type) => this.description = this.translate.get('okr-vocabulary-treeview.info', { type }) ); this.loading = this.vocabularyTreeviewService.isLoading(); diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html index dd50528bb66..731b5045bf1 100644 --- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html +++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html @@ -1,8 +1,8 @@ -
    - {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate)} }} -
    + {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }} + diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts index ce4caa23ebd..ac0669cbf92 100644 --- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts +++ b/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts @@ -82,7 +82,7 @@ describe('OkrSearchHierarchyFilterComponent', () => { function init() { fixture = TestBed.createComponent(OkrSearchHierarchyFilterComponent); fixture.detectChanges(); - showVocabularyTreeLink = fixture.debugElement.query(By.css('div#show-test-search-filter-tree')); + showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree')); } describe('if the vocabulary doesn\'t exist', () => { From 6be343cccfa43a841e931ff32d2014ed14e09870 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 1 Dec 2022 13:07:19 +0100 Subject: [PATCH 141/758] 97075: Margin fixes + metadata field autofocus and validation --- .../dso-edit-metadata.component.html | 31 ++++++++------- .../dso-edit-metadata.component.ts | 18 ++++++++- .../metadata-field-selector.component.html | 5 ++- .../metadata-field-selector.component.ts | 38 ++++++++++++++++--- 4 files changed, 69 insertions(+), 23 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 27cf706a1a8..4154a9ce564 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -1,18 +1,18 @@
    -
    +
    - - -
    - +
    -
    +
    @@ -44,16 +44,19 @@
    - - -
    @@ -109,15 +112,15 @@
    -
    +
    - - - diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index 5f837e1b80c..97f34ba2a33 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -1,7 +1,7 @@ -import { Component, Injector, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AlertType } from '../../shared/alert/aletr-type'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form'; +import { DsoEditMetadataChangeType, DsoEditMetadataForm, DsoEditMetadataValue } from './dso-edit-metadata-form'; import { map, switchMap } from 'rxjs/operators'; import { ActivatedRoute, Data } from '@angular/router'; import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest'; @@ -23,6 +23,7 @@ import { ResourceType } from '../../core/shared/resource-type'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { DataService } from '../../core/data/data.service'; +import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component'; @Component({ selector: 'ds-dso-edit-metadata', @@ -31,6 +32,7 @@ import { DataService } from '../../core/data/data.service'; }) export class DsoEditMetadataComponent implements OnInit, OnDestroy { @Input() dso: DSpaceObject; + @ViewChild(MetadataFieldSelectorComponent) metadataFieldSelectorComponent: MetadataFieldSelectorComponent; updateDataService: UpdateDataService; dsoType: string; @@ -41,6 +43,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { hasChanges: boolean; isEmpty: boolean; saving$: BehaviorSubject = new BehaviorSubject(false); + loadingFieldValidation$: BehaviorSubject = new BehaviorSubject(false); /** * The AlertType enumeration for access in the component's template @@ -120,6 +123,17 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { }); } + setMetadataField() { + this.loadingFieldValidation$.next(true); + this.metadataFieldSelectorComponent.validate().subscribe((valid) => { + this.loadingFieldValidation$.next(false); + if (valid) { + this.form.setMetadataField(this.newMdField); + this.onValueSaved(); + } + }); + } + add(): void { this.newMdField = undefined; this.form.add(); diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html index d2761e52a61..2a69c211880 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html @@ -1,11 +1,12 @@
    - +
    Invalid metadata field, please pick an existing one from the suggestions when searching
    diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index 17050a76bab..cde41dee965 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -1,15 +1,25 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { switchMap, debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { + AfterViewInit, + Component, + ElementRef, + EventEmitter, + Input, + OnDestroy, + OnInit, + Output, + ViewChild +} from '@angular/core'; +import { switchMap, debounceTime, distinctUntilChanged, map, tap, take } from 'rxjs/operators'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { - getAllSucceededRemoteData, + getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteData, metadataFieldsToString } from '../../../core/shared/operators'; import { Observable } from 'rxjs/internal/Observable'; import { RegistryService } from '../../../core/registry/registry.service'; import { FormControl } from '@angular/forms'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; -import { hasValue } from '../../../shared/empty.util'; +import { hasValue, isNotEmpty } from '../../../shared/empty.util'; import { Subscription } from 'rxjs/internal/Subscription'; @Component({ @@ -17,9 +27,11 @@ import { Subscription } from 'rxjs/internal/Subscription'; styleUrls: ['./metadata-field-selector.component.scss'], templateUrl: './metadata-field-selector.component.html' }) -export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { +export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterViewInit { @Input() mdField: string; + @Input() autofocus = false; @Output() mdFieldChange = new EventEmitter(); + @ViewChild('mdFieldInput', { static: true }) mdFieldInput: ElementRef; mdFieldOptions$: Observable; public input: FormControl = new FormControl(); @@ -27,6 +39,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { query$: BehaviorSubject = new BehaviorSubject(null); debounceTime = 300; selectedValueLoading = false; + showInvalid = false; subs: Subscription[] = []; @@ -49,6 +62,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { this.mdFieldOptions$ = this.query$.pipe( distinctUntilChanged(), switchMap((query) => { + this.showInvalid = false; if (query !== null) { return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe( getAllSucceededRemoteData(), @@ -61,6 +75,20 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy { ); } + ngAfterViewInit(): void { + this.mdFieldInput.nativeElement.focus(); + } + + validate(): Observable { + return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe( + getFirstSucceededRemoteData(), + metadataFieldsToString(), + take(1), + map((fields: string[]) => fields.indexOf(this.mdField) > -1), + tap((exists) => this.showInvalid = !exists), + ); + } + select(mdFieldOption: string) { this.selectedValueLoading = true; this.input.setValue(mdFieldOption); From 4afa5181a6ffae1b94ca946abad88a2c5fdbe199 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Thu, 1 Dec 2022 13:34:56 +0100 Subject: [PATCH 142/758] refac --- .../okr-vocabulary-treeview.component.scss | 0 .../okr-vocabulary-treeview.component.ts | 8 +-- ...okr-search-hierarchy-filter.component.html | 0 ...okr-search-hierarchy-filter.component.scss | 0 ...-search-hierarchy-filter.component.spec.ts | 24 +++---- .../okr-search-hierarchy-filter.component.ts | 30 ++++----- src/app/shared/search/search.module.ts | 6 +- src/app/shared/shared.module.ts | 5 ++ src/assets/i18n/en.json5 | 26 +++++++- src/themes/okr/entry-components.ts | 63 ------------------- 10 files changed, 66 insertions(+), 96 deletions(-) rename src/{themes/okr => }/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss (100%) rename src/{themes/okr => }/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts (74%) rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html (100%) rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss (100%) rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts (80%) rename src/{themes/okr => }/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts (64%) delete mode 100644 src/themes/okr/entry-components.ts diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss similarity index 100% rename from src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss rename to src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss diff --git a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts similarity index 74% rename from src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts rename to src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts index c9ef159f81a..80dcb1f739d 100644 --- a/src/themes/okr/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts +++ b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; -import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component'; +import { VocabularyTreeviewComponent } from '../vocabulary-treeview/vocabulary-treeview.component'; import { filter, map, startWith } from 'rxjs/operators'; -import { PageInfo } from '../../../../../app/core/shared/page-info.model'; +import { PageInfo } from '../../core/shared/page-info.model'; import { lowerCase } from 'lodash'; /** @@ -10,10 +10,10 @@ import { lowerCase } from 'lodash'; */ @Component({ selector: 'ds-okr-vocabulary-treeview', - templateUrl: '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.html', + templateUrl: '../vocabulary-treeview/vocabulary-treeview.component.html', styleUrls: [ './okr-vocabulary-treeview.component.scss', - '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.scss', + '../vocabulary-treeview/vocabulary-treeview.component.scss', ] }) export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent { diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html similarity index 100% rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss similarity index 100% rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts similarity index 80% rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts index ac0669cbf92..fe0866468af 100644 --- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts @@ -2,27 +2,27 @@ import { OkrSearchHierarchyFilterComponent } from './okr-search-hierarchy-filter import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service'; +import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; import { of as observableOf } from 'rxjs'; -import { RemoteData } from '../../../../../../../../app/core/data/remote-data'; -import { RequestEntryState } from '../../../../../../../../app/core/data/request.reducer'; +import { RemoteData } from '../../../../../core/data/remote-data'; +import { RequestEntryState } from '../../../../../core/data/request.reducer'; import { TranslateModule } from '@ngx-translate/core'; -import { RouterStub } from '../../../../../../../../app/shared/testing/router.stub'; -import { buildPaginatedList } from '../../../../../../../../app/core/data/paginated-list.model'; -import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model'; +import { RouterStub } from '../../../../testing/router.stub'; +import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; import { CommonModule } from '@angular/common'; -import { SearchService } from '../../../../../../../../app/core/shared/search/search.service'; +import { SearchService } from '../../../../../core/shared/search/search.service'; import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService -} from '../../../../../../../../app/core/shared/search/search-filter.service'; -import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service'; +} from '../../../../../core/shared/search/search-filter.service'; +import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; import { Router } from '@angular/router'; import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component'; -import { SearchConfigurationServiceStub } from '../../../../../../../../app/shared/testing/search-configuration-service.stub'; -import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; +import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model'; import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model'; diff --git a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts similarity index 64% rename from src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts rename to src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts index 7d4e41894ce..530b3d8d2bd 100644 --- a/src/themes/okr/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts @@ -1,28 +1,28 @@ import { Component, Inject } from '@angular/core'; -import { renderFacetFor } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-filter-type-decorator'; -import { FilterType } from '../../../../../../../../app/shared/search/filter-type.model'; -import { facetLoad } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component'; -import { SearchHierarchyFilterComponent } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component'; +import { renderFacetFor } from '../search-filter-type-decorator'; +import { FilterType } from '../../../models/filter-type.model'; +import { facetLoad } from '../search-facet-filter/search-facet-filter.component'; +import { SearchHierarchyFilterComponent } from '../search-hierarchy-filter/search-hierarchy-filter.component'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { OkrVocabularyTreeviewComponent } from '../../../../okr-vocabulary-treeview/okr-vocabulary-treeview.component'; -import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { SearchService } from '../../../../../../../../app/core/shared/search/search.service'; +import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { SearchService } from '../../../../../core/shared/search/search.service'; import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService -} from '../../../../../../../../app/core/shared/search/search-filter.service'; +} from '../../../../../core/shared/search/search-filter.service'; import { Router } from '@angular/router'; -import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component'; -import { SearchConfigurationService } from '../../../../../../../../app/core/shared/search/search-configuration.service'; -import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model'; -import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model'; -import { getFacetValueForType } from '../../../../../../../../app/shared/search/search.utils'; +import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; +import { SearchFilterConfig } from '../../../models/search-filter-config.model'; +import { FacetValue } from '../../../models/facet-value.model'; +import { getFacetValueForType } from '../../../search.utils'; import { filter, map, take } from 'rxjs/operators'; -import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service'; +import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; import { Observable } from 'rxjs'; -import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; /** * Component that represents a hierarchy facet for a specific filter configuration. diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts index 668d260c23a..e9c0b3e121b 100644 --- a/src/app/shared/search/search.module.ts +++ b/src/app/shared/search/search.module.ts @@ -28,6 +28,9 @@ import { MissingTranslationHelper } from '../translate/missing-translation.helpe import { SharedModule } from '../shared.module'; import { SearchResultsComponent } from './search-results/search-results.component'; import { SearchComponent } from './search.component'; +import { + OkrSearchHierarchyFilterComponent +} from './search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component'; const COMPONENTS = [ SearchComponent, @@ -50,7 +53,8 @@ const COMPONENTS = [ SearchAuthorityFilterComponent, SearchSwitchConfigurationComponent, ConfigurationSearchPageComponent, - ThemedConfigurationSearchPageComponent + ThemedConfigurationSearchPageComponent, + OkrSearchHierarchyFilterComponent ]; const ENTRY_COMPONENTS = [ diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 715ee66a99b..6f4091f465a 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -177,6 +177,10 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { DsSelectComponent } from './ds-select/ds-select.component'; import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'; +import { OkrVocabularyTreeviewComponent } from './okr-vocabulary-treeview/okr-vocabulary-treeview.component'; +import { + OkrSearchHierarchyFilterComponent +} from './search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -346,6 +350,7 @@ const COMPONENTS = [ CommunitySidebarSearchListElementComponent, SearchNavbarComponent, ScopeSelectorModalComponent, + OkrVocabularyTreeviewComponent ]; const ENTRY_COMPONENTS = [ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f742273edbe..3ebe8006efb 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4162,5 +4162,29 @@ "idle-modal.log-out": "Log out", - "idle-modal.extend-session": "Extend session" + "idle-modal.extend-session": "Extend session", + + "search.filters.filter.show-tree": "Browse {{ name }} tree", + + "search.filters.filter.supportedlanguage.placeholder": "Supported Language", + + "search.filters.filter.supportedlanguage.label": "Search supported Language", + + "search.filters.filter.topic.placeholder": "Topic", + + "search.filters.filter.topic.label": "Search topic", + + "search.filters.filter.doctype.placeholder": "Document type", + + "search.filters.filter.doctype.label": "Search document type", + + "search.filters.filter.region.placeholder": "Region", + + "search.filters.filter.region.label": "Search region", + + "search.filters.filter.country.placeholder": "Country", + + "search.filters.filter.country.label": "Search country", + + "okr-vocabulary-treeview.info": "Click a {{ type }} to add a search filter", } diff --git a/src/themes/okr/entry-components.ts b/src/themes/okr/entry-components.ts deleted file mode 100644 index bfc93ad2164..00000000000 --- a/src/themes/okr/entry-components.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component'; -import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; -import { PersonSearchResultListElementComponent } from './app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component'; -import { JournalSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component'; -import { JournalIssueSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component'; -import { JournalVolumeSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component'; -import { CitationsSectionComponent } from './app/item-page/field-components/citation/citations-section.component'; -import { CcIconsComponent } from './app/item-page/field-components/cc-icons/cc-icons.component'; -import { AltmetricDonutComponent } from './app/item-page/field-components/citation/altmetric-donut/altmetric-donut.component'; -import { ItemPageWbDateFieldComponent } from './app/item-page/field-components/specific-field/wb-date/item-page-wb-date-field.component'; -import { ItemPageWbGenericWithFallbackComponent } from './app/item-page/field-components/specific-field/wb-generic-with-fallback/item-page-wb-generic-with-fallback.component'; -import { ItemPageWbExternalContentComponent } from './app/item-page/field-components/specific-field/wb-external-content/item-page-wb-external-content.component'; -import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component'; -import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component'; -import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component'; -import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component'; -import { JournalVolumeGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component'; -import { JournalVolumeSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component'; -import { JournalIssueSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component'; -import { JournalIssueGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component'; -import { JournalVolumeSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component'; -import { JournalIssueSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component'; -import { JournalIssueListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component'; -import { JournalVolumeListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component'; -import { FeaturedPublicationsListElementComponent } from './app/featured-publications/featured-publications-list-element/featured-publications-list-element.component'; -import { ClaimedTaskActionsMarkDuplicateComponent } from './app/shared/mydspace-actions/claimed-task/mark-duplicate/claimed-task-actions-mark-duplicate.component'; -import { ClaimedTaskActionsReportProblemComponent } from './app/shared/mydspace-actions/claimed-task/report-problem/claimed-task-actions-report-problem.component'; -import { SingleStatletTableComponent } from './app/atmire-cua/statlets/shared/single-statlet/graph-types/single-statlet-table/single-statlet-table.component'; -import { OkrSearchHierarchyFilterComponent } from './app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component'; -import { OkrVocabularyTreeviewComponent } from './app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component'; - -export const ENTRY_COMPONENTS = [ - PublicationComponent, - ItemSearchResultListElementComponent, - PersonSearchResultListElementComponent, - JournalSearchResultListElementComponent, - JournalVolumeSearchResultListElementComponent, - JournalIssueSearchResultListElementComponent, - UntypedItemComponent, - AltmetricDonutComponent, - CitationsSectionComponent, - CcIconsComponent, - ItemPageWbDateFieldComponent, - ItemPageWbGenericWithFallbackComponent, - ItemPageWbExternalContentComponent, - JournalComponent, - JournalIssueComponent, - JournalVolumeComponent, - JournalVolumeGridElementComponent, - JournalVolumeSearchResultGridElementComponent, - JournalIssueSearchResultGridElementComponent, - JournalIssueGridElementComponent, - JournalVolumeSidebarSearchListElementComponent, - JournalIssueSidebarSearchListElementComponent, - JournalIssueListElementComponent, - JournalVolumeListElementComponent, - FeaturedPublicationsListElementComponent, - ClaimedTaskActionsMarkDuplicateComponent, - ClaimedTaskActionsReportProblemComponent, - SingleStatletTableComponent, - OkrSearchHierarchyFilterComponent, - OkrVocabularyTreeviewComponent, -]; From 532a59006fa10b0dc78f5b522f92518ecfca404e Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 1 Dec 2022 14:33:23 +0100 Subject: [PATCH 143/758] 97075: Edit-metadata redesign messages + JSDocs --- .../dso-edit-metadata-form.ts | 116 ++++++++++++++++++ .../dso-edit-metadata.component.html | 26 ++-- .../dso-edit-metadata.component.ts | 94 ++++++++++++-- .../metadata-field-selector.component.html | 2 +- .../metadata-field-selector.component.ts | 80 +++++++++++- .../edit-item-page.routing.module.ts | 1 - src/assets/i18n/en.json5 | 4 + 7 files changed, 295 insertions(+), 28 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index 220a4561f6e..984bec575ea 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -6,19 +6,50 @@ import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/pat import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model'; import { MetadataPatchOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model'; +/* tslint:disable:max-classes-per-file */ + +/** + * Enumeration for the type of change occurring on a metadata value + */ export enum DsoEditMetadataChangeType { UPDATE = 1, ADD = 2, REMOVE = 3 } +/** + * Class holding information about a metadata value and its changes within an edit form + */ export class DsoEditMetadataValue { + /** + * The original metadata value (should stay the same!) used to compare changes with + */ originalValue: MetadataValue; + + /** + * The new value, dynamically changing + */ newValue: MetadataValue; + + /** + * A value that can be used to undo any discarding that took place + */ reinstatableValue: MetadataValue; + /** + * Whether or not this value is currently being edited or not + */ editing = false; + + /** + * The type of change that's taking place on this metadata value + * Empty if no changes are made + */ change: DsoEditMetadataChangeType; + + /** + * A type or change that can be used to undo any discarding that took place + */ reinstatableChange: DsoEditMetadataChangeType; constructor(value: MetadataValue, added = false) { @@ -30,6 +61,12 @@ export class DsoEditMetadataValue { } } + /** + * Save the current changes made to the metadata value + * This will set the type of change to UPDATE if the new metadata value's value and/or language are different from + * the original value + * It will also set the editing flag to false + */ confirmChanges() { if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) { if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) { @@ -41,10 +78,19 @@ export class DsoEditMetadataValue { this.editing = false; } + /** + * Returns if the current value contains changes or not + * If the metadata value contains changes, but they haven't been confirmed yet through confirmChanges(), this might + * return false (which is desired) + */ hasChanges(): boolean { return hasValue(this.change); } + /** + * Discard the current changes and mark the value and change type re-instatable by storing them in their relevant + * properties + */ discardAndMarkReinstatable(): void { if (this.change === DsoEditMetadataChangeType.UPDATE) { this.reinstatableValue = this.newValue; @@ -53,12 +99,19 @@ export class DsoEditMetadataValue { this.discard(); } + /** + * Discard the current changes + * Call discardAndMarkReinstatable() instead, if the discard should be re-instatable + */ discard(): void { this.change = undefined; this.newValue = Object.assign(new MetadataValue(), this.originalValue); this.editing = false; } + /** + * Re-instate (undo) the last discard by replacing the value and change type with their reinstate properties (if present) + */ reinstate(): void { if (hasValue(this.reinstatableValue)) { this.newValue = this.reinstatableValue; @@ -70,20 +123,50 @@ export class DsoEditMetadataValue { } } + /** + * Returns if either the value or change type have a re-instatable property + * This will be the case if a discard has taken place that undid changes to the value or type + */ isReinstatable(): boolean { return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange); } } +/** + * Class holding information about the metadata of a DSpaceObject and its changes within an edit form + */ export class DsoEditMetadataForm { + /** + * List of original metadata field keys (before any changes took place) + */ originalFieldKeys: string[]; + + /** + * List of current metadata field keys (includes new fields for values added by the user) + */ fieldKeys: string[]; + + /** + * Current state of the form + * Key: Metadata field + * Value: List of {@link DsoEditMetadataValue}s for the metadata field + */ fields: { [mdField: string]: DsoEditMetadataValue[], }; + + /** + * A map of previously added metadata values before a discard of the form took place + * This can be used to re-instate the entire form to before the discard taking place + */ reinstatableNewValues: { [mdField: string]: DsoEditMetadataValue[], }; + + /** + * A (temporary) new metadata value added by the user, not belonging to a metadata field yet + * This value will be finalised and added to a field using setMetadataField() + */ newValue: DsoEditMetadataValue; constructor(metadata: MetadataMap) { @@ -98,18 +181,32 @@ export class DsoEditMetadataForm { }); } + /** + * Add a new temporary value for the user to edit + */ add(): void { if (hasNoValue(this.newValue)) { this.newValue = new DsoEditMetadataValue(new MetadataValue(), true); } } + /** + * Add the temporary value to a metadata field + * Clear the temporary value afterwards + * @param mdField + */ setMetadataField(mdField: string) { this.newValue.editing = false; this.addValueToField(this.newValue, mdField); this.newValue = undefined; } + /** + * Add a value to a metadata field within the map + * @param value + * @param mdField + * @private + */ private addValueToField(value: DsoEditMetadataValue, mdField: string) { if (isEmpty(this.fields[mdField])) { this.fieldKeys.push(mdField); @@ -118,6 +215,11 @@ export class DsoEditMetadataForm { this.fields[mdField].push(value); } + /** + * Remove a value from a metadata field on a given index (this actually removes the value, not just marking it deleted) + * @param mdField + * @param index + */ remove(mdField: string, index: number) { if (isNotEmpty(this.fields[mdField])) { this.fields[mdField].splice(index, 1); @@ -128,10 +230,17 @@ export class DsoEditMetadataForm { } } + /** + * Returns if at least one value within the form contains a change + */ hasChanges(): boolean { return Object.values(this.fields).some((values) => values.some((value) => value.hasChanges())); } + /** + * Discard all changes within the form and store their current values within re-instatable properties so they can be + * undone afterwards + */ discard(): void { Object.entries(this.fields).forEach(([field, values]) => { let removeFromIndex = -1; @@ -174,6 +283,9 @@ export class DsoEditMetadataForm { this.reinstatableNewValues = {}; } + /** + * Returns if at least one value contains a re-instatable property, meaning a discard can be reversed + */ isReinstatable(): boolean { return isNotEmpty(this.reinstatableNewValues) || Object.values(this.fields) @@ -181,6 +293,9 @@ export class DsoEditMetadataForm { .some((value) => value.isReinstatable())); } + /** + * Get the json PATCH operations for the current changes within this form + */ getOperations(): Operation[] { const operations: Operation[] = []; Object.entries(this.fields).forEach(([field, values]) => { @@ -211,3 +326,4 @@ export class DsoEditMetadataForm { return operations; } } +/* tslint:enable:max-classes-per-file */ diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 4154a9ce564..7578f2ec996 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -20,12 +20,12 @@
    -
    Field
    +
    {{ dsoType + '.edit.metadata.headers.field' | translate }}
    -
    Value
    -
    Lang
    -
    Edit
    +
    {{ dsoType + '.edit.metadata.headers.value' | translate }}
    +
    {{ dsoType + '.edit.metadata.headers.language' | translate }}
    +
    {{ dsoType + '.edit.metadata.headers.edit' | translate }}
    @@ -43,19 +43,19 @@
    - - - - @@ -82,25 +82,25 @@
    - - - -
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index 97f34ba2a33..eee2bc963c7 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -1,28 +1,22 @@ import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AlertType } from '../../shared/alert/aletr-type'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { DsoEditMetadataChangeType, DsoEditMetadataForm, DsoEditMetadataValue } from './dso-edit-metadata-form'; -import { map, switchMap } from 'rxjs/operators'; +import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form'; +import { map } from 'rxjs/operators'; import { ActivatedRoute, Data } from '@angular/router'; import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest'; import { Subscription } from 'rxjs/internal/Subscription'; import { RemoteData } from '../../core/data/remote-data'; import { hasNoValue, hasValue } from '../../shared/empty.util'; -import { RegistryService } from '../../core/registry/registry.service'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; -import { Observable } from 'rxjs/internal/Observable'; -import { followLink } from '../../shared/utils/follow-link-config.model'; import { getFirstCompletedRemoteData, - getFirstSucceededRemoteData, - metadataFieldsToString } from '../../core/shared/operators'; import { UpdateDataService } from '../../core/data/update-data.service'; import { getDataServiceFor } from '../../core/cache/builders/build-decorators'; import { ResourceType } from '../../core/shared/resource-type'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { DataService } from '../../core/data/data.service'; import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component'; @Component({ @@ -30,19 +24,56 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada styleUrls: ['./dso-edit-metadata.component.scss'], templateUrl: './dso-edit-metadata.component.html', }) +/** + * Component showing a table of all metadata on a DSpaceObject and options to modify them + */ export class DsoEditMetadataComponent implements OnInit, OnDestroy { + /** + * DSpaceObject to edit metadata for + */ @Input() dso: DSpaceObject; + + /** + * Reference to the component responsible for showing a metadata-field selector + * Used to validate its contents (existing metadata field) before adding a new metadata value + */ @ViewChild(MetadataFieldSelectorComponent) metadataFieldSelectorComponent: MetadataFieldSelectorComponent; + + /** + * Resolved update data-service for the given DSpaceObject (depending on its type, e.g. ItemDataService for an Item) + * Used to send the PATCH request + */ updateDataService: UpdateDataService; + + /** + * Type of the DSpaceObject in String + * Used to resolve i18n messages + */ dsoType: string; + /** + * A dynamic form object containing all information about the metadata and the changes made to them, see {@link DsoEditMetadataForm} + */ form: DsoEditMetadataForm; + + /** + * The metadata field entered by the user for a new metadata value + */ newMdField: string; + // Properties determined by the state of the dynamic form, updated by onValueSaved() isReinstatable: boolean; hasChanges: boolean; isEmpty: boolean; + + /** + * Whether or not the form is currently being submitted + */ saving$: BehaviorSubject = new BehaviorSubject(false); + + /** + * Whether or not the metadata field is currently being validated + */ loadingFieldValidation$: BehaviorSubject = new BehaviorSubject(false); /** @@ -57,6 +88,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { */ public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType; + /** + * Subscription for updating the current DSpaceObject + * Unsubscribed from in ngOnDestroy() + */ dsoUpdateSubscription: Subscription; constructor(protected route: ActivatedRoute, @@ -65,6 +100,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { protected parentInjector: Injector) { } + /** + * Read the route (or parent route)'s data to retrieve the current DSpaceObject + * After it's retrieved, initialise the data-service and form + */ ngOnInit(): void { if (hasNoValue(this.dso)) { this.dsoUpdateSubscription = observableCombineLatest([this.route.data, this.route.parent.data]).pipe( @@ -81,6 +120,9 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { } } + /** + * Initialise (resolve) the data-service for the current DSpaceObject + */ initDataService(): void { let type: ResourceType; if (typeof this.dso.type === 'string') { @@ -96,17 +138,29 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { this.dsoType = type.value; } + /** + * Initialise the dynamic form object by passing the DSpaceObject's metadata + * Call onValueSaved() to update the form's state properties + */ initForm(): void { this.form = new DsoEditMetadataForm(this.dso.metadata); this.onValueSaved(); } + /** + * Update the form's state properties + */ onValueSaved(): void { this.hasChanges = this.form.hasChanges(); this.isReinstatable = this.form.isReinstatable(); this.isEmpty = Object.keys(this.form.fields).length === 0; } + /** + * Submit the current changes to the form by retrieving json PATCH operations from the form and sending it to the + * DSpaceObject's data-service + * Display notificiations and reset the form afterwards if successful + */ submit(): void { this.saving$.next(true); this.updateDataService.patch(this.dso, this.form.getOperations()).pipe( @@ -114,15 +168,23 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { ).subscribe((rd: RemoteData) => { this.saving$.next(false); if (rd.hasFailed) { - this.notificationsService.error('error', rd.errorMessage); + this.notificationsService.error(this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.error.title`), rd.errorMessage); } else { - this.notificationsService.success('saved', 'saved'); + this.notificationsService.success( + this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.title`), + this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.content`) + ); this.dso = rd.payload; this.initForm(); } }); } + /** + * Set the metadata field of the temporary added new metadata value + * This will move the new value to its respective parent metadata field + * Validate the metadata field first + */ setMetadataField() { this.loadingFieldValidation$.next(true); this.metadataFieldSelectorComponent.validate().subscribe((valid) => { @@ -134,21 +196,33 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { }); } + /** + * Add a new temporary metadata value + */ add(): void { this.newMdField = undefined; this.form.add(); } + /** + * Discard all changes within the current form + */ discard(): void { this.form.discard(); this.onValueSaved(); } + /** + * Restore any changes previously discarded from the form + */ reinstate(): void { this.form.reinstate(); this.onValueSaved(); } + /** + * Unsubscribe from any open subscriptions + */ ngOnDestroy() { if (hasValue(this.dsoUpdateSubscription)) { this.dsoUpdateSubscription.unsubscribe(); diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html index 2a69c211880..4c310bd81bd 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html @@ -6,7 +6,7 @@ (focusin)="query$.next(mdField)" (dsClickOutside)="query$.next(null)" (click)="$event.stopPropagation();" /> -
    Invalid metadata field, please pick an existing one from the suggestions when searching
    +
    {{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}
    diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index cde41dee965..7fc56f8dc25 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -12,14 +12,14 @@ import { import { switchMap, debounceTime, distinctUntilChanged, map, tap, take } from 'rxjs/operators'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { - getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteData, + getAllSucceededRemoteData, getFirstSucceededRemoteData, metadataFieldsToString } from '../../../core/shared/operators'; import { Observable } from 'rxjs/internal/Observable'; import { RegistryService } from '../../../core/registry/registry.service'; import { FormControl } from '@angular/forms'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; -import { hasValue, isNotEmpty } from '../../../shared/empty.util'; +import { hasValue } from '../../../shared/empty.util'; import { Subscription } from 'rxjs/internal/Subscription'; @Component({ @@ -27,25 +27,83 @@ import { Subscription } from 'rxjs/internal/Subscription'; styleUrls: ['./metadata-field-selector.component.scss'], templateUrl: './metadata-field-selector.component.html' }) +/** + * Component displaying a searchable input for metadata-fields + */ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterViewInit { + /** + * Type of the DSpaceObject + * Used to resolve i18n messages + */ + @Input() dsoType: string; + + /** + * The currently entered metadata field + */ @Input() mdField: string; + + /** + * If true, the input will be automatically focussed upon when the component is first loaded + */ @Input() autofocus = false; + + /** + * Emit any changes made to the metadata field + * This will only emit after a debounce takes place to avoid constant emits when the user is typing + */ @Output() mdFieldChange = new EventEmitter(); + + /** + * Reference to the metadata-field's input + */ @ViewChild('mdFieldInput', { static: true }) mdFieldInput: ElementRef; + + /** + * List of available metadata field options to choose from, dependent on the current query the user entered + * Shows up in a dropdown below the input + */ mdFieldOptions$: Observable; + /** + * FormControl for the input + */ public input: FormControl = new FormControl(); + /** + * The current query to update mdFieldOptions$ for + * This is controlled by a debounce, to avoid too many requests + */ query$: BehaviorSubject = new BehaviorSubject(null); + + /** + * The amount of time to debounce the query for (in ms) + */ debounceTime = 300; + + /** + * Whether or not the the user just selected a value + * This flag avoids the metadata field from updating twice, which would result in the dropdown opening again right after selecting a value + */ selectedValueLoading = false; + + /** + * Whether or not to show the invalid feedback + * True when validate() is called and the mdField isn't present in the available metadata fields retrieved from the server + */ showInvalid = false; + /** + * Subscriptions to unsubscribe from on destroy + */ subs: Subscription[] = []; constructor(protected registryService: RegistryService) { } + /** + * Subscribe to any changes made to the input, with a debounce and fire a query, as well as emit the change from this component + * Update the mdFieldOptions$ depending on the query$ fired by querying the server + */ ngOnInit(): void { this.subs.push( this.input.valueChanges.pipe( @@ -75,10 +133,19 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV ); } + /** + * Focus the input if autofocus is enabled + */ ngAfterViewInit(): void { - this.mdFieldInput.nativeElement.focus(); + if (this.autofocus) { + this.mdFieldInput.nativeElement.focus(); + } } + /** + * Validate the metadata field to check if it exists on the server and return an observable boolean for success/error + * Upon subscribing to the returned observable, the showInvalid flag is updated accordingly to show the feedback under the input + */ validate(): Observable { return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe( getFirstSucceededRemoteData(), @@ -89,11 +156,18 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV ); } + /** + * Select a metadata field from the dropdown optipons + * @param mdFieldOption + */ select(mdFieldOption: string) { this.selectedValueLoading = true; this.input.setValue(mdFieldOption); } + /** + * Unsubscribe from any open subscriptions + */ ngOnDestroy(): void { this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); } 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 bd8af3742e3..7ccf1fec378 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 @@ -7,7 +7,6 @@ import { ItemPrivateComponent } from './item-private/item-private.component'; import { ItemPublicComponent } from './item-public/item-public.component'; import { ItemDeleteComponent } from './item-delete/item-delete.component'; import { ItemStatusComponent } from './item-status/item-status.component'; -import { ItemMetadataComponent } from './item-metadata/item-metadata.component'; import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component'; import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component'; import { ItemMoveComponent } from './item-move/item-move.component'; diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f742273edbe..93ee1427af8 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1791,6 +1791,10 @@ "item.edit.metadata.discard-button": "Discard", + "item.edit.metadata.edit.buttons.confirm": "Confirm", + + "item.edit.metadata.edit.buttons.drag": "Drag to reorder", + "item.edit.metadata.edit.buttons.edit": "Edit", "item.edit.metadata.edit.buttons.remove": "Remove", From edc73d35852bc70ac930546d344e0c250f79d1aa Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Thu, 1 Dec 2022 15:01:11 +0100 Subject: [PATCH 144/758] 97049: Refactor how to obtain vocabularies for filter (configurable) --- config/config.yml | 5 +++++ .../okr-search-hierarchy-filter.component.ts | 16 ++++++++++++++-- src/config/FilterVocabularyConfig.ts | 7 +++++++ src/config/app-config.interface.ts | 2 ++ src/config/default-app-config.ts | 9 +++++++++ src/environments/environment.test.ts | 10 +++++++++- 6 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 src/config/FilterVocabularyConfig.ts diff --git a/config/config.yml b/config/config.yml index b5eecd112f0..5b171d9cc41 100644 --- a/config/config.yml +++ b/config/config.yml @@ -3,3 +3,8 @@ rest: host: api7.dspace.org port: 443 nameSpace: /server + +vocabularies: + - filter: 'subject' + vocabulary: 'srsc' + enabled: true diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts index 530b3d8d2bd..f3a1a413554 100644 --- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts @@ -23,6 +23,7 @@ import { filter, map, take } from 'rxjs/operators'; import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; import { Observable } from 'rxjs'; import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { environment } from '../../../../../../environments/environment'; /** * Component that represents a hierarchy facet for a specific filter configuration. @@ -63,7 +64,7 @@ export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComp ngOnInit() { super.ngOnInit(); this.vocabularyExists$ = this.vocabularyService.searchTopEntries( - this.filterConfig.name, new PageInfo(), true, false, + this.getVocabularyEntry(), new PageInfo(), true, false, ).pipe( filter(rd => rd.hasCompleted), take(1), @@ -83,7 +84,7 @@ export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComp windowClass: 'treeview' }); modalRef.componentInstance.vocabularyOptions = { - name: this.filterConfig.name, + name: this.getVocabularyEntry(), closed: true }; modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => { @@ -103,4 +104,15 @@ export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComp }); }); } + + /** + * Returns the matching vocabulary entry for the given search filter. + * These are configurable in the config file. + */ + getVocabularyEntry() { + const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name); + if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) { + return foundVocabularyConfig[0].vocabulary; + } + } } diff --git a/src/config/FilterVocabularyConfig.ts b/src/config/FilterVocabularyConfig.ts new file mode 100644 index 00000000000..a9b37af2d81 --- /dev/null +++ b/src/config/FilterVocabularyConfig.ts @@ -0,0 +1,7 @@ +import { Config } from './config.interface'; + +export interface FilterVocabularyConfig extends Config { + filter: string; + vocabulary: string; + enabled: boolean; +} diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index 62d0be72169..21682e7c459 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -15,6 +15,7 @@ import { AuthConfig } from './auth-config.interfaces'; import { UIServerConfig } from './ui-server-config.interface'; import { MediaViewerConfig } from './media-viewer-config.interface'; import { BrowseByConfig } from './browse-by-config.interface'; +import { FilterVocabularyConfig } from './FilterVocabularyConfig'; interface AppConfig extends Config { ui: UIServerConfig; @@ -34,6 +35,7 @@ interface AppConfig extends Config { collection: CollectionPageConfig; themes: ThemeConfig[]; mediaViewer: MediaViewerConfig; + vocabularies: FilterVocabularyConfig[]; } const APP_CONFIG = new InjectionToken('APP_CONFIG'); diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index df9bbe9369b..65d8691421a 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -15,6 +15,7 @@ import { SubmissionConfig } from './submission-config.interface'; import { ThemeConfig } from './theme.model'; import { UIServerConfig } from './ui-server-config.interface'; import { UniversalConfig } from './universal-config.interface'; +import { FilterVocabularyConfig } from './FilterVocabularyConfig'; export class DefaultAppConfig implements AppConfig { production = false; @@ -314,4 +315,12 @@ export class DefaultAppConfig implements AppConfig { image: false, video: false }; + + vocabularies: FilterVocabularyConfig[] = [ + { + filter: 'subject', + vocabulary: 'srsc', + enabled: true + } + ]; } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index f8a3248837f..0ba688fac53 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -227,5 +227,13 @@ export const environment: AppConfig = { mediaViewer: { image: true, video: true - } + }, + + vocabularies: [ + { + filter: 'subject', + vocabulary: 'srsc', + enabled: true + } + ] }; From be0b54e05863266a207a7451219a8da28f9b2fdc Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Thu, 1 Dec 2022 15:08:58 +0100 Subject: [PATCH 145/758] change sitemap entries in robots.txt to absolute urls --- package.json | 2 ++ server.ts | 14 +++++++++ src/{robots.txt => robots.txt.ejs} | 4 +-- webpack/webpack.common.ts | 4 +-- yarn.lock | 50 +++++++++++++++++++++++++++++- 5 files changed, 69 insertions(+), 5 deletions(-) rename src/{robots.txt => robots.txt.ejs} (97%) diff --git a/package.json b/package.json index 278afdf6c38..3cc9ccb694d 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "cookie-parser": "1.4.5", "core-js": "^3.7.0", "deepmerge": "^4.2.2", + "ejs": "^3.1.8", "express": "^4.17.1", "express-rate-limit": "^5.1.3", "fast-json-patch": "^3.0.0-1", @@ -133,6 +134,7 @@ "@ngtools/webpack": "10.2.3", "@nguniversal/builders": "~11.2.1", "@types/deep-freeze": "0.1.2", + "@types/ejs": "^3.1.1", "@types/express": "^4.17.9", "@types/file-saver": "^2.0.1", "@types/jasmine": "~3.6.0", diff --git a/server.ts b/server.ts index da3b877bc13..e084998f561 100644 --- a/server.ts +++ b/server.ts @@ -23,6 +23,7 @@ import * as pem from 'pem'; import * as https from 'https'; import * as morgan from 'morgan'; import * as express from 'express'; +import * as ejs from 'ejs'; import * as bodyParser from 'body-parser'; import * as compression from 'compression'; @@ -120,10 +121,23 @@ export function app() { })(_, (options as any), callback) ); + server.engine('ejs', ejs.renderFile); + /* * Register the view engines for html and ejs */ server.set('view engine', 'html'); + server.set('view engine', 'ejs'); + + /** + * Serve the robots.txt ejs template, filling in the origin variable + */ + server.get('/robots.txt', (req, res) => { + res.setHeader('content-type', 'text/plain'); + res.render('assets/robots.txt.ejs', { + 'origin': req.protocol + '://' + req.headers.host + }); + }); /* * Set views folder path to directory where template files are stored diff --git a/src/robots.txt b/src/robots.txt.ejs similarity index 97% rename from src/robots.txt rename to src/robots.txt.ejs index 04cbb888e06..cd5e228b3a0 100644 --- a/src/robots.txt +++ b/src/robots.txt.ejs @@ -1,7 +1,7 @@ # The URL to the DSpace sitemaps # XML sitemap is listed first as it is preferred by most search engines -Sitemap: /sitemap_index.xml -Sitemap: /sitemap_index.html +Sitemap: <%= origin %>/sitemap_index.xml +Sitemap: <%= origin %>/sitemap_index.html ########################## # Default Access Group diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts index 07e55d89d4a..77fe941ec45 100644 --- a/webpack/webpack.common.ts +++ b/webpack/webpack.common.ts @@ -34,8 +34,8 @@ export const copyWebpackOptions = { }, }, { - from: path.join(__dirname, '..', 'src', 'robots.txt'), - to: 'robots.txt' + from: path.join(__dirname, '..', 'src', 'robots.txt.ejs'), + to: 'assets/robots.txt.ejs' } ] }; diff --git a/yarn.lock b/yarn.lock index 0f8ef0a6e60..941136052fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1982,6 +1982,11 @@ resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.2.tgz#68e5379291910e82c2f0d1629732163c2aa662cc" integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ== +"@types/ejs@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.1.tgz#29c539826376a65e7f7d672d51301f37ed718f6d" + integrity sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA== + "@types/express-serve-static-core@^4.17.18": version "4.17.26" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz#5d9a8eeecb9d5f9d7fc1d85f541512a84638ae88" @@ -2905,6 +2910,11 @@ async@^3.2.0: resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== +async@^3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -3222,6 +3232,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" @@ -3701,7 +3718,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4 escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@~4.1.0: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@~4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -5511,6 +5528,13 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +ejs@^3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" + integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== + dependencies: + jake "^10.8.5" + electron-to-chromium@^1.3.896: version "1.4.12" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.12.tgz#5f73d1278c6205fc41d7a0ebd75563046b77c5d8" @@ -6171,6 +6195,13 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== +filelist@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + filesize@^6.1.0: version "6.4.0" resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" @@ -7937,6 +7968,16 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" +jake@^10.8.5: + version "10.8.5" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.1" + minimatch "^3.0.4" + jasmine-core@^3.6.0: version "3.10.1" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.10.1.tgz#7aa6fa2b834a522315c651a128d940eca553989a" @@ -9046,6 +9087,13 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.1.tgz#6c9dffcf9927ff2a31e74b5af11adf8b9604b022" + integrity sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" From 85ccfc6ea749d214a43972728be8309cdcbe442b Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Thu, 1 Dec 2022 15:30:30 +0100 Subject: [PATCH 146/758] 97049: Remove client structure --- .../okr-vocabulary-treeview.component.scss | 0 .../okr-vocabulary-treeview.component.ts | 41 ------ ...okr-search-hierarchy-filter.component.html | 8 -- ...okr-search-hierarchy-filter.component.scss | 0 .../okr-search-hierarchy-filter.component.ts | 118 ------------------ .../search-hierarchy-filter.component.html | 7 ++ ...search-hierarchy-filter.component.spec.ts} | 12 +- .../search-hierarchy-filter.component.ts | 106 ++++++++++++++-- src/app/shared/search/search.module.ts | 6 +- src/app/shared/shared.module.ts | 5 - .../vocabulary-treeview.component.ts | 31 ++--- 11 files changed, 125 insertions(+), 209 deletions(-) delete mode 100644 src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss delete mode 100644 src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts delete mode 100644 src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html delete mode 100644 src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss delete mode 100644 src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts rename src/app/shared/search/search-filters/search-filter/{okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts => search-hierarchy-filter/search-hierarchy-filter.component.spec.ts} (92%) diff --git a/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts b/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts deleted file mode 100644 index 80dcb1f739d..00000000000 --- a/src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component } from '@angular/core'; -import { VocabularyTreeviewComponent } from '../vocabulary-treeview/vocabulary-treeview.component'; -import { filter, map, startWith } from 'rxjs/operators'; -import { PageInfo } from '../../core/shared/page-info.model'; -import { lowerCase } from 'lodash'; - -/** - * Component that show a hierarchical vocabulary in a tree view. - * Worldbank customization which omits the authentication check. - */ -@Component({ - selector: 'ds-okr-vocabulary-treeview', - templateUrl: '../vocabulary-treeview/vocabulary-treeview.component.html', - styleUrls: [ - './okr-vocabulary-treeview.component.scss', - '../vocabulary-treeview/vocabulary-treeview.component.scss', - ] -}) -export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent { - - /** - * Initialize the component, setting up the data to build the tree - */ - ngOnInit(): void { - this.subs.push( - this.vocabularyTreeviewService.getData().subscribe((data) => { - this.dataSource.data = data; - }) - ); - - this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe( - map((type) => lowerCase(type)), - ).subscribe( - (type) => this.description = this.translate.get('okr-vocabulary-treeview.info', { type }) - ); - - this.loading = this.vocabularyTreeviewService.isLoading(); - - this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), null); - } -} diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html deleted file mode 100644 index 731b5045bf1..00000000000 --- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }} - diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts deleted file mode 100644 index f3a1a413554..00000000000 --- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { Component, Inject } from '@angular/core'; -import { renderFacetFor } from '../search-filter-type-decorator'; -import { FilterType } from '../../../models/filter-type.model'; -import { facetLoad } from '../search-facet-filter/search-facet-filter.component'; -import { SearchHierarchyFilterComponent } from '../search-hierarchy-filter/search-hierarchy-filter.component'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { OkrVocabularyTreeviewComponent } from '../../../../okr-vocabulary-treeview/okr-vocabulary-treeview.component'; -import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { SearchService } from '../../../../../core/shared/search/search.service'; -import { - FILTER_CONFIG, - IN_PLACE_SEARCH, - SearchFilterService -} from '../../../../../core/shared/search/search-filter.service'; -import { Router } from '@angular/router'; -import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; -import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; -import { SearchFilterConfig } from '../../../models/search-filter-config.model'; -import { FacetValue } from '../../../models/facet-value.model'; -import { getFacetValueForType } from '../../../search.utils'; -import { filter, map, take } from 'rxjs/operators'; -import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; -import { Observable } from 'rxjs'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { environment } from '../../../../../../environments/environment'; - -/** - * Component that represents a hierarchy facet for a specific filter configuration. - * Worldbank customization which features a link at the bottom to open a vocabulary popup, - */ -@Component({ - selector: 'ds-okr-search-hierarchy-filter', - styleUrls: ['./okr-search-hierarchy-filter.component.scss'], - templateUrl: './okr-search-hierarchy-filter.component.html', - animations: [facetLoad] -}) -@renderFacetFor(FilterType.hierarchy) -export class OkrSearchHierarchyFilterComponent extends SearchHierarchyFilterComponent { - - constructor(protected searchService: SearchService, - protected filterService: SearchFilterService, - protected rdbs: RemoteDataBuildService, - protected router: Router, - protected modalService: NgbModal, - protected vocabularyService: VocabularyService, - @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService, - @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean, - @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig, - ) { - super( - searchService, - filterService, - rdbs, - router, - searchConfigService, - inPlaceSearch, - filterConfig, - ); - } - - vocabularyExists$: Observable; - - ngOnInit() { - super.ngOnInit(); - this.vocabularyExists$ = this.vocabularyService.searchTopEntries( - this.getVocabularyEntry(), new PageInfo(), true, false, - ).pipe( - filter(rd => rd.hasCompleted), - take(1), - map(rd => { - return rd.hasSucceeded; - }), - ); - } - - /** - * Open the vocabulary tree modal popup. - * When an entry is selected, add the filter query to the search options. - */ - showVocabularyTree() { - const modalRef: NgbModalRef = this.modalService.open(OkrVocabularyTreeviewComponent, { - size: 'lg', - windowClass: 'treeview' - }); - modalRef.componentInstance.vocabularyOptions = { - name: this.getVocabularyEntry(), - closed: true - }; - modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => { - this.selectedValues$ - .pipe(take(1)) - .subscribe((selectedValues) => { - this.router.navigate( - [this.searchService.getSearchLink()], - { - queryParams: { - [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}] - .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)), - }, - queryParamsHandling: 'merge', - }, - ); - }); - }); - } - - /** - * Returns the matching vocabulary entry for the given search filter. - * These are configurable in the config file. - */ - getVocabularyEntry() { - const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name); - if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) { - return foundVocabularyConfig[0].vocabulary; - } - } -} diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html index 49ca6fe3fdd..eb49235641f 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html @@ -29,3 +29,10 @@ ngDefaultControl >
    + + + {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }} + diff --git a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts similarity index 92% rename from src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index fe0866468af..41ab296c183 100644 --- a/src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -1,4 +1,4 @@ -import { OkrSearchHierarchyFilterComponent } from './okr-search-hierarchy-filter.component'; +import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; @@ -23,12 +23,12 @@ import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub'; import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model'; -import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model'; +import { FacetValue} from '../../../models/facet-value.model'; +import { SearchFilterConfig } from '../../../models/search-filter-config.model'; describe('OkrSearchHierarchyFilterComponent', () => { - let fixture: ComponentFixture; + let fixture: ComponentFixture; let showVocabularyTreeLink: DebugElement; const testSearchLink = 'test-search'; @@ -62,7 +62,7 @@ describe('OkrSearchHierarchyFilterComponent', () => { TranslateModule.forRoot(), ], declarations: [ - OkrSearchHierarchyFilterComponent, + SearchHierarchyFilterComponent, ], providers: [ { provide: SearchService, useValue: searchService }, @@ -80,7 +80,7 @@ describe('OkrSearchHierarchyFilterComponent', () => { }); function init() { - fixture = TestBed.createComponent(OkrSearchHierarchyFilterComponent); + fixture = TestBed.createComponent(SearchHierarchyFilterComponent); fixture.detectChanges(); showVocabularyTreeLink = fixture.debugElement.query(By.css('a#show-test-search-filter-tree')); } diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts index 7aa81116de4..e24e6c6d02f 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts @@ -1,18 +1,110 @@ -import { Component, OnInit } from '@angular/core'; -import { FilterType } from '../../../models/filter-type.model'; +import { Component, Inject, OnInit } from '@angular/core'; import { renderFacetFor } from '../search-filter-type-decorator'; +import { FilterType } from '../../../models/filter-type.model'; import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component'; +import { + VocabularyEntryDetail +} from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; +import { SearchService } from '../../../../../core/shared/search/search.service'; +import { + FILTER_CONFIG, + IN_PLACE_SEARCH, + SearchFilterService +} from '../../../../../core/shared/search/search-filter.service'; +import { Router } from '@angular/router'; +import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service'; +import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service'; +import { SearchFilterConfig } from '../../../models/search-filter-config.model'; +import { FacetValue } from '../../../models/facet-value.model'; +import { getFacetValueForType } from '../../../search.utils'; +import { filter, map, take } from 'rxjs/operators'; +import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; +import { Observable } from 'rxjs'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { environment } from '../../../../../../environments/environment'; +/** + * Component that represents a hierarchy facet for a specific filter configuration. + */ @Component({ selector: 'ds-search-hierarchy-filter', styleUrls: ['./search-hierarchy-filter.component.scss'], templateUrl: './search-hierarchy-filter.component.html', animations: [facetLoad] }) - -/** - * Component that represents a hierarchy facet for a specific filter configuration - */ -// @renderFacetFor(FilterType.hierarchy) +@renderFacetFor(FilterType.hierarchy) export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit { + + constructor(protected searchService: SearchService, + protected filterService: SearchFilterService, + protected rdbs: RemoteDataBuildService, + protected router: Router, + protected modalService: NgbModal, + protected vocabularyService: VocabularyService, + @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService, + @Inject(IN_PLACE_SEARCH) public inPlaceSearch: boolean, + @Inject(FILTER_CONFIG) public filterConfig: SearchFilterConfig, + ) { + super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig); + } + + vocabularyExists$: Observable; + + ngOnInit() { + super.ngOnInit(); + this.vocabularyExists$ = this.vocabularyService.searchTopEntries( + this.getVocabularyEntry(), new PageInfo(), true, false, + ).pipe( + filter(rd => rd.hasCompleted), + take(1), + map(rd => { + return rd.hasSucceeded; + }), + ); + } + + /** + * Open the vocabulary tree modal popup. + * When an entry is selected, add the filter query to the search options. + */ + showVocabularyTree() { + const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewComponent, { + size: 'lg', + windowClass: 'treeview' + }); + modalRef.componentInstance.vocabularyOptions = { + name: this.getVocabularyEntry(), + closed: true + }; + modalRef.componentInstance.select.subscribe((detail: VocabularyEntryDetail) => { + this.selectedValues$ + .pipe(take(1)) + .subscribe((selectedValues) => { + this.router.navigate( + [this.searchService.getSearchLink()], + { + queryParams: { + [this.filterConfig.paramName]: [...selectedValues, {value: detail.value}] + .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)), + }, + queryParamsHandling: 'merge', + }, + ); + }); + }); + } + + /** + * Returns the matching vocabulary entry for the given search filter. + * These are configurable in the config file. + */ + getVocabularyEntry() { + const foundVocabularyConfig = environment.vocabularies.filter((v) => v.filter === this.filterConfig.name); + if (foundVocabularyConfig.length > 0 && foundVocabularyConfig[0].enabled === true) { + return foundVocabularyConfig[0].vocabulary; + } + } } diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts index e9c0b3e121b..668d260c23a 100644 --- a/src/app/shared/search/search.module.ts +++ b/src/app/shared/search/search.module.ts @@ -28,9 +28,6 @@ import { MissingTranslationHelper } from '../translate/missing-translation.helpe import { SharedModule } from '../shared.module'; import { SearchResultsComponent } from './search-results/search-results.component'; import { SearchComponent } from './search.component'; -import { - OkrSearchHierarchyFilterComponent -} from './search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component'; const COMPONENTS = [ SearchComponent, @@ -53,8 +50,7 @@ const COMPONENTS = [ SearchAuthorityFilterComponent, SearchSwitchConfigurationComponent, ConfigurationSearchPageComponent, - ThemedConfigurationSearchPageComponent, - OkrSearchHierarchyFilterComponent + ThemedConfigurationSearchPageComponent ]; const ENTRY_COMPONENTS = [ diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 6f4091f465a..715ee66a99b 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -177,10 +177,6 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { DsSelectComponent } from './ds-select/ds-select.component'; import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'; -import { OkrVocabularyTreeviewComponent } from './okr-vocabulary-treeview/okr-vocabulary-treeview.component'; -import { - OkrSearchHierarchyFilterComponent -} from './search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -350,7 +346,6 @@ const COMPONENTS = [ CommunitySidebarSearchListElementComponent, SearchNavbarComponent, ScopeSelectorModalComponent, - OkrVocabularyTreeviewComponent ]; const ENTRY_COMPONENTS = [ diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts index f9e4d04f3b6..b62c4a22744 100644 --- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts +++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts @@ -2,7 +2,7 @@ import { FlatTreeControl } from '@angular/cdk/tree'; import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { filter, find, startWith } from 'rxjs/operators'; +import { filter, find, startWith, map } from 'rxjs/operators'; import { Observable, Subscription } from 'rxjs'; import { select, Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; @@ -18,6 +18,7 @@ import { PageInfo } from '../../core/shared/page-info.model'; import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model'; import { VocabularyTreeFlattener } from './vocabulary-tree-flattener'; import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source'; +import { lowerCase } from 'lodash'; /** * Component that show a hierarchical vocabulary in a tree view @@ -98,7 +99,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit { /** * Array to track all subscriptions and unsubscribe them onDestroy */ - protected subs: Subscription[] = []; + private subs: Subscription[] = []; /** * Initialize instance variables @@ -110,9 +111,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit { */ constructor( public activeModal: NgbActiveModal, - protected vocabularyTreeviewService: VocabularyTreeviewService, - protected store: Store, - protected translate: TranslateService + private vocabularyTreeviewService: VocabularyTreeviewService, + private store: Store, + private translate: TranslateService ) { this.treeFlattener = new VocabularyTreeFlattener(this.transformer, this.getLevel, this.isExpandable, this.getChildren); @@ -203,23 +204,15 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit { }) ); - const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name; - this.description = this.translate.get(descriptionLabel).pipe( - filter((msg) => msg !== descriptionLabel), - startWith('') + this.translate.get(`search.filters.filter.${this.vocabularyOptions.name}.head`).pipe( + map((type) => lowerCase(type)), + ).subscribe( + (type) => this.description = this.translate.get('okr-vocabulary-treeview.info', { type }) ); - // set isAuthenticated - this.isAuthenticated = this.store.pipe(select(isAuthenticated)); - this.loading = this.vocabularyTreeviewService.isLoading(); - this.isAuthenticated.pipe( - find((isAuth) => isAuth) - ).subscribe(() => { - const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null; - this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId); - }); + this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), null); } /** @@ -301,7 +294,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit { /** * Return an id for a given {@link VocabularyEntry} */ - protected getEntryId(entry: VocabularyEntry): string { + private getEntryId(entry: VocabularyEntry): string { return entry.authority || entry.otherInformation.id || undefined; } } From 472c2a1dd1da96b509bd75688914caea786156f1 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Thu, 1 Dec 2022 15:34:41 +0100 Subject: [PATCH 147/758] 97049: Remove client structure --- .../search-hierarchy-filter.component.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index 41ab296c183..88cb0400e22 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -26,14 +26,14 @@ import { VocabularyEntryDetail } from '../../../../../core/submission/vocabulari import { FacetValue} from '../../../models/facet-value.model'; import { SearchFilterConfig } from '../../../models/search-filter-config.model'; -describe('OkrSearchHierarchyFilterComponent', () => { +fdescribe('SearchHierarchyFilterComponent', () => { let fixture: ComponentFixture; let showVocabularyTreeLink: DebugElement; const testSearchLink = 'test-search'; const testSearchFilter = 'test-search-filter'; - const okrVocabularyTreeViewComponent = { + const VocabularyTreeViewComponent = { select: new EventEmitter(), }; @@ -47,7 +47,7 @@ describe('OkrSearchHierarchyFilterComponent', () => { const router = new RouterStub(); const ngbModal = jasmine.createSpyObj('modal', { open: { - componentInstance: okrVocabularyTreeViewComponent, + componentInstance: VocabularyTreeViewComponent, } }); const vocabularyService = { @@ -134,7 +134,7 @@ describe('OkrSearchHierarchyFilterComponent', () => { fixture.componentInstance.selectedValues$ = observableOf( alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value })) ); - okrVocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), { + VocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), { value: newSelectedValue, })); }); From dd3a528c485a9f1644fe61525cea0dc81c4367f7 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Thu, 1 Dec 2022 16:52:50 +0100 Subject: [PATCH 148/758] 97049: Remove accidental focused describe --- .../search-hierarchy-filter.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index 88cb0400e22..306d2523956 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -26,7 +26,7 @@ import { VocabularyEntryDetail } from '../../../../../core/submission/vocabulari import { FacetValue} from '../../../models/facet-value.model'; import { SearchFilterConfig } from '../../../models/search-filter-config.model'; -fdescribe('SearchHierarchyFilterComponent', () => { +describe('SearchHierarchyFilterComponent', () => { let fixture: ComponentFixture; let showVocabularyTreeLink: DebugElement; From 6ed762a8ac1fcbe206b0f656b18457577cce49d8 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Thu, 1 Dec 2022 17:12:14 +0100 Subject: [PATCH 149/758] 97049: alter tests --- .../vocabulary-treeview/vocabulary-treeview.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts index 1bdf4b9df7e..d965bc7f4b5 100644 --- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts +++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts @@ -141,7 +141,7 @@ describe('VocabularyTreeviewComponent test suite', () => { comp.selectedItem = currentValue; fixture.detectChanges(); expect(comp.dataSource.data).toEqual([]); - expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID'); + expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), null); }); it('should should init component properly with init value as VocabularyEntry', () => { @@ -153,7 +153,7 @@ describe('VocabularyTreeviewComponent test suite', () => { comp.selectedItem = currentValue; fixture.detectChanges(); expect(comp.dataSource.data).toEqual([]); - expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID'); + expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), null); }); it('should call loadMore function', () => { From 4ba5eba5565e4b231c7d53953152e6c25fc3708f Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 30 Nov 2022 13:30:09 +0100 Subject: [PATCH 150/758] 95335: Display error message when DSOSelectorComponent can't successfully retrieve the next page of DSOs --- .../dso-selector/dso-selector.component.html | 6 +-- .../dso-selector/dso-selector.component.ts | 37 +++++++++++++------ src/assets/i18n/en.json5 | 2 + 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index 8abb8ad5584..c4f5dbc4cd6 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -21,12 +21,12 @@ diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts index d40629f597f..20b79168d17 100644 --- a/src/app/register-email-form/register-email-form.component.ts +++ b/src/app/register-email-form/register-email-form.component.ts @@ -1,11 +1,13 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { NotificationsService } from '../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { Router } from '@angular/router'; -import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { Registration } from '../core/shared/registration.model'; -import { RemoteData } from '../core/data/remote-data'; +import {Component, Input, OnInit} from '@angular/core'; +import {EpersonRegistrationService} from '../core/data/eperson-registration.service'; +import {NotificationsService} from '../shared/notifications/notifications.service'; +import {TranslateService} from '@ngx-translate/core'; +import {Router} from '@angular/router'; +import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'; +import {Registration} from '../core/shared/registration.model'; +import {RemoteData} from '../core/data/remote-data'; +import {ConfigurationDataService} from "../core/data/configuration-data.service"; +import {getFirstCompletedRemoteData} from "../core/shared/operators"; @Component({ selector: 'ds-register-email-form', @@ -27,14 +29,16 @@ export class RegisterEmailFormComponent implements OnInit { @Input() MESSAGE_PREFIX: string; + valid_mail_domains: string[]; + constructor( private epersonRegistrationService: EpersonRegistrationService, private notificationService: NotificationsService, private translateService: TranslateService, private router: Router, - private formBuilder: FormBuilder + private formBuilder: FormBuilder, + private configurationService: ConfigurationDataService ) { - } ngOnInit(): void { @@ -45,7 +49,13 @@ export class RegisterEmailFormComponent implements OnInit { ], }) }); - + this.valid_mail_domains = []; + this.configurationService.findByPropertyName('authentication-password.domain.valid') + .pipe(getFirstCompletedRemoteData()) + .subscribe((remoteData) =>{ + this.valid_mail_domains.push(remoteData.payload.values[0]); + } + ); } /** From 6467c21a553247c3a6eb0fa5507c925a0d3dd0e4 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Wed, 7 Dec 2022 11:33:14 -0600 Subject: [PATCH 180/758] Enable Ukrainian by default --- config/config.example.yml | 3 +++ src/config/default-app-config.ts | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/config.example.yml b/config/config.example.yml index 27400f00411..a6673457ab2 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -170,6 +170,9 @@ languages: - code: el label: Ελληνικά active: true + - code: uk + label: Yкраї́нська + active: true # Browse-By Pages browseBy: diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index f489abc53b9..aeab5d63ac8 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -204,7 +204,8 @@ export class DefaultAppConfig implements AppConfig { { code: 'kk', label: 'Қазақ', active: true }, { code: 'bn', label: 'বাংলা', active: true }, { code: 'hi', label: 'हिंदी', active: true}, - { code: 'el', label: 'Ελληνικά', active: true } + { code: 'el', label: 'Ελληνικά', active: true }, + { code: 'uk', label: 'Yкраї́нська', active: true} ]; // Browse-By Pages From f378d53d4cdf338a31a9aca69be54ad690f2c34b Mon Sep 17 00:00:00 2001 From: Michael Spalti Date: Wed, 7 Dec 2022 12:16:45 -0800 Subject: [PATCH 181/758] Item back button and tests. --- .../journal-issue.component.html | 8 ++ .../journal-volume.component.html | 8 ++ .../item-pages/journal/journal.component.html | 8 ++ .../journal/journal.component.spec.ts | 3 +- .../org-unit/org-unit.component.html | 8 ++ .../item-pages/person/person.component.html | 8 ++ .../item-pages/project/project.component.html | 8 ++ .../publication/publication.component.html | 8 ++ .../publication/publication.component.spec.ts | 21 ++- .../item-types/shared/item.component.spec.ts | 126 +++++++++++++++++- .../item-types/shared/item.component.ts | 28 +++- .../untyped-item/untyped-item.component.html | 9 ++ .../untyped-item.component.spec.ts | 29 ++-- .../versioned-item.component.ts | 6 +- src/assets/i18n/en.json5 | 3 + 15 files changed, 251 insertions(+), 30 deletions(-) diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index bf73a624478..5e98a5f3f05 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index b370431a27f..75b159f9eb6 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index 27ee373237b..5f5cd09a494 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts index 4469a2ac292..7e20edca6b5 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts @@ -34,6 +34,7 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history import { VersionDataService } from '../../../../core/data/version-data.service'; import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service'; import { SearchService } from '../../../../core/shared/search/search.service'; +import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec'; let comp: JournalComponent; let fixture: ComponentFixture; @@ -99,7 +100,7 @@ describe('JournalComponent', () => { { provide: BitstreamDataService, useValue: mockBitstreamDataService }, { provide: WorkspaceitemDataService, useValue: {} }, { provide: SearchService, useValue: {} }, - { provide: RouteService, useValue: {} } + { provide: RouteService, useValue: mockRouteService } ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index ac92e4ad6d0..e743aeb9358 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index a73236006b8..d046578873a 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index 3fb5e2d5206..808ba17f360 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    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 181480b7894..e2f78a7f323 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 @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    { describe('with IIIF viewer and search', () => { + const localMockRouteService = { + getPreviousUrl(): Observable { + return of('/search?query=test%20query&fakeParam=true'); + } + }; beforeEach(waitForAsync(() => { - const localMockRouteService = { - getPreviousUrl(): Observable { - return of('/search?query=test%20query&fakeParam=true'); - } - }; const iiifEnabledMap: MetadataMap = { 'dspace.iiif.enabled': [getIIIFEnabled(true)], 'iiif.search.enabled': [getIIIFSearchEnabled(true)], @@ -193,13 +193,12 @@ describe('PublicationComponent', () => { }); describe('with IIIF viewer and search but no previous search query', () => { - + const localMockRouteService = { + getPreviousUrl(): Observable { + return of('/item'); + } + }; beforeEach(waitForAsync(() => { - const localMockRouteService = { - getPreviousUrl(): Observable { - return of('/item'); - } - }; const iiifEnabledMap: MetadataMap = { 'dspace.iiif.enabled': [getIIIFEnabled(true)], 'iiif.search.enabled': [getIIIFSearchEnabled(true)], diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts index b14e56a58e1..b47d12caee9 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts @@ -39,6 +39,12 @@ import { VersionHistoryDataService } from '../../../../core/data/version-history import { RouterTestingModule } from '@angular/router/testing'; import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service'; +import { Router } from '@angular/router'; + +import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; +import { PageInfo } from '../../../../core/shared/page-info.model'; +import { ItemComponent } from './item.component'; +import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service'; export function getIIIFSearchEnabled(enabled: boolean): MetadataValue { return Object.assign(new MetadataValue(), { @@ -60,7 +66,11 @@ export function getIIIFEnabled(enabled: boolean): MetadataValue { }); } -export const mockRouteService = jasmine.createSpyObj('RouteService', ['getPreviousUrl']); +export const mockRouteService = { + getPreviousUrl(): Observable { + return observableOf(''); + } +}; /** * Create a generic test for an item-page-fields component using a mockItem and the type of component @@ -115,7 +125,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) { { provide: BitstreamDataService, useValue: mockBitstreamDataService }, { provide: WorkspaceitemDataService, useValue: {} }, { provide: SearchService, useValue: {} }, - { provide: RouteService, useValue: {} }, + { provide: RouteService, useValue: mockRouteService }, { provide: AuthorizationDataService, useValue: authorizationService }, { provide: ResearcherProfileDataService, useValue: {} } ], @@ -377,4 +387,116 @@ describe('ItemComponent', () => { }); }); + const mockItem: Item = Object.assign(new Item(), { + bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), + metadata: { + 'publicationissue.issueNumber': [ + { + language: 'en_US', + value: '1234' + } + ], + 'dc.description': [ + { + language: 'en_US', + value: 'desc' + } + ] + }, + }); + + describe('back to results', () => { + let comp: ItemComponent; + let fixture: ComponentFixture; + let router: Router; + + const searchUrl = '/search?query=test&spc.page=2'; + const browseUrl = '/browse/title?scope=0cc&bbm.page=3'; + const recentSubmissionsUrl = '/collections/be7b8430-77a5-4016-91c9-90863e50583a?cp.page=3'; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + RouterTestingModule, + ], + declarations: [ItemComponent, GenericItemPageFieldComponent, TruncatePipe ], + providers: [ + { provide: ItemDataService, useValue: {} }, + { provide: TruncatableService, useValue: {} }, + { provide: RelationshipDataService, useValue: {} }, + { provide: ObjectCacheService, useValue: {} }, + { provide: UUIDService, useValue: {} }, + { provide: Store, useValue: {} }, + { provide: RemoteDataBuildService, useValue: {} }, + { provide: CommunityDataService, useValue: {} }, + { provide: HALEndpointService, useValue: {} }, + { provide: NotificationsService, useValue: {} }, + { provide: HttpClient, useValue: {} }, + { provide: DSOChangeAnalyzer, useValue: {} }, + { provide: DefaultChangeAnalyzer, useValue: {} }, + { provide: VersionHistoryDataService, useValue: {} }, + { provide: VersionDataService, useValue: {} }, + { provide: BitstreamDataService, useValue: {} }, + { provide: WorkspaceitemDataService, useValue: {} }, + { provide: SearchService, useValue: {} }, + { provide: ItemDataService, useValue: {} }, + { provide: ItemVersionsSharedService, useValue: {} }, + { provide: RouteService, useValue: mockRouteService } + ], + schemas: [NO_ERRORS_SCHEMA] + }).overrideComponent(ItemComponent, { + set: {changeDetection: ChangeDetectionStrategy.Default} + }); + })); + + beforeEach(waitForAsync(() => { + router = TestBed.inject(Router); + spyOn(router, 'navigateByUrl'); + spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf('')); + TestBed.compileComponents(); + fixture = TestBed.createComponent(ItemComponent); + comp = fixture.componentInstance; + comp.object = mockItem; + fixture.detectChanges(); + })); + + it('should hide back button',() => { + spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf('')); + comp.showBackButton.subscribe((val) => { + expect(val).toBeFalse(); + }); + }); + it('should show back button', () => { + spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl)); + comp.ngOnInit(); + comp.showBackButton.subscribe((val) => { + expect(val).toBeTrue(); + }); + }); + it('should navigate back to the search list', () => { + spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl)); + comp.back(); + expect(mockRouteService.getPreviousUrl).toHaveBeenCalled(); + expect(router.navigateByUrl).toHaveBeenCalledWith(searchUrl); + }); + it('should navigate back to the browse list', () => { + spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(browseUrl)); + comp.back(); + expect(mockRouteService.getPreviousUrl).toHaveBeenCalled(); + expect(router.navigateByUrl).toHaveBeenCalledWith(browseUrl); + }); + it('should navigate back to the recent submissions list', () => { + spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(recentSubmissionsUrl)); + comp.back(); + expect(mockRouteService.getPreviousUrl).toHaveBeenCalled(); + expect(router.navigateByUrl).toHaveBeenCalledWith(recentSubmissionsUrl); + }); + }); + }); 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 71b0b5b6787..b5037924f3c 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 @@ -5,6 +5,8 @@ import { getItemPageRoute } from '../../../item-page-routing-paths'; import { RouteService } from '../../../../core/services/route.service'; import { Observable } from 'rxjs'; import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils'; +import { filter, map, take } from 'rxjs/operators'; +import { Router } from '@angular/router'; @Component({ selector: 'ds-item', @@ -36,12 +38,29 @@ export class ItemComponent implements OnInit { */ iiifQuery$: Observable; + /** + * Used to configure search in mirador. + */ + showBackButton: Observable; + mediaViewer; - constructor(protected routeService: RouteService) { + constructor(protected routeService: RouteService, + protected router: Router) { this.mediaViewer = environment.mediaViewer; } + /** + * Navigate back from the item to the previous pagination url. + */ + public back() { + this.routeService.getPreviousUrl().pipe( + take(1) + ).subscribe( + (url => this.router.navigateByUrl(url)) + ); + } + ngOnInit(): void { this.itemPageRoute = getItemPageRoute(this.object); // check to see if iiif viewer is required. @@ -50,5 +69,12 @@ export class ItemComponent implements OnInit { if (this.iiifSearchEnabled) { this.iiifQuery$ = getDSpaceQuery(this.object, this.routeService); } + // Show the back to results button when the previous context was search, browse, + // or recent submissions pagination. + this.showBackButton = this.routeService.getPreviousUrl().pipe( + filter(url => /^(\/search|\/browse|\/collections)/.test(url)), + take(1), + map(() => true) + ); } } 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 5c3e5e77b01..2b0458d14c1 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 @@ -1,3 +1,11 @@ +
    +
    + +
    +
    +
    +
    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 57f546fbec1..135810d5434 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 @@ -169,13 +169,12 @@ describe('UntypedItemComponent', () => { }); describe('with IIIF viewer and search', () => { - + const localMockRouteService = { + getPreviousUrl(): Observable { + return of('/search?query=test%20query&fakeParam=true'); + } + }; beforeEach(waitForAsync(() => { - const localMockRouteService = { - getPreviousUrl(): Observable { - return of('/search?query=test%20query&fakeParam=true'); - } - }; const iiifEnabledMap: MetadataMap = { 'dspace.iiif.enabled': [getIIIFEnabled(true)], 'iiif.search.enabled': [getIIIFSearchEnabled(true)], @@ -183,6 +182,7 @@ describe('UntypedItemComponent', () => { TestBed.overrideProvider(RouteService, {useValue: localMockRouteService}); TestBed.compileComponents(); fixture = TestBed.createComponent(UntypedItemComponent); + spyOn(localMockRouteService, 'getPreviousUrl').and.callThrough(); comp = fixture.componentInstance; comp.object = getItem(iiifEnabledMap); fixture.detectChanges(); @@ -196,17 +196,21 @@ describe('UntypedItemComponent', () => { it('should retrieve the query term for previous route', (): void => { expect(comp.iiifQuery$.subscribe(result => expect(result).toEqual('test query'))); }); - + it('should navigate back to the browse list', () => { + comp.back(); + expect(localMockRouteService.getPreviousUrl).toHaveBeenCalled(); + //expect(routerSpy.navigateByUrl).toHaveBeenCalledWith(url); + }); }); describe('with IIIF viewer and search but no previous search query', () => { + const localMockRouteService = { + getPreviousUrl(): Observable { + return of('/item'); + } + }; beforeEach(waitForAsync(() => { - const localMockRouteService = { - getPreviousUrl(): Observable { - return of('/item'); - } - }; const iiifEnabledMap: MetadataMap = { 'dspace.iiif.enabled': [getIIIFEnabled(true)], 'iiif.search.enabled': [getIIIFSearchEnabled(true)], @@ -214,6 +218,7 @@ describe('UntypedItemComponent', () => { TestBed.overrideProvider(RouteService, {useValue: localMockRouteService}); TestBed.compileComponents(); fixture = TestBed.createComponent(UntypedItemComponent); + comp = fixture.componentInstance; comp.object = getItem(iiifEnabledMap); fixture.detectChanges(); 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 7f61cee10be..2dbbd494d63 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,13 +31,13 @@ export class VersionedItemComponent extends ItemComponent { private translateService: TranslateService, private versionService: VersionDataService, private itemVersionShared: ItemVersionsSharedService, - private router: Router, + protected router: Router, private workspaceItemDataService: WorkspaceitemDataService, private searchService: SearchService, private itemService: ItemDataService, - protected routeService: RouteService + protected routeService: RouteService, ) { - super(routeService); + super(routeService, router); } /** diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index a806588701f..68c7d555221 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -780,6 +780,9 @@ "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}", + "search-browse-item-return": "Back to Results", + + "chips.remove": "Remove chip", From 599a5fdca03387f7e6879b584619661564d02fc9 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Wed, 7 Dec 2022 14:46:28 -0600 Subject: [PATCH 182/758] Correct comment text --- config/config.example.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.example.yml b/config/config.example.yml index bb4c691f6bb..86c60073f0a 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -208,7 +208,7 @@ item: # Show the item access status label in items lists showAccessStatuses: false bitstream: - # Number of entries in the bitstream list in the full item view page. + # Number of entries in the bitstream list in the item view page. # Rounded to the nearest size in the list of selectable sizes on the # settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'. pageSize: 5 @@ -300,4 +300,4 @@ info: # display in supported metadata fields. By default, only dc.description.abstract is supported. markdown: enabled: false - mathjax: false \ No newline at end of file + mathjax: false From 9fefe064bf99c70051b1b0a91eee715bdc4633ca Mon Sep 17 00:00:00 2001 From: Michael Spalti Date: Wed, 7 Dec 2022 13:45:54 -0800 Subject: [PATCH 183/758] Added some space below the button. --- .../item-pages/journal-issue/journal-issue.component.html | 2 +- .../item-pages/journal-issue/journal-issue.component.scss | 4 ++++ .../item-pages/journal-volume/journal-volume.component.html | 2 +- .../item-pages/journal-volume/journal-volume.component.scss | 4 ++++ .../item-pages/journal/journal.component.html | 2 +- .../item-pages/journal/journal.component.scss | 4 ++++ .../item-pages/org-unit/org-unit.component.html | 2 +- .../item-pages/org-unit/org-unit.component.scss | 4 ++++ .../research-entities/item-pages/person/person.component.html | 2 +- .../research-entities/item-pages/person/person.component.scss | 4 ++++ .../item-pages/project/project.component.html | 2 +- .../item-pages/project/project.component.scss | 4 ++++ .../simple/item-types/publication/publication.component.html | 2 +- .../simple/item-types/publication/publication.component.scss | 4 ++++ .../item-types/untyped-item/untyped-item.component.html | 2 +- .../item-types/untyped-item/untyped-item.component.scss | 3 +++ 16 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index 5e98a5f3f05..22002d4af61 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss index 3575cae797d..b596e76018e 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss @@ -1 +1,5 @@ @import '../../../../../styles/variables.scss'; + +button.back-btn { + margin-bottom: 10px; +} diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index 75b159f9eb6..23b600691cd 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss index 3575cae797d..b596e76018e 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss @@ -1 +1,5 @@ @import '../../../../../styles/variables.scss'; + +button.back-btn { + margin-bottom: 10px; +} diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index 5f5cd09a494..f52990f5392 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss index 3575cae797d..b596e76018e 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss @@ -1 +1,5 @@ @import '../../../../../styles/variables.scss'; + +button.back-btn { + margin-bottom: 10px; +} diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index e743aeb9358..bd75e0bcdec 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss index 3575cae797d..b596e76018e 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss @@ -1 +1,5 @@ @import '../../../../../styles/variables.scss'; + +button.back-btn { + margin-bottom: 10px; +} diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index d046578873a..a1486fde0ea 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss index 3575cae797d..b596e76018e 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.scss +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.scss @@ -1 +1,5 @@ @import '../../../../../styles/variables.scss'; + +button.back-btn { + margin-bottom: 10px; +} diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index 808ba17f360..991cbf864d9 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss index 3575cae797d..b596e76018e 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.scss +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.scss @@ -1 +1,5 @@ @import '../../../../../styles/variables.scss'; + +button.back-btn { + margin-bottom: 10px; +} 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 e2f78a7f323..9c02fc8fd82 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 @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/item-page/simple/item-types/publication/publication.component.scss b/src/app/item-page/simple/item-types/publication/publication.component.scss index 3575cae797d..b596e76018e 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.scss +++ b/src/app/item-page/simple/item-types/publication/publication.component.scss @@ -1 +1,5 @@ @import '../../../../../styles/variables.scss'; + +button.back-btn { + margin-bottom: 10px; +} 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 2b0458d14c1..ebc4aaa38a5 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 @@ -1,6 +1,6 @@
    -
    diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss index 3575cae797d..efbfe5c4f91 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss @@ -1 +1,4 @@ @import '../../../../../styles/variables.scss'; +button.back-btn { + margin-bottom: 10px; +} From 86164f743e07f9c6ffa915132f20e261c5b8c45c Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 8 Dec 2022 11:05:11 +0100 Subject: [PATCH 184/758] 97075: Edit metadata - Reset reinstatable on change --- .../dso-edit-metadata-form.ts | 21 +++++++++++++++++++ .../dso-edit-metadata.component.html | 20 +++++++++--------- .../dso-edit-metadata.component.ts | 1 + 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index 984bec575ea..9e5f2c22e17 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -130,6 +130,14 @@ export class DsoEditMetadataValue { isReinstatable(): boolean { return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange); } + + /** + * Reset the state of the re-instatable properties + */ + resetReinstatable() { + this.reinstatableValue = undefined; + this.reinstatableChange = undefined; + } } /** @@ -242,6 +250,7 @@ export class DsoEditMetadataForm { * undone afterwards */ discard(): void { + this.resetReinstatable(); Object.entries(this.fields).forEach(([field, values]) => { let removeFromIndex = -1; values.forEach((value, index) => { @@ -293,6 +302,18 @@ export class DsoEditMetadataForm { .some((value) => value.isReinstatable())); } + /** + * Reset the state of the re-instatable properties and values + */ + resetReinstatable() { + this.reinstatableNewValues = {}; + Object.values(this.fields).forEach((values) => { + values.forEach((value) => { + value.resetReinstatable(); + }); + }); + } + /** * Get the json PATCH operations for the current changes within this form */ diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 7578f2ec996..9664fd4d934 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -43,19 +43,19 @@
    - - - - @@ -82,25 +82,25 @@
    - - - -
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index eee2bc963c7..2f6f32c1c16 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -186,6 +186,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { * Validate the metadata field first */ setMetadataField() { + this.form.resetReinstatable(); this.loadingFieldValidation$.next(true); this.metadataFieldSelectorComponent.validate().subscribe((valid) => { this.loadingFieldValidation$.next(false); From c24e904c660bd63db83718064508dd697e4046ae Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 8 Dec 2022 11:08:15 +0100 Subject: [PATCH 185/758] 97075: Edit metadata - reset reinstatable on value delete --- .../dso-edit-metadata/dso-edit-metadata.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 9664fd4d934..d3d1ee15968 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -91,7 +91,7 @@
    - +
    @@ -74,7 +74,8 @@ *ngFor="let mdValue of form.fields[mdField]; let idx = index">
    {{ mdValue.newValue.value }}
    - +
    {{ mdValue.newValue.language }}
    @@ -87,7 +88,7 @@ + + + + + +
    +
    +
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss new file mode 100644 index 00000000000..926dc6f471e --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss @@ -0,0 +1,8 @@ +.ds-success { + background-color: var(--bs-success-bg); + border: 1px solid var(--bs-success); +} + +.ds-drag-handle:not(.disabled) { + cursor: grab; +} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts new file mode 100644 index 00000000000..767bcf70bc1 --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -0,0 +1,62 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form'; +import { Observable } from 'rxjs/internal/Observable'; + +@Component({ + selector: 'ds-dso-edit-metadata-value', + styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'], + templateUrl: './dso-edit-metadata-value.component.html', +}) +/** + * Component displaying a single editable row for a metadata value + */ +export class DsoEditMetadataValueComponent { + /** + * Editable metadata value to show + */ + @Input() mdValue: DsoEditMetadataValue; + + /** + * Type of DSO we're displaying values for + * Determines i18n messages + */ + @Input() dsoType: string; + + /** + * Observable to check if the form is being saved or not + * Will disable certain functionality while saving + */ + @Input() saving$: Observable; + + /** + * Is this value the only one within its list? + * Will disable certain functionality like dragging (because dragging within a list of 1 is pointless) + */ + @Input() isOnlyValue = false; + + /** + * Emits when the user clicked edit + */ + @Output() edit: EventEmitter = new EventEmitter(); + + /** + * Emits when the user clicked confirm + */ + @Output() confirm: EventEmitter = new EventEmitter(); + + /** + * Emits when the user clicked remove + */ + @Output() remove: EventEmitter = new EventEmitter(); + + /** + * Emits when the user clicked undo + */ + @Output() undo: EventEmitter = new EventEmitter(); + + /** + * The DsoEditMetadataChangeType enumeration for access in the component's template + * @type {DsoEditMetadataChangeType} + */ + public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType; +} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index b9ad2b71628..026490da7c4 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -19,95 +19,36 @@
    -
    -
    {{ dsoType + '.edit.metadata.headers.field' | translate }}
    -
    -
    -
    {{ dsoType + '.edit.metadata.headers.value' | translate }}
    -
    {{ dsoType + '.edit.metadata.headers.language' | translate }}
    -
    {{ dsoType + '.edit.metadata.headers.edit' | translate }}
    -
    -
    -
    +
    - + +
    -
    -
    - -
    -
    - -
    -
    -
    - - - - -
    -
    -
    + +
    {{ mdField }}
    -
    -
    -
    -
    {{ mdValue.newValue.value }}
    - -
    -
    -
    {{ mdValue.newValue.language }}
    - -
    -
    -
    - - - - - - -
    -
    -
    -
    + +
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss index 954d15d10d2..caf84010f39 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss @@ -3,73 +3,15 @@ max-width: var(--ds-dso-edit-field-width); background-color: var(--bs-gray-100); font-weight: bold; - - &.ds-success { - background-color: var(--bs-success-bg); - border: 1px solid var(--bs-success); - } -} - -.lbl-cell, -.ds-flex-cell { padding: 1rem; border: 1px solid var(--bs-gray-200); -} - -.ds-lang-cell { - min-width: var(--ds-dso-edit-lang-width); - max-width: var(--ds-dso-edit-lang-width); -} - -.ds-edit-cell { - min-width: var(--ds-dso-edit-actions-width); -} - -.ds-value-row { - background-color: white; - - &:active { - cursor: grabbing; - } - - &.ds-warning { - background-color: var(--bs-warning-bg); - - .ds-flex-cell { - border: 1px solid var(--bs-warning); - } - } - - &.ds-danger { - background-color: var(--bs-danger-bg); - - .ds-flex-cell { - border: 1px solid var(--bs-danger); - } - } &.ds-success { background-color: var(--bs-success-bg); - - .ds-flex-cell { - border: 1px solid var(--bs-success); - } + border: 1px solid var(--bs-success); } } -.ds-drop-list { - background-color: var(--bs-gray-500); -} - .ds-field-row { border: 1px solid var(--bs-gray-400); } - - -.ds-header-row { - background-color: var(--bs-gray-100); -} - -.ds-drag-handle:not(.disabled) { - cursor: grab; -} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index 2f6f32c1c16..bc7bfd95938 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -1,7 +1,7 @@ import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AlertType } from '../../shared/alert/aletr-type'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form'; +import { DsoEditMetadataForm } from './dso-edit-metadata-form'; import { map } from 'rxjs/operators'; import { ActivatedRoute, Data } from '@angular/router'; import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest'; @@ -18,6 +18,7 @@ import { ResourceType } from '../../core/shared/resource-type'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component'; +import { Observable } from 'rxjs/internal/Observable'; @Component({ selector: 'ds-dso-edit-metadata', @@ -77,16 +78,16 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { loadingFieldValidation$: BehaviorSubject = new BehaviorSubject(false); /** - * The AlertType enumeration for access in the component's template - * @type {AlertType} + * Combination of saving$ and loadingFieldValidation$ + * Emits true when any of the two emit true */ - public AlertTypeEnum = AlertType; + savingOrLoadingFieldValidation$: Observable; /** - * The DsoEditMetadataChangeType enumeration for access in the component's template - * @type {DsoEditMetadataChangeType} + * The AlertType enumeration for access in the component's template + * @type {AlertType} */ - public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType; + public AlertTypeEnum = AlertType; /** * Subscription for updating the current DSpaceObject @@ -118,6 +119,9 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { this.initDataService(); this.initForm(); } + this.savingOrLoadingFieldValidation$ = observableCombineLatest([this.saving$, this.loadingFieldValidation$]).pipe( + map(([saving, loading]) => saving || loading), + ); } /** @@ -180,6 +184,16 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { }); } + /** + * Confirm the newly added value + * @param saved Whether or not the value was manually saved (only then, add the value to its metadata field) + */ + confirmNewValue(saved: boolean) { + if (saved) { + this.setMetadataField(); + } + } + /** * Set the metadata field of the temporary added new metadata value * This will move the new value to its respective parent metadata field diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts index 263d394906a..0a9294105bb 100644 --- a/src/app/dso-shared/dso-shared.module.ts +++ b/src/app/dso-shared/dso-shared.module.ts @@ -2,6 +2,9 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../shared/shared.module'; import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component'; import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component'; +import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component'; +import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component'; +import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component'; @NgModule({ imports: [ @@ -10,6 +13,9 @@ import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-fie declarations: [ DsoEditMetadataComponent, MetadataFieldSelectorComponent, + DsoEditMetadataFieldValuesComponent, + DsoEditMetadataValueComponent, + DsoEditMetadataHeadersComponent, ], exports: [ DsoEditMetadataComponent, From 454bfd2f9fb3488e67cc0728e4583a8a8e4b484f Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 12 Dec 2022 16:32:13 +0100 Subject: [PATCH 210/758] 97075: Feedback 2022-12-09 - debounce on language input --- .../dso-edit-metadata-value.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index b9da828bd4b..458b9d9e825 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -7,7 +7,8 @@
    {{ mdValue.newValue.language }}
    - +
    From 85c8722f7d53b95a15c27ede0064ca2798bfce7c Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Mon, 12 Dec 2022 10:19:42 -0600 Subject: [PATCH 211/758] Fix accessibility issue with empty by switching to a --- .../statistics-table/statistics-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html index 3ecd256812a..fb042b25c30 100644 --- a/src/app/statistics-page/statistics-table/statistics-table.component.html +++ b/src/app/statistics-page/statistics-table/statistics-table.component.html @@ -10,7 +10,7 @@

    - + From e0deed785ef4a21c926c1fbaa17ff224a98504ff Mon Sep 17 00:00:00 2001 From: Joost Date: Mon, 12 Dec 2022 17:27:54 +0100 Subject: [PATCH 212/758] [task 97298] error message for not correct domain in registration mail --- .../register-email-form.component.html | 3 +- .../register-email-form.component.ts | 29 +++++++++++-------- src/assets/i18n/en.json5 | 2 ++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html index 68d0a08d26f..b76fa521e23 100644 --- a/src/app/register-email-form/register-email-form.component.html +++ b/src/app/register-email-form/register-email-form.component.html @@ -1,8 +1,7 @@

    {{MESSAGE_PREFIX + '.header'|translate}}

    {{MESSAGE_PREFIX + '.info' | translate}}

    - {{valid_mail_domains.length}} -

    Accounts can be registered for mail addresses of the domanins {{valid_domain}}

    +

    Accounts can be registered for mail addresses of the domanins {{ valid_mail_domains.join(", ")}}

    diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts index 20b79168d17..09548def922 100644 --- a/src/app/register-email-form/register-email-form.component.ts +++ b/src/app/register-email-form/register-email-form.component.ts @@ -7,7 +7,7 @@ import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'; import {Registration} from '../core/shared/registration.model'; import {RemoteData} from '../core/data/remote-data'; import {ConfigurationDataService} from "../core/data/configuration-data.service"; -import {getFirstCompletedRemoteData} from "../core/shared/operators"; +import {getAllCompletedRemoteData} from "../core/shared/operators"; @Component({ selector: 'ds-register-email-form', @@ -51,9 +51,11 @@ export class RegisterEmailFormComponent implements OnInit { }); this.valid_mail_domains = []; this.configurationService.findByPropertyName('authentication-password.domain.valid') - .pipe(getFirstCompletedRemoteData()) - .subscribe((remoteData) =>{ - this.valid_mail_domains.push(remoteData.payload.values[0]); + .pipe(getAllCompletedRemoteData()) + .subscribe((remoteData) => { + for (const remoteValue of remoteData.payload.values) { + this.valid_mail_domains.push(remoteValue); + } } ); } @@ -64,14 +66,17 @@ export class RegisterEmailFormComponent implements OnInit { register() { if (!this.form.invalid) { this.epersonRegistrationService.registerEmail(this.email.value).subscribe((response: RemoteData) => { - if (response.hasSucceeded) { - this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`), - this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value})); - this.router.navigate(['/home']); - } else { - this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), - this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, {email: this.email.value})); - } + if (response.hasSucceeded) { + this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`), + this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value})); + this.router.navigate(['/home']); + } else if (response.statusCode == 400) { + this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.error.maildomain`, { domains: this.valid_mail_domains.join(", ")})); + } else { + this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), + this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, {email: this.email.value})); + this.notificationService.error("title", response.errorMessage); + } } ); } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f742273edbe..a98eb50cace 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3027,6 +3027,8 @@ "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}", + "register-page.registration.error.maildomain": "this email address is not on the list of domains who can register. Allowed domains are {{ domains }}", + "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items", From 03fe9a3ab9c385d595094a9c39b9610b1cd7c673 Mon Sep 17 00:00:00 2001 From: Joost Date: Tue, 13 Dec 2022 11:11:42 +0100 Subject: [PATCH 213/758] typo fix --- src/app/register-email-form/register-email-form.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html index 9a438d3e92c..81d425c4685 100644 --- a/src/app/register-email-form/register-email-form.component.html +++ b/src/app/register-email-form/register-email-form.component.html @@ -1,7 +1,7 @@

    {{MESSAGE_PREFIX + '.header'|translate}}

    {{MESSAGE_PREFIX + '.info' | translate}}

    -

    Accounts can be registered for mail addresses of the domanins {{ valid_mail_domains.join(", ")}}

    +

    Accounts can be registered for mail addresses of the domains {{ valid_mail_domains.join(", ")}}

    From 7917f612106b63810eb3ed5556eb1ccc005e0ce7 Mon Sep 17 00:00:00 2001 From: Joost Date: Tue, 13 Dec 2022 11:11:42 +0100 Subject: [PATCH 214/758] typo fix --- src/app/register-email-form/register-email-form.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html index b76fa521e23..15c68d322f4 100644 --- a/src/app/register-email-form/register-email-form.component.html +++ b/src/app/register-email-form/register-email-form.component.html @@ -1,7 +1,7 @@

    {{MESSAGE_PREFIX + '.header'|translate}}

    {{MESSAGE_PREFIX + '.info' | translate}}

    -

    Accounts can be registered for mail addresses of the domanins {{ valid_mail_domains.join(", ")}}

    +

    Accounts can be registered for mail addresses of the domains {{ valid_mail_domains.join(", ")}}

    From 50f7211947193e41abe4504590270fe0a0220c4d Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Tue, 13 Dec 2022 14:38:53 +0100 Subject: [PATCH 215/758] 93746: Edit metadata redesign - Virtual metadata --- src/app/core/data/relationship.service.ts | 37 +++++++++++- ...-edit-metadata-field-values.component.html | 3 +- ...so-edit-metadata-field-values.component.ts | 6 ++ .../dso-edit-metadata-value.component.html | 46 ++++++++------- .../dso-edit-metadata-value.component.ts | 56 ++++++++++++++++++- .../dso-edit-metadata.component.html | 4 +- .../metadata-representation-list.component.ts | 33 +---------- src/assets/i18n/en.json5 | 2 + 8 files changed, 130 insertions(+), 57 deletions(-) diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts index b99541f3c50..50a48883437 100644 --- a/src/app/core/data/relationship.service.ts +++ b/src/app/core/data/relationship.service.ts @@ -1,7 +1,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Inject, Injectable } from '@angular/core'; import { MemoizedSelector, select, Store } from '@ngrx/store'; -import { combineLatest as observableCombineLatest, Observable } from 'rxjs'; +import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs'; import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators'; import { compareArraysUsingIds, PAGINATED_RELATIONS_TO_ITEMS_OPERATOR, @@ -44,6 +44,11 @@ import { DeleteRequest, FindListOptions, PostRequest, RestRequest } from './requ import { RequestService } from './request.service'; import { RequestEntryState } from './request.reducer'; import { NoContent } from '../shared/NoContent.model'; +import { MetadataValue } from '../shared/metadata.models'; +import { MetadataRepresentation } from '../shared/metadata-representation/metadata-representation.model'; +import { MetadatumRepresentation } from '../shared/metadata-representation/metadatum/metadatum-representation.model'; +import { ItemMetadataRepresentation } from '../shared/metadata-representation/item/item-metadata-representation.model'; +import { DSpaceObject } from '../shared/dspace-object.model'; const relationshipListsStateSelector = (state: AppState) => state.relationshipLists; @@ -523,4 +528,34 @@ export class RelationshipService extends DataService { }) as Observable>>; } + + /** + * Resolve a {@link MetadataValue} into a {@link MetadataRepresentation} of the correct type + * @param metadatum {@link MetadataValue} to resolve + * @param parentItem Parent dspace object the metadata value belongs to + * @param itemType The type of item this metadata value represents (will only be used when no related item can be found, as a fallback) + */ + resolveMetadataRepresentation(metadatum: MetadataValue, parentItem: DSpaceObject, itemType: string): Observable { + if (metadatum.isVirtual) { + return this.findById(metadatum.virtualValue, true, false, followLink('leftItem'), followLink('rightItem')).pipe( + getFirstSucceededRemoteData(), + switchMap((relRD: RemoteData) => + observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe( + filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted), + map(([leftItem, rightItem]) => { + if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) { + return observableOf(Object.assign(new MetadatumRepresentation(itemType), metadatum)); + } else if (rightItem.hasSucceeded && leftItem.payload.id === parentItem.id) { + return rightItem.payload; + } else if (rightItem.payload.id === parentItem.id) { + return leftItem.payload; + } + }), + map((item: Item) => Object.assign(new ItemMetadataRepresentation(metadatum), item)) + ) + )); + } else { + return observableOf(Object.assign(new MetadatumRepresentation(itemType), metadatum)); + } + } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html index b600e6a228d..6a0386da8e4 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html @@ -1,5 +1,6 @@ -
    +
    -
    -
    {{ mdValue.newValue.value }}
    - +
    + {{ mdRepresentationName$ | async }} + +
    {{ mdValue.newValue.language }}
    @@ -12,22 +16,24 @@
    - - - - +
    + + + + +
    - {{ mdField }}
    Object.assign(new MetadataValue(), metadatum)) - .map((metadatum: MetadataValue) => { - if (metadatum.isVirtual) { - return this.relationshipService.findById(metadatum.virtualValue, true, false, followLink('leftItem'), followLink('rightItem')).pipe( - getFirstSucceededRemoteData(), - switchMap((relRD: RemoteData) => - observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe( - filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted), - map(([leftItem, rightItem]) => { - if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) { - return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum)); - } else if (rightItem.hasSucceeded && leftItem.payload.id === this.parentItem.id) { - return rightItem.payload; - } else if (rightItem.payload.id === this.parentItem.id) { - return leftItem.payload; - } - }), - map((item: Item) => Object.assign(new ItemMetadataRepresentation(metadatum), item)) - ) - )); - } else { - return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum)); - } - }) + .map((metadatum: MetadataValue) => this.relationshipService.resolveMetadataRepresentation(metadatum, this.parentItem, this.itemType)), ); } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 93ee1427af8..6e9bae138ee 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1803,6 +1803,8 @@ "item.edit.metadata.edit.buttons.unedit": "Stop editing", + "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab", + "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", From 04e5510c6b1fc168b8d0225b70880cc618d9e9fb Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Tue, 13 Dec 2022 15:01:56 +0100 Subject: [PATCH 216/758] 97049: fix wrong import after merge --- .../search-hierarchy-filter.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts index 3dd866c5b19..8504237f09f 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts @@ -3,7 +3,7 @@ import { renderFacetFor } from '../search-filter-type-decorator'; import { FilterType } from '../../../models/filter-type.model'; import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component'; +import { VocabularyTreeviewComponent } from '../../../../form/vocabulary-treeview/vocabulary-treeview.component'; import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; From c2ef6893d37c3c031cb4df698a34f51f81a7fe87 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Tue, 13 Dec 2022 15:12:28 +0100 Subject: [PATCH 217/758] 97049: fix lint issue after merge --- .../form/vocabulary-treeview/vocabulary-treeview.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts index 4b03a8c2b3f..56909090c77 100644 --- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts +++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts @@ -9,7 +9,6 @@ import { TranslateService } from '@ngx-translate/core'; import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; import { hasValue, isEmpty, isNotEmpty } from '../../empty.util'; -import { isAuthenticated } from '../../../core/auth/selectors'; import { VocabularyTreeviewService } from './vocabulary-treeview.service'; import { LOAD_MORE, LOAD_MORE_ROOT, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model'; import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model'; From b04c8025dc96ca01dd1a06c0897d108e26ae69e1 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Wed, 14 Dec 2022 11:35:19 +0100 Subject: [PATCH 218/758] 97049: Attempt to fix aSync test --- .../search-hierarchy-filter.component.spec.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index 165db5e43b3..a7ee15db1a1 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -1,5 +1,5 @@ import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service'; @@ -144,8 +144,8 @@ describe('SearchHierarchyFilterComponent', () => { })); }); - it('should add a new search filter to the existing search filters', (done) => { - expect(router.navigate).toHaveBeenCalledWith([testSearchLink], { + it('should add a new search filter to the existing search filters', () => { + waitForAsync(() => expect(router.navigate).toHaveBeenCalledWith([testSearchLink], { queryParams: { [`f.${testSearchFilter}`]: [ ...alreadySelectedValues, @@ -153,8 +153,7 @@ describe('SearchHierarchyFilterComponent', () => { ].map((value => `${value},equals`)), }, queryParamsHandling: 'merge', - }); - done(); + })); }); }); }); From 07fe4f261f1fc35c75a4f8d6952caedc497b7106 Mon Sep 17 00:00:00 2001 From: Jens Vannerum Date: Wed, 14 Dec 2022 11:52:00 +0100 Subject: [PATCH 219/758] 97049: Attempt to fix aSync test --- .../search-hierarchy-filter.component.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts index a7ee15db1a1..7fc21a3c31d 100644 --- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts @@ -154,6 +154,7 @@ describe('SearchHierarchyFilterComponent', () => { }, queryParamsHandling: 'merge', })); + fixture.destroy(); }); }); }); From 9f0f7c4f299798105a78b26224157e257f4ec344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dykas?= <96572102+michdyk@users.noreply.github.com> Date: Wed, 14 Dec 2022 15:57:30 +0100 Subject: [PATCH 220/758] Update pl.json5 Full Polish translation --- src/assets/i18n/pl.json5 | 9050 ++++++++++---------------------------- 1 file changed, 2300 insertions(+), 6750 deletions(-) diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5 index 58c8c61eb5d..49b1ef58392 100644 --- a/src/assets/i18n/pl.json5 +++ b/src/assets/i18n/pl.json5 @@ -1,6752 +1,2302 @@ { - - // "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. ", - // TODO New key - Add a translation - "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.link.home-page": "Take me to the home page", - // TODO New key - Add a translation - "404.link.home-page": "Take me to the home page", - - // "404.page-not-found": "page not found", - // TODO New key - Add a translation - "404.page-not-found": "page not found", - - // "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.", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.", - - // "admin.registries.bitstream-formats.create.failure.head": "Failure", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.create.failure.head": "Failure", - - // "admin.registries.bitstream-formats.create.head": "Create Bitstream format", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.create.head": "Create Bitstream format", - - // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.create.new": "Add a new bitstream format", - - // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.", - - // "admin.registries.bitstream-formats.create.success.head": "Success", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.create.success.head": "Success", - - // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)", - - // "admin.registries.bitstream-formats.delete.failure.head": "Failure", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.delete.failure.head": "Failure", - - // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)", - - // "admin.registries.bitstream-formats.delete.success.head": "Success", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.delete.success.head": "Success", - - // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.", - - // "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": "", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.description.hint": "", - - // "admin.registries.bitstream-formats.edit.description.label": "Description", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.description.label": "Description", - - // "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.", - // TODO New key - Add a translation - "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.label": "File extensions", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.extensions.label": "File extensions", - - // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot", - - // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.", - - // "admin.registries.bitstream-formats.edit.failure.head": "Failure", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.failure.head": "Failure", - - // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}", - - // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.", - // TODO New key - Add a translation - "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.label": "Internal", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.internal.label": "Internal", - - // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.", - // TODO New key - Add a translation - "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.label": "MIME Type", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type", - - // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)", - // TODO New key - Add a translation - "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.label": "Name", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.shortDescription.label": "Name", - - // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.", - - // "admin.registries.bitstream-formats.edit.success.head": "Success", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.success.head": "Success", - - // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.", - - // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level", - - // "admin.registries.bitstream-formats.head": "Bitstream Format Registry", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.head": "Bitstream Format Registry", - - // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.", - - // "admin.registries.bitstream-formats.table.delete": "Delete selected", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.delete": "Delete selected", - - // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.deselect-all": "Deselect all", - - // "admin.registries.bitstream-formats.table.internal": "internal", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.internal": "internal", - - // "admin.registries.bitstream-formats.table.mimetype": "MIME Type", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.mimetype": "MIME Type", - - // "admin.registries.bitstream-formats.table.name": "Name", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.name": "Name", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.id" : "ID", - - // "admin.registries.bitstream-formats.table.return": "Return", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.return": "Return", - - // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known", - - // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported", - - // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown", - - // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level", - - // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry", - // TODO New key - Add a translation - "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry", - - - - // "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.", - // TODO New key - Add a translation - "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.form.create": "Create metadata schema", - // TODO New key - Add a translation - "admin.registries.metadata.form.create": "Create metadata schema", - - // "admin.registries.metadata.form.edit": "Edit metadata schema", - // TODO New key - Add a translation - "admin.registries.metadata.form.edit": "Edit metadata schema", - - // "admin.registries.metadata.form.name": "Name", - // TODO New key - Add a translation - "admin.registries.metadata.form.name": "Name", - - // "admin.registries.metadata.form.namespace": "Namespace", - // TODO New key - Add a translation - "admin.registries.metadata.form.namespace": "Namespace", - - // "admin.registries.metadata.head": "Metadata Registry", - // TODO New key - Add a translation - "admin.registries.metadata.head": "Metadata Registry", - - // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.", - // TODO New key - Add a translation - "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.", - - // "admin.registries.metadata.schemas.table.delete": "Delete selected", - // TODO New key - Add a translation - "admin.registries.metadata.schemas.table.delete": "Delete selected", - - // "admin.registries.metadata.schemas.table.id": "ID", - // TODO New key - Add a translation - "admin.registries.metadata.schemas.table.id": "ID", - - // "admin.registries.metadata.schemas.table.name": "Name", - // TODO New key - Add a translation - "admin.registries.metadata.schemas.table.name": "Name", - - // "admin.registries.metadata.schemas.table.namespace": "Namespace", - // TODO New key - Add a translation - "admin.registries.metadata.schemas.table.namespace": "Namespace", - - // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry", - // TODO New key - Add a translation - "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry", - - - - // "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}}\".", - // TODO New key - Add a translation - "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".", - - // "admin.registries.schema.fields.head": "Schema metadata fields", - // TODO New key - Add a translation - "admin.registries.schema.fields.head": "Schema metadata fields", - - // "admin.registries.schema.fields.no-items": "No metadata fields to show.", - // TODO New key - Add a translation - "admin.registries.schema.fields.no-items": "No metadata fields to show.", - - // "admin.registries.schema.fields.table.delete": "Delete selected", - // TODO New key - Add a translation - "admin.registries.schema.fields.table.delete": "Delete selected", - - // "admin.registries.schema.fields.table.field": "Field", - // TODO New key - Add a translation - "admin.registries.schema.fields.table.field": "Field", - // TODO New key - Add a translation - "admin.registries.schema.fields.table.id" : "ID", - - // "admin.registries.schema.fields.table.scopenote": "Scope Note", - // TODO New key - Add a translation - "admin.registries.schema.fields.table.scopenote": "Scope Note", - - // "admin.registries.schema.form.create": "Create metadata field", - // TODO New key - Add a translation - "admin.registries.schema.form.create": "Create metadata field", - - // "admin.registries.schema.form.edit": "Edit metadata field", - // TODO New key - Add a translation - "admin.registries.schema.form.edit": "Edit metadata field", - - // "admin.registries.schema.form.element": "Element", - // TODO New key - Add a translation - "admin.registries.schema.form.element": "Element", - - // "admin.registries.schema.form.qualifier": "Qualifier", - // TODO New key - Add a translation - "admin.registries.schema.form.qualifier": "Qualifier", - - // "admin.registries.schema.form.scopenote": "Scope Note", - // TODO New key - Add a translation - "admin.registries.schema.form.scopenote": "Scope Note", - - // "admin.registries.schema.head": "Metadata Schema", - // TODO New key - Add a translation - "admin.registries.schema.head": "Metadata Schema", - - // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"", - // TODO New key - Add a translation - "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"", - - // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas", - // TODO New key - Add a translation - "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas", - - // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas", - // TODO New key - Add a translation - "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas", - - // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"", - // TODO New key - Add a translation - "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"", - - // "admin.registries.schema.notification.failure": "Error", - // TODO New key - Add a translation - "admin.registries.schema.notification.failure": "Error", - - // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"", - // TODO New key - Add a translation - "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"", - - // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields", - // TODO New key - Add a translation - "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields", - - // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields", - // TODO New key - Add a translation - "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields", - - // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"", - // TODO New key - Add a translation - "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"", - - // "admin.registries.schema.notification.success": "Success", - // TODO New key - Add a translation - "admin.registries.schema.notification.success": "Success", - - // "admin.registries.schema.return": "Return", - // TODO New key - Add a translation - "admin.registries.schema.return": "Return", - - // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry", - // TODO New key - Add a translation - "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry", - - - - // "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.", - // TODO New key - Add a translation - "auth.errors.invalid-user": "Invalid email address or password.", - - // "auth.messages.expired": "Your session has expired. Please log in again.", - // TODO New key - Add a translation - "auth.messages.expired": "Your session has expired. Please log in again.", - - - - // "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", - // TODO New key - Add a translation - "browse.comcol.by.author": "By Author", - - // "browse.comcol.by.dateissued": "By Issue Date", - // TODO New key - Add a translation - "browse.comcol.by.dateissued": "By Issue Date", - - // "browse.comcol.by.subject": "By Subject", - // TODO New key - Add a translation - "browse.comcol.by.subject": "By Subject", - - // "browse.comcol.by.title": "By Title", - // TODO New key - Add a translation - "browse.comcol.by.title": "By Title", - - // "browse.comcol.head": "Browse", - // TODO New key - Add a translation - "browse.comcol.head": "Browse", - - // "browse.empty": "No items to show.", - // TODO New key - Add a translation - "browse.empty": "No items to show.", - - // "browse.metadata.author": "Author", - // TODO New key - Add a translation - "browse.metadata.author": "Author", - - // "browse.metadata.dateissued": "Issue Date", - // TODO New key - Add a translation - "browse.metadata.dateissued": "Issue Date", - - // "browse.metadata.subject": "Subject", - // TODO New key - Add a translation - "browse.metadata.subject": "Subject", - - // "browse.metadata.title": "Title", - // TODO New key - Add a translation - "browse.metadata.title": "Title", - - // "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)", - // TODO New key - Add a translation - "browse.startsWith.choose_start": "(Choose start)", - - // "browse.startsWith.choose_year": "(Choose year)", - // TODO New key - Add a translation - "browse.startsWith.choose_year": "(Choose year)", - - // "browse.startsWith.jump": "Jump to a point in the index:", - // TODO New key - Add a translation - "browse.startsWith.jump": "Jump to a point in the index:", - - // "browse.startsWith.months.april": "April", - // TODO New key - Add a translation - "browse.startsWith.months.april": "April", - - // "browse.startsWith.months.august": "August", - // TODO New key - Add a translation - "browse.startsWith.months.august": "August", - - // "browse.startsWith.months.december": "December", - // TODO New key - Add a translation - "browse.startsWith.months.december": "December", - - // "browse.startsWith.months.february": "February", - // TODO New key - Add a translation - "browse.startsWith.months.february": "February", - - // "browse.startsWith.months.january": "January", - // TODO New key - Add a translation - "browse.startsWith.months.january": "January", - - // "browse.startsWith.months.july": "July", - // TODO New key - Add a translation - "browse.startsWith.months.july": "July", - - // "browse.startsWith.months.june": "June", - // TODO New key - Add a translation - "browse.startsWith.months.june": "June", - - // "browse.startsWith.months.march": "March", - // TODO New key - Add a translation - "browse.startsWith.months.march": "March", - - // "browse.startsWith.months.may": "May", - // TODO New key - Add a translation - "browse.startsWith.months.may": "May", - - // "browse.startsWith.months.none": "(Choose month)", - // TODO New key - Add a translation - "browse.startsWith.months.none": "(Choose month)", - - // "browse.startsWith.months.november": "November", - // TODO New key - Add a translation - "browse.startsWith.months.november": "November", - - // "browse.startsWith.months.october": "October", - // TODO New key - Add a translation - "browse.startsWith.months.october": "October", - - // "browse.startsWith.months.september": "September", - // TODO New key - Add a translation - "browse.startsWith.months.september": "September", - - // "browse.startsWith.submit": "Go", - // TODO New key - Add a translation - "browse.startsWith.submit": "Go", - - // "browse.startsWith.type_date": "Or type in a date (year-month):", - // TODO New key - Add a translation - "browse.startsWith.type_date": "Or type in a date (year-month):", - - // "browse.startsWith.type_text": "Or enter first few letters:", - // TODO New key - Add a translation - "browse.startsWith.type_text": "Or enter first few letters:", - - // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}", - // TODO New key - Add a translation - "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}", - - - // "chips.remove": "Remove chip", - // TODO New key - Add a translation - "chips.remove": "Remove chip", - - - - // "collection.create.head": "Create a Collection", - // TODO New key - Add a translation - "collection.create.head": "Create a Collection", - - // "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 }}", - // TODO New key - Add a translation - "collection.create.sub-head": "Create a Collection for Community {{ parent }}", - - // "collection.curate.header": "Curate Collection: {{collection}}", - // TODO New key - Add a translation - "collection.curate.header": "Curate Collection: {{collection}}", - - // "collection.delete.cancel": "Cancel", - // TODO New key - Add a translation - "collection.delete.cancel": "Cancel", - - // "collection.delete.confirm": "Confirm", - // TODO New key - Add a translation - "collection.delete.confirm": "Confirm", - - // "collection.delete.head": "Delete Collection", - // TODO New key - Add a translation - "collection.delete.head": "Delete Collection", - - // "collection.delete.notification.fail": "Collection could not be deleted", - // TODO New key - Add a translation - "collection.delete.notification.fail": "Collection could not be deleted", - - // "collection.delete.notification.success": "Successfully deleted collection", - // TODO New key - Add a translation - "collection.delete.notification.success": "Successfully deleted collection", - - // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"", - // TODO New key - Add a translation - "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"", - - - - // "collection.edit.delete": "Delete this collection", - // TODO New key - Add a translation - "collection.edit.delete": "Delete this collection", - - // "collection.edit.head": "Edit Collection", - // TODO New key - Add a translation - "collection.edit.head": "Edit Collection", - - // "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", - // TODO New key - Add a translation - "collection.edit.item-mapper.cancel": "Cancel", - - // "collection.edit.item-mapper.collection": "Collection: \"{{name}}\"", - // TODO New key - Add a translation - "collection.edit.item-mapper.collection": "Collection: \"{{name}}\"", - - // "collection.edit.item-mapper.confirm": "Map selected items", - // TODO New key - Add a translation - "collection.edit.item-mapper.confirm": "Map selected items", - - // "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.", - // TODO New key - Add a translation - "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.head": "Item Mapper - Map Items from Other Collections", - // TODO New key - Add a translation - "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections", - - // "collection.edit.item-mapper.no-search": "Please enter a query to search", - // TODO New key - Add a translation - "collection.edit.item-mapper.no-search": "Please enter a query to search", - - // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.", - - // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors", - - // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.", - - // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed", - - // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.", - - // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors", - - // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.", - - // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", - // TODO New key - Add a translation - "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed", - - // "collection.edit.item-mapper.remove": "Remove selected item mappings", - // TODO New key - Add a translation - "collection.edit.item-mapper.remove": "Remove selected item mappings", - - // "collection.edit.item-mapper.tabs.browse": "Browse mapped items", - // TODO New key - Add a translation - "collection.edit.item-mapper.tabs.browse": "Browse mapped items", - - // "collection.edit.item-mapper.tabs.map": "Map new items", - // TODO New key - Add a translation - "collection.edit.item-mapper.tabs.map": "Map new items", - - - - // "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", - // TODO New key - Add a translation - "collection.form.abstract": "Short Description", - - // "collection.form.description": "Introductory text (HTML)", - // TODO New key - Add a translation - "collection.form.description": "Introductory text (HTML)", - - // "collection.form.errors.title.required": "Please enter a collection name", - // TODO New key - Add a translation - "collection.form.errors.title.required": "Please enter a collection name", - - // "collection.form.license": "License", - // TODO New key - Add a translation - "collection.form.license": "License", - - // "collection.form.provenance": "Provenance", - // TODO New key - Add a translation - "collection.form.provenance": "Provenance", - - // "collection.form.rights": "Copyright text (HTML)", - // TODO New key - Add a translation - "collection.form.rights": "Copyright text (HTML)", - - // "collection.form.tableofcontents": "News (HTML)", - // TODO New key - Add a translation - "collection.form.tableofcontents": "News (HTML)", - - // "collection.form.title": "Name", - // TODO New key - Add a translation - "collection.form.title": "Name", - - - - // "collection.listelement.badge": "Collection", - // TODO New key - Add a translation - "collection.listelement.badge": "Collection", - - - - // "collection.page.browse.recent.head": "Recent Submissions", - // TODO New key - Add a translation - "collection.page.browse.recent.head": "Recent Submissions", - - // "collection.page.browse.recent.empty": "No items to show", - // TODO New key - Add a translation - "collection.page.browse.recent.empty": "No items to show", - - // "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", - // TODO New key - Add a translation - "collection.page.handle": "Permanent URI for this collection", - - // "collection.page.license": "License", - // TODO New key - Add a translation - "collection.page.license": "License", - - // "collection.page.news": "News", - // TODO New key - Add a translation - "collection.page.news": "News", - - - - // "collection.select.confirm": "Confirm selected", - // TODO New key - Add a translation - "collection.select.confirm": "Confirm selected", - - // "collection.select.empty": "No collections to show", - // TODO New key - Add a translation - "collection.select.empty": "No collections to show", - - // "collection.select.table.title": "Title", - // TODO New key - Add a translation - "collection.select.table.title": "Title", - - - - // "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", - // TODO New key - Add a translation - "community.create.head": "Create a Community", - - // "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 }}", - // TODO New key - Add a translation - "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}", - - // "community.curate.header": "Curate Community: {{community}}", - // TODO New key - Add a translation - "community.curate.header": "Curate Community: {{community}}", - - // "community.delete.cancel": "Cancel", - // TODO New key - Add a translation - "community.delete.cancel": "Cancel", - - // "community.delete.confirm": "Confirm", - // TODO New key - Add a translation - "community.delete.confirm": "Confirm", - - // "community.delete.head": "Delete Community", - // TODO New key - Add a translation - "community.delete.head": "Delete Community", - - // "community.delete.notification.fail": "Community could not be deleted", - // TODO New key - Add a translation - "community.delete.notification.fail": "Community could not be deleted", - - // "community.delete.notification.success": "Successfully deleted community", - // TODO New key - Add a translation - "community.delete.notification.success": "Successfully deleted community", - - // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"", - // TODO New key - Add a translation - "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"", - - // "community.edit.delete": "Delete this community", - // TODO New key - Add a translation - "community.edit.delete": "Delete this community", - - // "community.edit.head": "Edit Community", - // TODO New key - Add a translation - "community.edit.head": "Edit Community", - - // "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", - // TODO New key - Add a translation - "community.form.abstract": "Short Description", - - // "community.form.description": "Introductory text (HTML)", - // TODO New key - Add a translation - "community.form.description": "Introductory text (HTML)", - - // "community.form.errors.title.required": "Please enter a community name", - // TODO New key - Add a translation - "community.form.errors.title.required": "Please enter a community name", - - // "community.form.rights": "Copyright text (HTML)", - // TODO New key - Add a translation - "community.form.rights": "Copyright text (HTML)", - - // "community.form.tableofcontents": "News (HTML)", - // TODO New key - Add a translation - "community.form.tableofcontents": "News (HTML)", - - // "community.form.title": "Name", - // TODO New key - Add a translation - "community.form.title": "Name", - - // "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", - // TODO New key - Add a translation - "community.page.handle": "Permanent URI for this community", - - // "community.page.license": "License", - // TODO New key - Add a translation - "community.page.license": "License", - - // "community.page.news": "News", - // TODO New key - Add a translation - "community.page.news": "News", - - // "community.all-lists.head": "Subcommunities and Collections", - // TODO New key - Add a translation - "community.all-lists.head": "Subcommunities and Collections", - - // "community.sub-collection-list.head": "Collections of this Community", - // TODO New key - Add a translation - "community.sub-collection-list.head": "Collections of this Community", - - // "community.sub-community-list.head": "Communities of this Community", - // TODO New key - Add a translation - "community.sub-community-list.head": "Communities of this Community", - - - - // "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", - // TODO New key - Add a translation - "dso-selector.create.collection.head": "New collection", - - // "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", - // TODO New key - Add a translation - "dso-selector.create.community.head": "New community", - - // "dso-selector.create.community.sub-level": "Create a new community in", - // TODO New key - Add a translation - "dso-selector.create.community.sub-level": "Create a new community in", - - // "dso-selector.create.community.top-level": "Create a new top-level community", - // TODO New key - Add a translation - "dso-selector.create.community.top-level": "Create a new top-level community", - - // "dso-selector.create.item.head": "New item", - // TODO New key - Add a translation - "dso-selector.create.item.head": "New item", - - // "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", - // TODO New key - Add a translation - "dso-selector.edit.collection.head": "Edit collection", - - // "dso-selector.edit.community.head": "Edit community", - // TODO New key - Add a translation - "dso-selector.edit.community.head": "Edit community", - - // "dso-selector.edit.item.head": "Edit item", - // TODO New key - Add a translation - "dso-selector.edit.item.head": "Edit item", - - // "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", - // TODO New key - Add a translation - "dso-selector.no-results": "No {{ type }} found", - - // "dso-selector.placeholder": "Search for a {{ type }}", - // TODO New key - Add a translation - "dso-selector.placeholder": "Search for a {{ 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", - // TODO New key - Add a translation - "error.browse-by": "Error fetching items", - - // "error.collection": "Error fetching collection", - // TODO New key - Add a translation - "error.collection": "Error fetching collection", - - // "error.collections": "Error fetching collections", - // TODO New key - Add a translation - "error.collections": "Error fetching collections", - - // "error.community": "Error fetching community", - // TODO New key - Add a translation - "error.community": "Error fetching community", - - // "error.identifier": "No item found for the identifier", - // TODO New key - Add a translation - "error.identifier": "No item found for the identifier", - - // "error.default": "Error", - // TODO New key - Add a translation - "error.default": "Error", - - // "error.item": "Error fetching item", - // TODO New key - Add a translation - "error.item": "Error fetching item", - - // "error.items": "Error fetching items", - // TODO New key - Add a translation - "error.items": "Error fetching items", - - // "error.objects": "Error fetching objects", - // TODO New key - Add a translation - "error.objects": "Error fetching objects", - - // "error.recent-submissions": "Error fetching recent submissions", - // TODO New key - Add a translation - "error.recent-submissions": "Error fetching recent submissions", - - // "error.search-results": "Error fetching search results", - // TODO New key - Add a translation - "error.search-results": "Error fetching search results", - - // "error.sub-collections": "Error fetching sub-collections", - // TODO New key - Add a translation - "error.sub-collections": "Error fetching sub-collections", - - // "error.sub-communities": "Error fetching sub-communities", - // TODO New key - Add a translation - "error.sub-communities": "Error fetching sub-communities", - - // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below :

    ", - // TODO New key - Add a translation - "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below :

    ", - - // "error.top-level-communities": "Error fetching top-level communities", - // TODO New key - Add a translation - "error.top-level-communities": "Error fetching top-level communities", - - // "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.", - // TODO New key - Add a translation - "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.pattern": "This input is restricted by the current pattern: {{ pattern }}.", - // TODO New key - Add a translation - "error.validation.pattern": "This input is restricted by the current pattern: {{ 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 }}", - // TODO New key - Add a translation - "footer.copyright": "copyright © 2002-{{ year }}", - - // "footer.link.dspace": "DSpace software", - // TODO New key - Add a translation - "footer.link.dspace": "DSpace software", - - // "footer.link.lyrasis": "LYRASIS", - // TODO New key - Add a translation - "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", - // TODO New key - Add a translation - "form.cancel": "Cancel", - - // "form.clear": "Clear", - // TODO New key - Add a translation - "form.clear": "Clear", - - // "form.clear-help": "Click here to remove the selected value", - // TODO New key - Add a translation - "form.clear-help": "Click here to remove the selected value", - - // "form.edit": "Edit", - // TODO New key - Add a translation - "form.edit": "Edit", - - // "form.edit-help": "Click here to edit the selected value", - // TODO New key - Add a translation - "form.edit-help": "Click here to edit the selected value", - - // "form.first-name": "First name", - // TODO New key - Add a translation - "form.first-name": "First name", - - // "form.group-collapse": "Collapse", - // TODO New key - Add a translation - "form.group-collapse": "Collapse", - - // "form.group-collapse-help": "Click here to collapse", - // TODO New key - Add a translation - "form.group-collapse-help": "Click here to collapse", - - // "form.group-expand": "Expand", - // TODO New key - Add a translation - "form.group-expand": "Expand", - - // "form.group-expand-help": "Click here to expand and add more elements", - // TODO New key - Add a translation - "form.group-expand-help": "Click here to expand and add more elements", - - // "form.last-name": "Last name", - // TODO New key - Add a translation - "form.last-name": "Last name", - - // "form.loading": "Loading...", - // TODO New key - Add a translation - "form.loading": "Loading...", - - // "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", - // TODO New key - Add a translation - "form.no-results": "No results found", - - // "form.no-value": "No value entered", - // TODO New key - Add a translation - "form.no-value": "No value entered", - - // "form.other-information": {}, - // TODO New key - Add a translation - "form.other-information": {}, - - // "form.remove": "Remove", - // TODO New key - Add a translation - "form.remove": "Remove", - - // "form.save": "Save", - // TODO New key - Add a translation - "form.save": "Save", - - // "form.save-help": "Save changes", - // TODO New key - Add a translation - "form.save-help": "Save changes", - - // "form.search": "Search", - // TODO New key - Add a translation - "form.search": "Search", - - // "form.search-help": "Click here to look for an existing correspondence", - // TODO New key - Add a translation - "form.search-help": "Click here to look for an existing correspondence", - - // "form.submit": "Submit", - // TODO New key - Add a translation - "form.submit": "Submit", - - - - // "home.description": "", - // TODO New key - Add a translation - "home.description": "", - - // "home.breadcrumbs": "Home", - // TODO New key - Add a translation - "home.breadcrumbs": "Home", - - // "home.title": "DSpace Angular :: Home", - // TODO New key - Add a translation - "home.title": "DSpace Angular :: Home", - - // "home.top-level-communities.head": "Communities in DSpace", - // TODO New key - Add a translation - "home.top-level-communities.head": "Communities in DSpace", - - // "home.top-level-communities.help": "Select a community to browse its collections.", - // TODO New key - Add a translation - "home.top-level-communities.help": "Select a community to browse its collections.", - - - - // "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", - // TODO New key - Add a translation - "item.edit.delete.cancel": "Cancel", - - // "item.edit.delete.confirm": "Delete", - // TODO New key - Add a translation - "item.edit.delete.confirm": "Delete", - - // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.", - // TODO New key - Add a translation - "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.", - - // "item.edit.delete.error": "An error occurred while deleting the item", - // TODO New key - Add a translation - "item.edit.delete.error": "An error occurred while deleting the item", - - // "item.edit.delete.header": "Delete item: {{ id }}", - // TODO New key - Add a translation - "item.edit.delete.header": "Delete item: {{ id }}", - - // "item.edit.delete.success": "The item has been deleted", - // TODO New key - Add a translation - "item.edit.delete.success": "The item has been deleted", - - // "item.edit.head": "Edit Item", - // TODO New key - Add a translation - "item.edit.head": "Edit Item", - - // "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", - // TODO New key - Add a translation - "item.edit.item-mapper.buttons.add": "Map item to selected collections", - - // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections", - // TODO New key - Add a translation - "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections", - - // "item.edit.item-mapper.cancel": "Cancel", - // TODO New key - Add a translation - "item.edit.item-mapper.cancel": "Cancel", - - // "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.", - // TODO New key - Add a translation - "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.head": "Item Mapper - Map Item to Collections", - // TODO New key - Add a translation - "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections", - - // "item.edit.item-mapper.item": "Item: \"{{name}}\"", - // TODO New key - Add a translation - "item.edit.item-mapper.item": "Item: \"{{name}}\"", - - // "item.edit.item-mapper.no-search": "Please enter a query to search", - // TODO New key - Add a translation - "item.edit.item-mapper.no-search": "Please enter a query to search", - - // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.", - // TODO New key - Add a translation - "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.", - - // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors", - // TODO New key - Add a translation - "item.edit.item-mapper.notifications.add.error.head": "Mapping errors", - - // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.", - // TODO New key - Add a translation - "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.", - - // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed", - // TODO New key - Add a translation - "item.edit.item-mapper.notifications.add.success.head": "Mapping completed", - - // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.", - // TODO New key - Add a translation - "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.head": "Removal of mapping errors", - // TODO New key - Add a translation - "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors", - - // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.", - // TODO New key - Add a translation - "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.", - - // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed", - // TODO New key - Add a translation - "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed", - - // "item.edit.item-mapper.tabs.browse": "Browse mapped collections", - // TODO New key - Add a translation - "item.edit.item-mapper.tabs.browse": "Browse mapped collections", - - // "item.edit.item-mapper.tabs.map": "Map new collections", - // TODO New key - Add a translation - "item.edit.item-mapper.tabs.map": "Map new collections", - - - - // "item.edit.metadata.add-button": "Add", - // TODO New key - Add a translation - "item.edit.metadata.add-button": "Add", - - // "item.edit.metadata.discard-button": "Discard", - // TODO New key - Add a translation - "item.edit.metadata.discard-button": "Discard", - - // "item.edit.metadata.edit.buttons.edit": "Edit", - // TODO New key - Add a translation - "item.edit.metadata.edit.buttons.edit": "Edit", - - // "item.edit.metadata.edit.buttons.remove": "Remove", - // TODO New key - Add a translation - "item.edit.metadata.edit.buttons.remove": "Remove", - - // "item.edit.metadata.edit.buttons.undo": "Undo changes", - // TODO New key - Add a translation - "item.edit.metadata.edit.buttons.undo": "Undo changes", - - // "item.edit.metadata.edit.buttons.unedit": "Stop editing", - // TODO New key - Add a translation - "item.edit.metadata.edit.buttons.unedit": "Stop editing", - - // "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", - // TODO New key - Add a translation - "item.edit.metadata.headers.edit": "Edit", - - // "item.edit.metadata.headers.field": "Field", - // TODO New key - Add a translation - "item.edit.metadata.headers.field": "Field", - - // "item.edit.metadata.headers.language": "Lang", - // TODO New key - Add a translation - "item.edit.metadata.headers.language": "Lang", - - // "item.edit.metadata.headers.value": "Value", - // TODO New key - Add a translation - "item.edit.metadata.headers.value": "Value", - - // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", - // TODO New key - Add a translation - "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", - - // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - // TODO New key - Add a translation - "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - - // "item.edit.metadata.notifications.discarded.title": "Changed discarded", - // TODO New key - Add a translation - "item.edit.metadata.notifications.discarded.title": "Changed discarded", - - // "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.", - // TODO New key - Add a translation - "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.title": "Metadata invalid", - // TODO New key - Add a translation - "item.edit.metadata.notifications.invalid.title": "Metadata invalid", - - // "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", - // TODO New key - Add a translation - "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.title": "Changed outdated", - // TODO New key - Add a translation - "item.edit.metadata.notifications.outdated.title": "Changed outdated", - - // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.", - // TODO New key - Add a translation - "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.", - - // "item.edit.metadata.notifications.saved.title": "Metadata saved", - // TODO New key - Add a translation - "item.edit.metadata.notifications.saved.title": "Metadata saved", - - // "item.edit.metadata.reinstate-button": "Undo", - // TODO New key - Add a translation - "item.edit.metadata.reinstate-button": "Undo", - - // "item.edit.metadata.save-button": "Save", - // TODO New key - Add a translation - "item.edit.metadata.save-button": "Save", - - - - // "item.edit.modify.overview.field": "Field", - // TODO New key - Add a translation - "item.edit.modify.overview.field": "Field", - - // "item.edit.modify.overview.language": "Language", - // TODO New key - Add a translation - "item.edit.modify.overview.language": "Language", - - // "item.edit.modify.overview.value": "Value", - // TODO New key - Add a translation - "item.edit.modify.overview.value": "Value", - - - - // "item.edit.move.cancel": "Cancel", - // TODO New key - Add a translation - "item.edit.move.cancel": "Cancel", - - // "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.", - // TODO New key - Add a translation - "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.error": "An error occurred when attempting to move the item", - // TODO New key - Add a translation - "item.edit.move.error": "An error occurred when attempting to move the item", - - // "item.edit.move.head": "Move item: {{id}}", - // TODO New key - Add a translation - "item.edit.move.head": "Move item: {{id}}", - - // "item.edit.move.inheritpolicies.checkbox": "Inherit policies", - // TODO New key - Add a translation - "item.edit.move.inheritpolicies.checkbox": "Inherit policies", - - // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection", - // TODO New key - Add a translation - "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection", - - // "item.edit.move.move": "Move", - // TODO New key - Add a translation - "item.edit.move.move": "Move", - - // "item.edit.move.processing": "Moving...", - // TODO New key - Add a translation - "item.edit.move.processing": "Moving...", - - // "item.edit.move.search.placeholder": "Enter a search query to look for collections", - // TODO New key - Add a translation - "item.edit.move.search.placeholder": "Enter a search query to look for collections", - - // "item.edit.move.success": "The item has been moved successfully", - // TODO New key - Add a translation - "item.edit.move.success": "The item has been moved successfully", - - // "item.edit.move.title": "Move item", - // TODO New key - Add a translation - "item.edit.move.title": "Move item", - - - - // "item.edit.private.cancel": "Cancel", - // TODO New key - Add a translation - "item.edit.private.cancel": "Cancel", - - // "item.edit.private.confirm": "Make it Private", - // TODO New key - Add a translation - "item.edit.private.confirm": "Make it Private", - - // "item.edit.private.description": "Are you sure this item should be made private in the archive?", - // TODO New key - Add a translation - "item.edit.private.description": "Are you sure this item should be made private in the archive?", - - // "item.edit.private.error": "An error occurred while making the item private", - // TODO New key - Add a translation - "item.edit.private.error": "An error occurred while making the item private", - - // "item.edit.private.header": "Make item private: {{ id }}", - // TODO New key - Add a translation - "item.edit.private.header": "Make item private: {{ id }}", - - // "item.edit.private.success": "The item is now private", - // TODO New key - Add a translation - "item.edit.private.success": "The item is now private", - - - - // "item.edit.public.cancel": "Cancel", - // TODO New key - Add a translation - "item.edit.public.cancel": "Cancel", - - // "item.edit.public.confirm": "Make it Public", - // TODO New key - Add a translation - "item.edit.public.confirm": "Make it Public", - - // "item.edit.public.description": "Are you sure this item should be made public in the archive?", - // TODO New key - Add a translation - "item.edit.public.description": "Are you sure this item should be made public in the archive?", - - // "item.edit.public.error": "An error occurred while making the item public", - // TODO New key - Add a translation - "item.edit.public.error": "An error occurred while making the item public", - - // "item.edit.public.header": "Make item public: {{ id }}", - // TODO New key - Add a translation - "item.edit.public.header": "Make item public: {{ id }}", - - // "item.edit.public.success": "The item is now public", - // TODO New key - Add a translation - "item.edit.public.success": "The item is now public", - - - - // "item.edit.reinstate.cancel": "Cancel", - // TODO New key - Add a translation - "item.edit.reinstate.cancel": "Cancel", - - // "item.edit.reinstate.confirm": "Reinstate", - // TODO New key - Add a translation - "item.edit.reinstate.confirm": "Reinstate", - - // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?", - // TODO New key - Add a translation - "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?", - - // "item.edit.reinstate.error": "An error occurred while reinstating the item", - // TODO New key - Add a translation - "item.edit.reinstate.error": "An error occurred while reinstating the item", - - // "item.edit.reinstate.header": "Reinstate item: {{ id }}", - // TODO New key - Add a translation - "item.edit.reinstate.header": "Reinstate item: {{ id }}", - - // "item.edit.reinstate.success": "The item was reinstated successfully", - // TODO New key - Add a translation - "item.edit.reinstate.success": "The item was reinstated successfully", - - - - // "item.edit.relationships.discard-button": "Discard", - // TODO New key - Add a translation - "item.edit.relationships.discard-button": "Discard", - - // "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", - // TODO New key - Add a translation - "item.edit.relationships.edit.buttons.remove": "Remove", - - // "item.edit.relationships.edit.buttons.undo": "Undo changes", - // TODO New key - Add a translation - "item.edit.relationships.edit.buttons.undo": "Undo changes", - - // "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", - // TODO New key - Add a translation - "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - - // "item.edit.relationships.notifications.discarded.title": "Changes discarded", - // TODO New key - Add a translation - "item.edit.relationships.notifications.discarded.title": "Changes discarded", - - // "item.edit.relationships.notifications.failed.title": "Error editing relationships", - // TODO New key - Add a translation - "item.edit.relationships.notifications.failed.title": "Error editing relationships", - - // "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", - // TODO New key - Add a translation - "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.title": "Changes outdated", - // TODO New key - Add a translation - "item.edit.relationships.notifications.outdated.title": "Changes outdated", - - // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.", - // TODO New key - Add a translation - "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.", - - // "item.edit.relationships.notifications.saved.title": "Relationships saved", - // TODO New key - Add a translation - "item.edit.relationships.notifications.saved.title": "Relationships saved", - - // "item.edit.relationships.reinstate-button": "Undo", - // TODO New key - Add a translation - "item.edit.relationships.reinstate-button": "Undo", - - // "item.edit.relationships.save-button": "Save", - // TODO New key - Add a translation - "item.edit.relationships.save-button": "Save", - - // "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 New key - Add a translation - "item.edit.tabs.bitstreams.head": "Bitstreams", - - // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams", - // TODO New key - Add a translation - "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams", - - // "item.edit.tabs.curate.head": "Curate", - // TODO New key - Add a translation - "item.edit.tabs.curate.head": "Curate", - - // "item.edit.tabs.curate.title": "Item Edit - Curate", - // TODO New key - Add a translation - "item.edit.tabs.curate.title": "Item Edit - Curate", - - // "item.edit.tabs.metadata.head": "Metadata", - // TODO New key - Add a translation - "item.edit.tabs.metadata.head": "Metadata", - - // "item.edit.tabs.metadata.title": "Item Edit - Metadata", - // TODO New key - Add a translation - "item.edit.tabs.metadata.title": "Item Edit - Metadata", - - // "item.edit.tabs.relationships.head": "Relationships", - // TODO New key - Add a translation - "item.edit.tabs.relationships.head": "Relationships", - - // "item.edit.tabs.relationships.title": "Item Edit - Relationships", - // TODO New key - Add a translation - "item.edit.tabs.relationships.title": "Item Edit - Relationships", - - // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...", - - // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies", - - // "item.edit.tabs.status.buttons.delete.button": "Permanently delete", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.delete.button": "Permanently delete", - - // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.delete.label": "Completely expunge item", - - // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections", - - // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections", - - // "item.edit.tabs.status.buttons.move.button": "Move...", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.move.button": "Move...", - - // "item.edit.tabs.status.buttons.move.label": "Move item to another collection", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.move.label": "Move item to another collection", - - // "item.edit.tabs.status.buttons.private.button": "Make it private...", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.private.button": "Make it private...", - - // "item.edit.tabs.status.buttons.private.label": "Make item private", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.private.label": "Make item private", - - // "item.edit.tabs.status.buttons.public.button": "Make it public...", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.public.button": "Make it public...", - - // "item.edit.tabs.status.buttons.public.label": "Make item public", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.public.label": "Make item public", - - // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", - - // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository", - - // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...", - - // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository", - - // "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.", - // TODO New key - Add a translation - "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.head": "Status", - // TODO New key - Add a translation - "item.edit.tabs.status.head": "Status", - - // "item.edit.tabs.status.labels.handle": "Handle", - // TODO New key - Add a translation - "item.edit.tabs.status.labels.handle": "Handle", - - // "item.edit.tabs.status.labels.id": "Item Internal ID", - // TODO New key - Add a translation - "item.edit.tabs.status.labels.id": "Item Internal ID", - - // "item.edit.tabs.status.labels.itemPage": "Item Page", - // TODO New key - Add a translation - "item.edit.tabs.status.labels.itemPage": "Item Page", - - // "item.edit.tabs.status.labels.lastModified": "Last Modified", - // TODO New key - Add a translation - "item.edit.tabs.status.labels.lastModified": "Last Modified", - - // "item.edit.tabs.status.title": "Item Edit - Status", - // TODO New key - Add a translation - "item.edit.tabs.status.title": "Item Edit - Status", - - // "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", - // TODO New key - Add a translation - "item.edit.tabs.view.head": "View Item", - - // "item.edit.tabs.view.title": "Item Edit - View", - // TODO New key - Add a translation - "item.edit.tabs.view.title": "Item Edit - View", - - - - // "item.edit.withdraw.cancel": "Cancel", - // TODO New key - Add a translation - "item.edit.withdraw.cancel": "Cancel", - - // "item.edit.withdraw.confirm": "Withdraw", - // TODO New key - Add a translation - "item.edit.withdraw.confirm": "Withdraw", - - // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?", - // TODO New key - Add a translation - "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?", - - // "item.edit.withdraw.error": "An error occurred while withdrawing the item", - // TODO New key - Add a translation - "item.edit.withdraw.error": "An error occurred while withdrawing the item", - - // "item.edit.withdraw.header": "Withdraw item: {{ id }}", - // TODO New key - Add a translation - "item.edit.withdraw.header": "Withdraw item: {{ id }}", - - // "item.edit.withdraw.success": "The item was withdrawn successfully", - // TODO New key - Add a translation - "item.edit.withdraw.success": "The item was withdrawn successfully", - - - - // "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", - // TODO New key - Add a translation - "item.page.abstract": "Abstract", - - // "item.page.author": "Authors", - // TODO New key - Add a translation - "item.page.author": "Authors", - - // "item.page.citation": "Citation", - // TODO New key - Add a translation - "item.page.citation": "Citation", - - // "item.page.collections": "Collections", - // TODO New key - Add a translation - "item.page.collections": "Collections", - - // "item.page.date": "Date", - // TODO New key - Add a translation - "item.page.date": "Date", - - // "item.page.edit": "Edit this item", - // TODO New key - Add a translation - "item.page.edit": "Edit this item", - - // "item.page.files": "Files", - // TODO New key - Add a translation - "item.page.files": "Files", - - // "item.page.filesection.description": "Description:", - // TODO New key - Add a translation - "item.page.filesection.description": "Description:", - - // "item.page.filesection.download": "Download", - // TODO New key - Add a translation - "item.page.filesection.download": "Download", - - // "item.page.filesection.format": "Format:", - // TODO New key - Add a translation - "item.page.filesection.format": "Format:", - - // "item.page.filesection.name": "Name:", - // TODO New key - Add a translation - "item.page.filesection.name": "Name:", - - // "item.page.filesection.size": "Size:", - // TODO New key - Add a translation - "item.page.filesection.size": "Size:", - - // "item.page.journal.search.title": "Articles in this journal", - // TODO New key - Add a translation - "item.page.journal.search.title": "Articles in this journal", - - // "item.page.link.full": "Full item page", - // TODO New key - Add a translation - "item.page.link.full": "Full item page", - - // "item.page.link.simple": "Simple item page", - // TODO New key - Add a translation - "item.page.link.simple": "Simple item page", - - // "item.page.person.search.title": "Articles by this author", - // TODO New key - Add a translation - "item.page.person.search.title": "Articles by this author", - - // "item.page.related-items.view-more": "Show {{ amount }} more", - // TODO New key - Add a translation - "item.page.related-items.view-more": "Show {{ amount }} more", - - // "item.page.related-items.view-less": "Hide last {{ amount }}", - // TODO New key - Add a translation - "item.page.related-items.view-less": "Hide last {{ amount }}", - - // "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", - // TODO New key - Add a translation - "item.page.subject": "Keywords", - - // "item.page.uri": "URI", - // TODO New key - Add a translation - "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", - // TODO New key - Add a translation - "item.select.confirm": "Confirm selected", - - // "item.select.empty": "No items to show", - // TODO New key - Add a translation - "item.select.empty": "No items to show", - - // "item.select.table.author": "Author", - // TODO New key - Add a translation - "item.select.table.author": "Author", - - // "item.select.table.collection": "Collection", - // TODO New key - Add a translation - "item.select.table.collection": "Collection", - - // "item.select.table.title": "Title", - // TODO New key - Add a translation - "item.select.table.title": "Title", - - - // "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", - // TODO New key - Add a translation - "journal.listelement.badge": "Journal", - - // "journal.page.description": "Description", - // TODO New key - Add a translation - "journal.page.description": "Description", - - // "journal.page.edit": "Edit this item", - // TODO New key - Add a translation - "journal.page.edit": "Edit this item", - - // "journal.page.editor": "Editor-in-Chief", - // TODO New key - Add a translation - "journal.page.editor": "Editor-in-Chief", - - // "journal.page.issn": "ISSN", - // TODO New key - Add a translation - "journal.page.issn": "ISSN", - - // "journal.page.publisher": "Publisher", - // TODO New key - Add a translation - "journal.page.publisher": "Publisher", - - // "journal.page.titleprefix": "Journal: ", - // TODO New key - Add a translation - "journal.page.titleprefix": "Journal: ", - - // "journal.search.results.head": "Journal Search Results", - // TODO New key - Add a translation - "journal.search.results.head": "Journal Search Results", - - // "journal.search.title": "DSpace Angular :: Journal Search", - // TODO New key - Add a translation - "journal.search.title": "DSpace Angular :: Journal Search", - - - - // "journalissue.listelement.badge": "Journal Issue", - // TODO New key - Add a translation - "journalissue.listelement.badge": "Journal Issue", - - // "journalissue.page.description": "Description", - // TODO New key - Add a translation - "journalissue.page.description": "Description", - - // "journalissue.page.edit": "Edit this item", - // TODO New key - Add a translation - "journalissue.page.edit": "Edit this item", - - // "journalissue.page.issuedate": "Issue Date", - // TODO New key - Add a translation - "journalissue.page.issuedate": "Issue Date", - - // "journalissue.page.journal-issn": "Journal ISSN", - // TODO New key - Add a translation - "journalissue.page.journal-issn": "Journal ISSN", - - // "journalissue.page.journal-title": "Journal Title", - // TODO New key - Add a translation - "journalissue.page.journal-title": "Journal Title", - - // "journalissue.page.keyword": "Keywords", - // TODO New key - Add a translation - "journalissue.page.keyword": "Keywords", - - // "journalissue.page.number": "Number", - // TODO New key - Add a translation - "journalissue.page.number": "Number", - - // "journalissue.page.titleprefix": "Journal Issue: ", - // TODO New key - Add a translation - "journalissue.page.titleprefix": "Journal Issue: ", - - - - // "journalvolume.listelement.badge": "Journal Volume", - // TODO New key - Add a translation - "journalvolume.listelement.badge": "Journal Volume", - - // "journalvolume.page.description": "Description", - // TODO New key - Add a translation - "journalvolume.page.description": "Description", - - // "journalvolume.page.edit": "Edit this item", - // TODO New key - Add a translation - "journalvolume.page.edit": "Edit this item", - - // "journalvolume.page.issuedate": "Issue Date", - // TODO New key - Add a translation - "journalvolume.page.issuedate": "Issue Date", - - // "journalvolume.page.titleprefix": "Journal Volume: ", - // TODO New key - Add a translation - "journalvolume.page.titleprefix": "Journal Volume: ", - - // "journalvolume.page.volume": "Volume", - // TODO New key - Add a translation - "journalvolume.page.volume": "Volume", - - - - // "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...", - // TODO New key - Add a translation - "loading.browse-by": "Loading items...", - - // "loading.browse-by-page": "Loading page...", - // TODO New key - Add a translation - "loading.browse-by-page": "Loading page...", - - // "loading.collection": "Loading collection...", - // TODO New key - Add a translation - "loading.collection": "Loading collection...", - - // "loading.collections": "Loading collections...", - // TODO New key - Add a translation - "loading.collections": "Loading collections...", - - // "loading.content-source": "Loading content source...", - // TODO New key - Add a translation - "loading.content-source": "Loading content source...", - - // "loading.community": "Loading community...", - // TODO New key - Add a translation - "loading.community": "Loading community...", - - // "loading.default": "Loading...", - // TODO New key - Add a translation - "loading.default": "Loading...", - - // "loading.item": "Loading item...", - // TODO New key - Add a translation - "loading.item": "Loading item...", - - // "loading.items": "Loading items...", - // TODO New key - Add a translation - "loading.items": "Loading items...", - - // "loading.mydspace-results": "Loading items...", - // TODO New key - Add a translation - "loading.mydspace-results": "Loading items...", - - // "loading.objects": "Loading...", - // TODO New key - Add a translation - "loading.objects": "Loading...", - - // "loading.recent-submissions": "Loading recent submissions...", - // TODO New key - Add a translation - "loading.recent-submissions": "Loading recent submissions...", - - // "loading.search-results": "Loading search results...", - // TODO New key - Add a translation - "loading.search-results": "Loading search results...", - - // "loading.sub-collections": "Loading sub-collections...", - // TODO New key - Add a translation - "loading.sub-collections": "Loading sub-collections...", - - // "loading.sub-communities": "Loading sub-communities...", - // TODO New key - Add a translation - "loading.sub-communities": "Loading sub-communities...", - - // "loading.top-level-communities": "Loading top-level communities...", - // TODO New key - Add a translation - "loading.top-level-communities": "Loading top-level communities...", - - - - // "login.form.email": "Email address", - // TODO New key - Add a translation - "login.form.email": "Email address", - - // "login.form.forgot-password": "Have you forgotten your password?", - // TODO New key - Add a translation - "login.form.forgot-password": "Have you forgotten your password?", - - // "login.form.header": "Please log in to DSpace", - // TODO New key - Add a translation - "login.form.header": "Please log in to DSpace", - - // "login.form.new-user": "New user? Click here to register.", - // TODO New key - Add a translation - "login.form.new-user": "New user? Click here to register.", - - // "login.form.or-divider": "or", - // TODO New key - Add a translation - "login.form.or-divider": "or", - - // "login.form.password": "Password", - // TODO New key - Add a translation - "login.form.password": "Password", - - // "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", - // TODO New key - Add a translation - "login.form.submit": "Log in", - - // "login.title": "Login", - // TODO New key - Add a translation - "login.title": "Login", - - // "login.breadcrumbs": "Login", - // TODO New key - Add a translation - "login.breadcrumbs": "Login", - - - - // "logout.form.header": "Log out from DSpace", - // TODO New key - Add a translation - "logout.form.header": "Log out from DSpace", - - // "logout.form.submit": "Log out", - // TODO New key - Add a translation - "logout.form.submit": "Log out", - - // "logout.title": "Logout", - // TODO New key - Add a translation - "logout.title": "Logout", - - - - // "menu.header.admin": "Admin", - // TODO New key - Add a translation - "menu.header.admin": "Admin", - - // "menu.header.image.logo": "Repository logo", - // TODO New key - Add a translation - "menu.header.image.logo": "Repository logo", - - - - // "menu.section.access_control": "Access Control", - // TODO New key - Add a translation - "menu.section.access_control": "Access Control", - - // "menu.section.access_control_authorizations": "Authorizations", - // TODO New key - Add a translation - "menu.section.access_control_authorizations": "Authorizations", - - // "menu.section.access_control_groups": "Groups", - // TODO New key - Add a translation - "menu.section.access_control_groups": "Groups", - - // "menu.section.access_control_people": "People", - // TODO New key - Add a translation - "menu.section.access_control_people": "People", - - - - // "menu.section.admin_search": "Admin Search", - // TODO New key - Add a translation - "menu.section.admin_search": "Admin Search", - - - - // "menu.section.browse_community": "This Community", - // TODO New key - Add a translation - "menu.section.browse_community": "This Community", - - // "menu.section.browse_community_by_author": "By Author", - // TODO New key - Add a translation - "menu.section.browse_community_by_author": "By Author", - - // "menu.section.browse_community_by_issue_date": "By Issue Date", - // TODO New key - Add a translation - "menu.section.browse_community_by_issue_date": "By Issue Date", - - // "menu.section.browse_community_by_title": "By Title", - // TODO New key - Add a translation - "menu.section.browse_community_by_title": "By Title", - - // "menu.section.browse_global": "All of DSpace", - // TODO New key - Add a translation - "menu.section.browse_global": "All of DSpace", - - // "menu.section.browse_global_by_author": "By Author", - // TODO New key - Add a translation - "menu.section.browse_global_by_author": "By Author", - - // "menu.section.browse_global_by_dateissued": "By Issue Date", - // TODO New key - Add a translation - "menu.section.browse_global_by_dateissued": "By Issue Date", - - // "menu.section.browse_global_by_subject": "By Subject", - // TODO New key - Add a translation - "menu.section.browse_global_by_subject": "By Subject", - - // "menu.section.browse_global_by_title": "By Title", - // TODO New key - Add a translation - "menu.section.browse_global_by_title": "By Title", - - // "menu.section.browse_global_communities_and_collections": "Communities & Collections", - // TODO New key - Add a translation - "menu.section.browse_global_communities_and_collections": "Communities & Collections", - - - - // "menu.section.control_panel": "Control Panel", - // TODO New key - Add a translation - "menu.section.control_panel": "Control Panel", - - // "menu.section.curation_task": "Curation Task", - // TODO New key - Add a translation - "menu.section.curation_task": "Curation Task", - - - - // "menu.section.edit": "Edit", - // TODO New key - Add a translation - "menu.section.edit": "Edit", - - // "menu.section.edit_collection": "Collection", - // TODO New key - Add a translation - "menu.section.edit_collection": "Collection", - - // "menu.section.edit_community": "Community", - // TODO New key - Add a translation - "menu.section.edit_community": "Community", - - // "menu.section.edit_item": "Item", - // TODO New key - Add a translation - "menu.section.edit_item": "Item", - - - - // "menu.section.export": "Export", - // TODO New key - Add a translation - "menu.section.export": "Export", - - // "menu.section.export_collection": "Collection", - // TODO New key - Add a translation - "menu.section.export_collection": "Collection", - - // "menu.section.export_community": "Community", - // TODO New key - Add a translation - "menu.section.export_community": "Community", - - // "menu.section.export_item": "Item", - // TODO New key - Add a translation - "menu.section.export_item": "Item", - - // "menu.section.export_metadata": "Metadata", - // TODO New key - Add a translation - "menu.section.export_metadata": "Metadata", - - - - // "menu.section.icon.access_control": "Access Control menu section", - // TODO New key - Add a translation - "menu.section.icon.access_control": "Access Control menu section", - - // "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", - // TODO New key - Add a translation - "menu.section.icon.control_panel": "Control Panel menu section", - - // "menu.section.icon.curation_task": "Curation Task menu section", - // TODO New key - Add a translation - "menu.section.icon.curation_task": "Curation Task menu section", - - // "menu.section.icon.edit": "Edit menu section", - // TODO New key - Add a translation - "menu.section.icon.edit": "Edit menu section", - - // "menu.section.icon.export": "Export menu section", - // TODO New key - Add a translation - "menu.section.icon.export": "Export menu section", - - // "menu.section.icon.find": "Find menu section", - // TODO New key - Add a translation - "menu.section.icon.find": "Find menu section", - - // "menu.section.icon.import": "Import menu section", - // TODO New key - Add a translation - "menu.section.icon.import": "Import menu section", - - // "menu.section.icon.new": "New menu section", - // TODO New key - Add a translation - "menu.section.icon.new": "New menu section", - - // "menu.section.icon.pin": "Pin sidebar", - // TODO New key - Add a translation - "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", - // TODO New key - Add a translation - "menu.section.icon.registries": "Registries menu section", - - // "menu.section.icon.statistics_task": "Statistics Task menu section", - // TODO New key - Add a translation - "menu.section.icon.statistics_task": "Statistics Task menu section", - - // "menu.section.icon.unpin": "Unpin sidebar", - // TODO New key - Add a translation - "menu.section.icon.unpin": "Unpin sidebar", - - - - // "menu.section.import": "Import", - // TODO New key - Add a translation - "menu.section.import": "Import", - - // "menu.section.import_batch": "Batch Import (ZIP)", - // TODO New key - Add a translation - "menu.section.import_batch": "Batch Import (ZIP)", - - // "menu.section.import_metadata": "Metadata", - // TODO New key - Add a translation - "menu.section.import_metadata": "Metadata", - - - - // "menu.section.new": "New", - // TODO New key - Add a translation - "menu.section.new": "New", - - // "menu.section.new_collection": "Collection", - // TODO New key - Add a translation - "menu.section.new_collection": "Collection", - - // "menu.section.new_community": "Community", - // TODO New key - Add a translation - "menu.section.new_community": "Community", - - // "menu.section.new_item": "Item", - // TODO New key - Add a translation - "menu.section.new_item": "Item", - - // "menu.section.new_item_version": "Item Version", - // TODO New key - Add a translation - "menu.section.new_item_version": "Item Version", - - // "menu.section.new_process": "Process", - // TODO New key - Add a translation - "menu.section.new_process": "Process", - - - - // "menu.section.pin": "Pin sidebar", - // TODO New key - Add a translation - "menu.section.pin": "Pin sidebar", - - // "menu.section.unpin": "Unpin sidebar", - // TODO New key - Add a translation - "menu.section.unpin": "Unpin sidebar", - - - - // "menu.section.processes": "Processes", - // TODO New key - Add a translation - "menu.section.processes": "Processes", - - - - // "menu.section.registries": "Registries", - // TODO New key - Add a translation - "menu.section.registries": "Registries", - - // "menu.section.registries_format": "Format", - // TODO New key - Add a translation - "menu.section.registries_format": "Format", - - // "menu.section.registries_metadata": "Metadata", - // TODO New key - Add a translation - "menu.section.registries_metadata": "Metadata", - - - - // "menu.section.statistics": "Statistics", - // TODO New key - Add a translation - "menu.section.statistics": "Statistics", - - // "menu.section.statistics_task": "Statistics Task", - // TODO New key - Add a translation - "menu.section.statistics_task": "Statistics Task", - - - - // "menu.section.toggle.access_control": "Toggle Access Control section", - // TODO New key - Add a translation - "menu.section.toggle.access_control": "Toggle Access Control section", - - // "menu.section.toggle.control_panel": "Toggle Control Panel section", - // TODO New key - Add a translation - "menu.section.toggle.control_panel": "Toggle Control Panel section", - - // "menu.section.toggle.curation_task": "Toggle Curation Task section", - // TODO New key - Add a translation - "menu.section.toggle.curation_task": "Toggle Curation Task section", - - // "menu.section.toggle.edit": "Toggle Edit section", - // TODO New key - Add a translation - "menu.section.toggle.edit": "Toggle Edit section", - - // "menu.section.toggle.export": "Toggle Export section", - // TODO New key - Add a translation - "menu.section.toggle.export": "Toggle Export section", - - // "menu.section.toggle.find": "Toggle Find section", - // TODO New key - Add a translation - "menu.section.toggle.find": "Toggle Find section", - - // "menu.section.toggle.import": "Toggle Import section", - // TODO New key - Add a translation - "menu.section.toggle.import": "Toggle Import section", - - // "menu.section.toggle.new": "Toggle New section", - // TODO New key - Add a translation - "menu.section.toggle.new": "Toggle New section", - - // "menu.section.toggle.registries": "Toggle Registries section", - // TODO New key - Add a translation - "menu.section.toggle.registries": "Toggle Registries section", - - // "menu.section.toggle.statistics_task": "Toggle Statistics Task section", - // TODO New key - Add a translation - "menu.section.toggle.statistics_task": "Toggle Statistics Task section", - - - // "menu.section.workflow": "Administer Workflow", - // TODO New key - Add a translation - "menu.section.workflow": "Administer Workflow", - - - // "mydspace.description": "", - // TODO New key - Add a translation - "mydspace.description": "", - - // "mydspace.general.text-here": "here", - // TODO New key - Add a translation - "mydspace.general.text-here": "here", - - // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.", - // TODO New key - Add a translation - "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.", - - // "mydspace.messages.description-placeholder": "Insert your message here...", - // TODO New key - Add a translation - "mydspace.messages.description-placeholder": "Insert your message here...", - - // "mydspace.messages.hide-msg": "Hide message", - // TODO New key - Add a translation - "mydspace.messages.hide-msg": "Hide message", - - // "mydspace.messages.mark-as-read": "Mark as read", - // TODO New key - Add a translation - "mydspace.messages.mark-as-read": "Mark as read", - - // "mydspace.messages.mark-as-unread": "Mark as unread", - // TODO New key - Add a translation - "mydspace.messages.mark-as-unread": "Mark as unread", - - // "mydspace.messages.no-content": "No content.", - // TODO New key - Add a translation - "mydspace.messages.no-content": "No content.", - - // "mydspace.messages.no-messages": "No messages yet.", - // TODO New key - Add a translation - "mydspace.messages.no-messages": "No messages yet.", - - // "mydspace.messages.send-btn": "Send", - // TODO New key - Add a translation - "mydspace.messages.send-btn": "Send", - - // "mydspace.messages.show-msg": "Show message", - // TODO New key - Add a translation - "mydspace.messages.show-msg": "Show message", - - // "mydspace.messages.subject-placeholder": "Subject...", - // TODO New key - Add a translation - "mydspace.messages.subject-placeholder": "Subject...", - - // "mydspace.messages.submitter-help": "Select this option to send a message to controller.", - // TODO New key - Add a translation - "mydspace.messages.submitter-help": "Select this option to send a message to controller.", - - // "mydspace.messages.title": "Messages", - // TODO New key - Add a translation - "mydspace.messages.title": "Messages", - - // "mydspace.messages.to": "To", - // TODO New key - Add a translation - "mydspace.messages.to": "To", - - // "mydspace.new-submission": "New submission", - // TODO New key - Add a translation - "mydspace.new-submission": "New submission", - - // "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", - // TODO New key - Add a translation - "mydspace.results.head": "Your submissions", - - // "mydspace.results.no-abstract": "No Abstract", - // TODO New key - Add a translation - "mydspace.results.no-abstract": "No Abstract", - - // "mydspace.results.no-authors": "No Authors", - // TODO New key - Add a translation - "mydspace.results.no-authors": "No Authors", - - // "mydspace.results.no-collections": "No Collections", - // TODO New key - Add a translation - "mydspace.results.no-collections": "No Collections", - - // "mydspace.results.no-date": "No Date", - // TODO New key - Add a translation - "mydspace.results.no-date": "No Date", - - // "mydspace.results.no-files": "No Files", - // TODO New key - Add a translation - "mydspace.results.no-files": "No Files", - - // "mydspace.results.no-results": "There were no items to show", - // TODO New key - Add a translation - "mydspace.results.no-results": "There were no items to show", - - // "mydspace.results.no-title": "No title", - // TODO New key - Add a translation - "mydspace.results.no-title": "No title", - - // "mydspace.results.no-uri": "No Uri", - // TODO New key - Add a translation - "mydspace.results.no-uri": "No Uri", - - // "mydspace.show.workflow": "All tasks", - // TODO New key - Add a translation - "mydspace.show.workflow": "All tasks", - - // "mydspace.show.workspace": "Your Submissions", - // TODO New key - Add a translation - "mydspace.show.workspace": "Your Submissions", - - // "mydspace.status.archived": "Archived", - // TODO New key - Add a translation - "mydspace.status.archived": "Archived", - - // "mydspace.status.validation": "Validation", - // TODO New key - Add a translation - "mydspace.status.validation": "Validation", - - // "mydspace.status.waiting-for-controller": "Waiting for controller", - // TODO New key - Add a translation - "mydspace.status.waiting-for-controller": "Waiting for controller", - - // "mydspace.status.workflow": "Workflow", - // TODO New key - Add a translation - "mydspace.status.workflow": "Workflow", - - // "mydspace.status.workspace": "Workspace", - // TODO New key - Add a translation - "mydspace.status.workspace": "Workspace", - - // "mydspace.title": "MyDSpace", - // TODO New key - Add a translation - "mydspace.title": "MyDSpace", - - // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", - // TODO New key - Add a translation - "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.", - - // "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.", - // TODO New key - Add a translation - "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.", - - // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.", - // TODO New key - Add a translation - "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.", - - // "mydspace.view-btn": "View", - // TODO New key - Add a translation - "mydspace.view-btn": "View", - - - - // "nav.browse.header": "All of DSpace", - // TODO New key - Add a translation - "nav.browse.header": "All of DSpace", - - // "nav.community-browse.header": "By Community", - // TODO New key - Add a translation - "nav.community-browse.header": "By Community", - - // "nav.language": "Language switch", - // TODO New key - Add a translation - "nav.language": "Language switch", - - // "nav.login": "Log In", - // TODO New key - Add a translation - "nav.login": "Log In", - - // "nav.logout": "Log Out", - // TODO New key - Add a translation - "nav.logout": "Log Out", - - // "nav.mydspace": "MyDSpace", - // TODO New key - Add a translation - "nav.mydspace": "MyDSpace", - - // "nav.profile": "Profile", - // TODO New key - Add a translation - "nav.profile": "Profile", - - // "nav.search": "Search", - // TODO New key - Add a translation - "nav.search": "Search", - - // "nav.statistics.header": "Statistics", - // TODO New key - Add a translation - "nav.statistics.header": "Statistics", - - // "nav.stop-impersonating": "Stop impersonating EPerson", - // TODO New key - Add a translation - "nav.stop-impersonating": "Stop impersonating EPerson", - - - - // "orgunit.listelement.badge": "Organizational Unit", - // TODO New key - Add a translation - "orgunit.listelement.badge": "Organizational Unit", - - // "orgunit.page.city": "City", - // TODO New key - Add a translation - "orgunit.page.city": "City", - - // "orgunit.page.country": "Country", - // TODO New key - Add a translation - "orgunit.page.country": "Country", - - // "orgunit.page.dateestablished": "Date established", - // TODO New key - Add a translation - "orgunit.page.dateestablished": "Date established", - - // "orgunit.page.description": "Description", - // TODO New key - Add a translation - "orgunit.page.description": "Description", - - // "orgunit.page.edit": "Edit this item", - // TODO New key - Add a translation - "orgunit.page.edit": "Edit this item", - - // "orgunit.page.id": "ID", - // TODO New key - Add a translation - "orgunit.page.id": "ID", - - // "orgunit.page.titleprefix": "Organizational Unit: ", - // TODO New key - Add a translation - "orgunit.page.titleprefix": "Organizational Unit: ", - - - - // "pagination.results-per-page": "Results Per Page", - // TODO New key - Add a translation - "pagination.results-per-page": "Results Per Page", - - // "pagination.showing.detail": "{{ range }} of {{ total }}", - // TODO New key - Add a translation - "pagination.showing.detail": "{{ range }} of {{ total }}", - - // "pagination.showing.label": "Now showing ", - // TODO New key - Add a translation - "pagination.showing.label": "Now showing ", - - // "pagination.sort-direction": "Sort Options", - // TODO New key - Add a translation - "pagination.sort-direction": "Sort Options", - - - - // "person.listelement.badge": "Person", - // TODO New key - Add a translation - "person.listelement.badge": "Person", - - // "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", - // TODO New key - Add a translation - "person.page.birthdate": "Birth Date", - - // "person.page.edit": "Edit this item", - // TODO New key - Add a translation - "person.page.edit": "Edit this item", - - // "person.page.email": "Email Address", - // TODO New key - Add a translation - "person.page.email": "Email Address", - - // "person.page.firstname": "First Name", - // TODO New key - Add a translation - "person.page.firstname": "First Name", - - // "person.page.jobtitle": "Job Title", - // TODO New key - Add a translation - "person.page.jobtitle": "Job Title", - - // "person.page.lastname": "Last Name", - // TODO New key - Add a translation - "person.page.lastname": "Last Name", - - // "person.page.link.full": "Show all metadata", - // TODO New key - Add a translation - "person.page.link.full": "Show all metadata", - - // "person.page.orcid": "ORCID", - // TODO New key - Add a translation - "person.page.orcid": "ORCID", - - // "person.page.staffid": "Staff ID", - // TODO New key - Add a translation - "person.page.staffid": "Staff ID", - - // "person.page.titleprefix": "Person: ", - // TODO New key - Add a translation - "person.page.titleprefix": "Person: ", - - // "person.search.results.head": "Person Search Results", - // TODO New key - Add a translation - "person.search.results.head": "Person Search Results", - - // "person.search.title": "DSpace Angular :: Person Search", - // TODO New key - Add a translation - "person.search.title": "DSpace Angular :: Person Search", - - - - // "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", - // TODO New key - Add a translation - "project.listelement.badge": "Research Project", - - // "project.page.contributor": "Contributors", - // TODO New key - Add a translation - "project.page.contributor": "Contributors", - - // "project.page.description": "Description", - // TODO New key - Add a translation - "project.page.description": "Description", - - // "project.page.edit": "Edit this item", - // TODO New key - Add a translation - "project.page.edit": "Edit this item", - - // "project.page.expectedcompletion": "Expected Completion", - // TODO New key - Add a translation - "project.page.expectedcompletion": "Expected Completion", - - // "project.page.funder": "Funders", - // TODO New key - Add a translation - "project.page.funder": "Funders", - - // "project.page.id": "ID", - // TODO New key - Add a translation - "project.page.id": "ID", - - // "project.page.keyword": "Keywords", - // TODO New key - Add a translation - "project.page.keyword": "Keywords", - - // "project.page.status": "Status", - // TODO New key - Add a translation - "project.page.status": "Status", - - // "project.page.titleprefix": "Research Project: ", - // TODO New key - Add a translation - "project.page.titleprefix": "Research Project: ", - - // "project.search.results.head": "Project Search Results", - // TODO New key - Add a translation - "project.search.results.head": "Project Search Results", - - - - // "publication.listelement.badge": "Publication", - // TODO New key - Add a translation - "publication.listelement.badge": "Publication", - - // "publication.page.description": "Description", - // TODO New key - Add a translation - "publication.page.description": "Description", - - // "publication.page.edit": "Edit this item", - // TODO New key - Add a translation - "publication.page.edit": "Edit this item", - - // "publication.page.journal-issn": "Journal ISSN", - // TODO New key - Add a translation - "publication.page.journal-issn": "Journal ISSN", - - // "publication.page.journal-title": "Journal Title", - // TODO New key - Add a translation - "publication.page.journal-title": "Journal Title", - - // "publication.page.publisher": "Publisher", - // TODO New key - Add a translation - "publication.page.publisher": "Publisher", - - // "publication.page.titleprefix": "Publication: ", - // TODO New key - Add a translation - "publication.page.titleprefix": "Publication: ", - - // "publication.page.volume-title": "Volume Title", - // TODO New key - Add a translation - "publication.page.volume-title": "Volume Title", - - // "publication.search.results.head": "Publication Search Results", - // TODO New key - Add a translation - "publication.search.results.head": "Publication Search Results", - - // "publication.search.title": "DSpace Angular :: Publication Search", - // TODO New key - Add a translation - "publication.search.title": "DSpace Angular :: Publication Search", - - - // "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", - // TODO New key - Add a translation - "relationships.isAuthorOf": "Authors", - - // "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", - // TODO New key - Add a translation - "relationships.isIssueOf": "Journal Issues", - - // "relationships.isJournalIssueOf": "Journal Issue", - // TODO New key - Add a translation - "relationships.isJournalIssueOf": "Journal Issue", - - // "relationships.isJournalOf": "Journals", - // TODO New key - Add a translation - "relationships.isJournalOf": "Journals", - - // "relationships.isOrgUnitOf": "Organizational Units", - // TODO New key - Add a translation - "relationships.isOrgUnitOf": "Organizational Units", - - // "relationships.isPersonOf": "Authors", - // TODO New key - Add a translation - "relationships.isPersonOf": "Authors", - - // "relationships.isProjectOf": "Research Projects", - // TODO New key - Add a translation - "relationships.isProjectOf": "Research Projects", - - // "relationships.isPublicationOf": "Publications", - // TODO New key - Add a translation - "relationships.isPublicationOf": "Publications", - - // "relationships.isPublicationOfJournalIssue": "Articles", - // TODO New key - Add a translation - "relationships.isPublicationOfJournalIssue": "Articles", - - // "relationships.isSingleJournalOf": "Journal", - // TODO New key - Add a translation - "relationships.isSingleJournalOf": "Journal", - - // "relationships.isSingleVolumeOf": "Journal Volume", - // TODO New key - Add a translation - "relationships.isSingleVolumeOf": "Journal Volume", - - // "relationships.isVolumeOf": "Journal Volumes", - // TODO New key - Add a translation - "relationships.isVolumeOf": "Journal Volumes", - - // "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": "", - // TODO New key - Add a translation - "search.description": "", - - // "search.switch-configuration.title": "Show", - // TODO New key - Add a translation - "search.switch-configuration.title": "Show", - - // "search.title": "DSpace Angular :: Search", - // TODO New key - Add a translation - "search.title": "DSpace Angular :: Search", - - // "search.breadcrumbs": "Search", - // TODO New key - Add a translation - "search.breadcrumbs": "Search", - - - // "search.filters.applied.f.author": "Author", - // TODO New key - Add a translation - "search.filters.applied.f.author": "Author", - - // "search.filters.applied.f.dateIssued.max": "End date", - // TODO New key - Add a translation - "search.filters.applied.f.dateIssued.max": "End date", - - // "search.filters.applied.f.dateIssued.min": "Start date", - // TODO New key - Add a translation - "search.filters.applied.f.dateIssued.min": "Start date", - - // "search.filters.applied.f.dateSubmitted": "Date submitted", - // TODO New key - Add a translation - "search.filters.applied.f.dateSubmitted": "Date submitted", - - // "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", - // TODO New key - Add a translation - "search.filters.applied.f.entityType": "Item Type", - - // "search.filters.applied.f.has_content_in_original_bundle": "Has files", - // TODO New key - Add a translation - "search.filters.applied.f.has_content_in_original_bundle": "Has files", - - // "search.filters.applied.f.itemtype": "Type", - // TODO New key - Add a translation - "search.filters.applied.f.itemtype": "Type", - - // "search.filters.applied.f.namedresourcetype": "Status", - // TODO New key - Add a translation - "search.filters.applied.f.namedresourcetype": "Status", - - // "search.filters.applied.f.subject": "Subject", - // TODO New key - Add a translation - "search.filters.applied.f.subject": "Subject", - - // "search.filters.applied.f.submitter": "Submitter", - // TODO New key - Add a translation - "search.filters.applied.f.submitter": "Submitter", - - // "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", - // TODO New key - Add a translation - "search.filters.filter.author.head": "Author", - - // "search.filters.filter.author.placeholder": "Author name", - // TODO New key - Add a translation - "search.filters.filter.author.placeholder": "Author name", - - // "search.filters.filter.birthDate.head": "Birth Date", - // TODO New key - Add a translation - "search.filters.filter.birthDate.head": "Birth Date", - - // "search.filters.filter.birthDate.placeholder": "Birth Date", - // TODO New key - Add a translation - "search.filters.filter.birthDate.placeholder": "Birth Date", - - // "search.filters.filter.creativeDatePublished.head": "Date Published", - // TODO New key - Add a translation - "search.filters.filter.creativeDatePublished.head": "Date Published", - - // "search.filters.filter.creativeDatePublished.placeholder": "Date Published", - // TODO New key - Add a translation - "search.filters.filter.creativeDatePublished.placeholder": "Date Published", - - // "search.filters.filter.creativeWorkEditor.head": "Editor", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkEditor.head": "Editor", - - // "search.filters.filter.creativeWorkEditor.placeholder": "Editor", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkEditor.placeholder": "Editor", - - // "search.filters.filter.creativeWorkKeywords.head": "Subject", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkKeywords.head": "Subject", - - // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkKeywords.placeholder": "Subject", - - // "search.filters.filter.creativeWorkPublisher.head": "Publisher", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkPublisher.head": "Publisher", - - // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher", - // TODO New key - Add a translation - "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher", - - // "search.filters.filter.dateIssued.head": "Date", - // TODO New key - Add a translation - "search.filters.filter.dateIssued.head": "Date", - - // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date", - // TODO New key - Add a translation - "search.filters.filter.dateIssued.max.placeholder": "Minimum Date", - - // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date", - // TODO New key - Add a translation - "search.filters.filter.dateIssued.min.placeholder": "Maximum Date", - - // "search.filters.filter.dateSubmitted.head": "Date submitted", - // TODO New key - Add a translation - "search.filters.filter.dateSubmitted.head": "Date submitted", - - // "search.filters.filter.dateSubmitted.placeholder": "Date submitted", - // TODO New key - Add a translation - "search.filters.filter.dateSubmitted.placeholder": "Date submitted", - - // "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", - // TODO New key - Add a translation - "search.filters.filter.entityType.head": "Item Type", - - // "search.filters.filter.entityType.placeholder": "Item Type", - // TODO New key - Add a translation - "search.filters.filter.entityType.placeholder": "Item Type", - - // "search.filters.filter.has_content_in_original_bundle.head": "Has files", - // TODO New key - Add a translation - "search.filters.filter.has_content_in_original_bundle.head": "Has files", - - // "search.filters.filter.itemtype.head": "Type", - // TODO New key - Add a translation - "search.filters.filter.itemtype.head": "Type", - - // "search.filters.filter.itemtype.placeholder": "Type", - // TODO New key - Add a translation - "search.filters.filter.itemtype.placeholder": "Type", - - // "search.filters.filter.jobTitle.head": "Job Title", - // TODO New key - Add a translation - "search.filters.filter.jobTitle.head": "Job Title", - - // "search.filters.filter.jobTitle.placeholder": "Job Title", - // TODO New key - Add a translation - "search.filters.filter.jobTitle.placeholder": "Job Title", - - // "search.filters.filter.knowsLanguage.head": "Known language", - // TODO New key - Add a translation - "search.filters.filter.knowsLanguage.head": "Known language", - - // "search.filters.filter.knowsLanguage.placeholder": "Known language", - // TODO New key - Add a translation - "search.filters.filter.knowsLanguage.placeholder": "Known language", - - // "search.filters.filter.namedresourcetype.head": "Status", - // TODO New key - Add a translation - "search.filters.filter.namedresourcetype.head": "Status", - - // "search.filters.filter.namedresourcetype.placeholder": "Status", - // TODO New key - Add a translation - "search.filters.filter.namedresourcetype.placeholder": "Status", - - // "search.filters.filter.objectpeople.head": "People", - // TODO New key - Add a translation - "search.filters.filter.objectpeople.head": "People", - - // "search.filters.filter.objectpeople.placeholder": "People", - // TODO New key - Add a translation - "search.filters.filter.objectpeople.placeholder": "People", - - // "search.filters.filter.organizationAddressCountry.head": "Country", - // TODO New key - Add a translation - "search.filters.filter.organizationAddressCountry.head": "Country", - - // "search.filters.filter.organizationAddressCountry.placeholder": "Country", - // TODO New key - Add a translation - "search.filters.filter.organizationAddressCountry.placeholder": "Country", - - // "search.filters.filter.organizationAddressLocality.head": "City", - // TODO New key - Add a translation - "search.filters.filter.organizationAddressLocality.head": "City", - - // "search.filters.filter.organizationAddressLocality.placeholder": "City", - // TODO New key - Add a translation - "search.filters.filter.organizationAddressLocality.placeholder": "City", - - // "search.filters.filter.organizationFoundingDate.head": "Date Founded", - // TODO New key - Add a translation - "search.filters.filter.organizationFoundingDate.head": "Date Founded", - - // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded", - // TODO New key - Add a translation - "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded", - - // "search.filters.filter.scope.head": "Scope", - // TODO New key - Add a translation - "search.filters.filter.scope.head": "Scope", - - // "search.filters.filter.scope.placeholder": "Scope filter", - // TODO New key - Add a translation - "search.filters.filter.scope.placeholder": "Scope filter", - - // "search.filters.filter.show-less": "Collapse", - // TODO New key - Add a translation - "search.filters.filter.show-less": "Collapse", - - // "search.filters.filter.show-more": "Show more", - // TODO New key - Add a translation - "search.filters.filter.show-more": "Show more", - - // "search.filters.filter.subject.head": "Subject", - // TODO New key - Add a translation - "search.filters.filter.subject.head": "Subject", - - // "search.filters.filter.subject.placeholder": "Subject", - // TODO New key - Add a translation - "search.filters.filter.subject.placeholder": "Subject", - - // "search.filters.filter.submitter.head": "Submitter", - // TODO New key - Add a translation - "search.filters.filter.submitter.head": "Submitter", - - // "search.filters.filter.submitter.placeholder": "Submitter", - // TODO New key - Add a translation - "search.filters.filter.submitter.placeholder": "Submitter", - - - - // "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", - // TODO New key - Add a translation - "search.filters.head": "Filters", - - // "search.filters.reset": "Reset filters", - // TODO New key - Add a translation - "search.filters.reset": "Reset filters", - - - - // "search.form.search": "Search", - // TODO New key - Add a translation - "search.form.search": "Search", - - // "search.form.search_dspace": "Search DSpace", - // TODO New key - Add a translation - "search.form.search_dspace": "Search DSpace", - - // "search.form.search_mydspace": "Search MyDSpace", - // TODO New key - Add a translation - "search.form.search_mydspace": "Search MyDSpace", - - - - // "search.results.head": "Search Results", - // TODO New key - Add a translation - "search.results.head": "Search Results", - - // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting", - // TODO New key - Add a 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", - // TODO New key - Add a translation - "search.results.no-results-link": "quotes around it", - - // "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", - // TODO New key - Add a translation - "search.sidebar.close": "Back to results", - - // "search.sidebar.filters.title": "Filters", - // TODO New key - Add a translation - "search.sidebar.filters.title": "Filters", - - // "search.sidebar.open": "Search Tools", - // TODO New key - Add a translation - "search.sidebar.open": "Search Tools", - - // "search.sidebar.results": "results", - // TODO New key - Add a translation - "search.sidebar.results": "results", - - // "search.sidebar.settings.rpp": "Results per page", - // TODO New key - Add a translation - "search.sidebar.settings.rpp": "Results per page", - - // "search.sidebar.settings.sort-by": "Sort By", - // TODO New key - Add a translation - "search.sidebar.settings.sort-by": "Sort By", - - // "search.sidebar.settings.title": "Settings", - // TODO New key - Add a translation - "search.sidebar.settings.title": "Settings", - - - - // "search.view-switch.show-detail": "Show detail", - // TODO New key - Add a translation - "search.view-switch.show-detail": "Show detail", - - // "search.view-switch.show-grid": "Show as grid", - // TODO New key - Add a translation - "search.view-switch.show-grid": "Show as grid", - - // "search.view-switch.show-list": "Show as list", - // TODO New key - Add a translation - "search.view-switch.show-list": "Show as list", - - - - // "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", - // TODO New key - Add a translation - "sorting.dc.title.ASC": "Title Ascending", - - // "sorting.dc.title.DESC": "Title Descending", - // TODO New key - Add a translation - "sorting.dc.title.DESC": "Title Descending", - - // "sorting.score.DESC": "Relevance", - // TODO New key - Add a translation - "sorting.score.DESC": "Relevance", - - - - // "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", - // TODO New key - Add a translation - "submission.edit.title": "Edit Submission", - - // "submission.general.cannot_submit": "You have not the privilege to make a new submission.", - // TODO New key - Add a translation - "submission.general.cannot_submit": "You have not the privilege to make a new submission.", - - // "submission.general.deposit": "Deposit", - // TODO New key - Add a translation - "submission.general.deposit": "Deposit", - - // "submission.general.discard.confirm.cancel": "Cancel", - // TODO New key - Add a translation - "submission.general.discard.confirm.cancel": "Cancel", - - // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?", - // TODO New key - Add a translation - "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?", - - // "submission.general.discard.confirm.submit": "Yes, I'm sure", - // TODO New key - Add a translation - "submission.general.discard.confirm.submit": "Yes, I'm sure", - - // "submission.general.discard.confirm.title": "Discard submission", - // TODO New key - Add a translation - "submission.general.discard.confirm.title": "Discard submission", - - // "submission.general.discard.submit": "Discard", - // TODO New key - Add a translation - "submission.general.discard.submit": "Discard", - - // "submission.general.save": "Save", - // TODO New key - Add a translation - "submission.general.save": "Save", - - // "submission.general.save-later": "Save for later", - // TODO New key - Add a translation - "submission.general.save-later": "Save for later", - - - // "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", - // TODO New key - Add a translation - "submission.sections.general.add-more": "Add more", - - // "submission.sections.general.collection": "Collection", - // TODO New key - Add a translation - "submission.sections.general.collection": "Collection", - - // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.", - // TODO New key - Add a translation - "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.", - - // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.", - // TODO New key - Add a translation - "submission.sections.general.deposit_success_notice": "Submission deposited successfully.", - - // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.", - // TODO New key - Add a translation - "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.", - - // "submission.sections.general.discard_success_notice": "Submission discarded successfully.", - // TODO New key - Add a translation - "submission.sections.general.discard_success_notice": "Submission discarded successfully.", - - // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the {{sectionId}} section.", - // TODO New key - Add a translation - "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the {{sectionId}} section.", - - // "submission.sections.general.metadata-extracted-new-section": "New {{sectionId}} section has been added to submission.", - // TODO New key - Add a translation - "submission.sections.general.metadata-extracted-new-section": "New {{sectionId}} section has been added to submission.", - - // "submission.sections.general.no-collection": "No collection found", - // TODO New key - Add a translation - "submission.sections.general.no-collection": "No collection found", - - // "submission.sections.general.no-sections": "No options available", - // TODO New key - Add a translation - "submission.sections.general.no-sections": "No options available", - - // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.", - // TODO New key - Add a translation - "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.", - - // "submission.sections.general.save_success_notice": "Submission saved successfully.", - // TODO New key - Add a translation - "submission.sections.general.save_success_notice": "Submission saved successfully.", - - // "submission.sections.general.search-collection": "Search for a collection", - // TODO New key - Add a translation - "submission.sections.general.search-collection": "Search for a collection", - - // "submission.sections.general.sections_not_valid": "There are incomplete sections.", - // TODO New key - Add a translation - "submission.sections.general.sections_not_valid": "There are incomplete sections.", - - - - // "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", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.describe.recycle": "Recycle", - - // "submission.sections.submit.progressbar.describe.stepcustom": "Describe", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.describe.stepcustom": "Describe", - - // "submission.sections.submit.progressbar.describe.stepone": "Describe", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.describe.stepone": "Describe", - - // "submission.sections.submit.progressbar.describe.steptwo": "Describe", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.describe.steptwo": "Describe", - - // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates", - - // "submission.sections.submit.progressbar.license": "Deposit license", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.license": "Deposit license", - - // "submission.sections.submit.progressbar.upload": "Upload files", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.upload": "Upload files", - - - - // "submission.sections.upload.delete.confirm.cancel": "Cancel", - // TODO New key - Add a translation - "submission.sections.upload.delete.confirm.cancel": "Cancel", - - // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?", - // TODO New key - Add a translation - "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?", - - // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure", - // TODO New key - Add a translation - "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure", - - // "submission.sections.upload.delete.confirm.title": "Delete bitstream", - // TODO New key - Add a translation - "submission.sections.upload.delete.confirm.title": "Delete bitstream", - - // "submission.sections.upload.delete.submit": "Delete", - // TODO New key - Add a translation - "submission.sections.upload.delete.submit": "Delete", - - // "submission.sections.upload.drop-message": "Drop files to attach them to the item", - // TODO New key - Add a translation - "submission.sections.upload.drop-message": "Drop files to attach them to the item", - - // "submission.sections.upload.form.access-condition-label": "Access condition type", - // TODO New key - Add a translation - "submission.sections.upload.form.access-condition-label": "Access condition type", - - // "submission.sections.upload.form.date-required": "Date is required.", - // TODO New key - Add a translation - "submission.sections.upload.form.date-required": "Date is required.", - - // "submission.sections.upload.form.from-label": "Grant access from", - // TODO New key - Add a translation - "submission.sections.upload.form.from-label": "Grant access from", - - // "submission.sections.upload.form.from-placeholder": "From", - // TODO New key - Add a translation - "submission.sections.upload.form.from-placeholder": "From", - - // "submission.sections.upload.form.group-label": "Group", - // TODO New key - Add a translation - "submission.sections.upload.form.group-label": "Group", - - // "submission.sections.upload.form.group-required": "Group is required.", - // TODO New key - Add a translation - "submission.sections.upload.form.group-required": "Group is required.", - - // "submission.sections.upload.form.until-label": "Grant access until", - // TODO New key - Add a translation - "submission.sections.upload.form.until-label": "Grant access until", - - // "submission.sections.upload.form.until-placeholder": "Until", - // TODO New key - Add a translation - "submission.sections.upload.form.until-placeholder": "Until", - - // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):", - // TODO New key - Add a translation - "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.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):", - // TODO New key - Add a translation - "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.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", - // TODO New key - Add a translation - "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.no-entry": "No", - // TODO New key - Add a translation - "submission.sections.upload.no-entry": "No", - - // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.", - // TODO New key - Add a translation - "submission.sections.upload.no-file-uploaded": "No file uploaded yet.", - - // "submission.sections.upload.save-metadata": "Save metadata", - // TODO New key - Add a translation - "submission.sections.upload.save-metadata": "Save metadata", - - // "submission.sections.upload.undo": "Cancel", - // TODO New key - Add a translation - "submission.sections.upload.undo": "Cancel", - - // "submission.sections.upload.upload-failed": "Upload failed", - // TODO New key - Add a translation - "submission.sections.upload.upload-failed": "Upload failed", - - // "submission.sections.upload.upload-successful": "Upload successful", - // TODO New key - Add a translation - "submission.sections.upload.upload-successful": "Upload successful", - - - - // "submission.submit.title": "Submission", - // TODO New key - Add a translation - "submission.submit.title": "Submission", - - - - // "submission.workflow.generic.delete": "Delete", - // TODO New key - Add a translation - "submission.workflow.generic.delete": "Delete", - - // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\". You will then be asked to confirm it.", - // TODO New key - Add a translation - "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.edit": "Edit", - // TODO New key - Add a translation - "submission.workflow.generic.edit": "Edit", - - // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.", - // TODO New key - Add a translation - "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.", - - // "submission.workflow.generic.view": "View", - // TODO New key - Add a translation - "submission.workflow.generic.view": "View", - - // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.", - // TODO New key - Add a translation - "submission.workflow.generic.view-help": "Select this option to view the item's metadata.", - - - - // "submission.workflow.tasks.claimed.approve": "Approve", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.approve": "Approve", - - // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".", - // TODO New key - Add a translation - "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.edit": "Edit", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.edit": "Edit", - - // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", - - // "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.", - // TODO New key - Add a translation - "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.placeholder": "Describe the reason of reject", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject", - - // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item", - - // "submission.workflow.tasks.claimed.reject.reason.title": "Reason", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.reject.reason.title": "Reason", - - // "submission.workflow.tasks.claimed.reject.submit": "Reject", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.reject.submit": "Reject", - - // "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.", - // TODO New key - Add a translation - "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.return": "Return to pool", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.return": "Return to pool", - - // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.", - - - - // "submission.workflow.tasks.generic.error": "Error occurred during operation...", - // TODO New key - Add a translation - "submission.workflow.tasks.generic.error": "Error occurred during operation...", - - // "submission.workflow.tasks.generic.processing": "Processing...", - // TODO New key - Add a translation - "submission.workflow.tasks.generic.processing": "Processing...", - - // "submission.workflow.tasks.generic.submitter": "Submitter", - // TODO New key - Add a translation - "submission.workflow.tasks.generic.submitter": "Submitter", - - // "submission.workflow.tasks.generic.success": "Operation successful", - // TODO New key - Add a translation - "submission.workflow.tasks.generic.success": "Operation successful", - - - - // "submission.workflow.tasks.pool.claim": "Claim", - // TODO New key - Add a translation - "submission.workflow.tasks.pool.claim": "Claim", - - // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.", - // TODO New key - Add a translation - "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.", - - // "submission.workflow.tasks.pool.hide-detail": "Hide detail", - // TODO New key - Add a translation - "submission.workflow.tasks.pool.hide-detail": "Hide detail", - - // "submission.workflow.tasks.pool.show-detail": "Show detail", - // TODO New key - Add a translation - "submission.workflow.tasks.pool.show-detail": "Show detail", - - - - // "title": "DSpace", - // TODO New key - Add a translation - "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", - // TODO New key - Add a translation - "uploader.browse": "browse", - - // "uploader.drag-message": "Drag & Drop your files here", - // TODO New key - Add a translation - "uploader.drag-message": "Drag & Drop your files here", - - // "uploader.or": ", or ", - // TODO New key - Add a translation - "uploader.or": ", or ", - - // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)", - // TODO New key - Add a translation - "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)", - - // "uploader.queue-length": "Queue length", - // TODO New key - Add a translation - "uploader.queue-length": "Queue length", - - // "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" - - + "401.help":"Nie masz uprawnień do dostępu do tej strony. Możesz użyć przycisku poniżej, aby powrócić do strony głównej.", + "401.link.home-page":"Zabierz mnie na stronę główną", + "401.unauthorized":"nieautoryzowany", + "403.help":"Nie masz uprawnień do dostępu do tej strony. Możesz użyć przycisku poniżej, aby wrócić do strony głównej.", + "403.link.home-page":"Zabierz mnie na stronę główną", + "403.forbidden":"zabroniony", + "404.help":"Nie możemy znaleźć strony, której szukasz. Strona mogła zostać przeniesiona lub usunięta. Możesz użyć przycisku poniżej, aby powrócić do strony głównej. ", + "404.link.home-page":"Zabierz mnie na stronę główną", + "404.page-not-found":"strona nie została znaleziona", + "admin.curation-tasks.breadcrumbs":"Systemowe zadania administracyjne", + "admin.curation-tasks.title":"Systemowe zadania administracyjne", + "admin.curation-tasks.header":"Systemowe zadania administracyjne", + "admin.registries.bitstream-formats.breadcrumbs":"Rejestr formatów", + "admin.registries.bitstream-formats.create.breadcrumbs":"Format strumienia bitów", + "admin.registries.bitstream-formats.create.failure.content":"Wystąpił błąd podczas tworzenia nowego formatu strumienia bitów.", + "admin.registries.bitstream-formats.create.failure.head":"Nie udało się", + "admin.registries.bitstream-formats.create.head":"Utwórz nowy format", + "admin.registries.bitstream-formats.create.new":"Dodaj nowy format", + "admin.registries.bitstream-formats.create.success.content":"Nowy format strumienia bitów został pomyślnie utworzony.", + "admin.registries.bitstream-formats.create.success.head":"Udało się", + "admin.registries.bitstream-formats.delete.failure.amount":"Nie udało się usunąć {{ amount }} formatu(ów)", + "admin.registries.bitstream-formats.delete.failure.head":"Nie udało się", + "admin.registries.bitstream-formats.delete.success.amount":"Udało się usunąć {{ amount }} formatu(ów)", + "admin.registries.bitstream-formats.delete.success.head":"Udało się", + "admin.registries.bitstream-formats.description":"Na liście formatów wyświetlono informacje o obsługiwanych formatach i czy są one wspierane przez system.", + "admin.registries.bitstream-formats.edit.breadcrumbs":"Format strumienia bitów", + "admin.registries.bitstream-formats.edit.description.hint":"", + "admin.registries.bitstream-formats.edit.description.label":"Opis", + "admin.registries.bitstream-formats.edit.extensions.hint":"Rozszerzenia to rozszerzenia plików, które są używane do automatycznej identyfikacji formatu przesyłanych plików. Możesz wprowadzić kilka rozszerzeń dla każdego formatu.", + "admin.registries.bitstream-formats.edit.extensions.label":"Rozszerzenia plików", + "admin.registries.bitstream-formats.edit.extensions.placeholder":"Wprowadź rozszerzenie pliku bez kropki", + "admin.registries.bitstream-formats.edit.failure.content":"Wystąpił błąd podczas edycji formatu pliku.", + "admin.registries.bitstream-formats.edit.failure.head":"Nie udało się", + "admin.registries.bitstream-formats.edit.head":"Format plików: {{ format }}", + "admin.registries.bitstream-formats.edit.internal.hint":"Formaty oznaczone jako wewnętrzne są ukryte przed użytkownikiem i wykorzystywane do celów administracyjnych.", + "admin.registries.bitstream-formats.edit.internal.label":"Wewnętrzny", + "admin.registries.bitstream-formats.edit.mimetype.hint":"Typ MIME powiązany z tym formatem, nie musi być unikalny.", + "admin.registries.bitstream-formats.edit.mimetype.label":"Typ MIME", + "admin.registries.bitstream-formats.edit.shortDescription.hint":"Unikalna nazwa dla tego formatu, (np. Microsoft Word XP lub Microsoft Word 2000)", + "admin.registries.bitstream-formats.edit.shortDescription.label":"Nazwa", + "admin.registries.bitstream-formats.edit.success.content":"Format strumienia bitów został pomyślnie edytowany.", + "admin.registries.bitstream-formats.edit.success.head":"Udało się", + "admin.registries.bitstream-formats.edit.supportLevel.hint":"Poziom wsparcia, jaki Twoja instytucja deklaruje dla tego formatu.", + "admin.registries.bitstream-formats.edit.supportLevel.label":"Obsługiwany format", + "admin.registries.bitstream-formats.head":"Rejestr formatów", + "admin.registries.bitstream-formats.no-items":"Brak formatów plików do wyświetlenia.", + "admin.registries.bitstream-formats.table.delete":"Usuń zaznaczone", + "admin.registries.bitstream-formats.table.deselect-all":"Odznacz wszystkie", + "admin.registries.bitstream-formats.table.internal":"wewnętrzne", + "admin.registries.bitstream-formats.table.mimetype":"Typ MIME", + "admin.registries.bitstream-formats.table.name":"Nazwa", + "admin.registries.bitstream-formats.table.return":"Powrót", + "admin.registries.bitstream-formats.table.supportLevel.KNOWN":"Znane", + "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED":"Wspierane", + "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN":"Nieznane", + "admin.registries.bitstream-formats.table.supportLevel.head":"Obsługiwany format", + "admin.registries.bitstream-formats.title":"Rejestr formatów plików", + "admin.registries.metadata.breadcrumbs":"Rejestr metadanych", + "admin.registries.metadata.description":"W rejestrze metadanych przechowywana jest lista wszystkich pól metadanych dostępnych w repozytorium. Przechowywane pola są przechowywane w kilku rejestrach. DSpace wymaga kwalifikowanego rejestru metadanych Dublin Core.", + "admin.registries.metadata.form.create":"Utwórz schemat metadanych", + "admin.registries.metadata.form.edit":"Edytuj schemat metadanych", + "admin.registries.metadata.form.name":"Nazwa", + "admin.registries.metadata.form.namespace":"Nazwa schematu", + "admin.registries.metadata.head":"Rejestr metadanych", + "admin.registries.metadata.schemas.no-items":"Brak rejestrów metadanych do pokazania.", + "admin.registries.metadata.schemas.table.delete":"Usuń zaznaczone", + "admin.registries.metadata.schemas.table.id":"ID", + "admin.registries.metadata.schemas.table.name":"Nazwa", + "admin.registries.metadata.schemas.table.namespace":"Nazwa schematu", + "admin.registries.metadata.title":"Rejestr metadanych", + "admin.registries.schema.breadcrumbs":"Schemat metadanych", + "admin.registries.schema.description":"Ten schemat metadanych jest stworzony na podstawie \"{{namespace}}\".", + "admin.registries.schema.fields.head":"Pola schematu metadanych", + "admin.registries.schema.fields.no-items":"Brak pól metadanych do pokazania.", + "admin.registries.schema.fields.table.delete":"Usuń zaznaczone", + "admin.registries.schema.fields.table.field":"Pole", + "admin.registries.schema.fields.table.scopenote":"Uwagi", + "admin.registries.schema.form.create":"Stwórz pole metadanych", + "admin.registries.schema.form.edit":"Edytuj pole metadanych", + "admin.registries.schema.form.element":"Element", + "admin.registries.schema.form.qualifier":"Kwalifikator", + "admin.registries.schema.form.scopenote":"Uwagi", + "admin.registries.schema.head":"Schemat metadanych", + "admin.registries.schema.notification.created":"Udało się utworzyć schemat metdanych \"{{prefix}}\"", + "admin.registries.schema.notification.deleted.failure":"Nie udało się usunąć {{amount}} schematów metadanych", + "admin.registries.schema.notification.deleted.success":"Udało się usunąć {{amount}} schematów metadanych", + "admin.registries.schema.notification.edited":"Udało się edytować schemat metadanych \"{{prefix}}\"", + "admin.registries.schema.notification.failure":"Błąd", + "admin.registries.schema.notification.field.created":"Udało się utworzyć pole metadanych \"{{field}}\"", + "admin.registries.schema.notification.field.deleted.failure":"Nie udało się usunąć {{amount}} pól metadanych", + "admin.registries.schema.notification.field.deleted.success":"Udało się usunąć {{amount}} pól metadanych", + "admin.registries.schema.notification.field.edited":"SUdało się edytować pole metadanych \"{{field}}\"", + "admin.registries.schema.notification.success":"Udało się", + "admin.registries.schema.return":"Powrót", + "admin.registries.schema.title":"Rejestr schematów metadanych", + "admin.access-control.epeople.actions.delete":"Usuń użytkownika", + "admin.access-control.epeople.actions.impersonate":"Personifikuj użytkownika", + "admin.access-control.epeople.actions.reset":"Zresetuj hasło", + "admin.access-control.epeople.actions.stop-impersonating":"Przestań personifikować użytkownika", + "admin.access-control.epeople.breadcrumbs":"Użytkownicy", + "admin.access-control.epeople.title":"Użytkownicy", + "admin.access-control.epeople.head":"Użytkownicy", + "admin.access-control.epeople.search.head":"Wyszukaj", + "admin.access-control.epeople.button.see-all":"Przeglądaj wszystko", + "admin.access-control.epeople.search.scope.metadata":"Metadane", + "admin.access-control.epeople.search.scope.email":"E-mail", + "admin.access-control.epeople.search.button":"Wyszukaj", + "admin.access-control.epeople.search.placeholder":"Wyszukaj użytkownika...", + "admin.access-control.epeople.button.add":"Dodaj użytkownika", + "admin.access-control.epeople.table.id":"ID", + "admin.access-control.epeople.table.name":"Nazwa", + "admin.access-control.epeople.table.email":"E-mail", + "admin.access-control.epeople.table.edit":"Edytuj", + "admin.access-control.epeople.table.edit.buttons.edit":"Edytuj \"{{name}}\"", + "admin.access-control.epeople.table.edit.buttons.edit-disabled":"Brak uprawnień do edycji wybranej grupy", + "admin.access-control.epeople.table.edit.buttons.remove":"Usuń \"{{name}}\"", + "admin.access-control.epeople.no-items":"Brak użytkowników do wyświetlenia.", + "admin.access-control.epeople.form.create":"Utwórz użytkownika", + "admin.access-control.epeople.form.edit":"Edytuj użytkownika", + "admin.access-control.epeople.form.firstName":"Imię", + "admin.access-control.epeople.form.lastName":"Nazwisko", + "admin.access-control.epeople.form.email":"E-mail", + "admin.access-control.epeople.form.emailHint":"Adres e-mail musi być poprawny", + "admin.access-control.epeople.form.canLogIn":"Możliwość zalogowania", + "admin.access-control.epeople.form.requireCertificate":"Wymagany certyfikat", + "admin.access-control.epeople.form.return":"Powrót", + "admin.access-control.epeople.form.notification.created.success":"Udało się utworzyć użytkownika \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.failure":"Nie udało się utworzyć użytkownika \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.failure.emailInUse":"Nie udało się utworzyć użytkownika \"{{name}}\", email \"{{email}}\" już w użyciu.", + "admin.access-control.epeople.form.notification.edited.failure.emailInUse":"Nie udało się utworzyć użytkownika \"{{name}}\", email \"{{email}}\" już w użyciu.", + "admin.access-control.epeople.form.notification.edited.success":"Udało się edytować użytkownika \"{{name}}\"", + "admin.access-control.epeople.form.notification.edited.failure":"Nie udało się edytować użytkownika \"{{name}}\"", + "admin.access-control.epeople.form.notification.deleted.success":"Udało się usunąć użytkownika \"{{name}}\"", + "admin.access-control.epeople.form.notification.deleted.failure":"Nie udało się usunąć użytkownika \"{{name}}\"", + "admin.access-control.epeople.form.groupsEPersonIsMemberOf":"Członek grup:", + "admin.access-control.epeople.form.table.id":"ID", + "admin.access-control.epeople.form.table.name":"Nazwa", + "admin.access-control.epeople.form.table.collectionOrCommunity":"Zbiór/kolekcja", + "admin.access-control.epeople.form.memberOfNoGroups":"Ten użytkownik nie jest członkiem żadnej grupy", + "admin.access-control.epeople.form.goToGroups":"Dodaj do grup", + "admin.access-control.epeople.notification.deleted.failure":"Nie udało się usunąć użytkownika: \"{{name}}\"", + "admin.access-control.epeople.notification.deleted.success":"Udało się usunąć użytkownika: \"{{name}}\"", + "admin.access-control.groups.title":"Grupy", + "admin.access-control.groups.breadcrumbs":"Grupy", + "admin.access-control.groups.singleGroup.breadcrumbs":"Edytuj grupę", + "admin.access-control.groups.title.singleGroup":"Edytuj grupę", + "admin.access-control.groups.title.addGroup":"Nowa grupa", + "admin.access-control.groups.addGroup.breadcrumbs":"Nowa grupa", + "admin.access-control.groups.head":"Grupy/role", + "admin.access-control.groups.button.add":"Dodaj grupę", + "admin.access-control.groups.search.head":"Szukaj grup", + "admin.access-control.groups.button.see-all":"Przeszukaj wszystko", + "admin.access-control.groups.search.button":"Wyszukaj", + "admin.access-control.groups.search.placeholder":"Wyszukaj grupy...", + "admin.access-control.groups.table.id":"ID", + "admin.access-control.groups.table.name":"Nazwa", + "admin.access-control.groups.table.collectionOrCommunity":"Zbiór/kolekcja", + "admin.access-control.groups.table.members":"Członkowie", + "admin.access-control.groups.table.edit":"Edytuj", + "admin.access-control.groups.table.edit.buttons.edit":"Edytuj \"{{name}}\"", + "admin.access-control.groups.no-items":"Nie znaleziono grup z podaną frazą lub podanym UUID", + "admin.access-control.groups.notification.deleted.success":"Udało się usunąć grupę \"{{name}}\"", + "admin.access-control.groups.notification.deleted.failure.title":"Nie udało się usunąć grupy \"{{name}}\"", + "admin.access-control.groups.notification.deleted.failure.content":"Powód: \"{{cause}}\"", + "admin.access-control.groups.form.alert.permanent":"Ta grupa jest stała, więc nie może być edytowana ani usunięta. Nadal możesz dodawać i usuwać członków grupy za pomocą tej strony.", + "admin.access-control.groups.form.alert.workflowGroup":"Ta grupa nie może być edytowana lub usunięta, ponieważ odnosi się do roli lub bierze udział w procesie \"{{name}}\" {{comcol}}. Możesz ją usunąć ze strony \"assign roles\" edycji {{comcol}}. Wciąż może dodawać i usuwać członków tej grupy, korzystając z tej strony.", + "admin.access-control.groups.form.head.create":"Utwórz grupę", + "admin.access-control.groups.form.head.edit":"Edytuj grupę", + "admin.access-control.groups.form.groupName":"Nazwa grupy", + "admin.access-control.groups.form.groupCommunity":"Zbiór lub kolekcja", + "admin.access-control.groups.form.groupDescription":"Opis", + "admin.access-control.groups.form.notification.created.success":"Udało się utworzyć grupę \"{{name}}\"", + "admin.access-control.groups.form.notification.created.failure":"Nie udało się utworzyć grupy \"{{name}}\"", + "admin.access-control.groups.form.notification.created.failure.groupNameInUse":"Nie udało się utworzyć grupy o nazwie: \"{{name}}\", upewnij się, że nazwa nie jest już używana.", + "admin.access-control.groups.form.notification.edited.failure":"Nie udało się edytować grupy \"{{name}}\"", + "admin.access-control.groups.form.notification.edited.failure.groupNameInUse":"Nazwa \"{{name}}\" już w użyciu!", + "admin.access-control.groups.form.notification.edited.success":"Udało się edytować grupę \"{{name}}\"", + "admin.access-control.groups.form.actions.delete":"Usuń grupę", + "admin.access-control.groups.form.delete-group.modal.header":"Usuń grupę \"{{ dsoName }}\"", + "admin.access-control.groups.form.delete-group.modal.info":"Czy na pewno chcesz usunąć grupę \"{{ dsoName }}\"", + "admin.access-control.groups.form.delete-group.modal.cancel":"Anuluj", + "admin.access-control.groups.form.delete-group.modal.confirm":"Usuń", + "admin.access-control.groups.form.notification.deleted.success":"Udało się usunąć grupę \"{{ name }}\"", + "admin.access-control.groups.form.notification.deleted.failure.title":"Nie udało się usunąć grupy \"{{ name }}\"", + "admin.access-control.groups.form.notification.deleted.failure.content":"Powód: \"{{ cause }}\"", + "admin.access-control.groups.form.members-list.head":"Użytkownik", + "admin.access-control.groups.form.members-list.search.head":"Dodaj użytkownika", + "admin.access-control.groups.form.members-list.button.see-all":"Pokaż wszystkich", + "admin.access-control.groups.form.members-list.headMembers":"Aktualni członkowie", + "admin.access-control.groups.form.members-list.search.scope.metadata":"Metadane", + "admin.access-control.groups.form.members-list.search.scope.email":"E-mail", + "admin.access-control.groups.form.members-list.search.button":"Wyszukaj", + "admin.access-control.groups.form.members-list.table.id":"ID", + "admin.access-control.groups.form.members-list.table.name":"Nazwa", + "admin.access-control.groups.form.members-list.table.identity":"Tożsamość", + "admin.access-control.groups.form.members-list.table.email":"E-mail", + "admin.access-control.groups.form.members-list.table.netid":"NetID", + "admin.access-control.groups.form.members-list.table.edit":"Usuń / Dodaj", + "admin.access-control.groups.form.members-list.table.edit.buttons.remove":"Usuń użytkownika o nazwie \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.success.addMember":"Udało się dodać użytkownika o nazwie: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.failure.addMember":"Nie udało się dodać użytkownika o nazwie: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.success.deleteMember":"Udało się usunąć użytkownika o nazwie: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.failure.deleteMember":"Nie udało się usunąć użytkownika o nazwie: \"{{name}}\"", + "admin.access-control.groups.form.members-list.table.edit.buttons.add":"Dodaj użytkownika o nazwie \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup":"Brak aktywnej grupy, najpierw wpisz nazwę grupy.", + "admin.access-control.groups.form.members-list.no-members-yet":"Brak użytkowników w grupie, wyszukaj ich i dodaj.", + "admin.access-control.groups.form.members-list.no-items":"Nie znaleziono użytkowników podczas wyszukiwania", + "admin.access-control.groups.form.subgroups-list.notification.failure":"Coś poszło nie tak: \"{{cause}}\"", + "admin.access-control.groups.form.subgroups-list.head":"Grupy", + "admin.access-control.groups.form.subgroups-list.search.head":"Dodaj podgrupę", + "admin.access-control.groups.form.subgroups-list.button.see-all":"Przeglądaj wszystkie", + "admin.access-control.groups.form.subgroups-list.headSubgroups":"Aktualne podgrupy", + "admin.access-control.groups.form.subgroups-list.search.button":"Wyszukaj", + "admin.access-control.groups.form.subgroups-list.table.id":"ID", + "admin.access-control.groups.form.subgroups-list.table.name":"Nazwa", + "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity":"Zbiór/kolekcja", + "admin.access-control.groups.form.subgroups-list.table.edit":"Usuń / Dodaj", + "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove":"Usuń podgrupę o nazwie \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add":"Dodaj podgrupę o nazwie \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup":"Aktualna grupa", + "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup":"Udało się dodać podgrupę: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup":"Nie udało się dodać podgrupy: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup":"Udało się usunąć podgrupę: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup":"Nie udało się usunąć podgrupy: \"{{name}}\"", + "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup":"Brak aktywnej grupy, najpierw wpisz nazwę grupy.", + "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup":"Ta grupa jest już stworzona i nie może zostać dodana pononwie.", + "admin.access-control.groups.form.subgroups-list.no-items":"Nie znaleziono grup z tą nazwą lub UUID", + "admin.access-control.groups.form.subgroups-list.no-subgroups-yet":"Brak podgrup w grupie.", + "admin.access-control.groups.form.return":"Powrót", + "admin.search.breadcrumbs":"Wyszukiwanie administracyjne", + "admin.search.collection.edit":"Edytuj", + "admin.search.community.edit":"Edytuj", + "admin.search.item.delete":"Usuń", + "admin.search.item.edit":"Edytuj", + "admin.search.item.make-private":"Ukryj", + "admin.search.item.make-public":"Upublicznij", + "admin.search.item.move":"Przenieś", + "admin.search.item.reinstate":"Zmień instancję", + "admin.search.item.withdraw":"Wycofane", + "admin.search.title":"Wyszukiwanie administracyjne", + "administrativeView.search.results.head":"Wyszukiwanie administracyjne", + "admin.workflow.breadcrumbs":"Zarządzaj procesem", + "admin.workflow.title":"Zarządzaj procesem", + "admin.workflow.item.workflow":"Proces", + "admin.workflow.item.delete":"Usuń", + "admin.workflow.item.send-back":"Odeślij z powrotem", + "admin.metadata-import.breadcrumbs":"Importuj metadane", + "admin.metadata-import.title":"Importuj metadane", + "admin.metadata-import.page.header":"Importuj metadane", + "admin.metadata-import.page.help":"Tutaj możesz zaimportować pliki CSV, w których znajdują się metadane do operacji wsadowej. Zaimportuj je poprzez upuszczenie ich lub znajdź je na swoim komputerze", + "admin.metadata-import.page.dropMsg":"Upuść plik w formacie CSV", + "admin.metadata-import.page.dropMsgReplace":"Upuść, aby zastąpić metadane w formacie CSV do importu", + "admin.metadata-import.page.button.return":"Powrót", + "admin.metadata-import.page.button.proceed":"Zastosuj", + "admin.metadata-import.page.error.addFile":"Najpierw wybierz plik!", + "auth.errors.invalid-user":"Niewłaściwy adres e-mail lub hasło.", + "auth.messages.expired":"Twoja sesja wygasła. Zaloguj się ponownie.", + "auth.messages.token-refresh-failed":"Odświeżenie sesji nie powiodło się. Zaloguj się ponownie.", + "bitstream.download.page":"Pobieranie {{bitstream}}...", + "bitstream.download.page.back":"Powrót", + "bitstream.edit.authorizations.link":"Edytuj polityki plików", + "bitstream.edit.authorizations.title":"Edytuj polityki plików", + "bitstream.edit.return":"Powrót", + "bitstream.edit.bitstream":"Pliki: ", + "bitstream.edit.form.description.hint":"Opcjonalnie wprowadź krótki opis pliku, np.: \"Główna część artykułu\" lub \"Dane z eksperymentu\".", + "bitstream.edit.form.description.label":"Opis", + "bitstream.edit.form.embargo.hint":"Pierwszy dzień, od kiedy dostęp zostanie udzielony. Tej daty nie może być edytować w tym formularzu. Aby wybrać okres embarga czasowego, wybierz Status pozycji tab, kliknij Autoryzacje..., stwórz lub edytuj plik PRZEYCZTAJ zasady i wybierz określoną Datę początkową.", + "bitstream.edit.form.embargo.label":"Embargo do wybranej daty", + "bitstream.edit.form.fileName.hint":"Zmiana nazwy pliku dla strumienia bitów. Zauważ, że zmieni to wyświetlany adres URL strumienia bitów, ale stare linki nadal będą działać, o ile nie zmieni się identyfikator sekwencji.", + "bitstream.edit.form.fileName.label":"Nazwa pliku", + "bitstream.edit.form.newFormat.label":"Opisz nowy format", + "bitstream.edit.form.newFormat.hint":"Program, którego użyto do stworzenia pliku i numer wersji (np.: \"ACMESoft SuperApp version 1.5\").", + "bitstream.edit.form.primaryBitstream.label":"Pierwotny plik", + "bitstream.edit.form.selectedFormat.hint":"Jeśli formatu nie ma na powyższej liście, wybierz \"format not in list\" above i opisz jako \"Describe new format\".", + "bitstream.edit.form.selectedFormat.label":"Wybrany format", + "bitstream.edit.form.selectedFormat.unknown":"Tego formatu nie ma na liście", + "bitstream.edit.notifications.error.format.title":"Wystąpił błąd podczas zapisu formatu pliku", + "bitstream.edit.notifications.saved.content":"Zmiany w pliku zostały zapisane.", + "bitstream.edit.notifications.saved.title":"Plik został zapisany", + "bitstream.edit.title":"Edytuj plik", + "bitstream-request-a-copy.alert.canDownload1":"Masz już dostęp do tego pliki. Jeśli chcesz go pobrać, kliknij ", + "bitstream-request-a-copy.alert.canDownload2":"tutaj", + "bitstream-request-a-copy.header":"Wystąp o kopię wybranego pliku", + "bitstream-request-a-copy.intro":"Wpisz następujące informacje, aby wystąpić o kopię tej pozycji: ", + "bitstream-request-a-copy.intro.bitstream.one":"Wystąpienie o dostęp do następujących plików: ", + "bitstream-request-a-copy.intro.bitstream.all":"Wystąpienie o dostęp do wszystkich plików. ", + "bitstream-request-a-copy.name.label":"Imię *", + "bitstream-request-a-copy.name.error":"Imię jest wymagane", + "bitstream-request-a-copy.email.label":"Adres e-mail *", + "bitstream-request-a-copy.email.hint":"Plik zostanie przesłany na podany adres e-mail", + "bitstream-request-a-copy.email.error":"Proszę wprowadzić prawidłowy adres e-mail", + "bitstream-request-a-copy.allfiles.label":"Pliki", + "bitstream-request-a-copy.files-all-false.label":"Tylko plik, dla którego wystąpiono o dostęp", + "bitstream-request-a-copy.files-all-true.label":"Wszystkie pliki (w tej pozycji) z ograniczonym dostępem", + "bitstream-request-a-copy.message.label":"Wiadomość", + "bitstream-request-a-copy.return":"Powrót", + "bitstream-request-a-copy.submit":"Wystąp o kopię", + "bitstream-request-a-copy.submit.success":"Wystąpienie o dostęp do pliku zostało przesłane.", + "bitstream-request-a-copy.submit.error":"Coś poszło nie tak podczas wysyłania wystąpienia o dostęp do pliku", + "browse.comcol.by.author":"wg autorów", + "browse.comcol.by.dateissued":"wg daty wydania", + "browse.comcol.by.subject":"wg tematu", + "browse.comcol.by.title":"wg tytułu", + "browse.comcol.head":"Przeglądaj", + "browse.empty":"Brak rekordów do wyświetlenia.", + "browse.metadata.author":"Autor", + "browse.metadata.dateissued":"Data wydania", + "browse.metadata.subject":"Temat", + "browse.metadata.title":"Tytuł", + "browse.metadata.author.breadcrumbs":"Przeglądaj wg autorów", + "browse.metadata.dateissued.breadcrumbs":"Przeglądaj wg daty wydania", + "browse.metadata.subject.breadcrumbs":"Przeglądaj wg tematów", + "browse.metadata.title.breadcrumbs":"Przeglądaj wg tytułów", + "browse.startsWith.choose_start":"(Wybierz start)", + "browse.startsWith.choose_year":"(Wybierz rok)", + "browse.startsWith.choose_year.label":"Wybierz rok wydania", + "browse.startsWith.jump":"Przejdź do miejsca w indeksie:", + "browse.startsWith.months.april":"kwiecień", + "browse.startsWith.months.august":"sierpień", + "browse.startsWith.months.december":"grudzień", + "browse.startsWith.months.february":"luty", + "browse.startsWith.months.january":"styczeń", + "browse.startsWith.months.july":"lipiec", + "browse.startsWith.months.june":"czerwiec", + "browse.startsWith.months.march":"marzec", + "browse.startsWith.months.may":"maj", + "browse.startsWith.months.none":"(wybierz miesiąc)", + "browse.startsWith.months.none.label":"Wybierz miesiąc wydania", + "browse.startsWith.months.november":"listopad", + "browse.startsWith.months.october":"październik", + "browse.startsWith.months.september":"wrzesień", + "browse.startsWith.submit":"Zastosuj", + "browse.startsWith.type_date":"Lub wybierz datę (rok-miesiąc) i kliknij 'Przeglądaj'", + "browse.startsWith.type_date.label":"Lub wybierz datę (rok-miesiąc) i kliknij przycisk przeglądania", + "browse.startsWith.type_text":"Wpisz kilka pierwszych liter i kliknij przycisk przeglądania", + "browse.title":"Przeglądaj {{ collection }} wg {{ field }} {{ value }}", + "chips.remove":"Usuń chip", + "collection.create.head":"Utwórz kolekcję", + "collection.create.notifications.success":"Udało się utworzyć kolekcję", + "collection.create.sub-head":"Udało się utworzyć kolekcję dla zbioru {{ parent }}", + "collection.curate.header":"Administrator kolekcji: {{collection}}", + "collection.delete.cancel":"Anuluj", + "collection.delete.confirm":"Zatwierdź", + "collection.delete.processing":"Usuwanie", + "collection.delete.head":"Usuń kolekcję", + "collection.delete.notification.fail":"Kolekcja nie może być usunięt", + "collection.delete.notification.success":"Udało się usunąć kolekcję", + "collection.delete.text":"Czy na pewno chcesz usunąć kolekcję \"{{ dso }}\"", + "collection.edit.delete":"Usuń kolekcję", + "collection.edit.head":"Edytuj kolekcję", + "collection.edit.breadcrumbs":"Edytuj kolekcję", + "collection.edit.tabs.mapper.head":"Item Mapper", + "collection.edit.tabs.item-mapper.title":"Edytuj kolekcję - Item Mapper", + "collection.edit.item-mapper.cancel":"Anuluj", + "collection.edit.item-mapper.collection":"Kolekcja: \"{{name}}\"", + "collection.edit.item-mapper.confirm":"Mapuj wybrane elementy", + "collection.edit.item-mapper.description":"To jest narzędzie mapowania elementów, które pozwala administratorom kolekcji mapować elementy z innych kolekcji do tej kolekcji. Możesz wyszukiwać elementy z innych kolekcji i mapować je lub przeglądać listę aktualnie zmapowanych elementów.", + "collection.edit.item-mapper.head":"Item Mapper - Mapuj pozycje z innych kolekcji", + "collection.edit.item-mapper.no-search":"Wpisz co chcesz wyszukać", + "collection.edit.item-mapper.notifications.map.error.content":"Wystąpiły błędy podczas mapowania {{amount}} pozycji.", + "collection.edit.item-mapper.notifications.map.error.head":"Mapowanie błędów", + "collection.edit.item-mapper.notifications.map.success.content":"Udało się zmapować {{amount}} pozycji.", + "collection.edit.item-mapper.notifications.map.success.head":"Mapowanie zakończone", + "collection.edit.item-mapper.notifications.unmap.error.content":"Błędy wystąpiły podczas usuwania mapowania z {{amount}} elementów.", + "collection.edit.item-mapper.notifications.unmap.error.head":"Usuń błędy mapowania", + "collection.edit.item-mapper.notifications.unmap.success.content":"Udało się usunąć błędy mapowania z {{amount}} elementów.", + "collection.edit.item-mapper.notifications.unmap.success.head":"Usuwanie mapowania zakończone", + "collection.edit.item-mapper.remove":"Usuń wybrane mapowanie elementów", + "collection.edit.item-mapper.search-form.placeholder":"Wyszukaj pozycje...", + "collection.edit.item-mapper.tabs.browse":"Wyszukaj mapowane elementy", + "collection.edit.item-mapper.tabs.map":"Mapuj nowe elementy", + "collection.edit.logo.delete.title":"Usuń", + "collection.edit.logo.delete-undo.title":"Cofnij usunięcie", + "collection.edit.logo.label":"Logo kolekcji", + "collection.edit.logo.notifications.add.error":"Przesyłanie logo kolekcji nie powiodło się. Proszę zweryfikować zawartość przed ponowną ", + "collection.edit.logo.notifications.add.success":"Udało się przesłać logo kolekcji.", + "collection.edit.logo.notifications.delete.success.title":"Logo usunięte", + "collection.edit.logo.notifications.delete.success.content":"Udało się usunąć logo kolekcji", + "collection.edit.logo.notifications.delete.error.title":"Błąd podczas usuwania loga", + "collection.edit.logo.upload":"Upuść logo kolekcji, aby je wgrać", + "collection.edit.notifications.success":"Udało się edytować kolekcję", + "collection.edit.return":"Powrót", + "collection.edit.tabs.curate.head":"Kurator", + "collection.edit.tabs.curate.title":"Edytowanie kolekcji - kurator", + "collection.edit.tabs.authorizations.head":"Autoryzacje", + "collection.edit.tabs.authorizations.title":"Edytowanie kolekcji - autoryzacje", + "collection.edit.tabs.metadata.head":"Edytuj metadane", + "collection.edit.tabs.metadata.title":"Edytowanie kolekcji - metadane", + "collection.edit.tabs.roles.head":"Przypisz role", + "collection.edit.tabs.roles.title":"Edytowanie kolekcji - role", + "collection.edit.tabs.source.external":"Ta kolekcja pobiera swoją zawartość z zewnętrznego źródła", + "collection.edit.tabs.source.form.errors.oaiSource.required":"Musisz wskazać id docelowej kolekcji.", + "collection.edit.tabs.source.form.harvestType":"Odczytywanie zawartości", + "collection.edit.tabs.source.form.head":"Skonfiguruj zewnętrzne źródło", + "collection.edit.tabs.source.form.metadataConfigId":"Format metadanych", + "collection.edit.tabs.source.form.oaiSetId":"Określony zestaw ID OAI", + "collection.edit.tabs.source.form.oaiSource":"Dostawca OAI", + "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS":"Odczytaj metadane i pliki (wymaga wsparcia ORE)", + "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF":"Odczytaj metadane i bibliografię (wymaga wsparcia ORE)", + "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY":"Odczytaj tylko metadane", + "collection.edit.tabs.source.head":"Źródło treści", + "collection.edit.tabs.source.notifications.discarded.content":"Twoje zmiany zostały odrzucone. Aby odzyskać swoje zmiany wybierz 'Powrót'", + "collection.edit.tabs.source.notifications.discarded.title":"Zmiany odrzucone", + "collection.edit.tabs.source.notifications.invalid.content":"Zmiany nie zostały zapisane. Sprawdź czy wszystkie pola są wypełnione poprawne przed zapisem.", + "collection.edit.tabs.source.notifications.invalid.title":"Nieprawidłowe metadane", + "collection.edit.tabs.source.notifications.saved.content":"Zmiany wprowadzone w kolekcji zostały zapisane.", + "collection.edit.tabs.source.notifications.saved.title":"Źródło treści zapisane", + "collection.edit.tabs.source.title":"Collection Edit - Źródło treści", + "collection.edit.template.add-button":"Dodaj", + "collection.edit.template.breadcrumbs":"Szablon pozycji", + "collection.edit.template.cancel":"Anuluj", + "collection.edit.template.delete-button":"Usuń", + "collection.edit.template.edit-button":"Edytuj", + "collection.edit.template.error":"Wystąpił błąd podczas odzyskiwania szablonu pozycji", + "collection.edit.template.head":"Edytuj szablon dla kolekcji \"{{ collection }}\"", + "collection.edit.template.label":"Szablon pozycji", + "collection.edit.template.loading":"ładowanie szablonu pozycji...", + "collection.edit.template.notifications.delete.error":"Nie udało się usunąć szablonu pozycji", + "collection.edit.template.notifications.delete.success":"Udało się usunąć szablon pozycji", + "collection.edit.template.title":"Edytuj szablon pozycji", + "collection.form.abstract":"Opis skrócony", + "collection.form.description":"Tekst powitalny (HTML)", + "collection.form.errors.title.required":"Wpisz nazwę kolekcji", + "collection.form.license":"Licencja", + "collection.form.provenance":"Pochodzenie", + "collection.form.rights":"Tekst praw autorskich (HTML)", + "collection.form.tableofcontents":"Wiadomości (HTML)", + "collection.form.title":"Nazwa", + "collection.form.entityType":"Typ danych", + "collection.page.browse.recent.head":"Ostatnie zgłoszenia", + "collection.page.browse.recent.empty":"Brak pozycji do wyświetlenia", + "collection.page.edit":"Edytuj kolekcję", + "collection.page.handle":"Stały URI dla kolekcji", + "collection.page.license":"Licencja", + "collection.page.news":"Wiadomości", + "collection.select.confirm":"Zaakceptuj zaznaczone", + "collection.select.empty":"Brak kolekcji do wyświetlenia", + "collection.select.table.title":"Tytuł", + "collection.source.controls.head":"Kontrolki odczytywania", + "collection.source.controls.test.submit.error":"Coś poszło nie tak podczas rozpoczynania testów ustawień", + "collection.source.controls.test.failed":"Scenariusz testowy ustawień nie zadziałał", + "collection.source.controls.test.completed":"Scenariusz testowy ustawień został zakończony", + "collection.source.controls.test.submit":"Konfiguracja testowa", + "collection.source.controls.test.running":"Testowanie konfiguracji...", + "collection.source.controls.import.submit.success":"Import został rozpoczęty", + "collection.source.controls.import.submit.error":"Coś poszło nie tak podczas rozpoczynania importu", + "collection.source.controls.import.submit":"Importuj teraz", + "collection.source.controls.import.running":"Importowanie...", + "collection.source.controls.import.failed":"Wystąpił błąd podczas importu", + "collection.source.controls.import.completed":"Import zakończony", + "collection.source.controls.reset.submit.success":"Reset ustawień i powtórny import zostały rozpoczęte poprawnie", + "collection.source.controls.reset.submit.error":"Coś poszło nie tak podczas rozpoczynania zresetowanego, powtórnego importu", + "collection.source.controls.reset.failed":"Wystąpił błąd podczas resetowania ustawień i ponownego importu", + "collection.source.controls.reset.completed":"Reset ustawień i powtórny import zostały zakończone", + "collection.source.controls.reset.submit":"Resetowanie i powtórny import", + "collection.source.controls.reset.running":"Resetowanie i powtórny import...", + "collection.source.controls.harvest.status":"Status odczytywania:", + "collection.source.controls.harvest.start":"Czas rozpoczęcia odczytywania:", + "collection.source.controls.harvest.last":"Czas ostatniego odczytywania:", + "collection.source.controls.harvest.message":"Informacje nt. odczytywania:", + "collection.source.controls.harvest.no-information":"bd.", + "collection.source.update.notifications.error.content":"Te ustawienia zostały przetestowane i nie działają.", + "collection.source.update.notifications.error.title":"Błąd serwera", + "communityList.breadcrumbs":"Lista zbiorów", + "communityList.tabTitle":"Lista zbiorów", + "communityList.title":"Lista zbiorów", + "communityList.showMore":"Pokaż więcej", + "community.create.head":"Utwórz zbiór", + "community.create.notifications.success":"Udało się utworzyć zbiór", + "community.create.sub-head":"Utwórz podzbiór dla zbioru {{ parent }}", + "community.curate.header":"Zarządzaj zbiorem: {{community}}", + "community.delete.cancel":"Anuluj", + "community.delete.confirm":"Potwierdź", + "community.delete.processing":"Usuwanie...", + "community.delete.head":"Usuń zbiór", + "community.delete.notification.fail":"Zbiór nie może być usunięty", + "community.delete.notification.success":"Udało się usunąć zbiór", + "community.delete.text":"Czy na pewno chcesz usunąć zbiór \"{{ dso }}\"", + "community.edit.delete":"Usuń ten zbiór", + "community.edit.head":"Edytuj zbiór", + "community.edit.breadcrumbs":"Edytuj zbiór", + "community.edit.logo.delete.title":"Usuń logo", + "community.edit.logo.delete-undo.title":"Cofnij usunięcie", + "community.edit.logo.label":"Logo zbioru", + "community.edit.logo.notifications.add.error":"Przesłanie loga zbioru nie powiodło się. Sprawdź czy wszystkie parametry są odpowiednie przed próbą ponownego przesłania.", + "community.edit.logo.notifications.add.success":"Przesłanie loga powiodło się.", + "community.edit.logo.notifications.delete.success.title":"Logo usunięte", + "community.edit.logo.notifications.delete.success.content":"Usunięcie loga zbioru powiodło się", + "community.edit.logo.notifications.delete.error.title":"Błąd podczas usuwania loga", + "community.edit.logo.upload":"Upuść logo zbioru, aby je przesłać", + "community.edit.notifications.success":"Udało się edytować zbiór", + "community.edit.notifications.unauthorized":"Nie masz uprawnień, aby wykonać te zmiany", + "community.edit.notifications.error":"Wystąpił błąd podczas edycji zbioru", + "community.edit.return":"Cofnij", + "community.edit.tabs.curate.head":"Administruj", + "community.edit.tabs.curate.title":"Edycja zbioru - administrator", + "community.edit.tabs.metadata.head":"Edytuj metadane", + "community.edit.tabs.metadata.title":"Edycja zbioru - metadane", + "community.edit.tabs.roles.head":"Przypisz role", + "community.edit.tabs.roles.title":"Edycja zbioru - role", + "community.edit.tabs.authorizations.head":"Uprawnienia", + "community.edit.tabs.authorizations.title":"Edycja zbioru - uprawnienia", + "community.listelement.badge":"Zbiór", + "comcol-role.edit.no-group":"Brak", + "comcol-role.edit.create":"Utwórz", + "comcol-role.edit.restrict":"Ogranicz", + "comcol-role.edit.delete":"Usuń", + "comcol-role.edit.community-admin.name":"Administratorzy", + "comcol-role.edit.collection-admin.name":"Administratorzy", + "comcol-role.edit.community-admin.description":"Administratorzy zbioru mogą tworzyć podzbiory lub kolekcje i zarządzać nimi lub przydzielać zarządzanie tymi podzbiorami lub kolekcji innym użytkownikom. Ponadto decydują, kto może przesyłać elementy do dowolnych podkolekcji, edytować metadane pozycji (po przesłaniu) i dodawać (mapować) istniejące pozycje z innych kolekcji (z zastrzeżeniem autoryzacji).", + "comcol-role.edit.collection-admin.description":"Administratorzy kolekcji decydują o tym, kto może przesyłać pozycje do kolekcji, edytować metadane pozycji (po ich przesłaniu) oraz dodawać (mapować) istniejące elementy z innych kolekcji do tej kolekcji (z zastrzeżeniem uprawnień dla danej kolekcji).", + "comcol-role.edit.submitters.name":"Zgłaszający", + "comcol-role.edit.submitters.description":"Użytkownicy i grupy, którzy mają uprawnienia do przesyłania nowych pozycji do tej kolekcji.", + "comcol-role.edit.item_read.name":"Domyślny dostęp do odczytu pozycji", + "comcol-role.edit.item_read.description":"Użytkownicy i grupy, które mogą odczytywać nowe pozycje zgłoszone do tej kolekcji. Zmiany w tej roli nie działają wstecz. Istniejące pozycje w systemie będą nadal widoczne dla osób, które miały dostęp do odczytu w momencie ich dodania.", + "comcol-role.edit.item_read.anonymous-group":"Domyślny odczyt dla nowych pozycji jest obecnie ustawiony na Anonimowy.", + "comcol-role.edit.bitstream_read.name":"Domyślny dostęp do oczytu plików", + "comcol-role.edit.bitstream_read.description":"Administratorzy zbiorów mogą tworzyć podzbiory lub kolekcje, a także zarządzać nimi. Ponadto decydują o tym, kto może przesyłać elementy do podkolekcji, edytować metadane pozycji (po ich przesłaniu) oraz dodawać (mapować) istniejące pozycje z innych kolekcji (pod warunkiem posiadania odpowiednich uprawnień).", + "comcol-role.edit.bitstream_read.anonymous-group":"Domyślny status odczytu dla nowych plików to Anonimowy.", + "comcol-role.edit.editor.name":"Redaktorzy", + "comcol-role.edit.editor.description":"Redaktorzy mogą edytować metadane nowych pozycji, a następnie akceptować je lub odrzucać.", + "comcol-role.edit.finaleditor.name":"Redaktorzy końcowi", + "comcol-role.edit.finaleditor.description":"Redaktorzy końcowi mogą edytować metadane nowych pozycji, ale nie mogę odrzucać pozycji.", + "comcol-role.edit.reviewer.name":"Recenzenci", + "comcol-role.edit.reviewer.description":"Recenzenci mogą akceptować lub odrzucać nowe pozycje, ale nie mogę edytować ich metadanych.", + "community.form.abstract":"Opis skrócony", + "community.form.description":"Wstęp (HTML)", + "community.form.errors.title.required":"Wprowadź nazwę zbioru", + "community.form.rights":"Prawa autoskie (HTML)", + "community.form.tableofcontents":"Wiadomości (HTML)", + "community.form.title":"Nazwa", + "community.page.edit":"Edytuj ten zbiór", + "community.page.handle":"Stały URI zbioru", + "community.page.license":"Licencja", + "community.page.news":"Wiadomości", + "community.all-lists.head":"Podzbiory i kolekcje", + "community.sub-collection-list.head":"Kolekcje w tym zbiorze", + "community.sub-community-list.head":"Kolekcje w tym zbiorze", + "cookies.consent.accept-all":"Zaakceptuj wszystko", + "cookies.consent.accept-selected":"Zaakceptuj wybrane", + "cookies.consent.app.opt-out.description":"Aplikacja jest domyślnie włączona (możesz ją wyłączyć)", + "cookies.consent.app.opt-out.title":"(możesz ją wyłaczyć)", + "cookies.consent.app.purpose":"cel", + "cookies.consent.app.required.description":"Ta aplikacja jest zawsze wymagana", + "cookies.consent.app.required.title":"(zawsze wymagana)", + "cookies.consent.update":"Od ostatniej wizyty zostały wprowadzone zmiany. Zweryfikuj swoje zgody.", + "cookies.consent.close":"Zamknij", + "cookies.consent.decline":"Odrzuć", + "cookies.consent.content-notice.description":"Zbieramy i przetwarzamy Twoje dane do następujących celów: weryfikacja, preferencje, zgody i statystyka.
    Jeśli chcesz się dowiedzieć więcej, przycztaj naszą {privacyPolicy}.", + "cookies.consent.content-notice.learnMore":"Dostosuj", + "cookies.consent.content-modal.description":"Tutaj są wyświetlane informacje, które zbieramy o Tobie. Możesz je dostosować według swojego uznania.", + "cookies.consent.content-modal.privacy-policy.name":"polityka prywatności", + "cookies.consent.content-modal.privacy-policy.text":"Aby dowiedzieć się więcej przeczytaj naszą {privacyPolicy}.", + "cookies.consent.content-modal.title":"Informacje, które zbieramy", + "cookies.consent.app.title.authentication":"Logowanie", + "cookies.consent.app.description.authentication":"Musisz się zalogować", + "cookies.consent.app.title.preferences":"Preferencje", + "cookies.consent.app.description.preferences":"Wymagane, aby zapisać Twoje preferencje", + "cookies.consent.app.title.acknowledgement":"Zgody", + "cookies.consent.app.description.acknowledgement":"Wymagane, aby zapisać Twoje preferencje", + "cookies.consent.app.title.google-analytics":"Google Analytics", + "cookies.consent.app.description.google-analytics":"Pozwól na śledzenie do celów statystycznych", + "cookies.consent.purpose.functional":"Funkcjonalne", + "cookies.consent.purpose.statistical":"Statystyczne", + "curation-task.task.checklinks.label":"Sprawdź odnośniki w metadanych", + "curation-task.task.noop.label":"NOOP", + "curation-task.task.profileformats.label":"Profil formatów plików", + "curation-task.task.requiredmetadata.label":"Sprawdź poprawność wymaganych metadanych", + "curation-task.task.translate.label":"Microsoft Translator", + "curation-task.task.vscan.label":"Skan antywirusowy", + "curation.form.task-select.label":"Zadanie:", + "curation.form.submit":"Start", + "curation.form.submit.success.head":"Udało się rozpocząć zadanie administratora", + "curation.form.submit.success.content":"Zostaniesz przeniesiony na stronę procesu.", + "curation.form.submit.error.head":"Nie udało się się zakończyć zadania administratora", + "curation.form.submit.error.content":"Wystąpił błąd podczas rozpoczynania zadania administracyjnego.", + "curation.form.handle.label":"Automatyzacja:", + "curation.form.handle.hint":"Wskazówka: Wpisz [prefix swojego identyfikatora]/0, aby zautomatyzować zadanie (nie wszystkie zadania mogą wspierać tę funkcję)", + "deny-request-copy.email.message":"Drogi użytkowniku {{ recipientName }},\nW odpowiedzi na Państwa zapytanie, przykro mi poinformować, że to niemożliwe, aby przestać kopię pliku, o który Państwo prosili: \"{{ itemUrl }}\" ({{ itemName }}), którego jestem autorem.\n\nPozdrawiam serdecznie,\n{{ authorName }} <{{ authorEmail }}>", + "deny-request-copy.email.subject":"Wystąp o kopię dokumentu", + "deny-request-copy.error":"Wystąpił błąd", + "deny-request-copy.header":"Odrzuć prośbę o przesłanie kopii dokumentu", + "deny-request-copy.intro":"Ta wiadomość zostanie przesłana do osoby, która wystąpiła o dostęp", + "deny-request-copy.success":"Z powodzeniem odrzucono prośbę o udostępnienie pozycji", + "dso.name.untitled":"Brak tytułu", + "dso-selector.claim.item.head":"Wskazówki profilu", + "dso-selector.claim.item.body":"Istnieją profile, które mogą odnosić się do Ciebie. Jeśli, któryś z tych profilów jest Twój, wybierz go i przejdź do szczegółów, z opcji wybierz opcję przypisania profilu. W innym przypadku możesz utworzyć nowy profil z szablonu, wybierając przycisk poniżej.", + "dso-selector.claim.item.create-from-scratch":"Utwórz nowy", + "dso-selector.claim.item.not-mine-label":"Żaden nie jest mój", + "dso-selector.create.collection.head":"Nowa kolekcja", + "dso-selector.create.collection.sub-level":"Utwórz nową kolekcję w", + "dso-selector.create.community.head":"Nowy zbiór", + "dso-selector.create.community.sub-level":"Utwórz nowy zbiór", + "dso-selector.create.community.top-level":"Utwórz nowy nadrzędny zbiór", + "dso-selector.create.item.head":"Nowa pozycja", + "dso-selector.create.item.sub-level":"Utwórz nową pozycję w", + "dso-selector.create.submission.head":"Nowe zgłoszenie", + "dso-selector.edit.collection.head":"Edytuj kolekcję", + "dso-selector.edit.community.head":"Edytuj zbiór", + "dso-selector.edit.item.head":"Edytuj pozycję", + "dso-selector.error.title":"Wystąpił błąd podczas wyszukiwania typu {{ type }}", + "dso-selector.export-metadata.dspaceobject.head":"Eksportuj metadane z", + "dso-selector.no-results":"Nie znaleziono {{ type }}", + "dso-selector.placeholder":"Wyszukaj {{ type }}", + "dso-selector.select.collection.head":"Wybierz kolekcję", + "dso-selector.set-scope.community.head":"Wybierz wyszukiwanie zakresu", + "dso-selector.set-scope.community.button":"Wyszukaj w całym DSpace", + "dso-selector.set-scope.community.input-header":"Wyszukaj zbiór lub kolekcję", + "confirmation-modal.export-metadata.header":"Eksportuj metadane z {{ dsoName }}", + "confirmation-modal.export-metadata.info":"Czy na pewno chcesz eksportować metadane z {{ dsoName }}", + "confirmation-modal.export-metadata.cancel":"Anuluj", + "confirmation-modal.export-metadata.confirm":"Eksportuj", + "confirmation-modal.delete-eperson.header":"Usuń użytkownika \"{{ dsoName }}\"", + "confirmation-modal.delete-eperson.info":"Czy na pewno chcesz usunąć użytkownika \"{{ dsoName }}\"", + "confirmation-modal.delete-eperson.cancel":"Anuluj", + "confirmation-modal.delete-eperson.confirm":"Usuń", + "error.bitstream":"Wystąpił błąd podczas tworzenia plików", + "error.browse-by":"Wystąpił błąd podczas tworzenia pozycji", + "error.collection":"Wystąpił błąd podczas tworzenia kolekcji", + "error.collections":"Wystąpił błąd podczas tworzenia kolekcji", + "error.community":"Wystąpił błąd podczas tworzenia ziboru", + "error.identifier":"Nie znaleziono pozycji z podanym identyfikatorem", + "error.default":"Błąd", + "error.item":"Wystąpił błąd podczas tworzenia pozycji", + "error.items":"Wystąpił błąd podczas tworzenia pozycji", + "error.objects":"Wystąpił błąd podczas tworzenia obiektów", + "error.recent-submissions":"Wystąpił błąd podczas tworzenia ostatniego zgłoszenia", + "error.search-results":"Wystąpił błąd podczas tworzenia wyników wyszukiwania", + "error.sub-collections":"Wystąpił błąd podczas tworzenia podkolekcji", + "error.sub-communities":"Wystąpił błąd podczas tworzenia podzbiorów", + "error.submission.sections.init-form-error":"Wystąpił błąd w czasie inicjalizacji sekcji, sprawdź konfigurację. Szczegóły poniżej:

    ", + "error.top-level-communities":"Błąd podczas pobierania nadrzędnego zbioru", + "error.validation.license.notgranted":"Musisz wyrazić tę zgodę, aby przesłać swoje zgłoszenie. Jeśli nie możesz wyrazić zgody w tym momencie, możesz zapisać swoją pracę i wrócić do niej później lub usunąć zgłoszenie.", + "error.validation.pattern":"Te dane wejściowe są ograniczone przez aktualny wzór: {{ pattern }}.", + "error.validation.filerequired":"Przesłanie pliku jest obowiązkowe", + "error.validation.required":"Pole jest wymagane", + "error.validation.NotValidEmail":"E-mail nie jest poprawny", + "error.validation.emailTaken":"E-mail jest już zarejestrowany", + "error.validation.groupExists":"Ta grupa już istnieje", + "file-section.error.header":"Błąd podczas uzyskiwania plików dla tej pozycji", + "footer.copyright":"copyright © 2002-{{ year }}", + "footer.link.dspace":"oprogramowanie DSpace", + "footer.link.lyrasis":"LYRASIS", + "footer.link.cookies":"Ustawienia plików cookies", + "footer.link.privacy-policy":"Polityka prywatności", + "footer.link.end-user-agreement":"Umowa użytkownika", + "forgot-email.form.header":"Nie pamiętam hasła", + "forgot-email.form.info":"Zarejestruj się, aby otrzymywać wiadomości o nowych pozycjach w obserowanych kolekcjach, a także przesyłać nowe pozycje do repozytorium.", + "forgot-email.form.email":"Adres e-mail *", + "forgot-email.form.email.error.required":"Uzupełnij adres e-mail", + "forgot-email.form.email.error.pattern":"Uzupełnij prawidłowy adres e-mail", + "forgot-email.form.email.hint":"Ten adres e-mail będzie zweryfikowany i będziesz go używać jako swój login.", + "forgot-email.form.submit":"Wyślij", + "forgot-email.form.success.head":"Wysłano wiadomość weryfikacyjną", + "forgot-email.form.success.content":"Wiadomość została wysłana na adres e-mail {{ email }}. Zawiera ona unikatowy link i dalsze instrukcje postępowania.", + "forgot-email.form.error.head":"Błąd podczas rejestracji adresu e-mail", + "forgot-email.form.error.content":"Wystąpił błąd poczas próby rejestracji tego adresu e-mail: {{ email }}", + "forgot-password.title":"Nie pamiętam hasła", + "forgot-password.form.head":"Nie pamiętam hasła", + "forgot-password.form.info":"Wpisz nowe hasło w polu poniżej i potwierdź je wpisując je ponownie w drugim polu. Hasło powinno mieć co najmniej sześć znaków.", + "forgot-password.form.card.security":"Bezpieczeństwo", + "forgot-password.form.identification.header":"Identifikacja", + "forgot-password.form.identification.email":"Adres e-mail: ", + "forgot-password.form.label.password":"Hasło", + "forgot-password.form.label.passwordrepeat":"Potwierdź hasło", + "forgot-password.form.error.empty-password":"Wpisz hasło poniżej.", + "forgot-password.form.error.matching-passwords":"Hasła nie są identyczne.", + "forgot-password.form.notification.error.title":"Błąd podczas próby ustawienia nowego hasła", + "forgot-password.form.notification.success.content":"Resetowanie hasła udało się. Zalogowano jako stworzony przed momemntem użytkownik.", + "forgot-password.form.notification.success.title":"Resetowanie hasła udane", + "forgot-password.form.submit":"Wpisz hasło", + "form.add":"Dodaj", + "form.add-help":"Wybierz ten przycisk, aby dodać aktualny wpis lub dodać następny", + "form.cancel":"Anuluj", + "form.clear":"Wyczyść", + "form.clear-help":"Kliknij tutaj, aby usunąć wybraną wartość", + "form.discard":"Odrzuć", + "form.drag":"Przeciągnij", + "form.edit":"Edytuj", + "form.edit-help":"Kliknij tutaj, aby edytować wybraną wartość", + "form.first-name":"Imię", + "form.last-name":"Nazwisko", + "form.loading":"Ładowanie...", + "form.lookup":"Przeglądaj", + "form.lookup-help":"Kliknij tutaj, aby zobaczyć istniejące powiązania", + "form.no-results":"Nie znaleziono rezultatów", + "form.no-value":"Nie wprowadzono wartości", + "form.remove":"Usuń", + "form.save":"Zapisz", + "form.save-help":"Zapisz zmiany", + "form.search":"Wyszukaj", + "form.search-help":"Kliknij tutaj, aby wyszukać w istniejących komentarzach", + "form.submit":"Zapisz", + "form.repeatable.sort.tip":"Upuść nową pozycję w nowym miejscu", + "grant-deny-request-copy.deny":"Nie przesyłaj kopii", + "grant-deny-request-copy.email.back":"Cofnij", + "grant-deny-request-copy.email.message":"Wiadomości", + "grant-deny-request-copy.email.message.empty":"Proszę wprowadzić wiadomość", + "grant-deny-request-copy.email.permissions.info":"W tym miejscu możesz przemyśleć ograniczenie dostępu do dokumentu, aby odpowiadać na mniej próśb o dostęp. Jeśli chcesz wystąpić do administratorów reposytorium o zniesienie restrykcji, zaznacz okienko poniżej.", + "grant-deny-request-copy.email.permissions.label":"Ustaw jako otwarty dostęp", + "grant-deny-request-copy.email.send":"Wyślij", + "grant-deny-request-copy.email.subject":"Temat", + "grant-deny-request-copy.email.subject.empty":"Wpisz temat", + "grant-deny-request-copy.grant":"Wyślij kopię", + "grant-deny-request-copy.header":"Prośba o przesłanie kopii dokumentu", + "grant-deny-request-copy.home-page":"Zabierz mnie na stronę główną", + "grant-deny-request-copy.intro1":"Jeśli jesteś jednym z autorów dokumentu {{ name }}, wybierz jedną z poniższych opcji, aby odpowiedzieć zapytaniu użytkownika.", + "grant-deny-request-copy.intro2":"Po wybraniu opcji, zostaną wyświetlone sugerowane odpowiedzi, które można edytować.", + "grant-deny-request-copy.processed":"Ta prośba jest już procesowana. Możesz użyć przycisku poniżej, aby wrócić do strony głównej.", + "grant-request-copy.email.message":"Drogi użytkowniku {{ recipientName }},\nW odpowiedzi na Państwa zapytanie, miło mi poinformować, że w załączniku przesyłam kopię dokumentu, o który Państwo prosili: \"{{ itemUrl }}\" ({{ itemName }}), którego jestem autorem.\n\nPozdrawiam serdecznie,\n{{ authorName }} <{{ authorEmail }}>", + "grant-request-copy.email.subject":"Prośba o kopię dokumentu", + "grant-request-copy.error":"Wystąpił błąd", + "grant-request-copy.header":"Zezwól na wysłanie kopii dokumentu", + "grant-request-copy.intro":"To wiadomość zostanie wysłana do osoby, która wystąpiła o dostęp. Wskazane dokumenty zostaną dołączone jako załącznik.", + "grant-request-copy.success":"Prośba o dostęp do dokumentu została przyjęta", + "home.description":"", + "home.breadcrumbs":"Strona główna", + "home.search-form.placeholder":"Przeszukaj repozytorium...", + "home.title":"Strona główna", + "home.top-level-communities.head":"Zbiory w DSpace Cris", + "home.top-level-communities.help":"Przeszukaj kolekcje", + "info.end-user-agreement.accept":"Przeczytałem/am i akceptuję umowę użytkownika", + "info.end-user-agreement.accept.error":"Błąd wystąpił podczas akceptowania umowy użytkownika", + "info.end-user-agreement.accept.success":"Udało się zaktualizować umowę użytkownika", + "info.end-user-agreement.breadcrumbs":"Umowa użytkownika", + "info.end-user-agreement.buttons.cancel":"Anuluj", + "info.end-user-agreement.buttons.save":"Zapisz", + "info.end-user-agreement.head":"Umowa użytkownika", + "info.end-user-agreement.title":"Umowa użytkownika", + "info.privacy.breadcrumbs":"Oświadczenie polityki prywatności", + "info.privacy.head":"Oświadczenie polityki prywatności", + "info.privacy.title":"Oświadczenie polityki prywatności", + "item.alerts.private":"Ta pozycja jest prywatna", + "item.alerts.withdrawn":"Ta pozycja została wycofana", + "item.edit.authorizations.heading":"Za pomocą tego edytora możesz przeglądać i zmieniać polityki dla danej pozycji, a także zmieniać polityki dla poszczególnych części pozycji: paczek i strumieni bitów. W skrócie, pozycja jest kontenerem pakietów, a pakiety są kontenerami strumieni bitów. Kontenery zazwyczaj mają polityki ADD/REMOVE/READ/WRITE, natomiast strumienie bitów mają tylko polityki READ/WRITE.", + "item.edit.authorizations.title":"Edytuj politykę tej pozycji", + "item.badge.private":"Prywatny status publikacji", + "item.badge.withdrawn":"Wycofane publikacje", + "item.bitstreams.upload.bundle":"Pakiet", + "item.bitstreams.upload.bundle.placeholder":"Wybierz pakiet", + "item.bitstreams.upload.bundle.new":"Utworz pakiet", + "item.bitstreams.upload.bundles.empty":"Ta pozycja nie zawiera żadnych pakietów, do których można przesłać strumień bitów.", + "item.bitstreams.upload.cancel":"Anuluj", + "item.bitstreams.upload.drop-message":"Upuść plik, aby przesłać", + "item.bitstreams.upload.item":"Pozycja: ", + "item.bitstreams.upload.notifications.bundle.created.content":"Udało się utworzyć nowy pakiet.", + "item.bitstreams.upload.notifications.bundle.created.title":"Utwórz pakiet", + "item.bitstreams.upload.notifications.upload.failed":"Zweryfikuj pliki przed spróbowaniem ponownie.", + "item.bitstreams.upload.title":"Prześlij strumień bitów", + "item.edit.bitstreams.bundle.edit.buttons.upload":"Prześlij", + "item.edit.bitstreams.bundle.displaying":"Obecnie wyświetlono {{ amount }} plików z {{ total }}.", + "item.edit.bitstreams.bundle.load.all":"Załaduj wszystkie ({{ total }})", + "item.edit.bitstreams.bundle.load.more":"Załaduj więcej", + "item.edit.bitstreams.bundle.name":"PACZKA: {{ name }}", + "item.edit.bitstreams.discard-button":"Odrzuć", + "item.edit.bitstreams.edit.buttons.download":"Pobierz", + "item.edit.bitstreams.edit.buttons.drag":"Przeciągnij", + "item.edit.bitstreams.edit.buttons.edit":"Edytuj", + "item.edit.bitstreams.edit.buttons.remove":"Usuń", + "item.edit.bitstreams.edit.buttons.undo":"Cofnij zmiany", + "item.edit.bitstreams.empty":"Ta pozycja nie zawiera żadnych strumieni bitów. Wybierz strumienie do załadowania, aby je utworzyć.", + "item.edit.bitstreams.headers.actions":"Akcje", + "item.edit.bitstreams.headers.bundle":"Paczka", + "item.edit.bitstreams.headers.description":"Opis", + "item.edit.bitstreams.headers.format":"Format", + "item.edit.bitstreams.headers.name":"Nazwa", + "item.edit.bitstreams.notifications.discarded.content":"Twoje zmiany zostały odrzucone. Aby je przywrócić, wybierz przycisk 'Cofnij'", + "item.edit.bitstreams.notifications.discarded.title":"Zmiany odrzucone", + "item.edit.bitstreams.notifications.move.failed.title":"Błąd podczas przenoszenia plików", + "item.edit.bitstreams.notifications.move.saved.content":"Zmiany pozycji dla pliku tej pozycji oraz jego paczki zostały zapisane.", + "item.edit.bitstreams.notifications.move.saved.title":"Zmiana pozycji została zapisana", + "item.edit.bitstreams.notifications.outdated.content":"Pozycja została w międzyczasie zmieniona przez innego użytkownika. Twoje zmiany zostały cofnięte, aby uniknąć ewentualnych konfliktów", + "item.edit.bitstreams.notifications.outdated.title":"Zmiany nieaktualne", + "item.edit.bitstreams.notifications.remove.failed.title":"Błąd podczas usuwania pliku", + "item.edit.bitstreams.notifications.remove.saved.content":"Twoje zmiany dotyczące usunięcia plików z tej pozycji zostały zapisane.", + "item.edit.bitstreams.notifications.remove.saved.title":"Zmiany dotyczące usunięcia zapisane", + "item.edit.bitstreams.reinstate-button":"Cofnij", + "item.edit.bitstreams.save-button":"Zapisz", + "item.edit.bitstreams.upload-button":"Prześlij", + "item.edit.delete.cancel":"Anuluj", + "item.edit.delete.confirm":"Usuń", + "item.edit.delete.description":"Czy jesteś pewien, że ta pozycja powinna zostać całkowicie usunięta? Ostrożnie: Teraz nie pozostanie po tej pozycji żaden ślad.", + "item.edit.delete.error":"Błąd wystąpił podczas usuwania pozycji", + "item.edit.delete.header":"Usuń pozycję: {{ id }}", + "item.edit.delete.success":"Ta pozycja została usunięta", + "item.edit.head":"Edytuj pozycję", + "item.edit.breadcrumbs":"Edytuj pozycję", + "item.edit.tabs.disabled.tooltip":"Nie masz dostępu do tej strony", + "item.edit.tabs.mapper.head":"Mapper kolekcji", + "item.edit.tabs.item-mapper.title":"Edytowanie pozycji - Mapper kolekcji", + "item.edit.item-mapper.buttons.add":"Mapowanie pozycji do wybranych kolekcji", + "item.edit.item-mapper.buttons.remove":"Usuń mapowanie pozycji do wybranych kolekcji", + "item.edit.item-mapper.cancel":"Anuluj", + "item.edit.item-mapper.description":"To jest narzędzie do mapowania elementów, które pozwala administratorom mapować tę pozycję do innych kolekcji. Możesz wyszukiwać kolekcje i je mapować lub przeglądać listę kolekcji, do których dana pozycja jest aktualnie zmapowana.", + "item.edit.item-mapper.head":"Mapper pozycji - Mapowanie pozycji do kolekcji", + "item.edit.item-mapper.item":"Pozycja: \"{{name}}\"", + "item.edit.item-mapper.no-search":"Wpisz zapytanie, które chcesz wyszukać", + "item.edit.item-mapper.notifications.add.error.content":"Wystąpiły błędy dla mapowania pozycji w {{amount}} kolekcjach.", + "item.edit.item-mapper.notifications.add.error.head":"Błędy mapowania", + "item.edit.item-mapper.notifications.add.success.content":"Udało się zmapować elementy dla {{amount}} kolekcji.", + "item.edit.item-mapper.notifications.add.success.head":"Mapowanie zakończone", + "item.edit.item-mapper.notifications.remove.error.content":"Wystąpiły błędy podczas usuwania mapowania do {{amount}} kolekcji.", + "item.edit.item-mapper.notifications.remove.error.head":"Usunięcie mapowania błędów", + "item.edit.item-mapper.notifications.remove.success.content":"Udało się usunąć mapowanie pozycji w {{amount}} kolekcjach.", + "item.edit.item-mapper.notifications.remove.success.head":"Usuwanie mapowania zakończone", + "item.edit.item-mapper.search-form.placeholder":"Przeszukaj kolekcje...", + "item.edit.item-mapper.tabs.browse":"Przeglądaj zmapowane kolekcje", + "item.edit.item-mapper.tabs.map":"Mapuj nowe kolekcje", + "item.edit.metadata.add-button":"Dodaj", + "item.edit.metadata.discard-button":"Odrzuć", + "item.edit.metadata.edit.buttons.edit":"Edytuj", + "item.edit.metadata.edit.buttons.remove":"Usuń", + "item.edit.metadata.edit.buttons.undo":"Cofnij zmiany", + "item.edit.metadata.edit.buttons.unedit":"Zatrzymaj edycję", + "item.edit.metadata.empty":"Ta pozycja nie zawiera żadnych metadanych. Wybierz Dodaj, aby dodać metadane.", + "item.edit.metadata.headers.edit":"Edytuj", + "item.edit.metadata.headers.field":"Pole", + "item.edit.metadata.headers.language":"Język", + "item.edit.metadata.headers.value":"Wartość", + "item.edit.metadata.metadatafield.invalid":"Wybierz aktualne pole metadanych", + "item.edit.metadata.notifications.discarded.content":"Twoje zmiany zostały odrzucone. Aby wgrać je ponownie wybierz przycisk 'Cofnij'", + "item.edit.metadata.notifications.discarded.title":"Zmiany odrzucone", + "item.edit.metadata.notifications.error.title":"Wystąpił błąd", + "item.edit.metadata.notifications.invalid.content":"Twoje zmiany nie zostały zapisane. Przed zapisaniem upewnij się, że wszystkie pola są wypełnione prawidłowo.", + "item.edit.metadata.notifications.invalid.title":"Nieprawidłowe metadane", + "item.edit.metadata.notifications.outdated.content":"Pozycja została w międzyczasie zmieniona przez innego użytkownika. Twoje zmiany zostały cofnięte, aby zapobiec ewentualnym konfliktom", + "item.edit.metadata.notifications.outdated.title":"Zmiany nieaktualne", + "item.edit.metadata.notifications.saved.content":"Twoje zmiany metadanych tej pozycji zostały zapisane.", + "item.edit.metadata.notifications.saved.title":"Metadane zostały zapisane", + "item.edit.metadata.reinstate-button":"Cofnij", + "item.edit.metadata.save-button":"Zapisz", + "item.edit.modify.overview.field":"Pole", + "item.edit.modify.overview.language":"Język", + "item.edit.modify.overview.value":"Wartość", + "item.edit.move.cancel":"Anuluj", + "item.edit.move.save-button":"Zapisz", + "item.edit.move.discard-button":"Odrzuć", + "item.edit.move.description":"Wybierz kolekcję, do której chcesz przenieść tę pozycję. Aby zawęzić listę wyświetlanych kolekcji, możesz wprowadzić zapytanie w polu wyszukiwania.", + "item.edit.move.error":"Wystąpił błąd podczas przenoszenia pozycji", + "item.edit.move.head":"Przenieś pozycję: {{id}}", + "item.edit.move.inheritpolicies.checkbox":"Dziedziczenie polityk", + "item.edit.move.inheritpolicies.description":"Dziedzczenie domyślnych polityk z kolekcji docelowej", + "item.edit.move.move":"Przenieś", + "item.edit.move.processing":"Przenoszenie...", + "item.edit.move.search.placeholder":"Wpisz zapytanie, aby wyszukać w kolekcjach", + "item.edit.move.success":"Pozycja została przeniesiona", + "item.edit.move.title":"Przenieś pozycję", + "item.edit.private.cancel":"Anuluj", + "item.edit.private.confirm":"Ukryj", + "item.edit.private.description":"Czy chcesz ukryć tę pozycję?", + "item.edit.private.error":"Wystąpił błąd podczas ukrywania pozycji", + "item.edit.private.header":"Ukryj pozycję: {{ id }}", + "item.edit.private.success":"Pozycja jest teraz ukryta", + "item.edit.public.cancel":"Anuluj", + "item.edit.public.confirm":"Upublicznij", + "item.edit.public.description":"Czy chcesz upublicznić tę pozycję?", + "item.edit.public.error":"Wystąpił błąd podczas upubliczniania pozycji", + "item.edit.public.header":"Upublicznij pozycję: {{ id }}", + "item.edit.public.success":"Pozycja jest teraz publiczna", + "item.edit.reinstate.cancel":"Anuluj", + "item.edit.reinstate.confirm":"Przywróć", + "item.edit.reinstate.description":"Czy chcesz przywrócić tę pozycję?", + "item.edit.reinstate.error":"Wystąpił błąd podczas przywracania pozycji", + "item.edit.reinstate.header":"Przywróć pozycję: {{ id }}", + "item.edit.reinstate.success":"Pozycja została przywrócona", + "item.edit.relationships.discard-button":"Odrzuć", + "item.edit.relationships.edit.buttons.add":"Dodaj", + "item.edit.relationships.edit.buttons.remove":"Usuń", + "item.edit.relationships.edit.buttons.undo":"Cofnij zmiany", + "item.edit.relationships.no-relationships":"Brak relacji", + "item.edit.relationships.notifications.discarded.content":"Twoje zmiany zostały cofnięte. Aby przywrócić zmiany wybierz przycisk 'Cofnij'", + "item.edit.relationships.notifications.discarded.title":"Zmiany zostały cofnięte", + "item.edit.relationships.notifications.failed.title":"Wystąpił błąd podczas edytowania relacji", + "item.edit.relationships.notifications.outdated.content":"Ta pozycja została właśnie zmieniona przez innego użytkownika. Twoje zmiany zostały cofnięte, aby uniknąć konfliktów", + "item.edit.relationships.notifications.outdated.title":"Zmiany są nieaktualne", + "item.edit.relationships.notifications.saved.content":"Twoje zmiany w relacjach tej pozycji zostały zapisane.", + "item.edit.relationships.notifications.saved.title":"Relacje zostały zapisane", + "item.edit.relationships.reinstate-button":"Cofnij", + "item.edit.relationships.save-button":"Zapisz", + "item.edit.relationships.no-entity-type":"Dodaj metadaną 'dspace.entity.type', aby umożliwić dodawanie relacji do pozycji", + "item.edit.return":"Cofnij", + "item.edit.tabs.bitstreams.head":"Pliki", + "item.edit.tabs.bitstreams.title":"Edycja pozycji - pliki", + "item.edit.tabs.curate.head":"Administruj", + "item.edit.tabs.curate.title":"Edytowanie pozycji - administruj", + "item.edit.tabs.metadata.head":"Metadane", + "item.edit.tabs.metadata.title":"Edycja pozycji - metadane", + "item.edit.tabs.relationships.head":"Relacje", + "item.edit.tabs.relationships.title":"Edycja pozycja - relacje", + "item.edit.tabs.status.buttons.authorizations.button":"Dostępy...", + "item.edit.tabs.status.buttons.authorizations.label":"Określu dostęp do pozycji", + "item.edit.tabs.status.buttons.delete.button":"Usuń permanentnie", + "item.edit.tabs.status.buttons.delete.label":"Usuń pozycję permanentnie", + "item.edit.tabs.status.buttons.mappedCollections.button":"Zmapowane kolekcje", + "item.edit.tabs.status.buttons.mappedCollections.label":"Zarządzaj mapowanymi kolekcjami", + "item.edit.tabs.status.buttons.move.button":"Przenieś...", + "item.edit.tabs.status.buttons.move.label":"Przenieś pozycję do innej kolekcji", + "item.edit.tabs.status.buttons.private.button":"Ukryj...", + "item.edit.tabs.status.buttons.private.label":"Ukry pozycję", + "item.edit.tabs.status.buttons.public.button":"Upublicznij...", + "item.edit.tabs.status.buttons.public.label":"Upublicznij pozycję", + "item.edit.tabs.status.buttons.reinstate.button":"Przywróć...", + "item.edit.tabs.status.buttons.reinstate.label":"Przywróć pozycję", + "item.edit.tabs.status.buttons.unauthorized":"You're not authorized to perform this action", + "item.edit.tabs.status.buttons.withdraw.button":"Wycofaj...", + "item.edit.tabs.status.buttons.withdraw.label":"Wycofaj z repozytorium", + "item.edit.tabs.status.description":"Witamy na stronie zarządzania pozycjami. Z tego miejsca możesz wycofać, przywrócić, przenieść lub usunąć daną pozycję. Możesz również aktualizować lub dodawać nowe metadane lub pliki..", + "item.edit.tabs.status.head":"Status", + "item.edit.tabs.status.labels.handle":"Identyfikator", + "item.edit.tabs.status.labels.id":"ID pozycji", + "item.edit.tabs.status.labels.itemPage":"Strona pozycji", + "item.edit.tabs.status.labels.lastModified":"Ostatnia modyfikacja", + "item.edit.tabs.status.title":"Edycja pozycji - Status", + "item.edit.tabs.versionhistory.head":"Historia wersji", + "item.edit.tabs.versionhistory.title":"Edycja pozycji - historia wersji", + "item.edit.tabs.versionhistory.under-construction":"Edytowanie lub dodawanie nowych wersji jest niedostępne w tego poziomu interfejsu.", + "item.edit.tabs.view.head":"Widok pozycji", + "item.edit.tabs.view.title":"Edycja pozycji - widok", + "item.edit.withdraw.cancel":"Anuluj", + "item.edit.withdraw.confirm":"Wycofaj", + "item.edit.withdraw.description":"Czy na pewno chcesz wycofać pozycję?", + "item.edit.withdraw.error":"Wystąpił błąd podczas wycofywania pozycji", + "item.edit.withdraw.header":"Wycofaj pozycję: {{ id }}", + "item.edit.withdraw.success":"Pozycja została wycofana", + "item.listelement.badge":"Pozycja", + "item.page.description":"Opis", + "item.page.journal-issn":"ISSN czasopisma", + "item.page.journal-title":"Tytuł czasopisma", + "item.page.publisher":"Wydawca", + "item.page.titleprefix":"Pozycja: ", + "item.page.volume-title":"Tytuł tomu", + "item.search.results.head":"Wyniki wyszukiwania pozycji", + "item.search.title":"Wyszukiwanie pozycji", + "item.page.abstract":"Abstrakt", + "item.page.author":"Autorzy", + "item.page.citation":"Cytowanie", + "item.page.collections":"Kolekcje", + "item.page.collections.loading":"Ładowanie...", + "item.page.collections.load-more":"Załaduj więcej", + "item.page.date":"Data", + "item.page.edit":"Edytuj pozycję", + "item.page.files":"Pliki", + "item.page.filesection.description":"Opis:", + "item.page.filesection.download":"Pobierz", + "item.page.filesection.format":"Format:", + "item.page.filesection.name":"Nazwa:", + "item.page.filesection.size":"Rozmiar:", + "item.page.journal.search.title":"Artykuły w czasopiśmie", + "item.page.link.full":"Zobacz szczegóły", + "item.page.link.simple":"Uproszczony widok", + "item.page.person.search.title":"Artykuły tego autora", + "item.page.related-items.view-more":"Pokaż o {{ amount }} więcej", + "item.page.related-items.view-less":"Ukryj {{ amount }}", + "item.page.relationships.isAuthorOfPublication":"Publikacje", + "item.page.relationships.isJournalOfPublication":"Publikacje", + "item.page.relationships.isOrgUnitOfPerson":"Autorzy", + "item.page.relationships.isOrgUnitOfProject":"Projekty naukowe", + "item.page.subject":"Słowa kluczowe", + "item.page.uri":"URI", + "item.page.bitstreams.view-more":"Pokaż więcej", + "item.page.bitstreams.collapse":"Pokaż mniej", + "item.page.filesection.original.bundle":"Oryginalne pliki", + "item.page.filesection.license.bundle":"Licencja", + "item.page.return":"Powrót", + "item.page.version.create":"Utwórz nową wersję", + "item.page.version.hasDraft":"Nowa wersja nie może zostać utworzona, ponieważ istnieje już oczekujące na akceptację zgłoszenie dokumentu tego pliku", + "item.preview.dc.identifier.doi":"DOI", + "item.preview.dc.relation.ispartof":"Czasopismo lub seria", + "item.preview.dc.identifier.isbn":"ISBN", + "item.preview.dc.identifier.uri":"Identyfikator:", + "item.preview.dc.contributor.author":"Autorzy:", + "item.preview.dc.date.issued":"Data publikacji:", + "item.preview.dc.description.abstract":"Abstrakt:", + "item.preview.dc.identifier.other":"Inny identyfikator:", + "item.preview.dc.language.iso":"Język:", + "item.preview.dc.title":"Tytuł:", + "item.preview.dc.title.alternative":"Tytuł alternatywny", + "item.preview.dc.type":"Typ:", + "item.preview.dc.identifier":"Identyfikator:", + "item.preview.dc.relation.issn":"ISSN", + "item.preview.oaire.citation.issue":"Numer wydania", + "item.preview.oaire.citation.volume":"Numer tomu", + "item.preview.person.familyName":"Nazwisko:", + "item.preview.person.givenName":"Nazwa:", + "item.preview.person.identifier.orcid":"ORCID:", + "item.preview.project.funder.name":"Fundator:", + "item.preview.project.funder.identifier":"Identyfikator fundatora:", + "item.preview.oaire.awardNumber":"ID finansowania:", + "item.preview.dc.coverage.spatial":"Jurysdykcja:", + "item.preview.oaire.fundingStream":"Źródło finansowania:", + "item.select.confirm":"Potwierdź zaznaczone", + "item.select.empty":"Brak pozycji do wyświetlenia", + "item.select.table.author":"Autor", + "item.select.table.collection":"Kolekcja", + "item.select.table.title":"Tytuł", + "item.version.history.empty":"Jeszcze nie ma innych wersji tej pozycji.", + "item.version.history.head":"Poprzednie wersje", + "item.version.history.return":"Powrót", + "item.version.history.selected":"Wybrane wersje", + "item.version.history.selected.alert":"W tym momencie wyświetlono wersję {{version}} pozycji.", + "item.version.history.table.version":"Wersja", + "item.version.history.table.item":"Pozycja", + "item.version.history.table.editor":"Redaktor", + "item.version.history.table.date":"Data", + "item.version.history.table.summary":"Podsumowanie", + "item.version.history.table.workspaceItem":"Wersja robocza", + "item.version.history.table.workflowItem":"Pozycja workflow", + "item.version.history.table.actions":"Akcja", + "item.version.history.table.action.editWorkspaceItem":"Edytuj wersję roboczą pozycji", + "item.version.history.table.action.editSummary":"Edytuj podsumowanie", + "item.version.history.table.action.saveSummary":"Zapisz edycje podsumowania", + "item.version.history.table.action.discardSummary":"Odrzuć edycje podsumowania", + "item.version.history.table.action.newVersion":"Utwórz nową wersję z tej wersji", + "item.version.history.table.action.deleteVersion":"Wersja usunięta", + "item.version.history.table.action.hasDraft":"Nowa wersja nie może zostać utworzona, ponieważ istnieje już oczekujące na akceptację zgłoszenie dokumentu tego pliku", + "item.version.notice":"To nie jest najnowsza wersja tej pozycji. Najnowsza wersja jest dostępna tutaj.", + "item.version.create.modal.header":"Nowa wersja", + "item.version.create.modal.text":"Utwórz nową wersję tej pozycji", + "item.version.create.modal.text.startingFrom":"zaczynając od wersji {{version}}", + "item.version.create.modal.button.confirm":"Utwórz", + "item.version.create.modal.button.confirm.tooltip":"Utwórz nową wersję", + "item.version.create.modal.button.cancel":"Anuluj", + "item.version.create.modal.button.cancel.tooltip":"Nie stwarzaj nowej wersji", + "item.version.create.modal.form.summary.label":"Podsumowanie", + "item.version.create.modal.form.summary.placeholder":"Wprowadź podsumowanie nowej wersji", + "item.version.create.notification.success":"Nowa wersja została utworzona z numerem {{version}}", + "item.version.create.notification.failure":"Nowa wersja nie została utworzona", + "item.version.create.notification.inProgress":"Nowa wersja nie może być utworzona, ponieważ propozycja innej wersji jest już złożona do zaakceptowania", + "item.version.delete.modal.header":"Usuń wersję", + "item.version.delete.modal.text":"Czy chcesz usunąć wersję {{version}}?", + "item.version.delete.modal.button.confirm":"Usuń", + "item.version.delete.modal.button.confirm.tooltip":"Usuń wersję", + "item.version.delete.modal.button.cancel":"Anuluj", + "item.version.delete.modal.button.cancel.tooltip":"Nie usuwaj tej wersji", + "item.version.delete.notification.success":"Wersja {{version}} została usunięta", + "item.version.delete.notification.failure":"Wersja {{version}} nie została usunięta", + "item.version.edit.notification.success":"Podsumowanie wersji {{version}} zostało zmienione", + "item.version.edit.notification.failure":"Podsumowanie wersji {{version}} nie zostało zmienione", + "journal.listelement.badge":"Czasopismo", + "journal.page.description":"Opis", + "journal.page.edit":"Edytuj tę pozycję", + "journal.page.editor":"Redaktor naczelny", + "journal.page.issn":"ISSN", + "journal.page.publisher":"Wydawca", + "journal.page.titleprefix":"Czasopismo: ", + "journal.search.results.head":"Wyniki wyszukiwania czasopism", + "journal.search.title":"Wyszukiwanie czasopism", + "journalissue.listelement.badge":"Numer czasopisma", + "journalissue.page.description":"Opis", + "journalissue.page.edit":"Edytuj pozycję", + "journalissue.page.issuedate":"Data wydania", + "journalissue.page.journal-issn":"ISSN czasopisma", + "journalissue.page.journal-title":"Tytuł czasopisma", + "journalissue.page.keyword":"Słowa kluczowe", + "journalissue.page.number":"Numer", + "journalissue.page.titleprefix":"Wydanie czasopisma: ", + "journalvolume.listelement.badge":"Numer tomu czasopisma", + "journalvolume.page.description":"Opis", + "journalvolume.page.edit":"Edytuj pozycję", + "journalvolume.page.issuedate":"Data wydania", + "journalvolume.page.titleprefix":"Numer tomu czasopisma: ", + "journalvolume.page.volume":"Numer wydania", + "iiifsearchable.listelement.badge":"Multimedia dokumentu", + "iiifsearchable.page.titleprefix":"Dokument: ", + "iiifsearchable.page.doi":"Stały link: ", + "iiifsearchable.page.issue":"Wydanie: ", + "iiifsearchable.page.description":"Opis: ", + "iiifviewer.fullscreen.notice":"Wyświetl na pełnym ekranie dla lepszego widoku.", + "iiif.listelement.badge":"Multimedia obrazu", + "iiif.page.titleprefix":"Obraz: ", + "iiif.page.doi":"Stały link: ", + "iiif.page.issue":"Numer wydania: ", + "iiif.page.description":"Opis: ", + "loading.bitstream":"Ładowanie pliku...", + "loading.bitstreams":"Ładowanie plików...", + "loading.browse-by":"Ładowanie pozycji...", + "loading.browse-by-page":"Ładowanie strony...", + "loading.collection":"Ładowanie kolekcji...", + "loading.collections":"Ładowanie kolekcji...", + "loading.content-source":"Ładowanie źródła treści...", + "loading.community":"Ładowanie zbioru...", + "loading.default":"Ładowanie...", + "loading.item":"Ładowanie pozycji...", + "loading.items":"Ładowanie pozycji...", + "loading.mydspace-results":"Ładowanie pozycji...", + "loading.objects":"Ładowanie...", + "loading.recent-submissions":"Ładowanie ostatnich zgłoszeń...", + "loading.search-results":"Ładowanie wyników wyszukiwania...", + "loading.sub-collections":"Ładowanie podkolekcji...", + "loading.sub-communities":"Ładowanie podzbioru...", + "loading.top-level-communities":"Ładowanie zbioru wyszego szczebla...", + "login.form.email":"Adres e-mail", + "login.form.forgot-password":"Nie pamiętasz hasła?", + "login.form.header":"Zaloguj się do DSpace", + "login.form.new-user":"Nie masz konta? Zarejestruj się.", + "login.form.or-divider":"lub", + "login.form.orcid":"Zaloguj za pomocą ORCID", + "login.form.oidc":"Zaloguj za pomocą OIDC", + "login.form.password":"Hasło", + "login.form.shibboleth":"Zaloguj za pomocą Shibboleth", + "login.form.submit":"Zaloguj się", + "login.title":"Zaloguj", + "login.breadcrumbs":"Zaloguj", + "logout.form.header":"Wyloguj się z DSpace", + "logout.form.submit":"Wyloguj się", + "logout.title":"Wylogowywanie", + "menu.header.admin":"Panel administracyjny", + "menu.header.image.logo":"Logo repozytorium", + "menu.header.admin.description":"Menu administratora", + "menu.section.access_control":"Uprawnienia", + "menu.section.access_control_authorizations":"Dostępy", + "menu.section.access_control_groups":"Grupy", + "menu.section.access_control_people":"Użytkownicy", + "menu.section.admin_search":"Wyszukiwanie administracyjne", + "menu.section.browse_community":"Ten zbiór", + "menu.section.browse_community_by_author":"Wg autorów", + "menu.section.browse_community_by_issue_date":"Wg daty wydania", + "menu.section.browse_community_by_title":"Wg tytułów", + "menu.section.browse_global":"Wszystko na DSpace", + "menu.section.browse_global_by_author":"Wg autorów", + "menu.section.browse_global_by_dateissued":"Wg daty wydania", + "menu.section.browse_global_by_subject":"Wg tematu", + "menu.section.browse_global_by_title":"Wg tytułu", + "menu.section.browse_global_communities_and_collections":"Zbiory i kolekcje", + "menu.section.control_panel":"Panel sterowania", + "menu.section.curation_task":"Zadanie administracyjne", + "menu.section.edit":"Edytuj", + "menu.section.edit_collection":"Kolekcja", + "menu.section.edit_community":"Zbiór", + "menu.section.edit_item":"Pozycja", + "menu.section.export":"Eksport", + "menu.section.export_collection":"Kolekcja", + "menu.section.export_community":"Zbiór", + "menu.section.export_item":"Pozycja", + "menu.section.export_metadata":"Metadane", + "menu.section.icon.access_control":"Sekcja menu Uprawnienia", + "menu.section.icon.admin_search":"Sekcja menu Wyszukiwanie administracyjne", + "menu.section.icon.control_panel":"Sekcja menu Panel sterowania", + "menu.section.icon.curation_tasks":"Sekcja menu Zadanie administracyjne", + "menu.section.icon.edit":"Sekcja menu Edycja", + "menu.section.icon.export":"Sekcja menu Eksport", + "menu.section.icon.find":"Sekcja menu Wyszukiwanie", + "menu.section.icon.import":"Sekcja menu Import", + "menu.section.icon.new":"Sekcja menu Dodaj", + "menu.section.icon.pin":"Przypnij boczny pasek", + "menu.section.icon.processes":"Sekcja menu Procesy", + "menu.section.icon.registries":"Sekcja menu Rejestry", + "menu.section.icon.statistics_task":"Sekcja menu Zadanie statystyczne", + "menu.section.icon.workflow":"Sekcja menu Zarządzanie workflow", + "menu.section.icon.unpin":"Odepnij boczny pasek", + "menu.section.import":"Import", + "menu.section.import_batch":"Import masowy (ZIP)", + "menu.section.import_metadata":"Metadane", + "menu.section.new":"Dodaj", + "menu.section.new_collection":"Kolekcja", + "menu.section.new_community":"Zbiór", + "menu.section.new_item":"Pozycja", + "menu.section.new_item_version":"Wersja pozycji", + "menu.section.new_process":"Proces", + "menu.section.pin":"Przypnij pasek boczny", + "menu.section.unpin":"Odepnij pasek boczny", + "menu.section.processes":"Procesy", + "menu.section.registries":"Rejestry", + "menu.section.registries_format":"Formaty", + "menu.section.registries_metadata":"Metadane", + "menu.section.statistics":"Statystyki", + "menu.section.statistics_task":"Zadanie statystyczne", + "menu.section.toggle.access_control":"Przełącz sekcję Uprawnienia", + "menu.section.toggle.control_panel":"Przełącz sekcję Panel sterowania", + "menu.section.toggle.curation_task":"Przełącz sekcję Zadanie kuratora", + "menu.section.toggle.edit":"Przełącz sekcję Edytuj", + "menu.section.toggle.export":"Przełącz sekcję Eksport", + "menu.section.toggle.find":"Przełącz sekcję Wyszukiwanie", + "menu.section.toggle.import":"Przełącz sekcję Import", + "menu.section.toggle.new":"Przełącz nową sekcję", + "menu.section.toggle.registries":"Przełącz sekcję Rejestry", + "menu.section.toggle.statistics_task":"Przełącz sekcję Zadanie statystyczne", + "menu.section.workflow":"Zarządzaj Workflow", + "mydspace.breadcrumbs":"Mój DSpace", + "mydspace.description":"", + "mydspace.messages.controller-help":"Wybierz tę opcję, aby przesłać wiadomość do zgłaszającego.", + "mydspace.messages.description-placeholder":"Wpisz swoją wiadomość tutaj...", + "mydspace.messages.hide-msg":"Ukryj wiadomość", + "mydspace.messages.mark-as-read":"Oznacz jako przeczytane", + "mydspace.messages.mark-as-unread":"Oznacz jako nieprzeczytane", + "mydspace.messages.no-content":"Brak treści.", + "mydspace.messages.no-messages":"Brak wiadomości.", + "mydspace.messages.send-btn":"Wysłano", + "mydspace.messages.show-msg":"Pokaż wiadomość", + "mydspace.messages.subject-placeholder":"Temat...", + "mydspace.messages.submitter-help":"Wybierz tę opcję, aby przesłać wiadomość do osoby kontrolującej.", + "mydspace.messages.title":"Wiadomości", + "mydspace.messages.to":"Do", + "mydspace.new-submission":"Nowe zgłoszenie", + "mydspace.new-submission-external":"Import medatanych z zewnętrznego źródła", + "mydspace.new-submission-external-short":"Import metadanych", + "mydspace.results.head":"Twoje zadania", + "mydspace.results.no-abstract":"Brak abstraktu", + "mydspace.results.no-authors":"Brak autorów", + "mydspace.results.no-collections":"Brak kolekcji", + "mydspace.results.no-date":"Brak daty", + "mydspace.results.no-files":"Brak plików", + "mydspace.results.no-results":"Brak pozycji do wyświetlenia", + "mydspace.results.no-title":"Brak tytułu", + "mydspace.results.no-uri":"Brak Uri", + "mydspace.search-form.placeholder":"Wyszukaj w mydspace...", + "mydspace.show.workflow":"Wszystkie zadania", + "mydspace.show.workspace":"Twoje zadania", + "mydspace.status.archived":"Zarchiwizowano", + "mydspace.status.validation":"Walidacja", + "mydspace.status.waiting-for-controller":"Oczekiwanie na redaktora", + "mydspace.status.workflow":"Workflow", + "mydspace.status.workspace":"Wersja robocza", + "mydspace.title":"Mój DSpace", + "mydspace.upload.upload-failed":"Bład podczas tworzenia nowej wersji roboczej. Sprawdź poprawność plików i spróbuj ponownie.", + "mydspace.upload.upload-failed-manyentries":"Plik jest niemożliwy do przetworzenia. Wykryto wiele wejść, a dopuszczalne jest tylko jedno dla jednego pliku.", + "mydspace.upload.upload-failed-moreonefile":"Zapytanie niemożliwe do przetworzenia. Tylko jeden plik jest dopuszczalny.", + "mydspace.upload.upload-multiple-successful":"Utworzono {{qty}} przestrzeni roboczych.", + "mydspace.view-btn":"Widok", + "nav.browse.header":"Cały DSpace", + "nav.community-browse.header":"Wg zbiorów", + "nav.language":"Zmień język", + "nav.login":"Zaloguj", + "nav.logout":"Menu profilu użytkownika i wylogowywanie", + "nav.main.description":"Główny pasek nawigacji", + "nav.mydspace":"Mój DSpace", + "nav.profile":"Profil", + "nav.search":"Wyszukiwanie", + "nav.statistics.header":"Statystyki", + "nav.stop-impersonating":"Przestań impersonifikować użytkownika", + "nav.toggle":"Przełącz nawigację", + "nav.user.description":"Pasek profilu użytkownika", + "none.listelement.badge":"Pozycja", + "person.listelement.badge":"Osoba", + "person.listelement.no-title":"Nie znaleziono imienia", + "person.page.birthdate":"Data urodzenia", + "person.page.edit":"Edytuj pozycję", + "person.page.email":"Adres e-mail", + "person.page.firstname":"Imię", + "person.page.jobtitle":"Stanowisko", + "person.page.lastname":"Nazwisko", + "person.page.link.full":"Pokaż wszystkie metadane", + "person.page.orcid":"ORCID", + "person.page.orcid.create":"Utwórz ORCID ID", + "person.page.orcid.granted-authorizations":"Udzielone dostępy", + "person.page.orcid.grant-authorizations":"Udziel dostępu", + "person.page.orcid.link":"Połącz z ORCID ID", + "person.page.orcid.orcid-not-linked-message":"ORCID iD tego profilu ({{ orcid }}) nie jest połączony z bazą ORCID lub połączenie wygasło.", + "person.page.orcid.unlink":"Odepnij z ORCID", + "person.page.orcid.unlink.processing":"Procesowanie...", + "person.page.orcid.missing-authorizations":"Brak dostępów", + "person.page.orcid.missing-authorizations-message":"Brakuj następujących dostępów:", + "person.page.orcid.no-missing-authorizations-message":"Świetnie! To miejsce jest puste, co oznacza, że masz dostęp do wszystkich uprawnień, które są dostępne w Twojej instytucji.", + "person.page.orcid.no-orcid-message":"Brak przypisanego ORCID iD. Poprez wybranie przycisku poniżej możesz powiązać ten profil wraz z kontem ORCID.", + "person.page.orcid.profile-preferences":"Preferencje profilu", + "person.page.orcid.funding-preferences":"Preferencje finansowania", + "person.page.orcid.publications-preferences":"Preferencje publikacji", + "person.page.orcid.remove-orcid-message":"Jeśli chcesz usunąć Twój ORCID, skontaktuj się z administratorem repozytorium", + "person.page.orcid.save.preference.changes":"Aktualizuj ustawienia", + "person.page.orcid.sync-profile.affiliation":"Afiliacja", + "person.page.orcid.sync-profile.biographical":"Biografia", + "person.page.orcid.sync-profile.education":"Edukacja", + "person.page.orcid.sync-profile.identifiers":"Identyfikatory", + "person.page.orcid.sync-fundings.all":"Wszystkie źrodła finansowania", + "person.page.orcid.sync-fundings.mine":"Moje źrodła finansowania", + "person.page.orcid.sync-fundings.my_selected":"Wybrane źródła finansowania", + "person.page.orcid.sync-fundings.disabled":"Nieaktywne", + "person.page.orcid.sync-publications.all":"Wszystkie publikacje", + "person.page.orcid.sync-publications.mine":"Moje publikacje", + "person.page.orcid.sync-publications.my_selected":"Wybrane publikacje", + "person.page.orcid.sync-publications.disabled":"Nieaktywne", + "person.page.orcid.sync-queue.discard":"Odrzuć zmianę i nie synchronizuj z ORCID", + "person.page.orcid.sync-queue.discard.error":"Rekord kolejki ORCID nie został odrzucony", + "person.page.orcid.sync-queue.discard.success":"Rekord kolejki ORCID został odrzucony", + "person.page.orcid.sync-queue.empty-message":"Rejestr kolejki w ORCID jest pusty", + "person.page.orcid.sync-queue.description.affiliation":"Afiliacje", + "person.page.orcid.sync-queue.description.country":"Kraj", + "person.page.orcid.sync-queue.description.education":"Edukacja", + "person.page.orcid.sync-queue.description.external_ids":"Zewnętrzne identyfikatory", + "person.page.orcid.sync-queue.description.other_names":"Inne imiona", + "person.page.orcid.sync-queue.description.qualification":"Kwalifikacje", + "person.page.orcid.sync-queue.description.researcher_urls":"URL naukowca", + "person.page.orcid.sync-queue.description.keywords":"Słowa kluczowe", + "person.page.orcid.sync-queue.tooltip.insert":"Dodaj nowy wpis w rejestrze ORCID", + "person.page.orcid.sync-queue.tooltip.update":"Aktualizuj ten wpis w rejestrze ORCID", + "person.page.orcid.sync-queue.tooltip.delete":"Usuń ten wpis z rejestru ORCID", + "person.page.orcid.sync-queue.tooltip.publication":"Publikacja", + "person.page.orcid.sync-queue.tooltip.affiliation":"Afiliacja", + "person.page.orcid.sync-queue.tooltip.education":"Edukacja", + "person.page.orcid.sync-queue.tooltip.qualification":"Kwalifikacje", + "person.page.orcid.sync-queue.tooltip.other_names":"Inna nazwa", + "person.page.orcid.sync-queue.tooltip.country":"Kraj", + "person.page.orcid.sync-queue.tooltip.keywords":"Słowa kluczowe", + "person.page.orcid.sync-queue.tooltip.external_ids":"Zewnętrzny identyfikator", + "person.page.orcid.sync-queue.tooltip.researcher_urls":"URL naukowca", + "person.page.orcid.sync-queue.send":"Synchronizuj z rejestrem ORCID", + "person.page.orcid.sync-queue.send.unauthorized-error.title":"Wysłanie zgłoszenia do ORCID nieudane z powodu braku uprawnień.", + "person.page.orcid.sync-queue.send.unauthorized-error.content":"Wybierz here, aby wystąpić o niezbędne uprawnienia. Jeśli problem wciąż występuje, skontaktuj się z administratorem", + "person.page.orcid.sync-queue.send.bad-request-error":"Wysłanie zgłoszenia do ORCID nie powiodło się ponieważ źródła wysłane do rejestru ORCID nie jest poprawne", + "person.page.orcid.sync-queue.send.error":"Wysłanie zgłoszenia do ORCID nie powiodło się", + "person.page.orcid.sync-queue.send.conflict-error":"Zgłoszenie do ORCID nie powiodło się, ponieważ ta pozycja jest już dodana do rejestru ORCID", + "person.page.orcid.sync-queue.send.not-found-warning":"Pozycja nie istnieje już w rejestrze ORCID.", + "person.page.orcid.sync-queue.send.success":"Zgłoszenie do ORCID zostało zakończone pomyślnie", + "person.page.orcid.sync-queue.send.validation-error":"Dane, które chcesz zsynchronizować z ORCID nie są poprawne", + "person.page.orcid.sync-queue.send.validation-error.amount-currency.required":"Waluta jest wymagana", + "person.page.orcid.sync-queue.send.validation-error.external-id.required":"Aby wysłać pozycję, należy podać przynajmniej jeden identyfikator", + "person.page.orcid.sync-queue.send.validation-error.title.required":"Tytuł jest wymagany", + "person.page.orcid.sync-queue.send.validation-error.type.required":"Typ jest wymagany", + "person.page.orcid.sync-queue.send.validation-error.start-date.required":"Data początkowa jest wymagana", + "person.page.orcid.sync-queue.send.validation-error.funder.required":"Instytucja finansująca jest wymagana", + "person.page.orcid.sync-queue.send.validation-error.organization.required":"Instytucja jest wymagana", + "person.page.orcid.sync-queue.send.validation-error.organization.name-required":"Nazwa instytucji jest wymagana", + "person.page.orcid.sync-queue.send.validation-error.organization.address-required":"Aby wysłać instytucję, należy podać adres", + "person.page.orcid.sync-queue.send.validation-error.organization.city-required":"Aby wysłać adres, należy podać miasto", + "person.page.orcid.sync-queue.send.validation-error.organization.country-required":"Aby wysłać adres, należy podać kraj", + "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required":"Wymagany jest identyfikator umożliwiający rozróżnienie instytucji. Obsługiwane identyfikatory to GRID, Ringgold, kod LEI oraz identyfikatory z rejestru instytucji finansujących Crossref.", + "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required":"Należy uzupełnić wartość w identyfikatorze instytucji", + "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required":"Należy uzupełnić źródło w identyfikatorze instytucji", + "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid":"Źródło jednego z identyfikatorów organizcji jest niepoprawne. Wspierane źródła to RINGGOLD, GRID, LEI and FUNDREF", + "person.page.orcid.synchronization-mode":"Tryb synchronizacji", + "person.page.orcid.synchronization-mode.batch":"Wsad", + "person.page.orcid.synchronization-mode.label":"Tryb synchronizacji", + "person.page.orcid.synchronization-mode-message":"Włącz tryb 'Manual' synchronizacja, aby wyłaczyć tryb synchronizacji wsadowej, wtedy dane do rejestru ORCID będą musiały zostać wysłane ręcznie", + "person.page.orcid.synchronization-settings-update.success":"Opcje synchronizacji zostały zaktualizowane", + "person.page.orcid.synchronization-settings-update.error":"Opcje synchronizacji nie zostały zaktualizowane", + "person.page.orcid.synchronization-mode.manual":"Ręczna", + "person.page.orcid.scope.authenticate":"Uzyskaj swój ORCID iD", + "person.page.orcid.scope.read-limited":"Przeczytaj informacje o ustawieniach widoczności z firmami trzeciami", + "person.page.orcid.scope.activities-update":"Dodaj/aktualizuj swoje aktywności naukowe", + "person.page.orcid.scope.person-update":"Dodaj/aktualizuj inne informacje o Tobie", + "person.page.orcid.unlink.success":"Odłączenie Twojego profilu od rejestru ORCID powiodło się", + "person.page.orcid.unlink.error":"Wystąpił błąd podczas odłączania Twojego profilu od rejestru ORCID. Spróbuj ponownie", + "person.page.staffid":"ID pracownika", + "person.page.titleprefix":"Osoba: ", + "person.search.results.head":"Wyniki wyszukiwania użytkowników", + "person.search.title":"Wyniki wyszukiwania użytkowników", + "process.new.select-parameters":"Parametry", + "process.new.cancel":"Anuluj", + "process.new.submit":"Zapisz", + "process.new.select-script":"Skrypt", + "process.new.select-script.placeholder":"Wybierz skrypt...", + "process.new.select-script.required":"Skrypt jest wymagany", + "process.new.parameter.file.upload-button":"Wybierz plik...", + "process.new.parameter.file.required":"Proszę wybrać plik", + "process.new.parameter.string.required":"Wartość parametru jest wymagana", + "process.new.parameter.type.value":"wartość", + "process.new.parameter.type.file":"plik", + "process.new.parameter.required.missing":"Te parametry są wymagane, ale nie zostały uzupełnione:", + "process.new.notification.success.title":"Udało się", + "process.new.notification.success.content":"Udało się stworzyć proces", + "process.new.notification.error.title":"Błąd", + "process.new.notification.error.content":"Wystąpił błąd podczas tworzenia procesu", + "process.new.header":"Utwórz nowy proces", + "process.new.title":"Utwórz nowy proces", + "process.new.breadcrumbs":"Utwórz nowy proces", + "process.detail.arguments":"Argumenty", + "process.detail.arguments.empty":"Do tego procesu nie zostały przypisane żadne argumenty", + "process.detail.back":"Cofnij", + "process.detail.output":"Dane wyjściowe procesu", + "process.detail.logs.button":"Odzyskaj dane wyjściowe procesu", + "process.detail.logs.loading":"Odzyskiwanie", + "process.detail.logs.none":"Ten proces nie ma danych wyjściowych", + "process.detail.output-files":"Pliki", + "process.detail.output-files.empty":"Ten proces nie ma żadnych plików danych wyjściowych", + "process.detail.script":"Skrypt", + "process.detail.title":"Proces: {{ id }} - {{ name }}", + "process.detail.start-time":"Czas rozpoczęcia procesu", + "process.detail.end-time":"Czas zakończenia procesu", + "process.detail.status":"Status", + "process.detail.create":"Stwórz podobny proces", + "process.overview.table.finish":"Czas zakończenia (UTC)", + "process.overview.table.id":"Identyfikator procesu", + "process.overview.table.name":"Nazwa", + "process.overview.table.start":"Czas rozpoczęcia (UTC)", + "process.overview.table.status":"Status", + "process.overview.table.user":"Użytkownik", + "process.overview.title":"Przegląd procesów", + "process.overview.breadcrumbs":"Przegląd procesów", + "process.overview.new":"Nowy", + "profile.breadcrumbs":"Zaktualizuj profil", + "profile.card.identify":"Dane", + "profile.card.security":"Bezpieczeństwo", + "profile.form.submit":"Zaktualizuj profil", + "profile.groups.head":"Posiadane uprawnienia do kolekcji", + "profile.head":"Zaktualizuj profil", + "profile.metadata.form.error.firstname.required":"Imię jest wymagane", + "profile.metadata.form.error.lastname.required":"Nazwisko jest wymagane", + "profile.metadata.form.label.email":"Adres e-mail", + "profile.metadata.form.label.firstname":"Imię", + "profile.metadata.form.label.language":"Język", + "profile.metadata.form.label.lastname":"Nazwisko", + "profile.metadata.form.label.phone":"Telefon kontaktowy", + "profile.metadata.form.notifications.success.content":"Zmiany w profilu zostały zapisane.", + "profile.metadata.form.notifications.success.title":"Profil zapisany", + "profile.notifications.warning.no-changes.content":"Nie dokonano żadnych zmian w profilu.", + "profile.notifications.warning.no-changes.title":"Brak zmian", + "profile.security.form.error.matching-passwords":"Hasła nie są identyczne.", + "profile.security.form.info":"Możesz wprowadzić nowe hasło w polu poniżej i zatwierdzić poprzez ponowne wpisanie. Hasło musi mieć przynajmniej 6 znaków.", + "profile.security.form.label.password":"Hasło", + "profile.security.form.label.passwordrepeat":"Potwierdź hasło", + "profile.security.form.notifications.success.content":"Twoje zmiany w haśle zostały zapisane.", + "profile.security.form.notifications.success.title":"Hasło zapisane", + "profile.security.form.notifications.error.title":"Błąd podczas próby zmiany hasła", + "profile.security.form.notifications.error.not-same":"Hasła nie są identyczne.", + "profile.title":"Zaktualizuj profil", + "profile.card.researcher":"Profil naukowca", + "project.listelement.badge":"Projekt badawczy", + "project.page.contributor":"Autorzy", + "project.page.description":"Opis", + "project.page.edit":"Edytuj pozycję", + "project.page.expectedcompletion":"Spodziewany termin zakończenia", + "project.page.funder":"Instytucje finansujące", + "project.page.id":"ID", + "project.page.keyword":"Słowa kluczowe", + "project.page.status":"Status", + "project.page.titleprefix":"Projekt badawczy: ", + "project.search.results.head":"Wyniki wyszukiwania projektów", + "publication.listelement.badge":"Publikacja", + "publication.page.description":"Opis", + "publication.page.edit":"Edytuj pozycję", + "publication.page.journal-issn":"ISSN czasopisma", + "publication.page.journal-title":"Tytuł czasopisma", + "publication.page.publisher":"Wydawca", + "publication.page.titleprefix":"Publikacja: ", + "publication.page.volume-title":"Tytuł tomu", + "publication.search.results.head":"Wyniki wyszukiwania publikacji", + "publication.search.title":"Wyszukiwanie publikacji", + "media-viewer.next":"Nowy", + "media-viewer.previous":"Poprzedni", + "media-viewer.playlist":"Playlista", + "register-email.title":"Rejestracja nowego użytkownika", + "register-page.create-profile.header":"Stwórz profil", + "register-page.create-profile.identification.header":"Dane", + "register-page.create-profile.identification.email":"Adres e-mail", + "register-page.create-profile.identification.first-name":"Imię *", + "register-page.create-profile.identification.first-name.error":"Wpisz imię", + "register-page.create-profile.identification.last-name":"Nazwisko *", + "register-page.create-profile.identification.last-name.error":"Wpisz nazwisko", + "register-page.create-profile.identification.contact":"Telefon kontaktowy", + "register-page.create-profile.identification.language":"Język", + "register-page.create-profile.security.header":"Bezpieczeństwo", + "register-page.create-profile.security.info":"Wprowadź nowe hasło w polu poniżej i zatwierdź poprzez ponowne wpisanie w drugim polu. Hasło musi mieć przynajmniej 6 znaków.", + "register-page.create-profile.security.label.password":"Hasło *", + "register-page.create-profile.security.label.passwordrepeat":"Potwierdź hasło *", + "register-page.create-profile.security.error.empty-password":"Wprowadź hasło w polu poniżej.", + "register-page.create-profile.security.error.matching-passwords":"Hasła nie są identyczne.", + "register-page.create-profile.submit":"Rejestracja zakończona", + "register-page.create-profile.submit.error.content":"Coś się nie udało podczas rejestracji nowego użytkownika.", + "register-page.create-profile.submit.error.head":"Rejestracja nie powiodła się", + "register-page.create-profile.submit.success.content":"Rejestracja powiodła się. Zalogowano jako stworzony użytkownik.", + "register-page.create-profile.submit.success.head":"Rejestracja zakończona", + "register-page.registration.header":"Rejestracja nowego użytkownika", + "register-page.registration.info":"Zarejestruj się, aby otrzymywać wiadomości o nowych pozycjach w obserowanych kolekcjach, a także przesyłać nowe pozycje do repozytorium.", + "register-page.registration.email":"Adres e-mail *", + "register-page.registration.email.error.required":"Wypełnij adres e-mail", + "register-page.registration.email.error.pattern":"Wypełnij poprawny adres e-mail", + "register-page.registration.email.hint":"Ten adres e-mail będzie zweryfikowany i będziesz go używać jako swój login.", + "register-page.registration.submit":"Zarejestruj się", + "register-page.registration.success.head":"Wiadomość weryfikacyjna zostałą wysłana", + "register-page.registration.success.content":"Wiadomość została wysłana na adres e-mail {{ email }}. Zawiera ona unikatowy link i dalsze instrukcje postępowania.", + "register-page.registration.error.head":"Błąd podczas próby rejestracji adresu e-mail", + "register-page.registration.error.content":"Błąd podczas próby rejestracji adresu e-mail: {{ email }}", + "relationships.add.error.relationship-type.content":"Nie znaleziono dopasowania dla typu relacji {{ type }} pomiędzy dwoma pozycjami", + "relationships.add.error.server.content":"Błąd serwera", + "relationships.add.error.title":"Nie można dodać relacji", + "relationships.isAuthorOf":"Autorzy", + "relationships.isAuthorOf.Person":"Autorzy (osoby)", + "relationships.isAuthorOf.OrgUnit":"Autorzy (jednostki organizacyjne)", + "relationships.isIssueOf":"Numery czasopisma", + "relationships.isJournalIssueOf":"Numer czasopisma", + "relationships.isJournalOf":"Czasopisma", + "relationships.isOrgUnitOf":"Jednostki organizacyjne", + "relationships.isPersonOf":"Autorzy", + "relationships.isProjectOf":"Projekty badawcze", + "relationships.isPublicationOf":"Publikacje", + "relationships.isPublicationOfJournalIssue":"Artykuły", + "relationships.isSingleJournalOf":"Czasopismo", + "relationships.isSingleVolumeOf":"Tom czasopisma", + "relationships.isVolumeOf":"Tomy czasopisma", + "relationships.isContributorOf":"Autorzy", + "relationships.isContributorOf.OrgUnit":"Autor (Jednostka organizacyjna)", + "relationships.isContributorOf.Person":"Autor", + "relationships.isFundingAgencyOf.OrgUnit":"Instytucja finansująca", + "repository.image.logo":"Logo repozytorium", + "repository.title.prefix":"DSpace Cris Angular :: ", + "researcher.profile.action.processing":"Procesowanie...", + "researcher.profile.associated":"Przypisanie profilu badacza", + "researcher.profile.create.new":"Utwórz nowy", + "researcher.profile.create.success":"Profil badacza został utworzony", + "researcher.profile.create.fail":"Wystąpił błąd poczas tworzenia profilu badacza.", + "researcher.profile.delete":"Usuń", + "researcher.profile.expose":"Ujawnij", + "researcher.profile.hide":"Ukryj", + "researcher.profile.not.associated":"Profil badacza nie został jeszcze przypisany", + "researcher.profile.view":"Widok", + "researcher.profile.private.visibility":"PRYWATNY", + "researcher.profile.public.visibility":"PUBLICZNY", + "researcher.profile.status":"Status:", + "researcherprofile.claim.not-authorized":"Nie masz uprawnień, aby wystąpić o tę pozycję. Aby otrzymać więcej szczegółów, skontaktuj się z administratorami.", + "researcherprofile.error.claim.body":"Wystąpił błąd podczas wystąpienia z prośbą o przypisanie profilu. Spróbuj ponownie później.", + "researcherprofile.error.claim.title":"Błąd", + "researcherprofile.success.claim.body":"Wystąpienie z prośbą o przypisanie profilu udane", + "researcherprofile.success.claim.title":"Sukces", + "repository.title.prefixDSpace":"DSpace Angular ::", + "resource-policies.add.button":"Dodaj", + "resource-policies.add.for.":"Dodaj nową politykę", + "resource-policies.add.for.bitstream":"Dodaj nową politykę dla plików", + "resource-policies.add.for.bundle":"Dodaj nową politykę paczek", + "resource-policies.add.for.item":"Dodaj nową politykę pozycji", + "resource-policies.add.for.community":"Dodaj nową politykę zbioru", + "resource-policies.add.for.collection":"Dodaj nową politykę kolekcji", + "resource-policies.create.page.heading":"Utwórz nową politykę zasobu dla ", + "resource-policies.create.page.failure.content":"Wystąpił błąd podczas dodawania polityki zasobów.", + "resource-policies.create.page.success.content":"Działanie powiodło się", + "resource-policies.create.page.title":"Utwórz nową politykę zasobu", + "resource-policies.delete.btn":"Usuń zaznaczone", + "resource-policies.delete.btn.title":"Usuń zaznaczone polityki zasobów", + "resource-policies.delete.failure.content":"Wystąpił błąd podczas usuwania wybranych polityk zasobów.", + "resource-policies.delete.success.content":"Działanie powiodło się", + "resource-policies.edit.page.heading":"Edytuj politykę zasobu ", + "resource-policies.edit.page.failure.content":"Wystąpił błąd poczas edytowania polityki zasobu.", + "resource-policies.edit.page.success.content":"Działanie udało się", + "resource-policies.edit.page.title":"Edytuj politykę zasobu", + "resource-policies.form.action-type.label":"Wybierz ten typ akcji", + "resource-policies.form.action-type.required":"Musisz wybrać akcję polityki zasobu.", + "resource-policies.form.eperson-group-list.label":"Użytkownik lub grupa, która otrzyma uprawnienia.", + "resource-policies.form.eperson-group-list.select.btn":"Wybierz", + "resource-policies.form.eperson-group-list.tab.eperson":"Wyszukaj użytkownika", + "resource-policies.form.eperson-group-list.tab.group":"Wyszukaj grupę", + "resource-policies.form.eperson-group-list.table.headers.action":"Akcja", + "resource-policies.form.eperson-group-list.table.headers.id":"ID", + "resource-policies.form.eperson-group-list.table.headers.name":"Nazwa", + "resource-policies.form.date.end.label":"Data zakończenia", + "resource-policies.form.date.start.label":"Data rozpoczęcia", + "resource-policies.form.description.label":"Opis", + "resource-policies.form.name.label":"Nazwa", + "resource-policies.form.policy-type.label":"Wybierz typ polityki", + "resource-policies.form.policy-type.required":"Musisz wybrać typ polityki zasobu.", + "resource-policies.table.headers.action":"Akcja", + "resource-policies.table.headers.date.end":"Data zakończenia", + "resource-policies.table.headers.date.start":"Data rozpoczęcia", + "resource-policies.table.headers.edit":"Edytuj", + "resource-policies.table.headers.edit.group":"Edytuj grupę", + "resource-policies.table.headers.edit.policy":"Edytuj politykę", + "resource-policies.table.headers.eperson":"Użytkownik", + "resource-policies.table.headers.group":"Grupa", + "resource-policies.table.headers.id":"ID", + "resource-policies.table.headers.name":"Nazwa", + "resource-policies.table.headers.policyType":"typ", + "resource-policies.table.headers.title.for.bitstream":"Polityki dla plików", + "resource-policies.table.headers.title.for.bundle":"Polityki dla paczek", + "resource-policies.table.headers.title.for.item":"Polityki dla pozycji", + "resource-policies.table.headers.title.for.community":"Polityki dla zbioru", + "resource-policies.table.headers.title.for.collection":"Polityki dla kolekcji", + "search.description":"", + "search.switch-configuration.title":"Pokaż", + "search.title":"Szukaj", + "search.breadcrumbs":"Szukaj", + "search.search-form.placeholder":"Szukaj w repozytorium...", + "search.filters.applied.f.author":"Autor", + "search.filters.applied.f.dateIssued.max":"Data zakończenia", + "search.filters.applied.f.dateIssued.min":"Data rozpoczęcia", + "search.filters.applied.f.dateSubmitted":"Data zgłoszenia", + "search.filters.applied.f.discoverable":"Ukryty", + "search.filters.applied.f.entityType":"Typ pozycji", + "search.filters.applied.f.has_content_in_original_bundle":"Ma przypisane pliki", + "search.filters.applied.f.itemtype":"Typ", + "search.filters.applied.f.namedresourcetype":"Status", + "search.filters.applied.f.subject":"Temat", + "search.filters.applied.f.submitter":"Zgłaszający", + "search.filters.applied.f.jobTitle":"Stanowisko", + "search.filters.applied.f.birthDate.max":"Data zakończenia tworzenia", + "search.filters.applied.f.birthDate.min":"Data rozpoczęcia tworzenia", + "search.filters.applied.f.withdrawn":"Wycofane", + "search.filters.filter.author.head":"Autor", + "search.filters.filter.author.placeholder":"Autor", + "search.filters.filter.author.label":"Wyszukaj autora", + "search.filters.filter.birthDate.head":"Data urodzenia", + "search.filters.filter.birthDate.placeholder":"Data urodzenia", + "search.filters.filter.birthDate.label":"Wyszukaj datę urodzenia", + "search.filters.filter.collapse":"Ukryj filtr", + "search.filters.filter.creativeDatePublished.head":"Data opublikowania", + "search.filters.filter.creativeDatePublished.placeholder":"Data opublikowania", + "search.filters.filter.creativeDatePublished.label":"Wyszukaj datę opublikowania", + "search.filters.filter.creativeWorkEditor.head":"Redaktor", + "search.filters.filter.creativeWorkEditor.placeholder":"Redaktor", + "search.filters.filter.creativeWorkEditor.label":"Wyszukaj redaktora", + "search.filters.filter.creativeWorkKeywords.head":"Słowo kluczowe", + "search.filters.filter.creativeWorkKeywords.placeholder":"Słowo kluczowe", + "search.filters.filter.creativeWorkKeywords.label":"Wyszukaj temat", + "search.filters.filter.creativeWorkPublisher.head":"Wydawca", + "search.filters.filter.creativeWorkPublisher.placeholder":"Wydawca", + "search.filters.filter.creativeWorkPublisher.label":"Wyszukaj wydawcę", + "search.filters.filter.dateIssued.head":"Data", + "search.filters.filter.dateIssued.max.placeholder":"Data maksymalna", + "search.filters.filter.dateIssued.max.label":"Koniec", + "search.filters.filter.dateIssued.min.placeholder":"Data minimalna", + "search.filters.filter.dateIssued.min.label":"Start", + "search.filters.filter.dateSubmitted.head":"Data zgłoszenia", + "search.filters.filter.dateSubmitted.placeholder":"Data zgłoszenia", + "search.filters.filter.dateSubmitted.label":"Wyszukaj datę zgłoszenia", + "search.filters.filter.discoverable.head":"Ukryty", + "search.filters.filter.withdrawn.head":"Wycofane", + "search.filters.filter.entityType.head":"Typ pozycji", + "search.filters.filter.entityType.placeholder":"Typ pozycji", + "search.filters.filter.entityType.label":"Wyszukaj typ pozycji", + "search.filters.filter.expand":"Rozwiń filtr", + "search.filters.filter.has_content_in_original_bundle.head":"Ma przypisane pliki", + "search.filters.filter.itemtype.head":"Typ", + "search.filters.filter.itemtype.placeholder":"Typ", + "search.filters.filter.itemtype.label":"Wyszukaj typ", + "search.filters.filter.jobTitle.head":"Stanowisko", + "search.filters.filter.jobTitle.placeholder":"Stanowisko", + "search.filters.filter.jobTitle.label":"Wyszukaj stanowisko", + "search.filters.filter.knowsLanguage.head":"Znajomość języka", + "search.filters.filter.knowsLanguage.placeholder":"Znajomość języka", + "search.filters.filter.knowsLanguage.label":"Wyszukaj wg znajomości języka", + "search.filters.filter.namedresourcetype.head":"Status", + "search.filters.filter.namedresourcetype.placeholder":"Status", + "search.filters.filter.namedresourcetype.label":"Wyszukaj status", + "search.filters.filter.objectpeople.head":"Osoby", + "search.filters.filter.objectpeople.placeholder":"Osoby", + "search.filters.filter.objectpeople.label":"Wyszukaj użytkowników", + "search.filters.filter.organizationAddressCountry.head":"Kraj", + "search.filters.filter.organizationAddressCountry.placeholder":"Kraj", + "search.filters.filter.organizationAddressCountry.label":"Wyszukaj kraj", + "search.filters.filter.organizationAddressLocality.head":"Miasto", + "search.filters.filter.organizationAddressLocality.placeholder":"Miasto", + "search.filters.filter.organizationAddressLocality.label":"Wyszukaj miasto", + "search.filters.filter.organizationFoundingDate.head":"Data założenia", + "search.filters.filter.organizationFoundingDate.placeholder":"Data założenia", + "search.filters.filter.organizationFoundingDate.label":"Wyszukaj datę założenia", + "search.filters.filter.scope.head":"Zakres", + "search.filters.filter.scope.placeholder":"Filtr zakresu", + "search.filters.filter.scope.label":"Wyszukaj filtr zakresu", + "search.filters.filter.show-less":"Pokaż mniej", + "search.filters.filter.show-more":"Pokaż więcej", + "search.filters.filter.subject.head":"Temat", + "search.filters.filter.subject.placeholder":"Temat", + "search.filters.filter.subject.label":"Wyszukaj temat", + "search.filters.filter.submitter.head":"Zgłaszający", + "search.filters.filter.submitter.placeholder":"Zgłaszający", + "search.filters.filter.submitter.label":"Wyszukaj zgłaszającego", + "search.filters.entityType.JournalIssue":"Numer czasopisma", + "search.filters.entityType.JournalVolume":"Tom czasopisma", + "search.filters.entityType.OrgUnit":"Jednostka organizacyjna", + "search.filters.has_content_in_original_bundle.true":"Tak", + "search.filters.has_content_in_original_bundle.false":"Nie", + "search.filters.discoverable.true":"Nie", + "search.filters.discoverable.false":"Tak", + "search.filters.withdrawn.true":"Tak", + "search.filters.withdrawn.false":"Nie", + "search.filters.head":"Filtry", + "search.filters.reset":"Resetuj filtry", + "search.filters.search.submit":"Zastosuj", + "search.form.search":"Wyszukaj", + "search.form.search_dspace":"W repozytorium", + "search.form.scope.all":"W całym DSpace", + "search.results.head":"Wyniki wyszukiwania", + "default.search.results.head":"Wyniki wyszukiwania", + "search.results.no-results":"Twoj wyszukiwanie nie zwróciło żadnych rezultatów. Masz problem ze znalezieniem tego czego szukasz? Spróbuj użyć", + "search.results.no-results-link":"fraz podobnych do Twojego wyszukiwania", + "search.results.empty":"Twoje wyszukiwanie nie zwróciło żadnych rezultatów.", + "search.sidebar.close":"Wróć do wyników wyszukiwania", + "search.sidebar.filters.title":"Filtry", + "search.sidebar.open":"Narzędzia wyszukiwania", + "search.sidebar.results":"wyniki", + "search.sidebar.settings.rpp":"Wyników na stronie", + "search.sidebar.settings.sort-by":"Sortuj według", + "search.sidebar.settings.title":"Ustawienia", + "search.view-switch.show-detail":"Wyświetl widok szczegółowy", + "search.view-switch.show-grid":"Wyświetl jako siatkę", + "search.view-switch.show-list":"Wyświetl jako listę", + "sorting.ASC":"Rosnąco", + "sorting.DESC":"Malejąco", + "sorting.dc.title.ASC":"Tytułami rosnąco", + "sorting.dc.title.DESC":"Tytułami malejąco", + "sorting.score.ASC":"Najmniej trafne", + "sorting.score.DESC":"Najbardziej trafne", + "sorting.dc.date.issued.ASC":"Data wydania rosnąco", + "sorting.dc.date.issued.DESC":"Data wydania malejąco", + "sorting.dc.date.accessioned.ASC":"Data dostępu rosnąco", + "sorting.dc.date.accessioned.DESC":"Data dostępu malejąco", + "sorting.lastModified.ASC":"Ostatnia modyfikacja rosnąco", + "sorting.lastModified.DESC":"Ostatnia modyfikacja malejąco", + "statistics.title":"Statystyki", + "statistics.header":"Statystyki dla {{ scope }}", + "statistics.breadcrumbs":"Statystyki", + "statistics.page.no-data":"Brak dostępnych danych", + "statistics.table.no-data":"Brak dostępnych danych", + "statistics.table.header.views":"Wyświetlenia", + "submission.edit.breadcrumbs":"Edytuj zgłoszenie", + "submission.edit.title":"Edytuj zgłoszenie", + "submission.general.cancel":"Anuluj", + "submission.general.cannot_submit":"Nie masz uprawnień, aby utworzyć nowe zgłoszenie.", + "submission.general.deposit":"Deponuj", + "submission.general.discard.confirm.cancel":"Anuluj", + "submission.general.discard.confirm.info":"Czy na pewno? To działanie nie może zostać cofnięte.", + "submission.general.discard.confirm.submit":"Tak, na pewno", + "submission.general.discard.confirm.title":"Odrzuć zgłoszenie", + "submission.general.discard.submit":"Odrzuć", + "submission.general.info.saved":"Zapisane", + "submission.general.info.pending-changes":"Niezapisane zmiany", + "submission.general.save":"Zapisz", + "submission.general.save-later":"Zapisz wersję roboczą", + "submission.import-external.page.title":"Importuj metdane z zewnętrznego źródła", + "submission.import-external.title":"Importuj metadane z zewnętrznego źródła", + "submission.import-external.title.Journal":"Importuj czasopismo z zewnętrznego źródła", + "submission.import-external.title.JournalIssue":"Importuj numer czasopisma z zewnętrznego źródła", + "submission.import-external.title.JournalVolume":"Importuj tom czasopisma z zewnętrznego źródła", + "submission.import-external.title.OrgUnit":"Importuj wydawcę z zewnętrznego źródła", + "submission.import-external.title.Person":"Importuj osobę z zewnętrznego źródła", + "submission.import-external.title.Project":"Importuj projekt z zewnętrznego źródła", + "submission.import-external.title.Publication":"Importuj publikację z zewnętrznego źródła", + "submission.import-external.title.none":"Importuj metadane z zewnętrznego źródła", + "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":"Powrót do MyDSpace", + "submission.import-external.search.placeholder":"Wyszukaj zewnętrzne źródła danych", + "submission.import-external.search.button":"Szukaj", + "submission.import-external.search.button.hint":"Zacznij wpisywać frazę, aby wyszukać", + "submission.import-external.search.source.hint":"Wybierz zewnętrzne źródło", + "submission.import-external.source.ads":"NASA/ADS", + "submission.import-external.source.arxiv":"arXiv", + "submission.import-external.source.cinii":"CiNii", + "submission.import-external.source.crossref":"CrossRef", + "submission.import-external.source.loading":"ładowanie...", + "submission.import-external.source.sherpaJournal":"Czasopisma w SHERPA", + "submission.import-external.source.sherpaJournalIssn":"Czasopisma w SHERPA wg ISSN", + "submission.import-external.source.sherpaPublisher":"Wydawcy w SHERPA", + "submission.import-external.source.openAIREFunding":"Finansowanie OpenAIRE API", + "submission.import-external.source.orcid":"ORCID", + "submission.import-external.source.orcidWorks":"ORCID", + "submission.import-external.source.pubmed":"Pubmed", + "submission.import-external.source.pubmedeu":"Pubmed Europe", + "submission.import-external.source.lcname":"Nazwy Biblioteki Kongresu", + "submission.import-external.source.scielo":"SciELO", + "submission.import-external.source.scopus":"Scopus", + "submission.import-external.source.vufind":"VuFind", + "submission.import-external.source.wos":"Web Of Science", + "submission.import-external.source.epo":"Europejski Urząd Patentowy (EPO)", + "submission.import-external.preview.title.Journal":"Podgląd czasopisma", + "submission.import-external.preview.title.OrgUnit":"Podgląd organizacji", + "submission.import-external.preview.title.Person":"Podgląd osoby", + "submission.import-external.preview.title.Project":"Podgląd projektu", + "submission.import-external.preview.title.Publication":"Podgląd publikacji", + "submission.import-external.preview.subtitle":"Metadane poniżej zostały zaimportowane z zewnętrznego źródła. Niektóre pola zostaną uzupełnione automatycznie, kiedy rozpoczniesz zgłaszanie pozycji.", + "submission.import-external.preview.button.import":"Rozpocznij zgłoszenie", + "submission.import-external.preview.error.import.title":"Błąd zgłoszenia", + "submission.import-external.preview.error.import.body":"Wystąpił błąd podczas procesu importowania pozycji z zewnętrznego źródła.", + "submission.sections.describe.relationship-lookup.close":"Zamknij", + "submission.sections.describe.relationship-lookup.external-source.added":"Udało się dodać wpis do selekcji", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication":"Importuj zdalnego autora", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal":"Importuj zdalne czasopismo", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue":"Importuj zdalny numer czasopisma", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume":"Importuj zdalny tom czasopisma", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication":"Projekt", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity":"Nowy typ danych dodany!", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title":"Projekt", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding":"Finansowanie OpenAIRE API", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title":"Importuj zdalnego autora", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person":"Importuj zdalną osobę", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product":"Importuj zdalny produkt", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment":"Importuj zdalną aparaturę badawczą", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event":"Importuj zdalne wydarzenie", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding":"Importuj zdalną instytucję finansującą", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit":"Importuj zdalnego wydawcę", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent":"Importuj zdalnie patent", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project":"Importuj zdalnie projekt", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication":"Importuj zdalnie publikację", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity":"Udało się dodać autora do selekcji", + "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity":"Udało się zaimportować i dodać zewnętrznego autora do selekcji", + "submission.sections.describe.relationship-lookup.external-source.import-modal.authority":"Nadrzędność", + "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new":"Importuj jako nową, lokalną, nadrzędną pozycję", + "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel":"Anuluj", + "submission.sections.describe.relationship-lookup.external-source.import-modal.collection":"Wybierz kolekcję do zaimportowania nowych pozycji", + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities":"Typ danych", + "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new":"Importuj jako nowy lokalny typ danych", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname":"Importuj z LC Name", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid":"Importuj z ORCID", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal":"Importuj z Sherpa Journal", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher":"Importuj z Sherpa Publisher", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed":"Importuj z PubMed", + "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv":"Importuj z arXiv", + "submission.sections.describe.relationship-lookup.external-source.import-modal.import":"Import", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title":"Importuj zdalne czasopismo", + "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", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title":"Importuj zdalny numer czasopisma", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity":"Udało się dodać lokalne czasopismo do zaznaczenia", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity":"Udało się zaimportować i dodać czasopismo zewnętrzne do zaznaczenia", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title":"Importuj zdalny numer czasopisma", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity":"Udało się dodać lokalny numer czasopismo do zaznaczenia", + "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity":"Udało się zaimportować i dodać zewnętrzny numer czasopisma do zaznaczenia", + "submission.sections.describe.relationship-lookup.external-source.import-modal.select":"Wybierz lokalne powiązanie:", + "submission.sections.describe.relationship-lookup.search-tab.deselect-all":"Odznacz wszystko", + "submission.sections.describe.relationship-lookup.search-tab.deselect-page":"Odznacz stronę", + "submission.sections.describe.relationship-lookup.search-tab.loading":"Ładowanie...", + "submission.sections.describe.relationship-lookup.search-tab.placeholder":"Wyszukaj zapytanie", + "submission.sections.describe.relationship-lookup.search-tab.search":"Zastosuj", + "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder":"Wyszukaj...", + "submission.sections.describe.relationship-lookup.search-tab.select-all":"Zaznacz wszystko", + "submission.sections.describe.relationship-lookup.search-tab.select-page":"Zaznacz stronę", + "submission.sections.describe.relationship-lookup.selected":"Zaznacz {{ size }} pozycji", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication":"Autorzy lokalni ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication":"Czasopisma lokalne ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project":"Projekty lokalne ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication":"Publikacje lokalne ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person":"Autorzy lokalni ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit":"Lokalne jednostki organizacyjne ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage":"Lokalne paczki danych ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile":"Lokalne pliki danych ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal":"Lokalne czasopisma ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication":"Lokalne numery czasopism ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue":"Lokalne numery czasopism ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication":"Lokalne tomy czasopism ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume":"Lokalne tomy czasopism ({{ 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.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.pubmed":"PubMed ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv":"arXiv ({{ count }})", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication":"Wyszukaj instytucje finansujące", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication":"Wyszukaj finansowanie", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf":"Wyszukaj jednostki organizacyjne", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding":"Finansowanie OpenAIRE API", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication":"Projekty", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject":"Instytucja finansująca projekt", + "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding":"Finansowanie OpenAIRE API", + "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication":"Projekt", + "submission.sections.describe.relationship-lookup.title.isProjectOfPublication":"Projekty", + "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject":"Instytucja finansująca projekt", + "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder":"Wyszukaj...", + "submission.sections.describe.relationship-lookup.selection-tab.tab-title":"Aktualne zaznaczenie ({{ count }})", + "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication":"Numery czasopisma", + "submission.sections.describe.relationship-lookup.title.JournalIssue":"Numery czasopisma", + "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication":"Tomy czasopisma", + "submission.sections.describe.relationship-lookup.title.JournalVolume":"Tomy czasopisma", + "submission.sections.describe.relationship-lookup.title.isJournalOfPublication":"Czasopisma", + "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication":"Autorzy", + "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication":"Instytucja finansująca", + "submission.sections.describe.relationship-lookup.title.Project":"Projekty", + "submission.sections.describe.relationship-lookup.title.Publication":"Publikacje", + "submission.sections.describe.relationship-lookup.title.Person":"Autorzy", + "submission.sections.describe.relationship-lookup.title.OrgUnit":"Jednostki organizacyjne", + "submission.sections.describe.relationship-lookup.title.DataPackage":"Paczki danych", + "submission.sections.describe.relationship-lookup.title.DataFile":"Pliki danych", + "submission.sections.describe.relationship-lookup.title.Funding Agency":"Instytucja finansująca", + "submission.sections.describe.relationship-lookup.title.isFundingOfPublication":"Finansowanie", + "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf":"Nadrzędna jednostka organizacyjna", + "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown":"Przełącz na listę rozwijaną", + "submission.sections.describe.relationship-lookup.selection-tab.settings":"Ustawienia", + "submission.sections.describe.relationship-lookup.selection-tab.no-selection":"Twoje zaznaczenie jest puste.", + "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication":"Wybrani autorzy", + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication":"Wybrane czasopisma", + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication":"Wybrane tomy czasopisma", + "submission.sections.describe.relationship-lookup.selection-tab.title.Project":"Wybrane projekty", + "submission.sections.describe.relationship-lookup.selection-tab.title.Publication":"Wybrane publikacje", + "submission.sections.describe.relationship-lookup.selection-tab.title.Person":"Wybrani autorzy", + "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit":"Wybrane jednostki organizacyjne", + "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage":"Wybrane pakiety danych", + "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile":"Wybrane pliki danych", + "submission.sections.describe.relationship-lookup.selection-tab.title.Journal":"Wybrane czasopisma", + "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication":"Wybrany numer wydania", + "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume":"Wybrany tom czasopisma", + "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication":"Wybrane instytucje finansujące", + "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication":"Wybrane finansowanie", + "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue":"Wybrany numer wydania", + "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf":"Wybrana jednostka organizacyjna", + "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.crossref":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.orcid":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.lcname":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.epo":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.scopus":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.scielo":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title.wos":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.selection-tab.title":"Wyniki wyszukiwania", + "submission.sections.describe.relationship-lookup.name-variant.notification.content":"Czy chcesz zapisać \"{{ value }}\" jako wariant imienia dla tego użytkownika, aby Ty lub inni użytkownicy mogli używać tego wariantu w przyszłych zgłoszeniach?. Jeśli nie, nadal możesz użyć tego wariantu w tym zgłoszeniu.", + "submission.sections.describe.relationship-lookup.name-variant.notification.confirm":"Zapisz nowy wariant imienia", + "submission.sections.describe.relationship-lookup.name-variant.notification.decline":"Użyj tylko w tym zgłoszeniu", + "submission.sections.ccLicense.type":"Typ licencji", + "submission.sections.ccLicense.select":"Wybierz typ licencji…", + "submission.sections.ccLicense.change":"Zmień typ licencji…", + "submission.sections.ccLicense.none":"Brak dostępnych licencji", + "submission.sections.ccLicense.option.select":"Wybierz opcję…", + "submission.sections.ccLicense.link":"Wybrano licencję:", + "submission.sections.ccLicense.confirmation":"Udzielam powyższej licencji", + "submission.sections.general.add-more":"Dodaj więcej", + "submission.sections.general.collection":"Kolekcja", + "submission.sections.general.deposit_error_notice":"Wystąpił błąd podczas zgłaszania pozycji. Spróbuj ponownie później.", + "submission.sections.general.deposit_success_notice":"Udało się wprowadzić pozycję.", + "submission.sections.general.discard_error_notice":"Wystąpił błąd podczas odrzucania pozycji. Spróbuj ponownie później.", + "submission.sections.general.discard_success_notice":"Udało się odrzucić pozycję.", + "submission.sections.general.metadata-extracted":"Nowe metadane zostany rozpakowane i dodane do sekcji {{sectionId}}.", + "submission.sections.general.metadata-extracted-new-section":"Nowa sekcja {{sectionId}} została dodana do zgłoszenia.", + "submission.sections.general.no-collection":"Nie znaleziono kolekcji", + "submission.sections.general.no-sections":"Opcje niedostępne", + "submission.sections.general.save_error_notice":"Wystąpił błąd podczas zapisywania numeru. Spróbuj ponownie później. Po odświeżeniu strony niezapisane zmiany mogą zostać utracone.", + "submission.sections.general.save_success_notice":"Udało się zapisać zgłoszenie.", + "submission.sections.general.search-collection":"Szukaj kolekcji", + "submission.sections.general.sections_not_valid":"Niektóre sekcje są niekompletne.", + "submission.sections.submit.progressbar.CClicense":"Licencja Creative Commons", + "submission.sections.submit.progressbar.describe.recycle":"Odzyskaj", + "submission.sections.submit.progressbar.describe.stepcustom":"Opisz", + "submission.sections.submit.progressbar.describe.stepone":"Opisz", + "submission.sections.submit.progressbar.describe.steptwo":"Opisz", + "submission.sections.submit.progressbar.detect-duplicate":"Potencjalne duplikaty", + "submission.sections.submit.progressbar.license":"Zdeponuj licencję", + "submission.sections.submit.progressbar.upload":"Prześlij pliki", + "submission.sections.status.errors.title":"Błędy", + "submission.sections.status.valid.title":"Poprawność", + "submission.sections.status.warnings.title":"Ostrzeżenia", + "submission.sections.status.errors.aria":"ma błędy", + "submission.sections.status.valid.aria":"jest poprawne", + "submission.sections.status.warnings.aria":"ma ostrzeżenia", + "submission.sections.toggle.open":"Otwórz sekcję", + "submission.sections.toggle.close":"Zamknij sekcję", + "submission.sections.toggle.aria.open":"Rozwiń sekcję {{sectionHeader}}", + "submission.sections.toggle.aria.close":"Zwiń sekcję {{sectionHeader}}", + "submission.sections.upload.delete.confirm.cancel":"Anuluj", + "submission.sections.upload.delete.confirm.info":"Czy na pewno? To działanie nie może zostać cofnięte.", + "submission.sections.upload.delete.confirm.submit":"Tak, na pewno", + "submission.sections.upload.delete.confirm.title":"Usuń plik", + "submission.sections.upload.delete.submit":"Usuń", + "submission.sections.upload.download.title":"Pobierz plik", + "submission.sections.upload.drop-message":"Upuść pliki, aby załączyć je do tej pozycji", + "submission.sections.upload.edit.title":"Edytuj plik", + "submission.sections.upload.form.access-condition-label":"Typ dostępu", + "submission.sections.upload.form.date-required":"Data jest wymagana.", + "submission.sections.upload.form.date-required-from":"Data przyznania dostępu od jest wymagana.", + "submission.sections.upload.form.date-required-until":"Data przyznania dostępu do jest wymagana.", + "submission.sections.upload.form.from-label":"Pozwól na dostęp od", + "submission.sections.upload.form.from-placeholder":"Od", + "submission.sections.upload.form.group-label":"Grupa", + "submission.sections.upload.form.group-required":"Grupa jest wymagana", + "submission.sections.upload.form.until-label":"Pozwól na dostęp do", + "submission.sections.upload.form.until-placeholder":"Do", + "submission.sections.upload.header.policy.default.nolist":"Pliki wgrane do kolekcji {{collectionName}} będą dostępne dla poniższych grup:", + "submission.sections.upload.header.policy.default.withlist":"Zwróć uwagę na to, że pliki w kolekcji {{collectionName}} będą dostępne dla poniższych grup, z wyjątkiem tych, które zostały wyłączone z dostępu:", + "submission.sections.upload.info":"Tutaj znajdują się wszystkie pliki dodane w tym momencie do pozycji. Możesz zaktualizować metadane pliku i warunki dostępu lub przesłać dodatkowe pliki, przeciągając i opuszczając je gdziekolwiek na tej stronie", + "submission.sections.upload.no-entry":"Nie", + "submission.sections.upload.no-file-uploaded":"Pliki nie zostały jeszcze wgrane.", + "submission.sections.upload.save-metadata":"Zapisz metadane", + "submission.sections.upload.undo":"Anuluj", + "submission.sections.upload.upload-failed":"Przesyłanie nieudane", + "submission.sections.upload.upload-successful":"Przesyłanie udane", + "submission.submit.breadcrumbs":"Nowe zgłoszenie", + "submission.submit.title":"Nowe zgłoszenie", + "submission.workflow.generic.delete":"Usuń", + "submission.workflow.generic.delete-help":"Jeśli chcesz odrzucić tę pozycję, wybierz \"Delete\". Będzie wymagane potwierdzenie tej decyzji.", + "submission.workflow.generic.edit":"Edytuj", + "submission.workflow.generic.edit-help":"Wybierz tę opcję, aby zmienić metadane pozycji.", + "submission.workflow.generic.view":"Podgląd", + "submission.workflow.generic.view-help":"Wybierz tę opcję, aby wyświetlić metadane pozycji.", + "submission.workflow.tasks.claimed.approve":"Zatwierdź", + "submission.workflow.tasks.claimed.approve_help":"Jeśli ta pozycja ma zostać zatwierdzona i wprowadzona do kolekcji, wybierz \"Approve\".", + "submission.workflow.tasks.claimed.edit":"Edytuj", + "submission.workflow.tasks.claimed.edit_help":"Wybierz tę opcję, aby zmienić metadane pozycji.", + "submission.workflow.tasks.claimed.reject.reason.info":"Proszę wpisać powód odrzucenia zgłoszenia w poniższe pole, wskazując, czy zgłaszający może poprawić problem i ponownie przesłać zgłoszenie.", + "submission.workflow.tasks.claimed.reject.reason.placeholder":"Opisz powód odrzucenia zgłoszenia", + "submission.workflow.tasks.claimed.reject.reason.submit":"Odrzuć pozycję", + "submission.workflow.tasks.claimed.reject.reason.title":"Powód", + "submission.workflow.tasks.claimed.reject.submit":"Odrzuć", + "submission.workflow.tasks.claimed.reject_help":"Jeśli po przejrzeniu pozycji stwierdzono, że nie nadaje się ona do włączenia do kolekcji, wybierz opcję \"Reject\". Zostaniesz wtedy poproszony o określenie powodu odrzucenia, i wskazanie czy zgłaszający powinien wprowadzić zmiany i przesłać ponownie pozycję.", + "submission.workflow.tasks.claimed.return":"Cofnij do puli zadań", + "submission.workflow.tasks.claimed.return_help":"Cofnij zadanie do puli, aby inny użytkownik mógł się go podjąć.", + "submission.workflow.tasks.generic.error":"Podczas działania wystąpił błąd...", + "submission.workflow.tasks.generic.processing":"Procesowanie...", + "submission.workflow.tasks.generic.submitter":"Zgłaszający", + "submission.workflow.tasks.generic.success":"Udało się", + "submission.workflow.tasks.pool.claim":"Podejmij pracę", + "submission.workflow.tasks.pool.claim_help":"Przypisz to zadanie do siebie.", + "submission.workflow.tasks.pool.hide-detail":"Ukryj szczegóły", + "submission.workflow.tasks.pool.show-detail":"Pokaż szczegóły", + "thumbnail.default.alt":"Miniatura", + "thumbnail.default.placeholder":"Brak miniatury", + "thumbnail.project.alt":"Logo projektu", + "thumbnail.project.placeholder":"Obraz zastępczy projketu", + "thumbnail.orgunit.alt":"Logo jednostki organizacyjnej", + "thumbnail.orgunit.placeholder":"Obraz zastępczy jednostki organizacyjnej", + "thumbnail.person.alt":"Zdjęcie profilowe", + "thumbnail.person.placeholder":"Brak zdjęcia profilowego", + "title":"DSpace Cris", + "vocabulary-treeview.header":"Widok drzewka", + "vocabulary-treeview.load-more":"Pokaż więcej", + "vocabulary-treeview.search.form.reset":"Resetuj", + "vocabulary-treeview.search.form.search":"Szukaj", + "vocabulary-treeview.search.no-result":"Brak pozycji do wyświetlenia", + "vocabulary-treeview.tree.description.nsi":"The Norwegian Science Index", + "vocabulary-treeview.tree.description.srsc":"Kategorie tematów badań", + "uploader.browse":"wyszukaj na swoim urządzeniu", + "uploader.drag-message":"Przeciągnij i upuść pliki tutaj", + "uploader.delete.btn-title":"Usuń", + "uploader.or":", lub ", + "uploader.processing":"Procesowanie", + "uploader.queue-length":"Długość kolejki", + "virtual-metadata.delete-item.info":"Wybierz typy, dla których chcesz zapisać wirtualne metadane jako rzeczywiste metadane", + "virtual-metadata.delete-item.modal-head":"Wirtualne metadane tego powiązania", + "virtual-metadata.delete-relationship.modal-head":"Wybierz pozycje, dla których chcesz zapisać wirtualne metadane jako rzeczywiste metadane", + "workflowAdmin.search.results.head":"Zarządzaj procesami", + "workflow-item.edit.breadcrumbs":"Edytuj pozycję procesu", + "workflow-item.edit.title":"Edytuj pozycję procesu", + "workflow-item.delete.notification.success.title":"Usunięte", + "workflow-item.delete.notification.success.content":"Ten element procesu został usunięty", + "workflow-item.delete.notification.error.title":"Coś poszło nie tak", + "workflow-item.delete.notification.error.content":"Ten element procesu nie mógł zostać usunięty", + "workflow-item.delete.title":"Usuń element procesu", + "workflow-item.delete.header":"Usuń element procesu", + "workflow-item.delete.button.cancel":"Anuluj", + "workflow-item.delete.button.confirm":"Usuń", + "workflow-item.send-back.notification.success.title":"SOdeślij do zgłaszającego", + "workflow-item.send-back.notification.success.content":"Ten element procesu został odesłany do zgłaszającego", + "workflow-item.send-back.notification.error.title":"Coś poszło nie tak", + "workflow-item.send-back.notification.error.content":"Ten element procesu nie mógł zostać odesłany do zgłaszającego", + "workflow-item.send-back.title":"Odeślij element procesu do zgłaszającego", + "workflow-item.send-back.header":"Odeślij element procesu do zgłaszającego", + "workflow-item.send-back.button.cancel":"Anuluj", + "workflow-item.send-back.button.confirm":"Odeślij", + "workflow-item.view.breadcrumbs":"Widok procesu", + "idle-modal.header":"Sesja wkrótce wygaśnie", + "idle-modal.info":"Ze względów bezpieczeństwa sesja wygaśnie po {{ timeToExpire }} minutach nieaktywności. Twoja sesja wkrótce wygaśnie. Czy chcesz ją przedłużyć albo wylogować się?", + "idle-modal.log-out":"Wyloguj", + "idle-modal.extend-session":"Wydłuż sesję", + "workspace.search.results.head":"Twoje zadania", + "orgunit.listelement.badge":"Jednostka organizacyjna", + "orgunit.page.city":"Miasto", + "orgunit.page.country":"Kraj", + "orgunit.page.dateestablished":"Data założenia", + "orgunit.page.description":"Opis", + "orgunit.page.edit":"Edytuj pozycję", + "orgunit.page.id":"ID", + "orgunit.page.titleprefix":"Jednostka organizacyjna: ", + "pagination.options.description":"Opcje strony", + "pagination.results-per-page":"Wyników na stronę", + "pagination.showing.detail":"{{ range }} z {{ total }}", + "pagination.showing.label":"Teraz wyświetlane ", + "pagination.sort-direction":"Opcje sortowania", + "cookies.consent.purpose.sharing":"Udostępnianie", + "item.preview.dc.identifier.issn":"ISSN", + "500.page-internal-server-error":"Usługa niedostępna", + "500.help":"Serwer jest tymczasowo niezdolny do obsługi Twojego żądania z powodu przestoju konserwacyjnego lub problemów z przepustowością. Prosimy spróbować ponownie później.", + "500.link.home-page":"Zabierz mnie na stronę główną", + "error-page.description.401":"brak autoryzacji", + "error-page.description.403":"brak dostępu", + "error-page.description.500":"usługa niedostępna", + "error-page.description.404":"nie znaleziono strony", + "error-page.orcid.generic-error":"Podczas logowania za pomocą ORCID wystąpił błąd. Upewnij się, że udostępniłeś DSpace adres e-mail swojego konta ORCID. Jeśli błąd nadal występuje, skontaktuj się z administratorem", + "access-status.embargo.listelement.badge":"Embargo", + "access-status.metadata.only.listelement.badge":"Tylko metadane", + "access-status.open.access.listelement.badge":"Open Access", + "access-status.restricted.listelement.badge":"Brak dostępu", + "access-status.unknown.listelement.badge":"Nieznane", + "admin.access-control.groups.table.edit.buttons.remove":"Usuń \"{{name}}\"", + "admin.metadata-import.page.validateOnly":"Tylko waliduj", + "admin.metadata-import.page.validateOnly.hint":"Po wybraniu tej opcji przesłany plik CSV zostanie poddany walidacji. Otrzymasz raport o wykrytych zmianach, ale żadne zmiany nie zostaną zapisane.", + "bitstream.edit.form.iiifLabel.label":"Etykieta canvyIIIF", + "bitstream.edit.form.iiifLabel.hint":"Etykieta dla tego obrazu. Jeśli nie została dostarczona, zostanie użyta domyślna etykieta.", + "bitstream.edit.form.iiifToc.label":"Spis treści IIIF", + "bitstream.edit.form.iiifToc.hint":"Dodanie tekstu tutaj zapoczątkuje nowy zakres spisu treści.", + "bitstream.edit.form.iiifWidth.label":"Szerokość canvy IIIF", + "bitstream.edit.form.iiifWidth.hint":"Szerokość canvy jest zwykle równa szerokości obrazu.", + "bitstream.edit.form.iiifHeight.label":"Wysokość canvy IIIF", + "bitstream.edit.form.iiifHeight.hint":"Wysokość canvy jest zwykle równa szerokości obrazu.", + "browse.back.all-results":"Wszystkie wyniki wyszukiwania", + "pagination.next.button":"Następny", + "pagination.previous.button":"Poprzedni", + "pagination.next.button.disabled.tooltip":"Brak więcej stron z wynikami wyszukiwania", + "browse.startsWith":", zaczyna się od {{ startsWith }}", + "browse.title.page":"Przeszukiwanie {{ collection }} wg {{ field }} {{ value }}", + "collection.edit.item.authorizations.load-bundle-button":"Załaduj więcej paczek", + "collection.edit.item.authorizations.load-more-button":"Załaduj więcej", + "collection.edit.item.authorizations.show-bitstreams-button":"Pokaż polityki plików dla paczek", + "comcol-role.edit.create.error.title":"Nie udało się utworzyć grupy dla roli '{{ role }}'", + "curation.form.submit.error.invalid-handle":"Nie ustalono identyfikatora dla tego obiektu", + "confirmation-modal.delete-profile.header":"Usuń profil", + "confirmation-modal.delete-profile.info":"Czy na pewno chcesz usunąć profil", + "confirmation-modal.delete-profile.cancel":"Anuluj", + "confirmation-modal.delete-profile.confirm":"Usuń", + "error.invalid-search-query":"Zapytanie nie jest poprawne. Wejdź na Solr query syntax, aby dowiedzieć się o najlepszych praktykach i dodatkowych informacjach o tym błędzie.", + "feed.description":"Aktualności", + "footer.link.feedback":"Prześlij uwagi", + "form.group-collapse":"Zwiń", + "form.group-collapse-help":"Kliknij tutaj, aby zwinąć", + "form.group-expand":"Rozwiń", + "form.group-expand-help":"Kliknij tutaj, aby rozwinąć", + "form.other-information":{ + + }, + "health.breadcrumbs":"Stan systemu", + "health-page.heading":"Stan systemu", + "health-page.info-tab":"Informacje", + "health-page.status-tab":"Status", + "health-page.error.msg":"Serwis stanu systemu jest tymczasowo niedostępny", + "health-page.property.status":"Kod statusu", + "health-page.section.db.title":"Baza danych", + "health-page.section.geoIp.title":"GeoIp", + "health-page.section.solrAuthorityCore.title":"Autentykacja", + "health-page.section.solrOaiCore.title":"OAI", + "health-page.section.solrSearchCore.title":"Wyszukiwarka", + "health-page.section.solrStatisticsCore.title":"Statystyki", + "health-page.section-info.app.title":"Backend aplikacji", + "health-page.section-info.java.title":"Java", + "health-page.status":"Status", + "health-page.status.ok.info":"operacyjny", + "health-page.status.error.info":"Wykryte problemy", + "health-page.status.warning.info":"Wykryte potencjalne problemy", + "health-page.title":"Stan systemu", + "health-page.section.no-issues":"Nie wykryto żadnych problemów", + "info.feedback.breadcrumbs":"Uwagi", + "info.feedback.head":"Uwagi", + "info.feedback.title":"Uwagi", + "info.feedback.info":"Dziękujemy za podzielenie się opinią na temat systemu DSpace. Doceniamy Twój wkład w lepsze działanie systemu!", + "info.feedback.email_help":"Ten adres zostanie użyty, aby przesłać odpowiedź na uwagi.", + "info.feedback.send":"Prześlij uwagi", + "info.feedback.comments":"Komentarz", + "info.feedback.email-label":"Twoj adres e-mail", + "info.feedback.create.success":"Uwagi przesłane!", + "info.feedback.error.email.required":"Poprawny adres e-mail jest wymagany", + "info.feedback.error.message.required":"Treść komentarza jest wymagana", + "info.feedback.page-label":"Strona", + "info.feedback.page_help":"Ta strona odnosi się do uwag.", + "item.orcid.return":"Powrót", + "item.truncatable-part.show-more":"Pokaż więcej", + "item.truncatable-part.show-less":"Pokaż mniej", + "item.page.orcid.title":"ORCID", + "item.page.orcid.tooltip":"Otwórz ustawienia ORCID", + "item.page.claim.button":"Podejmij pracę", + "item.page.claim.tooltip":"Podejmij pracę jako profil", + "item.version.create.modal.submitted.header":"Tworzenie nowej wersji...", + "item.version.create.modal.submitted.text":"Nowa wersja została utworzona. Mogło to trwać chwilę, jeśli pozycja ma wiele powiązań.", + "journal-relationships.search.results.head":"Wyniki wyszukiwania czasopism", + "menu.section.icon.health":"Sekcja menu Stan systemu", + "menu.section.health":"Stan systemu", + "metadata-export-search.tooltip":"Eksportuj wyniki wyszukiwania w formacie CSV", + "metadata-export-search.submit.success":"Eksport rozpoczął się", + "metadata-export-search.submit.error":"Eksport nie rozpoczął się", + "person.page.name":"Nazwa", + "person-relationships.search.results.head":"Wyniki wyszukiwania osób", + "profile.special.groups.head":"Autoryzacja do specjalnych grup, do których należysz", + "project-relationships.search.results.head":"Wyniki wyszukiwania projektów", + "publication-relationships.search.results.head":"Wyniki wyszukiwania publikacji", + "resource-policies.edit.page.target-failure.content":"Wystąpił błąd podczas edycji (użytkownika lub grupy) związany z polityką zasobu.", + "resource-policies.edit.page.other-failure.content":"Wystąpił błąd podczas edycji polityki zasobu. Użytkownik lub grupa zostały zaktualizowane pomyślnie.", + "resource-policies.form.eperson-group-list.modal.header":"Nie można zmienić typu", + "resource-policies.form.eperson-group-list.modal.text1.toGroup":"Nie można zastąpić użytkownika grupą.", + "resource-policies.form.eperson-group-list.modal.text1.toEPerson":"Nie można zastąpić grupy użytkownikiem.", + "resource-policies.form.eperson-group-list.modal.text2":"Usuń obecną polityke zasobu i stwórz nową o określonym typie.", + "resource-policies.form.eperson-group-list.modal.close":"Ok", + "search.results.view-result":"Widok", + "default-relationships.search.results.head":"Wyniki wyszukiwania", + "statistics.table.title.TotalVisits":"Wyświetlnia ogółem", + "statistics.table.title.TotalVisitsPerMonth":"Wyświetlenia w miesiącu", + "statistics.table.title.TotalDownloads":"Pobrania", + "statistics.table.title.TopCountries":"Wyświetlenia wg krajów", + "statistics.table.title.TopCities":"Wyświetlenia wg miast", + "submission.import-external.preview.title":"Podgląd pozycji", + "submission.import-external.preview.title.none":"Podgląd pozycji", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.none":"Import pozycji zdalnie", + "submission.sections.general.cannot_deposit":"Nie można zakończyć deponowania, ponieważ w formularzu wystąpiły błędy.
    Aby zakończyć deponowanie, wypełnij wszystkie obowiązkowe pola.", + "submission.sections.submit.progressbar.accessCondition":"Warunki dostępu do pozycji", + "submission.sections.submit.progressbar.sherpapolicy":"Polityki Sherpa", + "submission.sections.submit.progressbar.sherpaPolicies":"Informacje o polityce open access wydawcy.", + "submission.sections.status.info.title":"Dodatkowe informacje", + "submission.sections.status.info.aria":"Dodatkowe informacje", + "submission.sections.upload.form.access-condition-hint":"Wybierz w jaki sposób pliki dla tej pozycji po jest zdeponowaniu będą mogły być udostępnione", + "submission.sections.upload.form.from-hint":"Wybierz datę, od której ma zostać zastosowany warunek dostępu", + "submission.sections.upload.form.until-hint":"Wybierz datę, do której ma zostać zastosowany warunek dostępu", + "submission.sections.accesses.form.discoverable-description":"Jeśli checkbox jest zaznaczony, pozycja będzie wyświetlana w wynikach wyszukiwania. Jeśli checkbox jest odznaczony, dostęp do pozycji będzie dostępny tylko przez bezpośredni link, pozycja nie będzie wyświetlana w wynikach wyszukiwania.", + "submission.sections.accesses.form.discoverable-label":"Niemożliwe do wyszukania", + "submission.sections.accesses.form.access-condition-label":"Typ warunku dostępu", + "submission.sections.accesses.form.access-condition-hint":"Wybierz warunek dostępu, aby przypisać go do pozycji, kiedy zostanie zdeponowany.", + "submission.sections.accesses.form.date-required":"Data jest wymagana.", + "submission.sections.accesses.form.date-required-from":"Początkowa data przyznania dostępu jest wymagana.", + "submission.sections.accesses.form.date-required-until":"Końcowa data przyznania dostępu jest wymagana.", + "submission.sections.accesses.form.from-label":"Udziel dostępu od", + "submission.sections.accesses.form.from-hint":"Wybierz datę, od kiedy zostanie przyznany dostęp do tej pozycji", + "submission.sections.accesses.form.from-placeholder":"Od", + "submission.sections.accesses.form.group-label":"Grupa", + "submission.sections.accesses.form.group-required":"Grupa jest wymagana.", + "submission.sections.accesses.form.until-label":"Udziel dostępu do", + "submission.sections.accesses.form.until-hint":"Wybierz datę, do kiedy zostanie przyznany dostęp do tej pozycji", + "submission.sections.accesses.form.until-placeholder":"Do", + "submission.sections.sherpa.publication.information":"Informacje o publikacji", + "submission.sections.sherpa.publication.information.title":"Tytuł", + "submission.sections.sherpa.publication.information.issns":"Numery ISSN", + "submission.sections.sherpa.publication.information.url":"URL", + "submission.sections.sherpa.publication.information.publishers":"Wydawca", + "submission.sections.sherpa.publication.information.romeoPub":"Wydawca Romeo", + "submission.sections.sherpa.publication.information.zetoPub":"Wydawca Zeto", + "submission.sections.sherpa.publisher.policy":"Polityka wydawnicza", + "submission.sections.sherpa.publisher.policy.description":"Poniższe informacje zostały znalezione za pośrednictwem Sherpa Romeo. W oparciu o politykę Twojego wydawcy, zawiera ona porady dotyczące tego, czy embargo może być konieczne i/lub jakie pliki możesz przesłać. Jeśli masz pytania, skontaktuj się z administratorem strony poprzez formularz.", + "submission.sections.sherpa.publisher.policy.openaccess":"Rodzaje Open Access dozwolone przez politykę wydawniczą tego czasopisma są wymienione poniżej. Kliknij na wybrany rodzaj, aby przejść do szczegółowego widoku", + "submission.sections.sherpa.publisher.policy.more.information":"Aby uzuyskać więcej informacji, kliknij tutaj:", + "submission.sections.sherpa.publisher.policy.version":"Wersja", + "submission.sections.sherpa.publisher.policy.embargo":"Embargo", + "submission.sections.sherpa.publisher.policy.noembargo":"Brak embargo", + "submission.sections.sherpa.publisher.policy.nolocation":"Brak", + "submission.sections.sherpa.publisher.policy.license":"Licencja", + "submission.sections.sherpa.publisher.policy.prerequisites":"Wymagania wstępne", + "submission.sections.sherpa.publisher.policy.location":"Lokalizacja", + "submission.sections.sherpa.publisher.policy.conditions":"Wymagania", + "submission.sections.sherpa.publisher.policy.refresh":"Odśwież", + "submission.sections.sherpa.record.information":"Informacje o rekordzie", + "submission.sections.sherpa.record.information.id":"ID", + "submission.sections.sherpa.record.information.date.created":"Data utworzenia", + "submission.sections.sherpa.record.information.date.modified":"Ostatnia modyfikacja", + "submission.sections.sherpa.record.information.uri":"URI", + "submission.sections.sherpa.error.message":"Wystąpił błąd podczas pobierania informacji z Sherpa", + "submission.workspace.generic.view":"Podgląd", + "submission.workspace.generic.view-help":"Wybierz tę opcje, aby zobaczyć metadane.", + "workflow.search.results.head":"Zadania na workflow", + "workspace-item.view.breadcrumbs":"Widok wersji roboczej", + "workspace-item.view.title":"Widok wersji roboczej", + "researcher.profile.change-visibility.fail":"Wystąpił niespodziewany błąd podczas zmiany widoczności profilu", + "person.page.orcid.link.processing":"Łączenie profilu z ORCID...", + "person.page.orcid.link.error.message":"Coś poszło nie tak podczas łączenia z ORCID. Jeśli problem będzie się powtarzał, skontaktuj się z administratorem.", + "person.page.orcid.sync-queue.table.header.type":"Typ", + "person.page.orcid.sync-queue.table.header.description":"Opis", + "person.page.orcid.sync-queue.table.header.action":"Akcja", + "person.page.orcid.sync-queue.tooltip.project":"Projekt", + "person.page.orcid.sync-queue.send.validation-error.country.invalid":"Niewłaściwy dwuznakowy kod kraju ISO 3166", + "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid":"Wymagana data publikacji to co najmniej rok po 1900", + "person.page.orcid.synchronization-mode-funding-message":"Wybierz, czy chcesz wysłać swoje projekty na swoją listę informacji o projektach w profilu ORCID.", + "person.page.orcid.synchronization-mode-publication-message":"Wybierz, czy chcesz wysłać swoje publikacje na swoją listę informacji o publikacjach w profilu ORCID.", + "person.page.orcid.synchronization-mode-profile-message":"Wybierz, czy chcesz wysłać swoje dane bibliograficzne lub osobiste identyfikatory do swojego profilu ORCID.", + "person.orcid.sync.setting":"Ustawienia synchronizacji z ORCID", + "person.orcid.registry.queue":"Kolejka rejestru z ORCID", + "person.orcid.registry.auth":"Autoryzacje z ORCID", + "home.recent-submissions.head":"Najnowsze publikacje", + "submission.sections.sherpa-policy.title-empty":"Nie wybrano ISSN i informacje o polityce wydawniczej czasopisma są niedostępne", + "admin.batch-import.breadcrumbs":"Import zbiorczy", + "admin.batch-import.page.dropMsg":"Drop a batch ZIP to import", + "admin.batch-import.page.dropMsgReplace":"Drop to replace the batch ZIP to import", + "admin.batch-import.page.error.addFile":"Najpierw wybierz plik (ZIP)", + "admin.batch-import.page.header":"Import masowy", + "admin.batch-import.page.help":"Wybierz kolekcję do zaimportowania kolekcji. Potem, upuść lub przeszukaj plik SAF, który zawiera pozycje do importu", + "admin.batch-import.page.remove":"usuń", + "admin.batch-import.page.validateOnly.hint":"Jeśli wybrano, importowany plik ZIP będzie walidowany. Otrzymasz raport ze zmianami, ale żadne zmiany nie zostaną wykonane zapisane.", + "collection.form.correctionSubmissionDefinition":"Wzór zgłoszenia do prośby o korektę", + "comcol-role.edit.delete.error.title":"Nie udało się usunąć roli '{{ role }}' dla grup", + "confirmation-modal.export-batch.header":"Eksport maasowy (ZIP) {{ dsoName }}", + "confirmation-modal.export-batch.info":"Czy na pewno chcesz wyeksportować plik ZIP z {{ dsoName }}", + "dso-selector.export-batch.dspaceobject.head":"Eksport masowy (ZIP) z", + "menu.section.export_batch":"Eksport masowy (ZIP)", + "nav.user-profile-menu-and-logout":"Profil użytkownika i wylogowywanie", + "process.detail.actions":"Akcje", + "process.detail.delete.body":"Czy na pewno chcesz usunąć bieżący proces?", + "process.detail.delete.button":"Usuń proces", + "process.detail.delete.cancel":"Anuluj", + "process.detail.delete.confirm":"Usuń proces", + "process.detail.delete.error":"Nie udało się usunąć procesu", + "process.detail.delete.header":"Usuń proces", + "process.detail.delete.success":"Proces został usunięty.", + "admin.batch-import.title":"Masowy import", + "admin.metadata-import.page.button.select-collection":"Wybierz kolekcję", + "admin.registries.bitstream-formats.table.id":"ID", + "admin.registries.schema.fields.table.id":"ID", + "cookies.consent.app.description.google-recaptcha":"Podczas rejestracji i odzyskiwania hasła używamy narzędzia google reCAPTCHA", + "cookies.consent.app.disable-all.description":"Przełącz, aby zaakceptować lub odrzucić wszystkie", + "cookies.consent.app.disable-all.title":"Akceptowacja lub odrzucenie wszystkich", + "cookies.consent.app.title.google-recaptcha":"Google reCaptcha", + "cookies.consent.content-modal.service":"usługa", + "cookies.consent.content-modal.services":"usługi", + "cookies.consent.content-notice.description.no-privacy":"Zbieramy i przetwarzamy Twoje dane w celu: autentykacji, ustawień preferencji i zgód oraz do celów statystycznych.", + "cookies.consent.content-notice.title":"Zgoda na ciasteczka", + "cookies.consent.ok":"Zgadzam się", + "cookies.consent.purpose.registration-password-recovery":"Rejestracja i odzyskiwanie hasła", + "cookies.consent.save":"Zapisz", + "curation-task.task.citationpage.label":"Generuj stronę z cytowaniem", + "dso-selector.import-batch.dspaceobject.head":"Import masowy z", + "orgunit.listelement.no-title":"Brak tytyłu", + "process.bulk.delete.error.body":"Proces z ID {{processId}} nie może być usunięty. Pozostałe procesy zostaną usunięte.", + "process.bulk.delete.error.head":"Błąd podczas usuwania procesu", + "process.bulk.delete.success":"{{count}} proces/y został/y usunięte", + "process.overview.delete":"Usuń {{count}} proces/y", + "process.overview.delete.body":"Czy na pewno usunąć {{count}} proces/y?", + "process.overview.delete.clear":"Wyczyść selekcję procesów do usunięcia", + "process.overview.delete.header":"Usuń procesy", + "process.overview.delete.processing":"{{count}} procesów zostanie usuniętych. Poczekaj, gdy usuwanie się zakończy. Może to zająć chwilę.", + "process.overview.table.actions":"Akcje", + "profile.security.form.label.current-password":"Aktualne hasło", + "profile.security.form.notifications.error.change-failed":"Wystąpił błąd podczas próby zmiany hasła. Sprawdź czy aktualne hasło jest prawidłowe.", + "profile.security.form.notifications.error.general":"Uzupełnij wymagane pola dla bezpieczeństwa na formularzu", + "register-page.registration.error.recaptcha":"Wystąpił błąd podczas próby autentykacji przez reCAPTCHA", + "register-page.registration.google-recaptcha.must-accept-cookies":"Aby się zarejestrować, musisz zaakceptować ciasteczka dla rejestracji i odzyskiwania hasła (Google reCaptcha).", + "register-page.registration.google-recaptcha.notification.message.error":"Wystąpił błąd podczas weryfikacji reCaptcha", + "register-page.registration.google-recaptcha.notification.message.expired":"Weryfikacja wygasła. Zweryfikuj ponownie.", + "register-page.registration.google-recaptcha.notification.title":"Google reCaptcha", + "register-page.registration.google-recaptcha.open-cookie-settings":"Otwórz ustawienia plików cookies", + "search.results.response.500":"Wystąpił błąd podczas wysyłania zapytania. Spróbuj ponownie później", + "submission.sections.license.granted-label":"Potwierdzam akceptację powyższej licencji", + "submission.sections.license.notgranted":"Najpierw musisz zaakceptować licencję", + "submission.sections.license.required":"Najpierw musisz zaakceptować licencję", + "confirmation-modal.export-batch.confirm":"Eksportuj", + "confirmation-modal.export-batch.cancel":"Anuluj" } From 43d9e3f958804745ebcc24a372f80db26aa1c234 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 14 Dec 2022 16:00:10 +0100 Subject: [PATCH 221/758] 93746: Feedback 2022-12-14 - missing types & tooltip width --- .../dso-edit-metadata-form.ts | 38 +++++++++---------- .../dso-edit-metadata-value.component.scss | 4 ++ .../dso-edit-metadata-value.component.ts | 19 +++++++--- .../dso-edit-metadata.component.ts | 10 ++--- .../metadata-field-selector.component.ts | 8 ++-- src/styles/_custom_variables.scss | 1 + 6 files changed, 46 insertions(+), 34 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index 2bbc923187e..fde0ecf9d4a 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -187,7 +187,7 @@ export class DsoEditMetadataForm { Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => { this.originalFieldKeys.push(mdField); this.fieldKeys.push(mdField); - this.fields[mdField] = values.map((value) => new DsoEditMetadataValue(value)); + this.fields[mdField] = values.map((value: MetadataValue) => new DsoEditMetadataValue(value)); }); } @@ -205,7 +205,7 @@ export class DsoEditMetadataForm { * Clear the temporary value afterwards * @param mdField */ - setMetadataField(mdField: string) { + setMetadataField(mdField: string): void { this.newValue.editing = false; this.addValueToField(this.newValue, mdField); this.newValue = undefined; @@ -217,7 +217,7 @@ export class DsoEditMetadataForm { * @param mdField * @private */ - private addValueToField(value: DsoEditMetadataValue, mdField: string) { + private addValueToField(value: DsoEditMetadataValue, mdField: string): void { if (isEmpty(this.fields[mdField])) { this.fieldKeys.push(mdField); this.fields[mdField] = []; @@ -230,7 +230,7 @@ export class DsoEditMetadataForm { * @param mdField * @param index */ - remove(mdField: string, index: number) { + remove(mdField: string, index: number): void { if (isNotEmpty(this.fields[mdField])) { this.fields[mdField].splice(index, 1); if (this.fields[mdField].length === 0) { @@ -244,7 +244,7 @@ export class DsoEditMetadataForm { * Returns if at least one value within the form contains a change */ hasChanges(): boolean { - return Object.values(this.fields).some((values) => values.some((value) => value.hasChanges())); + return Object.values(this.fields).some((values: DsoEditMetadataValue[]) => values.some((value: DsoEditMetadataValue) => value.hasChanges())); } /** @@ -253,9 +253,9 @@ export class DsoEditMetadataForm { */ discard(): void { this.resetReinstatable(); - Object.entries(this.fields).forEach(([field, values]) => { + Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => { let removeFromIndex = -1; - values.forEach((value, index) => { + values.forEach((value: DsoEditMetadataValue, index: number) => { if (value.change === DsoEditMetadataChangeType.ADD) { if (isEmpty(this.reinstatableNewValues[field])) { this.reinstatableNewValues[field] = []; @@ -272,7 +272,7 @@ export class DsoEditMetadataForm { this.fields[field].splice(removeFromIndex, this.fields[field].length - removeFromIndex); } }); - this.fieldKeys.forEach((field) => { + this.fieldKeys.forEach((field: string) => { if (this.originalFieldKeys.indexOf(field) < 0) { delete this.fields[field]; } @@ -281,13 +281,13 @@ export class DsoEditMetadataForm { } reinstate(): void { - Object.values(this.fields).forEach((values) => { - values.forEach((value) => { + Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => { + values.forEach((value: DsoEditMetadataValue) => { value.reinstate(); }); }); - Object.entries(this.reinstatableNewValues).forEach(([field, values]) => { - values.forEach((value) => { + Object.entries(this.reinstatableNewValues).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => { + values.forEach((value: DsoEditMetadataValue) => { this.addValueToField(value, field); }); }); @@ -300,17 +300,17 @@ export class DsoEditMetadataForm { isReinstatable(): boolean { return isNotEmpty(this.reinstatableNewValues) || Object.values(this.fields) - .some((values) => values - .some((value) => value.isReinstatable())); + .some((values: DsoEditMetadataValue[]) => values + .some((value: DsoEditMetadataValue) => value.isReinstatable())); } /** * Reset the state of the re-instatable properties and values */ - resetReinstatable() { + resetReinstatable(): void { this.reinstatableNewValues = {}; - Object.values(this.fields).forEach((values) => { - values.forEach((value) => { + Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => { + values.forEach((value: DsoEditMetadataValue) => { value.resetReinstatable(); }); }); @@ -321,8 +321,8 @@ export class DsoEditMetadataForm { */ getOperations(): Operation[] { const operations: Operation[] = []; - Object.entries(this.fields).forEach(([field, values]) => { - values.forEach((value, place) => { + Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => { + values.forEach((value: DsoEditMetadataValue, place: number) => { if (value.hasChanges()) { let operation: MetadataPatchOperation; if (value.change === DsoEditMetadataChangeType.UPDATE) { diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss index 926dc6f471e..1196aa1940c 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss @@ -6,3 +6,7 @@ .ds-drag-handle:not(.disabled) { cursor: grab; } + +::ng-deep .tooltip-inner { + min-width: var(--ds-dso-edit-virtual-tooltip-min-width); +} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index 64024ef302d..b61255e4fe0 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -1,14 +1,17 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DsoEditMetadataChangeType, DsoEditMetadataValue } from '../dso-edit-metadata-form'; import { Observable } from 'rxjs/internal/Observable'; -import { MetadataRepresentationType } from '../../../core/shared/metadata-representation/metadata-representation.model'; +import { + MetadataRepresentation, + MetadataRepresentationType +} from '../../../core/shared/metadata-representation/metadata-representation.model'; import { RelationshipService } from '../../../core/data/relationship.service'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { of } from 'rxjs/internal/observable/of'; import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { map } from 'rxjs/operators'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { EMPTY } from 'rxjs/internal/observable/empty'; @Component({ selector: 'ds-dso-edit-metadata-value', @@ -100,15 +103,19 @@ export class DsoEditMetadataValueComponent implements OnInit { /** * Initialise potential properties of a virtual metadata value */ - initVirtualProperties() { + initVirtualProperties(): void { this.mdRepresentation$ = this.mdValue.newValue.isVirtual ? this.relationshipService.resolveMetadataRepresentation(this.mdValue.newValue, this.dso, 'Item') - .pipe(map((mdRepresentation) => mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation : null)) : of(null); + .pipe( + map((mdRepresentation: MetadataRepresentation) => + mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation as ItemMetadataRepresentation : null + ) + ) : EMPTY; this.mdRepresentationItemRoute$ = this.mdRepresentation$.pipe( - map((mdRepresentation) => mdRepresentation ? getItemPageRoute(mdRepresentation) : null), + map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? getItemPageRoute(mdRepresentation) : null), ); this.mdRepresentationName$ = this.mdRepresentation$.pipe( - map((mdRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null), + map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null), ); } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index bc7bfd95938..e98cc3663dc 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -120,7 +120,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { this.initForm(); } this.savingOrLoadingFieldValidation$ = observableCombineLatest([this.saving$, this.loadingFieldValidation$]).pipe( - map(([saving, loading]) => saving || loading), + map(([saving, loading]: [boolean, boolean]) => saving || loading), ); } @@ -188,7 +188,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { * Confirm the newly added value * @param saved Whether or not the value was manually saved (only then, add the value to its metadata field) */ - confirmNewValue(saved: boolean) { + confirmNewValue(saved: boolean): void { if (saved) { this.setMetadataField(); } @@ -199,10 +199,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { * This will move the new value to its respective parent metadata field * Validate the metadata field first */ - setMetadataField() { + setMetadataField(): void { this.form.resetReinstatable(); this.loadingFieldValidation$.next(true); - this.metadataFieldSelectorComponent.validate().subscribe((valid) => { + this.metadataFieldSelectorComponent.validate().subscribe((valid: boolean) => { this.loadingFieldValidation$.next(false); if (valid) { this.form.setMetadataField(this.newMdField); @@ -238,7 +238,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { /** * Unsubscribe from any open subscriptions */ - ngOnDestroy() { + ngOnDestroy(): void { if (hasValue(this.dsoUpdateSubscription)) { this.dsoUpdateSubscription.unsubscribe(); } diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index 7fc56f8dc25..f3f6f159147 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -119,7 +119,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV ); this.mdFieldOptions$ = this.query$.pipe( distinctUntilChanged(), - switchMap((query) => { + switchMap((query: string) => { this.showInvalid = false; if (query !== null) { return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe( @@ -152,7 +152,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV metadataFieldsToString(), take(1), map((fields: string[]) => fields.indexOf(this.mdField) > -1), - tap((exists) => this.showInvalid = !exists), + tap((exists: boolean) => this.showInvalid = !exists), ); } @@ -160,7 +160,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV * Select a metadata field from the dropdown optipons * @param mdFieldOption */ - select(mdFieldOption: string) { + select(mdFieldOption: string): void { this.selectedValueLoading = true; this.input.setValue(mdFieldOption); } @@ -169,6 +169,6 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV * Unsubscribe from any open subscriptions */ ngOnDestroy(): void { - this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + this.subs.filter((sub: Subscription) => hasValue(sub)).forEach((sub: Subscription) => sub.unsubscribe()); } } diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index e01018c044c..3498deea7d3 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -89,4 +89,5 @@ --ds-dso-edit-field-width: 210px; --ds-dso-edit-lang-width: 90px; --ds-dso-edit-actions-width: 173px; + --ds-dso-edit-virtual-tooltip-min-width: 300px; } From 4dcc082ec0125246ce573d6ab66fa1f29be65280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dykas?= <96572102+michdyk@users.noreply.github.com> Date: Wed, 14 Dec 2022 16:00:22 +0100 Subject: [PATCH 222/758] Update config.example.yml Enabling Polish language --- config/config.example.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/config.example.yml b/config/config.example.yml index 1e55dfda5ff..e21605a2a46 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -173,6 +173,10 @@ languages: - code: uk label: Yкраї́нська active: true + - code: pl + label: Polski + active: true + # Browse-By Pages browseBy: From 64d96453c3b81e6e8b0bdafdac271df3a425b53e Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 15 Dec 2022 17:25:23 +0100 Subject: [PATCH 223/758] 93747: Edit metadata redesign - drag to reorder pt1 --- .../metadata-patch-move-operation.model.ts | 33 +++++ ...-edit-metadata-field-values.component.html | 5 +- ...-edit-metadata-field-values.component.scss | 4 + ...so-edit-metadata-field-values.component.ts | 32 ++++- .../dso-edit-metadata-form.ts | 113 +++++++++++++----- .../dso-edit-metadata-value.component.html | 4 +- .../dso-edit-metadata-value.component.scss | 4 + .../dso-edit-metadata-value.component.ts | 5 + .../dso-edit-metadata.component.html | 1 + .../dso-edit-metadata.component.ts | 13 +- 10 files changed, 180 insertions(+), 34 deletions(-) create mode 100644 src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts new file mode 100644 index 00000000000..962d53dfee4 --- /dev/null +++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts @@ -0,0 +1,33 @@ +import { MetadataPatchOperation } from './metadata-patch-operation.model'; +import { Operation } from 'fast-json-patch'; + +/** + * Wrapper object for a metadata patch move Operation + */ +export class MetadataPatchMoveOperation extends MetadataPatchOperation { + static operationType = 'move'; + + /** + * The original place of the metadata value to move + */ + from: number; + + /** + * The new place to move the metadata value to + */ + to: number; + + constructor(field: string, from: number, to: number) { + super(MetadataPatchMoveOperation.operationType, field); + this.from = from; + this.to = to; + } + + /** + * Transform the MetadataPatchOperation into a fast-json-patch Operation by constructing its path and other properties + * using the information provided. + */ + toOperation(): Operation { + return { op: this.op as any, from: `/metadata/${this.field}/${this.from}`, path: `/metadata/${this.field}/${this.to}` }; + } +} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html index 6a0386da8e4..190d5a7e31b 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html @@ -1,4 +1,4 @@ -
    +
    + (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()" + (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)">
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss index afe5084bc2f..6b52c4f4b35 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss @@ -1,3 +1,7 @@ .ds-drop-list { background-color: var(--bs-gray-500); + + &.disabled { + opacity: 0.3; + } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts index 0db427c2184..2702e0ba1f8 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts @@ -1,7 +1,9 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { DsoEditMetadataChangeType, DsoEditMetadataForm } from '../dso-edit-metadata-form'; +import { DsoEditMetadataChangeType, DsoEditMetadataForm, DsoEditMetadataValue } from '../dso-edit-metadata-form'; import { Observable } from 'rxjs/internal/Observable'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; +import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; @Component({ selector: 'ds-dso-edit-metadata-field-values', @@ -38,6 +40,12 @@ export class DsoEditMetadataFieldValuesComponent { */ @Input() saving$: Observable; + /** + * Tracks for which metadata-field a drag operation is taking place + * Null when no drag is currently happening for any field + */ + @Input() draggingMdField$: BehaviorSubject; + /** * Emit when the value has been saved within the form */ @@ -48,4 +56,26 @@ export class DsoEditMetadataFieldValuesComponent { * @type {DsoEditMetadataChangeType} */ public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType; + + /** + * Drop a value into a new position + * Update the form's value array for the current field to match the dropped position + * Update the values their place property to match the new order + * Send an update to the parent + * @param event + */ + drop(event: CdkDragDrop) { + const dragIndex = event.previousIndex; + const dropIndex = event.currentIndex; + // Move the value within its field + moveItemInArray(this.form.fields[this.mdField], dragIndex, dropIndex); + // Update all the values in this field their place property + this.form.fields[this.mdField].forEach((value: DsoEditMetadataValue, index: number) => { + value.newValue.place = index; + value.confirmChanges(); + }); + // Update the form statuses + this.form.resetReinstatable(); + this.valueSaved.emit(); + } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index fde0ecf9d4a..cc1f55838ba 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -1,10 +1,11 @@ import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models'; import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util'; -import { Operation } from 'fast-json-patch'; +import { MoveOperation, Operation } from 'fast-json-patch'; import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model'; import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model'; import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model'; -import { MetadataPatchOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-operation.model'; +import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; +import { MetadataPatchMoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model'; /* tslint:disable:max-classes-per-file */ @@ -69,7 +70,7 @@ export class DsoEditMetadataValue { */ confirmChanges(finishEditing = false) { if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) { - if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) { + if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language || this.originalValue.place !== this.newValue.place)) { this.change = DsoEditMetadataChangeType.UPDATE; } else { this.change = undefined; @@ -187,7 +188,7 @@ export class DsoEditMetadataForm { Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => { this.originalFieldKeys.push(mdField); this.fieldKeys.push(mdField); - this.fields[mdField] = values.map((value: MetadataValue) => new DsoEditMetadataValue(value)); + this.setValuesForFieldSorted(mdField, values.map((value: MetadataValue) => new DsoEditMetadataValue(value))); }); } @@ -208,6 +209,10 @@ export class DsoEditMetadataForm { setMetadataField(mdField: string): void { this.newValue.editing = false; this.addValueToField(this.newValue, mdField); + // Set the place property to match the new value's position within its field + const place = this.fields[mdField].length - 1; + this.fields[mdField][place].originalValue.place = place; + this.fields[mdField][place].newValue.place = place; this.newValue = undefined; } @@ -253,6 +258,7 @@ export class DsoEditMetadataForm { */ discard(): void { this.resetReinstatable(); + // Discard changes from each value from each field Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => { let removeFromIndex = -1; values.forEach((value: DsoEditMetadataValue, index: number) => { @@ -272,25 +278,39 @@ export class DsoEditMetadataForm { this.fields[field].splice(removeFromIndex, this.fields[field].length - removeFromIndex); } }); + // Delete new metadata fields this.fieldKeys.forEach((field: string) => { if (this.originalFieldKeys.indexOf(field) < 0) { delete this.fields[field]; } }); this.fieldKeys = [...this.originalFieldKeys]; + // Reset the order of values within their fields to match their place property + this.fieldKeys.forEach((field: string) => { + this.setValuesForFieldSorted(field, this.fields[field]); + }); } + /** + * Undo any previously discarded changes + */ reinstate(): void { + // Reinstate each value Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => { values.forEach((value: DsoEditMetadataValue) => { value.reinstate(); }); }); + // Re-add new values Object.entries(this.reinstatableNewValues).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => { values.forEach((value: DsoEditMetadataValue) => { this.addValueToField(value, field); }); }); + // Reset the order of values within their fields to match their place property + this.fieldKeys.forEach((field: string) => { + this.setValuesForFieldSorted(field, this.fields[field]); + }); this.reinstatableNewValues = {}; } @@ -316,35 +336,74 @@ export class DsoEditMetadataForm { }); } + /** + * Set the values of a metadata field and sort them by their newValue's place property + * @param mdField + * @param values + */ + private setValuesForFieldSorted(mdField: string, values: DsoEditMetadataValue[]) { + this.fields[mdField] = values.sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place); + } + /** * Get the json PATCH operations for the current changes within this form + * For each metadata field, it'll return operations in the following order: replace, remove (from last to first place), add and move + * This order is important, as each operation is executed in succession of the previous one */ - getOperations(): Operation[] { + getOperations(moveAnalyser: ArrayMoveChangeAnalyzer): Operation[] { const operations: Operation[] = []; Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => { - values.forEach((value: DsoEditMetadataValue, place: number) => { - if (value.hasChanges()) { - let operation: MetadataPatchOperation; - if (value.change === DsoEditMetadataChangeType.UPDATE) { - operation = new MetadataPatchReplaceOperation(field, place, { - value: value.newValue.value, - language: value.newValue.language, - }); - } else if (value.change === DsoEditMetadataChangeType.REMOVE) { - operation = new MetadataPatchRemoveOperation(field, place); - } else if (value.change === DsoEditMetadataChangeType.ADD) { - operation = new MetadataPatchAddOperation(field, { - value: value.newValue.value, - language: value.newValue.language, - }); - } else { - console.warn('Illegal metadata change state detected for', value); - } - if (hasValue(operation)) { - operations.push(operation.toOperation()); + const replaceOperations: MetadataPatchReplaceOperation[] = []; + const removeOperations: MetadataPatchRemoveOperation[] = []; + const addOperations: MetadataPatchAddOperation[] = []; + values + .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place) + .forEach((value: DsoEditMetadataValue) => { + if (value.hasChanges()) { + if (value.change === DsoEditMetadataChangeType.UPDATE) { + // Only changes to value or language are considered "replace" operations. Changes to place are considered "move", which is processed below. + if (value.originalValue.value !== value.newValue.value || value.originalValue.language !== value.newValue.language) { + replaceOperations.push(new MetadataPatchReplaceOperation(field, value.originalValue.place, { + value: value.newValue.value, + language: value.newValue.language, + })); + } + } else if (value.change === DsoEditMetadataChangeType.REMOVE) { + removeOperations.push(new MetadataPatchRemoveOperation(field, value.originalValue.place)); + } else if (value.change === DsoEditMetadataChangeType.ADD) { + addOperations.push(new MetadataPatchAddOperation(field, { + value: value.newValue.value, + language: value.newValue.language, + })); + } else { + console.warn('Illegal metadata change state detected for', value); + } } - } - }); + }); + + operations.push(...replaceOperations + .map((operation: MetadataPatchReplaceOperation) => operation.toOperation())); + operations.push(...removeOperations + // Sort remove operations backwards first, because they get executed in order. This avoids one removal affecting the next. + .sort((a: MetadataPatchRemoveOperation, b: MetadataPatchRemoveOperation) => b.place - a.place) + .map((operation: MetadataPatchRemoveOperation) => operation.toOperation())); + operations.push(...addOperations + .map((operation: MetadataPatchAddOperation) => operation.toOperation())); + }); + // Calculate and add the move operations that need to happen in order to move value from their old place to their new within the field + // This uses an ArrayMoveChangeAnalyzer + Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => { + // Exclude values marked for removal, because operations are executed in order (remove first, then move) + const valuesWithoutRemoved = values.filter((value: DsoEditMetadataValue) => value.change !== DsoEditMetadataChangeType.REMOVE); + const moveOperations = moveAnalyser + .diff( + valuesWithoutRemoved + .map((value: DsoEditMetadataValue) => value.originalValue.place), + valuesWithoutRemoved + .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place) + .map((value: DsoEditMetadataValue) => value.originalValue.place)) + .map((operation: MoveOperation) => new MetadataPatchMoveOperation(field, +operation.from.substr(1), +operation.path.substr(1)).toOperation()); + operations.push(...moveOperations); }); return operations; } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index e72a9e84446..9941d03308d 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -1,4 +1,5 @@
    {{ mdValue.newValue.value }}
    @@ -34,8 +35,7 @@
    - - diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss index 1196aa1940c..bcf491b9ce3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss @@ -10,3 +10,7 @@ ::ng-deep .tooltip-inner { min-width: var(--ds-dso-edit-virtual-tooltip-min-width); } + +.cdk-drag-placeholder { + opacity: 0; +} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index b61255e4fe0..dce0ec68b0e 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -71,6 +71,11 @@ export class DsoEditMetadataValueComponent implements OnInit { */ @Output() undo: EventEmitter = new EventEmitter(); + /** + * Emits true when the user starts dragging a value, false when the user stops dragging + */ + @Output() dragging: EventEmitter = new EventEmitter(); + /** * The DsoEditMetadataChangeType enumeration for access in the component's template * @type {DsoEditMetadataChangeType} diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 0ca62ff1b68..e498dc373ea 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -48,6 +48,7 @@ [form]="form" [dsoType]="dsoType" [saving$]="saving$" + [draggingMdField$]="draggingMdField$" [mdField]="mdField" (valueSaved)="onValueSaved()"> diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index e98cc3663dc..7f98720b2ce 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -19,6 +19,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { TranslateService } from '@ngx-translate/core'; import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component'; import { Observable } from 'rxjs/internal/Observable'; +import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; @Component({ selector: 'ds-dso-edit-metadata', @@ -72,6 +73,13 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { */ saving$: BehaviorSubject = new BehaviorSubject(false); + /** + * Tracks for which metadata-field a drag operation is taking place + * Null when no drag is currently happening for any field + * This is a BehaviorSubject that is passed down to child components, to give them the power to alter the state + */ + draggingMdField$: BehaviorSubject = new BehaviorSubject(null); + /** * Whether or not the metadata field is currently being validated */ @@ -98,7 +106,8 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { constructor(protected route: ActivatedRoute, protected notificationsService: NotificationsService, protected translateService: TranslateService, - protected parentInjector: Injector) { + protected parentInjector: Injector, + protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer) { } /** @@ -167,7 +176,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { */ submit(): void { this.saving$.next(true); - this.updateDataService.patch(this.dso, this.form.getOperations()).pipe( + this.updateDataService.patch(this.dso, this.form.getOperations(this.arrayMoveChangeAnalyser)).pipe( getFirstCompletedRemoteData() ).subscribe((rd: RemoteData) => { this.saving$.next(false); From e0679d4ba69fa1e5ac9672870f1395a7d226114a Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 15 Dec 2022 14:56:29 -0600 Subject: [PATCH 224/758] Ensure all necessary build tools exist in image --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8eb3582ba31..61d960e7d3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,10 @@ WORKDIR /app ADD . /app/ EXPOSE 4000 +# Ensure Python and other build tools are available +# These are needed to install some node modules, especially on linux/arm64 +RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/* + # We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com # See, for example https://github.com/yarnpkg/yarn/issues/5540 RUN yarn install --network-timeout 300000 From ea275aff34fa1138afbc668f0ff2269cfbb557c6 Mon Sep 17 00:00:00 2001 From: Julian Timal <30701057+jtimal@users.noreply.github.com> Date: Thu, 15 Dec 2022 16:23:08 -0600 Subject: [PATCH 225/758] Use full community, collection and item names in breadcrumb navigation (#1957) * Add ngTooTip and property botton in ToolTip modify the breadcumbs html file to show the full name on mouseover * fixed in test of breadcumbs * Suggestion last breadcumb * Fix alignment (as it was before) Co-authored-by: Tim Donohue --- src/app/breadcrumbs/breadcrumbs.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html index 51524fde488..bff792eeff4 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.html +++ b/src/app/breadcrumbs/breadcrumbs.component.html @@ -10,7 +10,7 @@ -
  • {{text | translate}}
    • +
  • {{text | translate}}
    •  From 2fea10aced4194c73da32385d74eccf9527e9376 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Thu, 15 Dec 2022 17:18:22 -0600 Subject: [PATCH 226/758] add/remove comments --- .../media-viewer/media-viewer-video/caption-info.ts | 7 +++++++ .../media-viewer-video/media-viewer-video.component.html | 1 - .../media-viewer-video/media-viewer-video.component.ts | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts index 011249027fe..43996d096d4 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts +++ b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts @@ -1,3 +1,10 @@ +/* + The class is designed to host information related to Video Captioning support + and used in HTML 5 video track + src: source vtt file + srclang: two letter language code + langLabel: language label + */ export class CaptionInfo { constructor(public src: string, public srclang: string, public langLabel: string ) { } diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html index 5e744373930..0cc854b2721 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html +++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html @@ -10,7 +10,6 @@ preload="none" controls > - diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts index c4806d83063..cc08d2b4a06 100644 --- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts +++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts @@ -52,7 +52,6 @@ export class MediaViewerVideoComponent implements OnInit { filteredCapMedias .forEach((media, index) => { let srclang: string = media.bitstream.name.slice(-6, -4).toLowerCase(); - //capInfos[index] = new CaptionInfo( capInfos.push(new CaptionInfo( media.bitstream._links.content.href, srclang, From 9771d756b6a62498fe357044dffccfd4c2c67637 Mon Sep 17 00:00:00 2001 From: Mark Cooper Date: Fri, 26 Aug 2022 17:58:06 -0700 Subject: [PATCH 227/758] Enable / disable spellcheck for textarea inputs via config --- config/config.example.yml | 2 ++ .../group-registry/group-form/group-form.component.ts | 2 ++ .../bitstream-formats/format-form/format-form.component.ts | 2 ++ .../collection-form/collection-form.models.ts | 6 ++++++ .../community-form/community-form.component.ts | 5 +++++ .../shared/form/builder/parsers/textarea-field-parser.ts | 2 ++ src/config/default-app-config.ts | 1 + src/config/form-config.interfaces.ts | 1 + src/environments/environment.test.ts | 1 + 9 files changed, 22 insertions(+) diff --git a/config/config.example.yml b/config/config.example.yml index 1e55dfda5ff..beb0f7a0c94 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -55,6 +55,8 @@ auth: # Form settings form: + # Sets the spellcheck textarea attribute value + spellCheck: true # NOTE: Map server-side validators to comparative Angular form validators validatorMap: required: required 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 b0178f12948..584b28ba1e6 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 @@ -46,6 +46,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model'; import { NoContent } from '../../../core/shared/NoContent.model'; import { Operation } from 'fast-json-patch'; import { ValidateGroupExists } from './validators/group-exists.validator'; +import { environment } from '../../../../environments/environment'; @Component({ selector: 'ds-group-form', @@ -194,6 +195,7 @@ export class GroupFormComponent implements OnInit, OnDestroy { label: groupDescription, name: 'groupDescription', required: false, + spellCheck: environment.form.spellCheck, }); this.formModel = [ this.groupName, diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts index 161cfa7ecff..142f6fb83d5 100644 --- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts @@ -15,6 +15,7 @@ import { Router } from '@angular/router'; import { hasValue, isEmpty } from '../../../../shared/empty.util'; import { TranslateService } from '@ngx-translate/core'; import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths'; +import { environment } from '../../../../../environments/environment'; /** * The component responsible for rendering the form to create/edit a bitstream format @@ -90,6 +91,7 @@ export class FormatFormComponent implements OnInit { name: 'description', label: 'admin.registries.bitstream-formats.edit.description.label', hint: 'admin.registries.bitstream-formats.edit.description.hint', + spellCheck: environment.form.spellCheck, }), new DynamicSelectModel({ 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 37e9d8a9a0e..1a009d95a10 100644 --- a/src/app/collection-page/collection-form/collection-form.models.ts +++ b/src/app/collection-page/collection-form/collection-form.models.ts @@ -1,5 +1,6 @@ import { DynamicFormControlModel, DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core'; import { DynamicSelectModelConfig } from '@ng-dynamic-forms/core/lib/model/select/dynamic-select.model'; +import { environment } from '../../../environments/environment'; export const collectionFormEntityTypeSelectionConfig: DynamicSelectModelConfig = { id: 'entityType', @@ -26,21 +27,26 @@ export const collectionFormModels: DynamicFormControlModel[] = [ new DynamicTextAreaModel({ id: 'description', name: 'dc.description', + spellCheck: environment.form.spellCheck, }), new DynamicTextAreaModel({ id: 'abstract', name: 'dc.description.abstract', + spellCheck: environment.form.spellCheck, }), new DynamicTextAreaModel({ id: 'rights', name: 'dc.rights', + spellCheck: environment.form.spellCheck, }), new DynamicTextAreaModel({ id: 'tableofcontents', name: 'dc.description.tableofcontents', + spellCheck: environment.form.spellCheck, }), new DynamicTextAreaModel({ id: 'license', name: 'dc.rights.license', + spellCheck: environment.form.spellCheck, }) ]; diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts index a3730fd4182..c6dd1147c34 100644 --- a/src/app/community-page/community-form/community-form.component.ts +++ b/src/app/community-page/community-form/community-form.component.ts @@ -13,6 +13,7 @@ import { CommunityDataService } from '../../core/data/community-data.service'; import { AuthService } from '../../core/auth/auth.service'; import { RequestService } from '../../core/data/request.service'; import { ObjectCacheService } from '../../core/cache/object-cache.service'; +import { environment } from '../../../environments/environment'; /** * Form used for creating and editing communities @@ -52,18 +53,22 @@ export class CommunityFormComponent extends ComColFormComponent { new DynamicTextAreaModel({ id: 'description', name: 'dc.description', + spellCheck: environment.form.spellCheck, }), new DynamicTextAreaModel({ id: 'abstract', name: 'dc.description.abstract', + spellCheck: environment.form.spellCheck, }), new DynamicTextAreaModel({ id: 'rights', name: 'dc.rights', + spellCheck: environment.form.spellCheck, }), new DynamicTextAreaModel({ id: 'tableofcontents', name: 'dc.description.tableofcontents', + spellCheck: environment.form.spellCheck, }), ]; diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.ts index 740e94721f1..548ce567c3e 100644 --- a/src/app/shared/form/builder/parsers/textarea-field-parser.ts +++ b/src/app/shared/form/builder/parsers/textarea-field-parser.ts @@ -5,6 +5,7 @@ import { DsDynamicTextAreaModel, DsDynamicTextAreaModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model'; +import { environment } from '../../../../../environments/environment'; export class TextareaFieldParser extends FieldParser { @@ -20,6 +21,7 @@ export class TextareaFieldParser extends FieldParser { }; textAreaModelConfig.rows = 10; + textAreaModelConfig.spellCheck = environment.form.spellCheck; this.setValues(textAreaModelConfig, fieldValue); const textAreaModel = new DsDynamicTextAreaModel(textAreaModelConfig, layout); diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index a6949fabe24..bc8ff14e03c 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -93,6 +93,7 @@ export class DefaultAppConfig implements AppConfig { // Form settings form: FormConfig = { + spellCheck: true, // NOTE: Map server-side validators to comparative Angular form validators validatorMap: { required: 'required', diff --git a/src/config/form-config.interfaces.ts b/src/config/form-config.interfaces.ts index e13fdc1c605..50769c2d2fe 100644 --- a/src/config/form-config.interfaces.ts +++ b/src/config/form-config.interfaces.ts @@ -5,5 +5,6 @@ export interface ValidatorMap { } export interface FormConfig extends Config { + spellCheck: boolean; validatorMap: ValidatorMap; } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index ec49ff60091..19eec26a140 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -78,6 +78,7 @@ export const environment: BuildConfig = { // Form settings form: { + spellCheck: true, // NOTE: Map server-side validators to comparative Angular form validators validatorMap: { required: 'required', From a40d93a9411890502a3fe56826f4ee9c5efdb14c Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Fri, 16 Dec 2022 11:41:09 +0100 Subject: [PATCH 228/758] 97399 Implemented basic working tooltip on top level community list --- .../top-level-community-list.component.html | 6 +++- .../context-help-wrapper.component.html | 26 +++++++++++++++++ .../context-help-wrapper.component.scss | 25 ++++++++++++++++ .../context-help-wrapper.component.spec.ts | 25 ++++++++++++++++ .../context-help-wrapper.component.ts | 23 +++++++++++++++ src/app/shared/context-help.directive.spec.ts | 8 +++++ src/app/shared/context-help.directive.ts | 29 +++++++++++++++++++ src/app/shared/shared.module.ts | 7 ++++- src/assets/i18n/en.json5 | 5 +++- src/styles/_custom_variables.scss | 3 ++ 10 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.html create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.scss create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts create mode 100644 src/app/shared/context-help-wrapper/context-help-wrapper.component.ts create mode 100644 src/app/shared/context-help.directive.spec.ts create mode 100644 src/app/shared/context-help.directive.ts diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html index dbea87a1752..064b308ed5f 100644 --- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html +++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html @@ -1,6 +1,10 @@
    -

    {{'home.top-level-communities.head' | translate}}

    +

    + + {{'home.top-level-communities.head' | translate}} +

    {{'home.top-level-communities.help' | translate}}

    + +
    {{ content | translate }}
    +     + + + + + + + + + + + + + + + + + diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss new file mode 100644 index 00000000000..30bbac02ffc --- /dev/null +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss @@ -0,0 +1,25 @@ +:host { + position: relative; +} + +.ds-context-help-icon { + position: absolute; + top: 0; +} + +.ds-context-help-icon-left { + left: var(--ds-context-x-offset); + color: var(--bs-info); + background-color: var(--bs-white); + font-size: (--dscontext-help-icon-size); + line-height: 1; + border-radius: 50%; +} + +.ds-context-help-icon-right { + right: var(--ds-context-icon-width); +} + +::ng-deep .tooltip-inner { + max-width: 300px; +} diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts new file mode 100644 index 00000000000..aee7a0c6966 --- /dev/null +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ContextHelpWrapperComponent } from './context-help-wrapper.component'; + +describe('ContextHelpWrapperComponent', () => { + let component: ContextHelpWrapperComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ContextHelpWrapperComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ContextHelpWrapperComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts new file mode 100644 index 00000000000..b39c2b2f063 --- /dev/null +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts @@ -0,0 +1,23 @@ +import { Component, Input, OnInit, TemplateRef } from '@angular/core'; +import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning'; + +export type PlacementDir = 'left' | 'right'; + +@Component({ + selector: 'ds-context-help-wrapper', + templateUrl: './context-help-wrapper.component.html', + styleUrls: ['./context-help-wrapper.component.scss'] +}) +export class ContextHelpWrapperComponent implements OnInit { + @Input() templateRef: TemplateRef; + @Input() content: string; + @Input() tooltipPlacement: PlacementArray; // TODO: type + // @Input('iconPlacement') iconPlacement: string; + + constructor() { } + + ngOnInit(): void { + // console.log("In ContextHelpWrapperComponent.ngOnInit:", this.content); // XXX + } + +} diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts new file mode 100644 index 00000000000..f00fb9d355b --- /dev/null +++ b/src/app/shared/context-help.directive.spec.ts @@ -0,0 +1,8 @@ +import { ContextHelpDirective } from './context-help.directive'; + +describe('ContextHelpDirective', () => { + it('should create an instance', () => { + const directive = new ContextHelpDirective(); + expect(directive).toBeTruthy(); + }); +}); diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts new file mode 100644 index 00000000000..712950a6f12 --- /dev/null +++ b/src/app/shared/context-help.directive.ts @@ -0,0 +1,29 @@ +import { ComponentFactoryResolver, ComponentRef, Directive, Input, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; +import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning'; +import { ContextHelpWrapperComponent, PlacementDir } from './context-help-wrapper/context-help-wrapper.component'; + +@Directive({ + selector: '[dsContextHelp]' +}) +export class ContextHelpDirective implements OnInit { + @Input('dsContextHelp') content: string; + @Input('dsTooltipPlacement') tooltipPlacement: PlacementArray; + // @Input('iconPlacement') iconPlacement: PlacementDir; + + protected wrapper: ComponentRef; + + constructor( + private templateRef: TemplateRef, + private viewContainerRef: ViewContainerRef, + private componentFactoryResolver: ComponentFactoryResolver + ){} + + ngOnInit() { + const factory + = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent); + this.wrapper = this.viewContainerRef.createComponent(factory); + this.wrapper.instance.templateRef = this.templateRef; + this.wrapper.instance.content = this.content; + this.wrapper.instance.tooltipPlacement = this.tooltipPlacement; + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 715ee66a99b..0b51ba131c4 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -177,6 +177,8 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { DsSelectComponent } from './ds-select/ds-select.component'; import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'; +import { ContextHelpDirective } from './context-help.directive'; +import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -454,6 +456,8 @@ const DIRECTIVES = [ ...SHARED_ITEM_PAGE_COMPONENTS, ItemVersionsSummaryModalComponent, ItemVersionsDeleteModalComponent, + ContextHelpDirective, + ContextHelpWrapperComponent, ], providers: [ ...PROVIDERS @@ -464,7 +468,8 @@ const DIRECTIVES = [ ...COMPONENTS, ...SHARED_ITEM_PAGE_COMPONENTS, ...DIRECTIVES, - TranslateModule + TranslateModule, + ContextHelpDirective ] }) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f742273edbe..c9d9a326998 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4162,5 +4162,8 @@ "idle-modal.log-out": "Log out", - "idle-modal.extend-session": "Extend session" + "idle-modal.extend-session": "Extend session", + + "context-help.multi-para.test": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In facilisis ac metus ut tristique. Integer eros risus, efficitur non urna eu, ultrices mollis felis. Nullam mi sapien, mattis eu nunc in, rhoncus vulputate risus. \n\nDuis pharetra et nibh aliquam sodales. Integer ut rutrum dolor, ut maximus quam. Nunc sit amet maximus urna. In nec erat vulputate, facilisis nulla a, scelerisque orci. Ut pellentesque sapien et eros euismod scelerisque finibus at sem. Duis egestas convallis ligula nec laoreet. \n\nProin ut magna sit amet libero consequat ultrices et sed mi. Nam congue sed risus ac fringilla. Suspendisse potenti. Cras mattis, est non laoreet elementum, erat enim interdum tortor, eu placerat enim metus sit amet enim.", + } diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 66e0e87f93c..15c595a5647 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -85,4 +85,7 @@ --ds-slider-handle-width: 18px; --ds-search-form-scope-max-width: 150px; + + --ds-context-x-offset: -16px; + --dscontext-help-icon-size: 16px; } From bf9612e9674edb76cfba59194dc480fdde0d9c52 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Fri, 16 Dec 2022 15:08:32 +0100 Subject: [PATCH 229/758] 93747: Edit metadata redesign - drag to reorder pt2 --- ...-edit-metadata-field-values.component.html | 2 +- .../dso-edit-metadata-form.ts | 67 +++++++++++++++---- .../dso-edit-metadata-value.component.html | 6 +- .../dso-edit-metadata.component.html | 4 ++ .../dso-edit-metadata.component.scss | 4 ++ src/assets/i18n/en.json5 | 2 + 6 files changed, 69 insertions(+), 16 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html index 190d5a7e31b..cfa457580f3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html @@ -7,7 +7,7 @@ [isOnlyValue]="form.fields[mdField].length === 1" (edit)="mdValue.editing = true" (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()" - (remove)="mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()" + (remove)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()" (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()" (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)"> diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index cc1f55838ba..b97c838ffb3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -48,6 +48,11 @@ export class DsoEditMetadataValue { */ change: DsoEditMetadataChangeType; + /** + * A flag to keep track if the value has been reordered (place has changed) + */ + reordered = false; + /** * A type or change that can be used to undo any discarding that took place */ @@ -69,8 +74,9 @@ export class DsoEditMetadataValue { * It will also set the editing flag to false */ confirmChanges(finishEditing = false) { + this.reordered = this.originalValue.place !== this.newValue.place; if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) { - if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language || this.originalValue.place !== this.newValue.place)) { + if ((this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language)) { this.change = DsoEditMetadataChangeType.UPDATE; } else { this.change = undefined; @@ -87,7 +93,7 @@ export class DsoEditMetadataValue { * return false (which is desired) */ hasChanges(): boolean { - return hasValue(this.change); + return hasValue(this.change) || this.reordered; } /** @@ -95,21 +101,25 @@ export class DsoEditMetadataValue { * properties */ discardAndMarkReinstatable(): void { - if (this.change === DsoEditMetadataChangeType.UPDATE) { + if (this.change === DsoEditMetadataChangeType.UPDATE || this.reordered) { this.reinstatableValue = this.newValue; } this.reinstatableChange = this.change; - this.discard(); + this.discard(false); } /** * Discard the current changes * Call discardAndMarkReinstatable() instead, if the discard should be re-instatable */ - discard(): void { + discard(keepPlace = true): void { this.change = undefined; + const place = this.newValue.place; this.newValue = Object.assign(new MetadataValue(), this.originalValue); - this.editing = false; + if (keepPlace) { + this.newValue.place = place; + } + this.confirmChanges(true); } /** @@ -124,6 +134,7 @@ export class DsoEditMetadataValue { this.change = this.reinstatableChange; this.reinstatableChange = undefined; } + this.confirmChanges(); } /** @@ -190,6 +201,7 @@ export class DsoEditMetadataForm { this.fieldKeys.push(mdField); this.setValuesForFieldSorted(mdField, values.map((value: MetadataValue) => new DsoEditMetadataValue(value))); }); + this.sortFieldKeys(); } /** @@ -225,6 +237,7 @@ export class DsoEditMetadataForm { private addValueToField(value: DsoEditMetadataValue, mdField: string): void { if (isEmpty(this.fields[mdField])) { this.fieldKeys.push(mdField); + this.sortFieldKeys(); this.fields[mdField] = []; } this.fields[mdField].push(value); @@ -252,6 +265,14 @@ export class DsoEditMetadataForm { return Object.values(this.fields).some((values: DsoEditMetadataValue[]) => values.some((value: DsoEditMetadataValue) => value.hasChanges())); } + /** + * Check if a metadata field contains changes within its order (place property of values) + * @param mdField + */ + hasOrderChanges(mdField: string): boolean { + return this.fields[mdField].some((value: DsoEditMetadataValue) => value.originalValue.place !== value.newValue.place); + } + /** * Discard all changes within the form and store their current values within re-instatable properties so they can be * undone afterwards @@ -285,12 +306,34 @@ export class DsoEditMetadataForm { } }); this.fieldKeys = [...this.originalFieldKeys]; + this.sortFieldKeys(); // Reset the order of values within their fields to match their place property this.fieldKeys.forEach((field: string) => { this.setValuesForFieldSorted(field, this.fields[field]); }); } + /** + * Reset the order of values within a metadata field to their original places + * Update the actual array to match the place properties + * @param mdField + */ + resetOrder(mdField: string) { + this.fields[mdField].forEach((value: DsoEditMetadataValue) => { + value.newValue.place = value.originalValue.place; + value.confirmChanges(); + }); + this.setValuesForFieldSorted(mdField, this.fields[mdField]); + } + + /** + * Sort fieldKeys alphabetically + * Should be called whenever a field is added to ensure the alphabetical order is kept + */ + sortFieldKeys() { + this.fieldKeys.sort((a: string, b: string) => a.localeCompare(b)); + } + /** * Undo any previously discarded changes */ @@ -356,10 +399,10 @@ export class DsoEditMetadataForm { const replaceOperations: MetadataPatchReplaceOperation[] = []; const removeOperations: MetadataPatchRemoveOperation[] = []; const addOperations: MetadataPatchAddOperation[] = []; - values + [...values] .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place) .forEach((value: DsoEditMetadataValue) => { - if (value.hasChanges()) { + if (hasValue(value.change)) { if (value.change === DsoEditMetadataChangeType.UPDATE) { // Only changes to value or language are considered "replace" operations. Changes to place are considered "move", which is processed below. if (value.originalValue.value !== value.newValue.value || value.originalValue.language !== value.newValue.language) { @@ -398,10 +441,10 @@ export class DsoEditMetadataForm { const moveOperations = moveAnalyser .diff( valuesWithoutRemoved - .map((value: DsoEditMetadataValue) => value.originalValue.place), - valuesWithoutRemoved - .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place) - .map((value: DsoEditMetadataValue) => value.originalValue.place)) + .map((value: DsoEditMetadataValue) => value.newValue.place), + [...valuesWithoutRemoved] + .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place) + .map((value: DsoEditMetadataValue) => value.newValue.place)) .map((operation: MoveOperation) => new MetadataPatchMoveOperation(field, +operation.from.substr(1), +operation.path.substr(1)).toOperation()); operations.push(...moveOperations); }); diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index 9941d03308d..4e5890ae7d1 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -1,6 +1,6 @@
    + [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
    {{ mdValue.newValue.value }}
    +
    + + {{ 'system-wide-alert.form.error.message' | translate }} + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + {{'system-wide-alert.form.label.countdownTo.hint' | translate}} +
    + +
    + + +
    + +
    diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss new file mode 100644 index 00000000000..ce3e065cafb --- /dev/null +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss @@ -0,0 +1,3 @@ +.timepicker-margin { + margin-top: -38px; +} diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts new file mode 100644 index 00000000000..435aef3a7d5 --- /dev/null +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts @@ -0,0 +1,219 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service'; +import { SystemWideAlert } from '../system-wide-alert.model'; +import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz'; +import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { createPaginatedList } from '../../shared/testing/utils.test'; +import { TranslateModule } from '@ngx-translate/core'; +import { SystemWideAlertFormComponent } from './system-wide-alert-form.component'; +import { RequestService } from '../../core/data/request.service'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import { RouterStub } from '../../shared/testing/router.stub'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { Router } from '@angular/router'; +import { FormsModule } from '@angular/forms'; +import { SharedModule } from '../../shared/shared.module'; +import { UiSwitchModule } from 'ngx-ui-switch'; + +describe('SystemWideAlertFormComponent', () => { + let comp: SystemWideAlertFormComponent; + let fixture: ComponentFixture; + let systemWideAlertDataService: SystemWideAlertDataService; + + let systemWideAlert: SystemWideAlert; + let requestService: RequestService; + let notificationsService; + let router; + + + beforeEach(waitForAsync(() => { + + const countDownDate = new Date(); + countDownDate.setDate(countDownDate.getDate() + 1); + countDownDate.setHours(countDownDate.getHours() + 1); + countDownDate.setMinutes(countDownDate.getMinutes() + 1); + + systemWideAlert = Object.assign(new SystemWideAlert(), { + alertId: 1, + message: 'Test alert message', + active: true, + countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString() + }); + + systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', { + findAll: createSuccessfulRemoteDataObject$(createPaginatedList([systemWideAlert])), + put: createSuccessfulRemoteDataObject$(systemWideAlert), + create: createSuccessfulRemoteDataObject$(systemWideAlert) + }); + + requestService = jasmine.createSpyObj('requestService', ['setStaleByHrefSubstring']); + + notificationsService = new NotificationsServiceStub(); + router = new RouterStub(); + + TestBed.configureTestingModule({ + imports: [FormsModule, SharedModule, UiSwitchModule, TranslateModule.forRoot()], + declarations: [SystemWideAlertFormComponent], + providers: [ + {provide: SystemWideAlertDataService, useValue: systemWideAlertDataService}, + {provide: NotificationsService, useValue: notificationsService}, + {provide: Router, useValue: router}, + {provide: RequestService, useValue: requestService}, + ] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SystemWideAlertFormComponent); + comp = fixture.componentInstance; + + spyOn(comp, 'createForm').and.callThrough(); + spyOn(comp, 'initFormValues').and.callThrough(); + + fixture.detectChanges(); + }); + + describe('init', () => { + it('should init the comp', () => { + expect(comp).toBeTruthy(); + }); + it('should create the form and init the values based on an existing alert', () => { + expect(comp.createForm).toHaveBeenCalled(); + expect(comp.initFormValues).toHaveBeenCalledWith(systemWideAlert); + }); + }); + + describe('createForm', () => { + it('should create the form', () => { + const now = new Date(); + + comp.createForm(); + expect(comp.formMessage.value).toEqual(''); + expect(comp.formActive.value).toEqual(false); + expect(comp.time).toEqual({hour: now.getHours(), minute: now.getMinutes()}); + expect(comp.date).toEqual({year: now.getFullYear(), month: now.getMonth() + 1, day: now.getDate()}); + }); + }); + + describe('initFormValues', () => { + it('should fill in the form based on the provided system-wide alert', () => { + comp.initFormValues(systemWideAlert); + + const countDownTo = zonedTimeToUtc(systemWideAlert.countdownTo, 'UTC'); + + expect(comp.formMessage.value).toEqual(systemWideAlert.message); + expect(comp.formActive.value).toEqual(true); + expect(comp.time).toEqual({hour: countDownTo.getHours(), minute: countDownTo.getMinutes()}); + expect(comp.date).toEqual({ + year: countDownTo.getFullYear(), + month: countDownTo.getMonth() + 1, + day: countDownTo.getDate() + }); + }); + }); + describe('save', () => { + it('should update the exising alert with the form values and show a success notification on success', () => { + spyOn(comp, 'back'); + comp.currentAlert = systemWideAlert; + + comp.formMessage.patchValue('New message'); + comp.formActive.patchValue(true); + comp.time = {hour: 4, minute: 26}; + comp.date = {year: 2023, month: 1, day: 25}; + + const expectedAlert = new SystemWideAlert(); + expectedAlert.alertId = systemWideAlert.alertId; + expectedAlert.message = 'New message'; + expectedAlert.active = true; + const countDownTo = new Date(2023, 0, 25, 4, 26); + expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString(); + + comp.save(); + + expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert); + expect(notificationsService.success).toHaveBeenCalled(); + expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts'); + expect(comp.back).toHaveBeenCalled(); + }); + it('should update the exising alert with the form values and show a error notification on error', () => { + spyOn(comp, 'back'); + (systemWideAlertDataService.put as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$()); + comp.currentAlert = systemWideAlert; + + comp.formMessage.patchValue('New message'); + comp.formActive.patchValue(true); + comp.time = {hour: 4, minute: 26}; + comp.date = {year: 2023, month: 1, day: 25}; + + const expectedAlert = new SystemWideAlert(); + expectedAlert.alertId = systemWideAlert.alertId; + expectedAlert.message = 'New message'; + expectedAlert.active = true; + const countDownTo = new Date(2023, 0, 25, 4, 26); + expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString(); + + comp.save(); + + expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert); + expect(notificationsService.error).toHaveBeenCalled(); + expect(requestService.setStaleByHrefSubstring).not.toHaveBeenCalledWith('systemwidealerts'); + expect(comp.back).not.toHaveBeenCalled(); + }); + it('should create a new alert with the form values and show a success notification on success', () => { + spyOn(comp, 'back'); + comp.currentAlert = undefined; + + comp.formMessage.patchValue('New message'); + comp.formActive.patchValue(true); + comp.time = {hour: 4, minute: 26}; + comp.date = {year: 2023, month: 1, day: 25}; + + const expectedAlert = new SystemWideAlert(); + expectedAlert.message = 'New message'; + expectedAlert.active = true; + const countDownTo = new Date(2023, 0, 25, 4, 26); + expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString(); + + comp.save(); + + expect(systemWideAlertDataService.create).toHaveBeenCalledWith(expectedAlert); + expect(notificationsService.success).toHaveBeenCalled(); + expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts'); + expect(comp.back).toHaveBeenCalled(); + + }); + it('should create a new alert with the form values and show a error notification on error', () => { + spyOn(comp, 'back'); + (systemWideAlertDataService.create as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$()); + + comp.currentAlert = undefined; + + comp.formMessage.patchValue('New message'); + comp.formActive.patchValue(true); + comp.time = {hour: 4, minute: 26}; + comp.date = {year: 2023, month: 1, day: 25}; + + const expectedAlert = new SystemWideAlert(); + expectedAlert.message = 'New message'; + expectedAlert.active = true; + const countDownTo = new Date(2023, 0, 25, 4, 26); + expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString(); + + comp.save(); + + expect(systemWideAlertDataService.create).toHaveBeenCalledWith(expectedAlert); + expect(notificationsService.error).toHaveBeenCalled(); + expect(requestService.setStaleByHrefSubstring).not.toHaveBeenCalledWith('systemwidealerts'); + expect(comp.back).not.toHaveBeenCalled(); + + }); + }); + describe('back', () => { + it('should navigate back to the home page', () => { + comp.back(); + expect(router.navigate).toHaveBeenCalledWith(['/home']); + }); + }); + + +}); diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts new file mode 100644 index 00000000000..59aa9166ce4 --- /dev/null +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts @@ -0,0 +1,163 @@ +import { Component, OnInit } from '@angular/core'; +import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; +import { filter, map } from 'rxjs/operators'; +import { PaginatedList } from '../../core/data/paginated-list.model'; +import { SystemWideAlert } from '../system-wide-alert.model'; +import { hasValue, isNotEmpty } from '../../shared/empty.util'; +import { Observable } from 'rxjs'; +import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; +import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; +import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz'; +import { RemoteData } from '../../core/data/remote-data'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { Router } from '@angular/router'; +import { RequestService } from '../../core/data/request.service'; +import { TranslateService } from '@ngx-translate/core'; + + +/** + * Component responsible for rendering the form to update a system-wide alert + */ +@Component({ + selector: 'ds-system-wide-alert-form', + styleUrls: ['./system-wide-alert-form.component.scss'], + templateUrl: './system-wide-alert-form.component.html' +}) +export class SystemWideAlertFormComponent implements OnInit { + + /** + * Observable to track an existing system-wide alert + */ + systemWideAlert$: Observable; + + /** + * The currently configured system-wide alert + */ + currentAlert: SystemWideAlert; + + /** + * The form group representing the system-wide alert + */ + alertForm: FormGroup; + + /** + * Date object to store the countdown date part + */ + date: NgbDateStruct; + + /** + * Object to store the countdown time part + */ + time; + + + constructor( + protected systemWideAlertDataService: SystemWideAlertDataService, + protected notificationsService: NotificationsService, + protected router: Router, + protected requestService: RequestService, + protected translateService: TranslateService + ) { + } + + ngOnInit() { + this.systemWideAlert$ = this.systemWideAlertDataService.findAll().pipe( + getFirstSucceededRemoteDataPayload(), + map((payload: PaginatedList) => payload.page), + filter((page) => isNotEmpty(page)), + map((page) => page[0]) + ); + this.createForm(); + + this.systemWideAlert$.subscribe((alert) => { + this.currentAlert = alert; + this.initFormValues(alert); + }); + } + + /** + * Creates the form with empty values + */ + createForm() { + this.alertForm = new FormBuilder().group({ + formMessage: new FormControl('', { + validators: [Validators.required], + }), + formActive: new FormControl(false), + } + ); + this.setDateTime(new Date()); + } + + /** + * Sets the form values based on the values retrieve from the provided system-wide alert + * @param alert - System-wide alert to use to init the form + */ + initFormValues(alert: SystemWideAlert) { + this.formMessage.patchValue(alert.message); + this.formActive.patchValue(alert.active); + const countDownTo = zonedTimeToUtc(alert.countdownTo, 'UTC'); + if (countDownTo.getTime() - new Date().getTime() > 0) { + this.setDateTime(countDownTo); + } + + } + + private setDateTime(dateToSet) { + this.time = {hour: dateToSet.getHours(), minute: dateToSet.getMinutes()}; + this.date = {year: dateToSet.getFullYear(), month: dateToSet.getMonth() + 1, day: dateToSet.getDate()}; + + } + + get formMessage() { + return this.alertForm.get('formMessage'); + } + + get formActive() { + return this.alertForm.get('formActive'); + } + + /** + * Save the system-wide alert present in the form + * When no alert is present yet on the server, a new one will be created + * When one already exists, the existing one will be updated + */ + save() { + const alert = new SystemWideAlert(); + alert.message = this.formMessage.value; + alert.active = this.formActive.value; + const countDownTo = new Date(this.date.year, this.date.month - 1, this.date.day, this.time.hour, this.time.minute); + alert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString(); + + if (hasValue(this.currentAlert)) { + const updatedAlert = Object.assign(new SystemWideAlert(), this.currentAlert, alert); + this.handleResponse(this.systemWideAlertDataService.put(updatedAlert), 'system-wide-alert.form.update'); + } else { + this.handleResponse(this.systemWideAlertDataService.create(alert), 'system-wide-alert.form.create'); + } + } + + private handleResponse(response$: Observable>, messagePrefix) { + response$.pipe( + getFirstCompletedRemoteData() + ).subscribe((response: RemoteData) => { + if (response.hasSucceeded) { + this.notificationsService.success(this.translateService.get(`${messagePrefix}.success`)); + this.requestService.setStaleByHrefSubstring('systemwidealerts'); + this.back(); + } else { + this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`, response.errorMessage)); + } + }); + } + + /** + * Navigate back to the homepage + */ + back() { + this.router.navigate(['/home']); + } + + +} diff --git a/src/app/system-wide-alert/system-wide-alert-routing.module.ts b/src/app/system-wide-alert/system-wide-alert-routing.module.ts new file mode 100644 index 00000000000..beb1b32187a --- /dev/null +++ b/src/app/system-wide-alert/system-wide-alert-routing.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { + SiteAdministratorGuard +} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; +import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { + path: '', + canActivate: [SiteAdministratorGuard], + component: SystemWideAlertFormComponent, + }, + + ]) + ] +}) +export class SystemWideAlertRoutingModule { + +} diff --git a/src/app/system-wide-alert/system-wide-alert.model.ts b/src/app/system-wide-alert/system-wide-alert.model.ts new file mode 100644 index 00000000000..158deb26036 --- /dev/null +++ b/src/app/system-wide-alert/system-wide-alert.model.ts @@ -0,0 +1,55 @@ +import { autoserialize, deserialize } from 'cerialize'; +import { typedObject } from '../core/cache/builders/build-decorators'; +import { CacheableObject } from '../core/cache/cacheable-object.model'; +import { HALLink } from '../core/shared/hal-link.model'; +import { ResourceType } from '../core/shared/resource-type'; +import { excludeFromEquals } from '../core/utilities/equals.decorators'; +import { SYSTEMWIDEALERT } from './system-wide-alert.resource-type'; + +/** + * Object representing a system-wide alert + */ +@typedObject +export class SystemWideAlert implements CacheableObject { + static type = SYSTEMWIDEALERT; + + /** + * The object type + */ + @excludeFromEquals + @autoserialize + type: ResourceType; + + /** + * The identifier for this system-wide alert + */ + @autoserialize + alertId: string; + + /** + * The message for this system-wide alert + */ + @autoserialize + message: string; + + /** + * A string representation of the date to which this system-wide alert will count down when active + */ + @autoserialize + countdownTo: string; + + /** + * Whether the system-wide alert is active + */ + @autoserialize + active: boolean; + + + /** + * The {@link HALLink}s for this system-wide alert + */ + @deserialize + _links: { + self: HALLink, + }; +} diff --git a/src/app/system-wide-alert/system-wide-alert.module.ts b/src/app/system-wide-alert/system-wide-alert.module.ts new file mode 100644 index 00000000000..ce2a87f9820 --- /dev/null +++ b/src/app/system-wide-alert/system-wide-alert.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { SystemWideAlertBannerComponent } from './alert-banner/system-wide-alert-banner.component'; +import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component'; +import { SharedModule } from '../shared/shared.module'; +import { SystemWideAlertDataService } from '../core/data/system-wide-alert-data.service'; +import { SystemWideAlertRoutingModule } from './system-wide-alert-routing.module'; +import { UiSwitchModule } from 'ngx-ui-switch'; + +@NgModule({ + imports: [ + FormsModule, + SharedModule, + UiSwitchModule, + SystemWideAlertRoutingModule, + ], + exports: [ + SystemWideAlertBannerComponent + ], + declarations: [ + SystemWideAlertBannerComponent, + SystemWideAlertFormComponent + ], + providers: [ + SystemWideAlertDataService + ] +}) +export class SystemWideAlertModule { + +} diff --git a/src/app/system-wide-alert/system-wide-alert.resource-type.ts b/src/app/system-wide-alert/system-wide-alert.resource-type.ts new file mode 100644 index 00000000000..f67f00719bd --- /dev/null +++ b/src/app/system-wide-alert/system-wide-alert.resource-type.ts @@ -0,0 +1,10 @@ +/** + * The resource type for SystemWideAlert + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ + +import { ResourceType } from '../core/shared/resource-type'; + +export const SYSTEMWIDEALERT = new ResourceType('systemwidealert'); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 597f226cc75..dd52b7dd9d2 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4811,4 +4811,47 @@ "person.orcid.registry.auth": "ORCID Authorizations", "home.recent-submissions.head": "Recent Submissions", + + + "system-wide-alert-banner.countdown.prefix": "In", + + "system-wide-alert-banner.countdown.days": "{{days}} day(s),", + + "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and", + + "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):", + + + + "menu.section.system-wide-alert": "System-wide Alerts", + + "system-wide-alert.form.header": "System-wide Alerts", + + "system-wide-alert.form.cancel": "Cancel", + + "system-wide-alert.form.save": "Save", + + "system-wide-alert.form.label.active": "ACTIVE", + + "system-wide-alert.form.label.inactive": "INACTIVE", + + "system-wide-alert.form.error.message": "The system wide alert must have a message", + + "system-wide-alert.form.label.message": "Alert message", + + "system-wide-alert.form.label.countdownTo": "Count down", + + "system-wide-alert.form.label.countdownTo.hint": "Hint: When a date in the future is set, the system wide alert banner will perform a countdown to the set date. Setting the date to the current time or in the past will disable the countdown.", + + "system-wide-alert.form.update.success": "The system-wide alert was successfully updated", + + "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert", + + "system-wide-alert.form.create.success": "The system-wide alert was successfully created", + + "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert", + + "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", + + "admin.system-wide-alert.title": "System-wide Alerts", } diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index d2ac0ae7877..3aacac9c739 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -114,6 +114,7 @@ import { ObjectListComponent } from './app/shared/object-list/object-list.compon import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component'; import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component'; import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component'; +import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module'; const DECLARATIONS = [ FileSectionComponent, @@ -220,6 +221,7 @@ const DECLARATIONS = [ FormsModule, ResourcePoliciesModule, ComcolModule, + SystemWideAlertModule ], declarations: DECLARATIONS, exports: [ diff --git a/yarn.lock b/yarn.lock index 9542bfdbe18..2e2ce3140e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4759,6 +4759,16 @@ data-urls@^3.0.1: whatwg-mimetype "^3.0.0" whatwg-url "^10.0.0" +date-fns-tz@^1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.7.tgz#e8e9d2aaceba5f1cc0e677631563081fdcb0e69a" + integrity sha512-1t1b8zyJo+UI8aR+g3iqr5fkUHWpd58VBx8J/ZSQ+w7YrGlw80Ag4sA86qkfCXRBLmMc4I2US+aPMd4uKvwj5g== + +date-fns@^2.29.3: + version "2.29.3" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" + integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== + date-format@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.4.tgz#b58036e29e74121fca3e1b3e0dc4a62c65faa233" From b6218494e548a4bdf11689ce39056df2007a2b1b Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Fri, 23 Dec 2022 12:15:35 +0100 Subject: [PATCH 256/758] 97425: Fix countdown timer intial display and remove rounded banner corner --- .../alert-banner/system-wide-alert-banner.component.html | 2 +- .../alert-banner/system-wide-alert-banner.component.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html index 3e360cc55e9..5f741091f1e 100644 --- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html +++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html @@ -1,5 +1,5 @@
    -
    +
    diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts index b405957c54f..57a9604f90e 100644 --- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts +++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts @@ -64,6 +64,7 @@ export class SystemWideAlertBannerComponent implements OnInit, OnDestroy { const date = zonedTimeToUtc(alert.countdownTo, 'UTC'); const timeDifference = date.getTime() - new Date().getTime(); if (timeDifference > 0) { + this.allocateTimeUnits(timeDifference); return interval(1000); } } From f15ca85afd9043aedb4402d619d721ebc66f1ba3 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 23 Dec 2022 13:18:40 +0100 Subject: [PATCH 257/758] [CST-7757] Subscriptions porting (wip) --- .../subscription-modal.component.html | 5 +- .../subscription-modal.component.ts | 176 ++++++------------ 2 files changed, 54 insertions(+), 127 deletions(-) diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html index 53119d9a152..52746fb5c84 100644 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html @@ -17,9 +17,8 @@

    {{'item.page.subscriptions.modal.title' | translate}} -
    - +
    +
    diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts index c249cc592b6..e0d025be548 100644 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts @@ -1,38 +1,23 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; - -import { - AbstractControl, - FormArray, - FormBuilder, - FormControl, - FormGroup, - ValidatorFn, - Validators -} from '@angular/forms'; +import { Component, Input, OnInit } from '@angular/core'; + +import { FormBuilder, FormGroup } from '@angular/forms'; import { Subscription } from '../../models/subscription.model'; -import { BehaviorSubject, Observable } from 'rxjs'; +import { BehaviorSubject, Observable, shareReplay } from 'rxjs'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { SubscriptionService } from '../../subscription.service'; import { NotificationsService } from '../../../notifications/notifications.service'; -import { NotificationType } from '../../../notifications/models/notification-type'; -import { NotificationOptions } from '../../../notifications/models/notification-options.model'; -import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { hasValue } from '../../../empty.util'; -import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; - -import { filter, map, switchMap, take, tap } from 'rxjs/operators'; -import { NoContent } from '../../../../core/shared/NoContent.model'; +import { map, switchMap, take, tap } from 'rxjs/operators'; import { RemoteData } from '../../../../core/data/remote-data'; import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; import { AuthService } from '../../../../core/auth/auth.service'; @Component({ @@ -70,6 +55,8 @@ export class SubscriptionModalComponent implements OnInit { ePersonId$: Observable; + ePersonId: string; + /** * Types of subscription to be shown on select */ @@ -98,6 +85,10 @@ export class SubscriptionModalComponent implements OnInit { this.ePersonId$ = this.authService.getAuthenticatedUserFromStore().pipe( take(1), map((ePerson) => ePerson.uuid), + tap((res) => { + this.ePersonId = res; + }), + shareReplay(), ); this.subscriptionForm = this.formBuilder.group({}); @@ -138,9 +129,9 @@ export class SubscriptionModalComponent implements OnInit { // TODO loop over subscription types // for (let type of this.subscriptionTypes) { - const type = 'content'; // remove + const type = 'content'; // TODO remove const subscription = this.subscriptions.find((s) => s.subscriptionType === type); - // TODO manage multiple subscriptions with same tipe (there should be only one) + // TODO manage multiple subscriptions with same type (there should be only one) for (let parameter of subscription.subscriptionParameterList.filter((p) => p.name === 'frequency')) { this.subscriptionForm.controls[parameter.value]?.setValue(true); } @@ -169,29 +160,45 @@ export class SubscriptionModalComponent implements OnInit { submit() { - // TODO - - /* - - remove subscription if no checkbox is selected - - add subscription if it does not exist - - edit subscription if it already exists - */ - - const body = { - type: 'content', - subscriptionParameterList: [] - }; - - for (let frequency of this.frequencies) { - if (this.subscriptionForm.value[frequency]) { - body.subscriptionParameterList.push( - { - name: 'frequency', - value: frequency, - } - ); + // for (let type of this.subscriptionTypes) { + + const type = 'content'; // TODO remove + + const currentSubscription = this.subscriptions?.find((s) => s.subscriptionType === type); + + const body = { + id: currentSubscription?.id, + type, + subscriptionParameterList: [] + }; + + let someCheckboxSelected = false; + + for (let frequency of this.frequencies) { + if (this.subscriptionForm.value[frequency]) { // TODO read the value for the type + someCheckboxSelected = true; + body.subscriptionParameterList.push( + { + name: 'frequency', + value: frequency, + } + ); + } + } + + if (currentSubscription && someCheckboxSelected) { + console.log('UPDATE'); + this.subscriptionService.updateSubscription(body, this.ePersonId, this.dso.uuid).subscribe(console.log); + } else if (currentSubscription && !someCheckboxSelected) { + console.log('DELETE'); + this.subscriptionService.deleteSubscription(currentSubscription.id).subscribe(console.log); + } else if (someCheckboxSelected) { + console.log('CREATE'); + this.subscriptionService.createSubscription(body, this.ePersonId, this.dso.uuid).subscribe(console.log); } - } + + + // } // this.subscriptionService.createSubscription(body, this.ePersonId, this.dso.uuid).subscribe((res) => { // // this.refresh(); @@ -206,43 +213,6 @@ export class SubscriptionModalComponent implements OnInit { } - /** - * Sends request to create a new subscription, refreshes the table of subscriptions and notifies about summary page - */ - /*createForm(body): void { - this.subscriptionService.createSubscription(body, this.ePersonId, this.dso.uuid).subscribe((res) => { - this.refresh(); - this.notify(); - this.processing$.next(false); - }, - err => { - this.processing$.next(false); - } - ); - }*/ - - /** - * Sends request to update a subscription, refreshes the table of subscriptions and notifies about summary page - */ - /*updateForm(body) { - this.subscriptionService.updateSubscription(body, this.ePersonId, this.dso.uuid).subscribe((res) => { - this.refresh(); - this.notify(); - this.processing$.next(false); - }, - err => { - this.processing$.next(false); - } - ); - }*/ - - - /** - * Sends the request to delete the subscription with a specific id - */ - /*deleteSubscription(id): Observable { - return this.subscriptionService.deleteSubscription(id); - }*/ /** * Creates a notification with the link to the subscription summary page @@ -261,46 +231,4 @@ export class SubscriptionModalComponent implements OnInit { ); }*/ - /** - * When an action is done it will reinitialize the table and remove subscription form - */ - /*refresh(): void { - this.initSubscription(); - this.subscriptionForm = null; - this.submitted = false; - }*/ - - /** - * Returns if a specific frequency exists in the subscriptionParameterList - */ - getIsChecked(frequency): boolean { - return !!this.subscriptionForm.get('subscriptionParameterList').value.find(el => el.value === frequency.value); - } - - /** - * Deletes Subscription, show notification on success/failure & updates list - * - * @param subscription Subscription to be deleted - */ - /*deleteSubscriptionPopup(subscription: Subscription): void { - if (hasValue(subscription.id)) { - const modalRef = this.modalService.open(ConfirmationModalComponent); - modalRef.componentInstance.dso = this.dso; - modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-subscription.header'; - modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-subscription.info'; - modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-subscription.cancel'; - modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-subscription.confirm'; - modalRef.componentInstance.brandColor = 'danger'; - modalRef.componentInstance.confirmIcon = 'fas fa-trash'; - - modalRef.componentInstance.response.pipe( - take(1), - filter((confirm: boolean) => confirm), - switchMap(() => this.deleteSubscription(subscription.id)) - ).subscribe(() => { - this.refresh(); - }); - - } - }*/ } From 3ab552ed389c1d2b660985c75e2d004202b56765 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 23 Dec 2022 14:06:28 +0100 Subject: [PATCH 258/758] [CST-7757] Subscriptions porting (wip) --- .../subscription-modal.component.ts | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts index e0d025be548..39cc79ff8d9 100644 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts @@ -17,8 +17,10 @@ import { PaginatedList } from '../../../../core/data/paginated-list.model'; import { map, switchMap, take, tap } from 'rxjs/operators'; import { RemoteData } from '../../../../core/data/remote-data'; -import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; +import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; import { AuthService } from '../../../../core/auth/auth.service'; +import { NotificationType } from '../../../notifications/models/notification-type'; +import { NotificationOptions } from '../../../notifications/models/notification-options.model'; @Component({ selector: 'ds-subscription-modal', @@ -188,7 +190,17 @@ export class SubscriptionModalComponent implements OnInit { if (currentSubscription && someCheckboxSelected) { console.log('UPDATE'); - this.subscriptionService.updateSubscription(body, this.ePersonId, this.dso.uuid).subscribe(console.log); + this.subscriptionService.updateSubscription(body, this.ePersonId, this.dso.uuid).pipe( + getFirstCompletedRemoteData(), + ).subscribe((res) => { + if (res.hasSucceeded) { + this.notifySuccess(); + this.activeModal.close(); + } else { + this.notifyFailure(); + } + } + ); } else if (currentSubscription && !someCheckboxSelected) { console.log('DELETE'); this.subscriptionService.deleteSubscription(currentSubscription.id).subscribe(console.log); @@ -217,7 +229,7 @@ export class SubscriptionModalComponent implements OnInit { /** * Creates a notification with the link to the subscription summary page */ - /*notify(): void { + notifySuccess(): void { const options = new NotificationOptions(); options.timeOut = 0; const link = '/subscriptions'; @@ -229,6 +241,11 @@ export class SubscriptionModalComponent implements OnInit { 'context-menu.actions.subscription.notification.content', 'here' ); - }*/ + } + + notifyFailure() { + console.error('error'); + // TODO + } } From a6cd39c9067b1ee4dd7c004a28519becc83e5467 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 23 Dec 2022 18:25:04 +0100 Subject: [PATCH 259/758] [CST-7757] Subscriptions porting (wip) --- .../subscription-modal.component.ts | 39 ++++++++--- .../subscriptions-page.component.html | 2 +- .../subscriptions-page.component.ts | 66 +++++++++++-------- src/assets/i18n/en.json5 | 32 +++++++++ 4 files changed, 101 insertions(+), 38 deletions(-) diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts index 39cc79ff8d9..b283e12d342 100644 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts @@ -188,25 +188,44 @@ export class SubscriptionModalComponent implements OnInit { } } - if (currentSubscription && someCheckboxSelected) { - console.log('UPDATE'); - this.subscriptionService.updateSubscription(body, this.ePersonId, this.dso.uuid).pipe( - getFirstCompletedRemoteData(), - ).subscribe((res) => { + if (currentSubscription) { + const subscriptionsToBeRemobed = this.subscriptions?.filter( + (s) => s.subscriptionType === type && s.id !== currentSubscription.id + ); + for (let s of subscriptionsToBeRemobed) { + this.subscriptionService.deleteSubscription(currentSubscription.id).pipe( + getFirstCompletedRemoteData(), + ).subscribe((res) => { if (res.hasSucceeded) { - this.notifySuccess(); - this.activeModal.close(); + console.warn(`An additional subscription with type=${type} and id=${s.id} has been removed`); } else { this.notifyFailure(); } + }); + } + } + + + if (currentSubscription && someCheckboxSelected) { + // Update the existing subscription + this.subscriptionService.updateSubscription(body, this.ePersonId, this.dso.uuid).pipe( + getFirstCompletedRemoteData(), + ).subscribe((res) => { + if (res.hasSucceeded) { + this.notifySuccess(); + this.activeModal.close(); + } else { + this.notifyFailure(); } - ); + }); } else if (currentSubscription && !someCheckboxSelected) { - console.log('DELETE'); + // Delete the existing subscription this.subscriptionService.deleteSubscription(currentSubscription.id).subscribe(console.log); + // TODO handle notifications } else if (someCheckboxSelected) { - console.log('CREATE'); + // Create a new subscription this.subscriptionService.createSubscription(body, this.ePersonId, this.dso.uuid).subscribe(console.log); + // TODO handle notifications } diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html index bfbdbe72fcd..9d1e6d504e0 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.html +++ b/src/app/subscriptions-page/subscriptions-page.component.html @@ -10,7 +10,7 @@

    {{'subscriptions.title' | translate}}

    diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index b81b7c56171..2951cf037c6 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { BehaviorSubject, Subscription as rxSubscription } from 'rxjs'; -import { switchMap, take } from 'rxjs/operators'; +import { BehaviorSubject, combineLatestWith, Observable, of, shareReplay, Subscription as rxSubscription } from 'rxjs'; +import { combineLatest, map, switchMap, take, tap } from 'rxjs/operators'; import { Subscription } from '../shared/subscriptions/models/subscription.model'; import { buildPaginatedList, PaginatedList } from '../core/data/paginated-list.model'; import { SubscriptionService } from '../shared/subscriptions/subscription.service'; @@ -9,6 +9,7 @@ import { PaginationService } from '../core/pagination/pagination.service'; import { PageInfo } from '../core/shared/page-info.model'; import { AuthService } from '../core/auth/auth.service'; import { EPerson } from '../core/eperson/models/eperson.model'; +import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators'; @Component({ selector: 'ds-subscriptions-page', @@ -42,10 +43,12 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { */ loading$: BehaviorSubject = new BehaviorSubject(false); + ePersonId$: Observable; + /** * EPerson id of the logged in user */ - eperson: string; + // ePersonId: string; constructor( private paginationService: PaginationService, @@ -58,27 +61,32 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { * When page is changed it will request the new subscriptions for the new page config */ ngOnInit(): void { - this.authService.getAuthenticatedUserFromStore().pipe(take(1)).subscribe( (eperson: EPerson) => { - this.eperson = eperson.id; - - this.sub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( - switchMap((findListOptions) => { - this.loading$.next(true); - return this.subscriptionService.findByEPerson(this.eperson,{ - currentPage: findListOptions.currentPage, - elementsPerPage: findListOptions.pageSize - }); - } - ) - ).subscribe({ - next: (res: any) => { - this.subscriptions$.next(res); - this.loading$.next(false); - }, - error: () => { - this.loading$.next(false); - } - }); + this.ePersonId$ = this.authService.getAuthenticatedUserFromStore().pipe( + take(1), + map((ePerson: EPerson) => ePerson.id), + shareReplay(), + /*tap((ePersonId: string) => { // TODO unused + this.ePersonId = ePersonId; + }),*/ + ); + const currentPagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( + tap(console.log), + combineLatestWith(this.ePersonId$), + tap(() => {this.loading$.next(true);}), + switchMap(([currentPagination, ePersonId]) => this.subscriptionService.findByEPerson(ePersonId,{ + currentPage: currentPagination.currentPage, + elementsPerPage: currentPagination.pageSize + })), + tap((x) => console.log('find', x)), + // getFirstSucceededRemoteDataPayload(), + ).subscribe({ + next: (res: any) => { + this.subscriptions$.next(res); + this.loading$.next(false); + }, + error: () => { + this.loading$.next(false); + } }); } @@ -86,11 +94,11 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { * When an action is made and the information is changed refresh the information */ refresh(): void { - this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( + /*this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( take(1), switchMap((findListOptions) => { this.loading$.next(true); - return this.subscriptionService.findByEPerson(this.eperson,{ + return this.subscriptionService.findByEPerson(this.ePersonId,{ currentPage: findListOptions.currentPage, elementsPerPage: findListOptions.pageSize }); @@ -104,7 +112,7 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { error: () => { this.loading$.next(false); } - }); + });*/ } /** @@ -114,4 +122,8 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { this.sub.unsubscribe(); } + obs(v) { + return of(v); + } + } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 12a21beaa2b..2af33eb11d2 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2915,6 +2915,8 @@ "nav.stop-impersonating": "Stop impersonating EPerson", + "nav.subscriptions" : "Subscriptions", + "nav.toggle" : "Toggle navigation", "nav.user.description" : "User profile bar", @@ -4492,6 +4494,36 @@ "submission.workspace.generic.view-help": "Select this option to view the item's metadata.", + "subscriptions.title": "Subscriptions", + + "subscriptions.item": "Subscriptions for items", + + "subscriptions.collection": "Subscriptions for collections", + + "subscriptions.community": "Subscriptions for communities", + + "subscriptions.subscription_type": "Subscription type", + + "subscriptions.frequency": "Subscription frequency", + + "subscriptions.frequency.D": "Daily", + + "subscriptions.frequency.M": "Monthly", + + "subscriptions.frequency.W": "Weekly", + + "subscriptions.table.dso": "Subject", + + "subscriptions.table.subscription_type": "Subscription Type", + + "subscriptions.table.subscription_frequency": "Subscription Frequency", + + "subscriptions.table.action": "Action", + + "subscriptions.table.empty.message": "You have not subscribed any notification yet. To subscribe notification about an object please use the contextual menu in the object detail view", + + + "thumbnail.default.alt": "Thumbnail Image", "thumbnail.default.placeholder": "No Thumbnail Available", From 72a42b0a6e4df708e5bbe97e06033575e5fc5625 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 27 Dec 2022 20:10:47 +0100 Subject: [PATCH 260/758] [CST-7757] Refactoring code --- ...so-page-subscription-button.component.html | 2 +- ...page-subscription-button.component.spec.ts | 66 ++++- .../dso-page-subscription-button.component.ts | 7 +- .../subscription-edit-modal.component.html | 44 --- .../subscription-edit-modal.component.scss | 4 - .../subscription-edit-modal.component.spec.ts | 116 -------- .../subscription-edit-modal.component.ts | 190 ------------ .../subscription-modal.component.scss | 12 - .../subscription-modal.component.spec.ts | 223 --------------- .../subscription-modal.component.ts | 270 ------------------ .../models/subscription.model.ts | 30 +- .../subscription-modal.component.html | 15 +- .../subscription-modal.component.scss} | 0 .../subscription-modal.component.spec.ts | 194 +++++++++++++ .../subscription-modal.component.ts | 261 +++++++++++++++++ .../subscription-view.component.html | 7 +- .../subscription-view.component.scss | 0 .../subscription-view.component.spec.ts | 37 ++- .../subscription-view.component.ts | 42 +-- .../subscriptions/subscription.service.ts | 11 +- .../subscriptions/subscriptions.module.ts | 17 +- .../shared/testing/subscriptions-data.mock.ts | 33 ++- .../subscriptions-page.component.html | 13 +- .../subscriptions-page.component.ts | 55 +--- src/assets/i18n/en.json5 | 21 ++ 25 files changed, 689 insertions(+), 981 deletions(-) delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.html delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss delete mode 100644 src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts rename src/app/shared/subscriptions/{components => }/subscription-modal/subscription-modal.component.html (64%) rename src/app/shared/subscriptions/{components/subscription-view/subscription-view.component.scss => subscription-modal/subscription-modal.component.scss} (100%) create mode 100644 src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts create mode 100644 src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts rename src/app/shared/subscriptions/{components => }/subscription-view/subscription-view.component.html (69%) create mode 100644 src/app/shared/subscriptions/subscription-view/subscription-view.component.scss rename src/app/shared/subscriptions/{components => }/subscription-view/subscription-view.component.spec.ts (77%) rename src/app/shared/subscriptions/{components => }/subscription-view/subscription-view.component.ts (66%) diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html index 9956163944b..1932c370005 100644 --- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html +++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html @@ -1,4 +1,4 @@ - -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    -
    - {{ 'context-menu.actions.subscription.frequency.required' | translate }} -
    -
    -
    -
    -
    -
    - -
    -
    - - - - - -
    diff --git a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss b/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss deleted file mode 100644 index fb9db5b0ff1..00000000000 --- a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss +++ /dev/null @@ -1,4 +0,0 @@ -.alert{ - font-weight: bold; - color:red; -} diff --git a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts b/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts deleted file mode 100644 index d406fa2c1ae..00000000000 --- a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts +++ /dev/null @@ -1,116 +0,0 @@ -import { ComponentFixture, ComponentFixtureAutoDetect, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing'; -import { cold } from 'jasmine-marbles'; - -// Import modules -import { CommonModule } from '@angular/common'; -import { ReactiveFormsModule } from '@angular/forms'; -import { By } from '@angular/platform-browser'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { DebugElement } from '@angular/core'; - -import { SubscriptionEditModalComponent } from './subscription-edit-modal.component'; - -// Import mocks -import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; -import { subscription } from '../../../testing/subscriptions-data.mock'; -import { ItemInfo } from '../../../testing/relationships-mocks'; - -// Import utils -import { NotificationsService } from '../../../notifications/notifications.service'; -import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; -import { SubscriptionService } from '../../subscription.service'; -import { Subscription } from '../../models/subscription.model'; - - -describe('SubscriptionEditModalComponent', () => { - let component: SubscriptionEditModalComponent; - let fixture: ComponentFixture; - let de: DebugElement; - - const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - updateSubscription: jasmine.createSpy('updateSubscription'), - }); - - - beforeEach(waitForAsync (() => { - TestBed.configureTestingModule({ - imports: [ - CommonModule, - ReactiveFormsModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [ SubscriptionEditModalComponent ], - providers: [ - { provide: ComponentFixtureAutoDetect, useValue: true }, - { provide: NotificationsService, useValue: NotificationsServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SubscriptionEditModalComponent); - component = fixture.componentInstance; - component.eperson = 'testid123'; - component.dso = ItemInfo.payload; - - de = fixture.debugElement; - - subscriptionServiceStub.updateSubscription.and.returnValue(cold('a|', { - a: {} - })); - - - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - describe('No Subscription inserted', () => { - it('should not show form', () => { - expect(de.query(By.css('form'))).toBeNull(); - }); - }); - - - describe('Subscription inserted', () => { - - beforeEach(fakeAsync(() => { - component.subscription = Object.assign(new Subscription(), subscription); - component.ngOnInit(); - fixture.detectChanges(); - })); - - it('when insert subscription show form', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should have right checkboxes checked', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(true); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(true); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - it('on checkbox clicked should change form values', () => { - const checkbox = de.query(By.css('#checkbox-2')).nativeElement; - checkbox.click(); - - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(true); - expect(component.subscriptionParameterList?.value?.length).toEqual(3); - }); - - it('on submit clicked update should have been called', () => { - const button = de.query(By.css('.btn-success')).nativeElement; - button.click(); - expect(subscriptionServiceStub.updateSubscription).toHaveBeenCalled(); - }); - }); -}); diff --git a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts b/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts deleted file mode 100644 index 46c895dc18e..00000000000 --- a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts +++ /dev/null @@ -1,190 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; - -import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; - -import { Subscription } from '../../models/subscription.model'; - -import { BehaviorSubject } from 'rxjs'; - -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; - -import { SubscriptionService } from '../../subscription.service'; -import { NotificationsService } from '../../../notifications/notifications.service'; - -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; - -@Component({ - selector: 'ds-subscription-edit-modal', - templateUrl: './subscription-edit-modal.component.html', - styleUrls: ['./subscription-edit-modal.component.scss'] -}) -export class SubscriptionEditModalComponent implements OnInit { - - - /** - * DSpaceObject of the subscription - */ - @Input() dso: DSpaceObject; - - /** - * EPerson of the subscription - */ - @Input() eperson: string; - - /** - * List of subscription for the dso object and eperson relation - */ - @Input() subscription!: Subscription; - - /** - * Close event emit to close modal - */ - @Output() close: EventEmitter = new EventEmitter(); - - /** - * Reload event emit to refresh informations - */ - @Output() reload: EventEmitter = new EventEmitter(); - - /** - * A boolean representing if a request operation is pending - * @type {BehaviorSubject} - */ - public processing$ = new BehaviorSubject(false); - - /** - * Reactive form group that will be used to add subscriptions - */ - subscriptionForm: FormGroup; - - /** - * Used to show validation errors when user submits - */ - submitted = false; - - /** - * Reference to NgbModal - */ - public modalRef: NgbModalRef; - - - /** - * Frequencies to be shown as checkboxes - */ - frequencies = [ - {name: 'daily' ,value: 'D'}, - {name: 'monthly' ,value: 'M'}, - {name: 'weekly' ,value: 'W'}, - ]; - - constructor(private formGroup: FormBuilder, - private notificationsService: NotificationsService, - private subscriptionService: SubscriptionService - ) {} - - /** - * When component starts initialize starting functionality - */ - ngOnInit(): void { - this.initSubscription(); - } - - /** - * If the subscription is passed start the form with the information of subscription - */ - initSubscription(): void { - if (!!this.subscription) { - this.buildFormBuilder(this.subscription); - } - } - - /** - * Function to get subscriptionParameterList form array cleaner - */ - get subscriptionParameterList(): FormArray { - return this.subscriptionForm.get('subscriptionParameterList') as FormArray; - } - - /** - * When frequency checkboxes are being changed we add/remove frequencies from subscriptionParameterList - */ - selectCheckbox(event,frequency): void { - if (event.target.checked) { - this.addFrequency(frequency); - } else { - this.removeFrequency(frequency); - } - } - - /** - * Start the form with preinserted informations - */ - buildFormBuilder(subscription): void { - - this.subscriptionForm = this.formGroup.group({ - id: subscription.id, - type: subscription.subscriptionType, - subscriptionParameterList: this.formGroup.array([], Validators.required) - }); - - subscription.subscriptionParameterList.forEach( (parameter) => { - this.addFrequency(parameter.value); - }); - } - - /** - * Add a new frequency to the subscriptionParameterList form array - */ - addFrequency(frequency): void { - this.subscriptionParameterList.push( - this.formGroup.group({ - name: 'frequency', - value: frequency - }) - ); - } - - /** - * Remove frequency from subscriptionParameterList form array - */ - removeFrequency(frequency): void { - const index = this.subscriptionParameterList.controls.findIndex(el => el.value.value === frequency); - this.subscriptionParameterList.removeAt(index); - } - - /** - * When user saves it will check if form is valid and send request to update subscription - */ - submit(): void { - this.submitted = true; - if (this.subscriptionForm.valid) { - if (this.subscriptionForm.value.id) { - this.updateForm(this.subscriptionForm.value); - } - } - } - - /** - * Sends request to update a new subscription, refreshes the table of subscriptions and notifies about summary page - */ - updateForm(body): void { - this.subscriptionService.updateSubscription(body,this.eperson,this.dso.uuid).subscribe( (res) => { - this.reload.emit(); - this.close.emit(); - }); - } - - /** - * When close button is pressed emit function to close modal - */ - c(text): void { - this.close.emit(text); - } - - /** - * Returns if a specific frequency exists in the subscriptionParameterList - */ - getIsChecked(frequency): boolean { - return !!this.subscriptionForm.get('subscriptionParameterList').value.find(el => el.value === frequency.value); - } -} diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss deleted file mode 100644 index 62dd1105e70..00000000000 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss +++ /dev/null @@ -1,12 +0,0 @@ -.alert{ - font-weight: bold; - color:red; -} - -// .modal-footer{ -// justify-content: space-between; -// } - -.add-button{ - padding: 0px 15px 15px 15px; -} \ No newline at end of file diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts deleted file mode 100644 index 088ec3004c6..00000000000 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts +++ /dev/null @@ -1,223 +0,0 @@ -import { ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing'; - -import { of as observableOf } from 'rxjs'; - -// Import modules -import { CommonModule } from '@angular/common'; -import { ReactiveFormsModule } from '@angular/forms'; -import { By } from '@angular/platform-browser'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { DebugElement } from '@angular/core'; - -import { SubscriptionModalComponent } from './subscription-modal.component'; - -// Import mocks -import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; -import { findByEPersonAndDsoRes, findByEPersonAndDsoResEmpty } from '../../../testing/subscriptions-data.mock'; -import { ItemInfo } from '../../../testing/relationships-mocks'; - -// Import utils -import { NotificationsService } from '../../../notifications/notifications.service'; -import { SubscriptionService } from '../../subscription.service'; - -import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; - - -describe('SubscriptionModalComponent', () => { - let component: SubscriptionModalComponent; - let fixture: ComponentFixture; - let de: DebugElement; - - let subscriptionServiceStub; - const notificationServiceStub = { - notificationWithAnchor() { - return true; - } - }; - - - describe('when empty subscriptions', () => { - - beforeEach(async () => { - - subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - getSubscriptionByPersonDSO: observableOf(findByEPersonAndDsoResEmpty), - createSubscription: createSuccessfulRemoteDataObject$({}), - updateSubscription: createSuccessfulRemoteDataObject$({}), - }); - - await TestBed.configureTestingModule({ - imports: [ - CommonModule, - NgbModule, - ReactiveFormsModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [SubscriptionModalComponent], - providers: [ - { provide: ComponentFixtureAutoDetect, useValue: true }, - { provide: NotificationsService, useValue: notificationServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, - ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(SubscriptionModalComponent); - component = fixture.componentInstance; - component.ePersonId = 'testid123'; - component.dso = ItemInfo.payload; - de = fixture.debugElement; - - await fixture.whenStable(); - await fixture.whenRenderingDone(); - - fixture.detectChanges(); - - }); - - it('should be no table', () => { - expect(de.query(By.css('table'))).toBeNull(); - }); - - it('should show empty form', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should show form with empty checkboxes', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - }); - - - describe('when we have subscriptions', () => { - - beforeEach(async () => { - - subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - getSubscriptionByPersonDSO: observableOf(findByEPersonAndDsoRes), - createSubscription: createSuccessfulRemoteDataObject$({}), - updateSubscription: createSuccessfulRemoteDataObject$({}), - }); - - await TestBed.configureTestingModule({ - imports: [ - CommonModule, - NgbModule, - ReactiveFormsModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [SubscriptionModalComponent], - providers: [ - { provide: ComponentFixtureAutoDetect, useValue: true }, - { provide: NotificationsService, useValue: notificationServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, - ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(SubscriptionModalComponent); - component = fixture.componentInstance; - component.ePersonId = 'testid123'; - component.dso = ItemInfo.payload; - de = fixture.debugElement; - await fixture.whenStable(); - await fixture.whenRenderingDone(); - - fixture.detectChanges(); - - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should render 2 subscriptions', () => { - expect(de.queryAll(By.css('tbody > tr')).length).toEqual(2); - }); - - it('should show no form', () => { - expect(de.query(By.css('form'))).toBeNull(); - }); - - it('should have 2 edit buttons', () => { - expect(de.queryAll(By.css('.btn-outline-primary')).length).toEqual(2); - }); - - it('should have 2 delete buttons', () => { - expect(de.queryAll(By.css('.btn-outline-danger')).length).toEqual(2); - }); - - describe('When creating new subscription', () => { - - beforeEach(() => { - // add button click - const button = de.query(By.css('.btn-success')).nativeElement; - button.click(); - }); - - - it('should show form when add button click event', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should show form with empty checkboxes', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - it('should call create request when submit click event', () => { - const checkbox = de.query(By.css('#checkbox-2')).nativeElement; - checkbox.click(); - - const button = de.queryAll(By.css('.btn-success'))[1].nativeElement; - button.click(); - expect(subscriptionServiceStub.createSubscription).toHaveBeenCalled(); - }); - - }); - - - describe('When updating subscription', () => { - - beforeEach(() => { - // edit button click - const button = de.query(By.css('.btn-outline-primary')).nativeElement; - button.click(); - }); - - it('should show form when edit button click event', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should show form with empty checkboxes', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(true); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - it('should call update request when submit click event', () => { - const button = de.queryAll(By.css('.btn-success'))[1].nativeElement; - button.click(); - expect(subscriptionServiceStub.updateSubscription).toHaveBeenCalled(); - }); - - }); - - }); - -}); diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts deleted file mode 100644 index b283e12d342..00000000000 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts +++ /dev/null @@ -1,270 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; - -import { FormBuilder, FormGroup } from '@angular/forms'; - -import { Subscription } from '../../models/subscription.model'; - -import { BehaviorSubject, Observable, shareReplay } from 'rxjs'; - -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; - -import { SubscriptionService } from '../../subscription.service'; -import { NotificationsService } from '../../../notifications/notifications.service'; - -import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; - -import { PaginatedList } from '../../../../core/data/paginated-list.model'; - -import { map, switchMap, take, tap } from 'rxjs/operators'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { NotificationType } from '../../../notifications/models/notification-type'; -import { NotificationOptions } from '../../../notifications/models/notification-options.model'; - -@Component({ - selector: 'ds-subscription-modal', - templateUrl: './subscription-modal.component.html', - styleUrls: ['./subscription-modal.component.scss'] -}) -export class SubscriptionModalComponent implements OnInit { - - /** - * DSpaceObject of which to get the subscriptions - */ - @Input() dso: DSpaceObject; - - /** - * List of subscription for the dso object and eperson relation - */ - subscriptions: Subscription[]; - - /** - * A boolean representing if a request operation is pending - * @type {BehaviorSubject} - */ - public processing$ = new BehaviorSubject(false); - - /** - * Reactive form group that will be used to add subscriptions - */ - subscriptionForm: FormGroup; - - /** - * Used to show validation errors when user submits - */ - submitted = false; - - ePersonId$: Observable; - - ePersonId: string; - - /** - * Types of subscription to be shown on select - */ - subscriptionTypes = [ 'content', 'statistics' ]; - - /** - * Frequencies to be shown as checkboxes - */ - frequencies = [ 'D', 'M', 'W' ]; - - constructor( - private formBuilder: FormBuilder, - private modalService: NgbModal, - private notificationsService: NotificationsService, - private subscriptionService: SubscriptionService, - public activeModal: NgbActiveModal, - private authService: AuthService, - ) { - } - - /** - * When component starts initialize starting functionality - */ - ngOnInit(): void { - - this.ePersonId$ = this.authService.getAuthenticatedUserFromStore().pipe( - take(1), - map((ePerson) => ePerson.uuid), - tap((res) => { - this.ePersonId = res; - }), - shareReplay(), - ); - - this.subscriptionForm = this.formBuilder.group({}); - - for (let f of this.frequencies) { - this.subscriptionForm.addControl(f, this.formBuilder.control(false)); - } - - // TODO iterate over subscription types - - /*this.subscriptionForm = this.formBuilder.group({}); - for (let t of this.subscriptionTypes) { - this.subscriptionForm.addControl(t, this.formBuilder.group({})); - for (let f of this.frequencies) { - this.subscriptionForm[t].addControl(f, this.formBuilder.control(false)); - } - }*/ - - - this.initSubscription(); - - } - - /** - * Get subscription for the eperson & dso object relation - * If no subscription start with an empty form - */ - initSubscription(): void { - this.processing$.next(true); - this.ePersonId$.pipe( - tap(console.log), - switchMap((ePersonId: string) => this.getSubscription(ePersonId, this.dso?.uuid)), - getFirstSucceededRemoteDataPayload(), - ).subscribe({ - next: (res: PaginatedList) => { - if (res.pageInfo.totalElements > 0) { - this.subscriptions = res.page; - - // TODO loop over subscription types - // for (let type of this.subscriptionTypes) { - const type = 'content'; // TODO remove - const subscription = this.subscriptions.find((s) => s.subscriptionType === type); - // TODO manage multiple subscriptions with same type (there should be only one) - for (let parameter of subscription.subscriptionParameterList.filter((p) => p.name === 'frequency')) { - this.subscriptionForm.controls[parameter.value]?.setValue(true); - } - // } - - } - this.processing$.next(false); - }, - error: err => { - this.processing$.next(false); - } - }); - } - - /** - * Function to get subscriptions based on the eperson & dso - * - * @param ePersonId Eperson that is logged in - * @param uuid DSpaceObject id that subscriptions are related to - */ - getSubscription(ePersonId: string, uuid: string): Observable>> { - return this.subscriptionService.getSubscriptionByPersonDSO(ePersonId, uuid); - } - - - - submit() { - - // for (let type of this.subscriptionTypes) { - - const type = 'content'; // TODO remove - - const currentSubscription = this.subscriptions?.find((s) => s.subscriptionType === type); - - const body = { - id: currentSubscription?.id, - type, - subscriptionParameterList: [] - }; - - let someCheckboxSelected = false; - - for (let frequency of this.frequencies) { - if (this.subscriptionForm.value[frequency]) { // TODO read the value for the type - someCheckboxSelected = true; - body.subscriptionParameterList.push( - { - name: 'frequency', - value: frequency, - } - ); - } - } - - if (currentSubscription) { - const subscriptionsToBeRemobed = this.subscriptions?.filter( - (s) => s.subscriptionType === type && s.id !== currentSubscription.id - ); - for (let s of subscriptionsToBeRemobed) { - this.subscriptionService.deleteSubscription(currentSubscription.id).pipe( - getFirstCompletedRemoteData(), - ).subscribe((res) => { - if (res.hasSucceeded) { - console.warn(`An additional subscription with type=${type} and id=${s.id} has been removed`); - } else { - this.notifyFailure(); - } - }); - } - } - - - if (currentSubscription && someCheckboxSelected) { - // Update the existing subscription - this.subscriptionService.updateSubscription(body, this.ePersonId, this.dso.uuid).pipe( - getFirstCompletedRemoteData(), - ).subscribe((res) => { - if (res.hasSucceeded) { - this.notifySuccess(); - this.activeModal.close(); - } else { - this.notifyFailure(); - } - }); - } else if (currentSubscription && !someCheckboxSelected) { - // Delete the existing subscription - this.subscriptionService.deleteSubscription(currentSubscription.id).subscribe(console.log); - // TODO handle notifications - } else if (someCheckboxSelected) { - // Create a new subscription - this.subscriptionService.createSubscription(body, this.ePersonId, this.dso.uuid).subscribe(console.log); - // TODO handle notifications - } - - - // } - - // this.subscriptionService.createSubscription(body, this.ePersonId, this.dso.uuid).subscribe((res) => { - // // this.refresh(); - // // this.notify(); - // // this.processing$.next(false); - // }, - // err => { - // // this.processing$.next(false); - // } - // ); - - } - - - - /** - * Creates a notification with the link to the subscription summary page - */ - notifySuccess(): void { - const options = new NotificationOptions(); - options.timeOut = 0; - const link = '/subscriptions'; - this.notificationsService.notificationWithAnchor( - NotificationType.Success, - options, - link, - 'context-menu.actions.subscription.notification.here-text', - 'context-menu.actions.subscription.notification.content', - 'here' - ); - } - - notifyFailure() { - console.error('error'); - // TODO - } - -} diff --git a/src/app/shared/subscriptions/models/subscription.model.ts b/src/app/shared/subscriptions/models/subscription.model.ts index b5d6977d39c..36e43ce996f 100644 --- a/src/app/shared/subscriptions/models/subscription.model.ts +++ b/src/app/shared/subscriptions/models/subscription.model.ts @@ -1,11 +1,14 @@ +import { Observable } from 'rxjs'; import { autoserialize, deserialize, inheritSerialization } from 'cerialize'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; +import { link, typedObject } from '../../../core/cache/builders/build-decorators'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { HALLink } from '../../../core/shared/hal-link.model'; import { SUBSCRIPTION } from './subscription.resource-type'; import { EPerson } from '../../../core/eperson/models/eperson.model'; - +import { RemoteData } from '../../../core/data/remote-data'; +import { EPERSON } from '../../../core/eperson/models/eperson.resource-type'; +import { DSPACE_OBJECT } from '../../../core/shared/dspace-object.resource-type'; @typedObject @inheritSerialization(DSpaceObject) @@ -40,14 +43,27 @@ export class Subscription extends DSpaceObject { dSpaceObject: HALLink; }; + /** + * The logo for this Community + * Will be undefined unless the logo {@link HALLink} has been resolved. + */ + @link(EPERSON) + ePerson?: Observable>; + + /** + * The logo for this Community + * Will be undefined unless the logo {@link HALLink} has been resolved. + */ + @link(DSPACE_OBJECT) + dSpaceObject?: Observable>; /** * The embedded ePerson & dSpaceObject for this Subscription */ - @deserialize - _embedded: { - ePerson: EPerson; - dSpaceObject: DSpaceObject; - }; + /* @deserialize + _embedded: { + ePerson: EPerson; + dSpaceObject: DSpaceObject; + };*/ } export interface SubscriptionParameterList { diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html similarity index 64% rename from src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html rename to src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index 52746fb5c84..ef9e26032d6 100644 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -1,4 +1,4 @@ -
    +

    {{'item.page.subscriptions.modal.title' | translate}}

    - - - - - diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.scss b/src/app/shared/subscriptions/subscription-view/subscription-view.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts similarity index 77% rename from src/app/shared/subscriptions/components/subscription-view/subscription-view.component.spec.ts rename to src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts index e32112c5a01..3ec826d6c53 100644 --- a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts @@ -6,27 +6,27 @@ import { ReactiveFormsModule } from '@angular/forms'; import { BrowserModule, By } from '@angular/platform-browser'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { SharedModule } from '../../../shared.module'; +import { SharedModule } from '../../shared.module'; import { DebugElement } from '@angular/core'; import { RouterTestingModule } from '@angular/router/testing'; import { SubscriptionViewComponent } from './subscription-view.component'; // Import mocks -import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; -import { ItemInfo } from '../../../testing/relationships-mocks'; -import { findByEPersonAndDsoResEmpty, subscription } from '../../../testing/subscriptions-data.mock'; +import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; +import { findByEPersonAndDsoResEmpty, subscriptionMock } from '../../testing/subscriptions-data.mock'; // Import utils -import { NotificationsService } from '../../../notifications/notifications.service'; -import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; -import { SubscriptionService } from '../../subscription.service'; -import { Subscription } from '../../models/subscription.model'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import { SubscriptionService } from '../subscription.service'; +import { Subscription } from '../models/subscription.model'; import { of as observableOf } from 'rxjs'; -import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; - +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { Item } from '../../../core/shared/item.model'; +import { ITEM } from '../../../core/shared/item.resource-type'; describe('SubscriptionViewComponent', () => { let component: SubscriptionViewComponent; @@ -40,6 +40,19 @@ describe('SubscriptionViewComponent', () => { updateSubscription: createSuccessfulRemoteDataObject$({}), }); + const mockItem = Object.assign(new Item(), { + id: 'fake-id', + uuid: 'fake-id', + handle: 'fake/handle', + lastModified: '2018', + type: ITEM, + _links: { + self: { + href: 'https://localhost:8000/items/fake-id' + } + } + }); + beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ @@ -70,8 +83,8 @@ describe('SubscriptionViewComponent', () => { fixture = TestBed.createComponent(SubscriptionViewComponent); component = fixture.componentInstance; component.eperson = 'testid123'; - component.dso = ItemInfo.payload; - component.subscription = Object.assign(new Subscription(), subscription); + component.dso = mockItem; + component.subscription = Object.assign(new Subscription(), subscriptionMock); de = fixture.debugElement; fixture.detectChanges(); }); diff --git a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts similarity index 66% rename from src/app/shared/subscriptions/components/subscription-view/subscription-view.component.ts rename to src/app/shared/subscriptions/subscription-view/subscription-view.component.ts index cb831534b6f..4844be5b79c 100644 --- a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts @@ -1,13 +1,17 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { Subscription } from '../../models/subscription.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { Subscription } from '../models/subscription.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { take } from 'rxjs/operators'; - import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { hasValue } from '../../../empty.util'; -import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; -import { SubscriptionService } from '../../subscription.service'; + +import { hasValue } from '../../empty.util'; +import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component'; +import { SubscriptionService } from '../subscription.service'; +import { getCommunityModuleRoute } from '../../../community-page/community-page-routing-paths'; +import { getCollectionModuleRoute } from '../../../collection-page/collection-page-routing-paths'; +import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths'; +import { SubscriptionModalComponent } from '../subscription-modal/subscription-modal.component'; @Component({ // eslint-disable-next-line @angular-eslint/component-selector @@ -47,16 +51,6 @@ export class SubscriptionViewComponent { private subscriptionService: SubscriptionService, ) { } - - /** - * Open modal - * - * @param content - */ - public openSubscription(content: any) { - this.modalRef = this.modalService.open(content); - } - /** * Return the prefix of the route to the dso object page ( e.g. "items") */ @@ -64,13 +58,13 @@ export class SubscriptionViewComponent { let routePrefix; switch (this.dso.type.toString()) { case 'community': - routePrefix = '/communities'; + routePrefix = getCommunityModuleRoute(); break; case 'collection': - routePrefix = '/collections'; + routePrefix = getCollectionModuleRoute(); break; case 'item': - routePrefix = '/items'; + routePrefix = getItemModuleRoute(); break; } return routePrefix; @@ -99,4 +93,14 @@ export class SubscriptionViewComponent { }); } } + + public openSubscriptionModal() { + this.modalRef = this.modalService.open(SubscriptionModalComponent); + this.modalRef.componentInstance.dso = this.dso; + this.modalRef.componentInstance.subscription = this.subscription; + this.modalRef.componentInstance.updateSubscription.pipe(take(1)).subscribe((subscription: Subscription) => { + this.subscription = subscription; + }) + + } } diff --git a/src/app/shared/subscriptions/subscription.service.ts b/src/app/shared/subscriptions/subscription.service.ts index 5010286e727..480598a15ad 100644 --- a/src/app/shared/subscriptions/subscription.service.ts +++ b/src/app/shared/subscriptions/subscription.service.ts @@ -70,7 +70,7 @@ export class SubscriptionService extends IdentifiableDataService { * @param eperson The eperson to search for * @param uuid The uuid of the dsobjcet to search for */ - getSubscriptionByPersonDSO(eperson: string, uuid: string): Observable>> { + getSubscriptionsByPersonDSO(eperson: string, uuid: string): Observable>> { const optionsWithObject = Object.assign(new FindListOptions(), { searchParams: [ @@ -160,7 +160,14 @@ export class SubscriptionService extends IdentifiableDataService { ] }); - return this.searchData.searchBy(this.findByEpersonLinkPath, optionsWithObject, true, true, followLink('dSpaceObject'), followLink('ePerson')); + // return this.searchData.searchBy(this.findByEpersonLinkPath, optionsWithObject, true, true, followLink('dSpaceObject'), followLink('ePerson')); + + return this.getEndpoint().pipe( + map(href => `${href}/search/${this.findByEpersonLinkPath}`), + switchMap(href => this.findListByHref(href, optionsWithObject, true, true, followLink('dSpaceObject'), followLink('ePerson'))) + ); + + } } diff --git a/src/app/shared/subscriptions/subscriptions.module.ts b/src/app/shared/subscriptions/subscriptions.module.ts index 9b72493f673..122bf5ca8d9 100644 --- a/src/app/shared/subscriptions/subscriptions.module.ts +++ b/src/app/shared/subscriptions/subscriptions.module.ts @@ -2,16 +2,16 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ReactiveFormsModule } from '@angular/forms'; -import { SubscriptionViewComponent } from './components/subscription-view/subscription-view.component'; -import { SubscriptionModalComponent } from './components/subscription-modal/subscription-modal.component'; -import { SubscriptionEditModalComponent } from './components/subscription-edit-modal/subscription-edit-modal.component'; +import { SubscriptionViewComponent } from './subscription-view/subscription-view.component'; +import { SubscriptionModalComponent } from './subscription-modal/subscription-modal.component'; import { TranslateModule } from '@ngx-translate/core'; import { RouterModule } from '@angular/router'; +import { SharedModule } from '../shared.module'; +import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; const COMPONENTS = [ SubscriptionViewComponent, - SubscriptionModalComponent, - SubscriptionEditModalComponent, + SubscriptionModalComponent ]; @NgModule({ @@ -20,12 +20,15 @@ const COMPONENTS = [ ], imports: [ CommonModule, + NgbModalModule, ReactiveFormsModule, TranslateModule, - RouterModule + RouterModule, + SharedModule ], exports: [ ...COMPONENTS ] }) -export class SubscriptionsModule { } +export class SubscriptionsModule { +} diff --git a/src/app/shared/testing/subscriptions-data.mock.ts b/src/app/shared/testing/subscriptions-data.mock.ts index 971f69786e3..191fc46252b 100644 --- a/src/app/shared/testing/subscriptions-data.mock.ts +++ b/src/app/shared/testing/subscriptions-data.mock.ts @@ -4435,7 +4435,7 @@ export const findByEPersonAndDsoResEmpty = { 'page': [] }; -export const subscription = { +export const subscriptionMock = { 'id': 21, 'type': 'subscription', 'subscriptionParameterList': [ @@ -4450,18 +4450,41 @@ export const subscription = { 'value': 'M' } ], - 'subscriptionType': 'content', + 'subscriptionType': 'test1', '_links': { 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/dSpaceObject' + 'href': 'https://dspace/server/api/core/subscriptions/21/dSpaceObject' }, 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/ePerson' + 'href': 'https://dspace/server/api/core/subscriptions/21/ePerson' }, 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21' + 'href': 'https://dspace/server/api/core/subscriptions/21' } } }; +export const subscriptionMock2 = { + 'id': 21, + 'type': 'subscription', + 'subscriptionParameterList': [ + { + 'id': 77, + 'name': 'frequency', + 'value': 'D' + }, + ], + 'subscriptionType': 'test2', + '_links': { + 'dSpaceObject': { + 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/dSpaceObject' + }, + 'ePerson': { + 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/ePerson' + }, + 'self': { + 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21' + } + } +}; diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html index 9d1e6d504e0..56e4980ca7c 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.html +++ b/src/app/subscriptions-page/subscriptions-page.component.html @@ -4,13 +4,12 @@

    {{'subscriptions.title' | translate}}

    - + @@ -25,16 +24,20 @@

    {{'subscriptions.title' | translate}}

    - +
    -
    + {{ 'subscriptions.table.empty.message' | translate }} -
    +
    diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 2951cf037c6..a99daa9d683 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -1,6 +1,8 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { BehaviorSubject, combineLatestWith, Observable, of, shareReplay, Subscription as rxSubscription } from 'rxjs'; -import { combineLatest, map, switchMap, take, tap } from 'rxjs/operators'; +import { Component, OnInit } from '@angular/core'; + +import { BehaviorSubject, combineLatestWith, Observable, shareReplay } from 'rxjs'; +import { map, switchMap, take, tap } from 'rxjs/operators'; + import { Subscription } from '../shared/subscriptions/models/subscription.model'; import { buildPaginatedList, PaginatedList } from '../core/data/paginated-list.model'; import { SubscriptionService } from '../shared/subscriptions/subscription.service'; @@ -16,7 +18,7 @@ import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators'; templateUrl: './subscriptions-page.component.html', styleUrls: ['./subscriptions-page.component.scss'] }) -export class SubscriptionsPageComponent implements OnInit, OnDestroy { +export class SubscriptionsPageComponent implements OnInit { /** * The subscriptions to show on this page, as an Observable list. @@ -33,11 +35,6 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { currentPage: 1 }); - /** - * Subscription to be unsubscribed - */ - sub: rxSubscription; - /** * A boolean representing if is loading */ @@ -69,7 +66,11 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { this.ePersonId = ePersonId; }),*/ ); - const currentPagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( + this.retrieveSubscriptions(); + } + + private retrieveSubscriptions() { + this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( tap(console.log), combineLatestWith(this.ePersonId$), tap(() => {this.loading$.next(true);}), @@ -77,10 +78,12 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { currentPage: currentPagination.currentPage, elementsPerPage: currentPagination.pageSize })), + getFirstSucceededRemoteDataPayload(), tap((x) => console.log('find', x)), // getFirstSucceededRemoteDataPayload(), ).subscribe({ next: (res: any) => { + console.log('next',res); this.subscriptions$.next(res); this.loading$.next(false); }, @@ -89,41 +92,11 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { } }); } - /** * When an action is made and the information is changed refresh the information */ refresh(): void { - /*this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( - take(1), - switchMap((findListOptions) => { - this.loading$.next(true); - return this.subscriptionService.findByEPerson(this.ePersonId,{ - currentPage: findListOptions.currentPage, - elementsPerPage: findListOptions.pageSize - }); - } - ) - ).subscribe({ - next: (res: any) => { - this.subscriptions$.next(res); - this.loading$.next(false); - }, - error: () => { - this.loading$.next(false); - } - });*/ - } - - /** - * Unsubscribe from pagination subscription - */ - ngOnDestroy(): void { - this.sub.unsubscribe(); - } - - obs(v) { - return of(v); + this.retrieveSubscriptions(); } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 2af33eb11d2..ea0c87b8588 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1450,6 +1450,13 @@ "confirmation-modal.delete-profile.confirm": "Delete", + "confirmation-modal.delete-subscription.header": "Delete Subscription", + + "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"", + + "confirmation-modal.delete-subscription.cancel": "Cancel", + + "confirmation-modal.delete-subscription.confirm": "Delete", "error.bitstream": "Error fetching bitstream", @@ -4512,6 +4519,20 @@ "subscriptions.frequency.W": "Weekly", + + + "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.", + + "subscriptions.modal.delete.success": "Subscription deleted successfully", + + "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully", + + "subscriptions.modal.create.error": "An error occurs during the subscription creation", + + "subscriptions.modal.delete.error": "An error occurs during the subscription delete", + + "subscriptions.modal.update.error": "An error occurs during the subscription update", + "subscriptions.table.dso": "Subject", "subscriptions.table.subscription_type": "Subscription Type", From 88e191e961a9143e5e7ca3c435a062820342e48a Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 28 Dec 2022 11:28:18 +0100 Subject: [PATCH 261/758] [CST-7757] Fix lint errors --- ...page-subscription-button.component.spec.ts | 4 ++-- .../subscription-modal.component.spec.ts | 10 ++++----- .../subscription-modal.component.ts | 22 +++++++++---------- .../subscription-view.component.ts | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts index 7dcdf84235d..726854778dc 100644 --- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts +++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.spec.ts @@ -61,7 +61,7 @@ describe('DsoPageSubscriptionButtonComponent', () => { describe('when is authorized', () => { beforeEach(() => { - authorizationService.isAuthorized.and.returnValue(observableOf(true)) + authorizationService.isAuthorized.and.returnValue(observableOf(true)); fixture.detectChanges(); }); @@ -72,7 +72,7 @@ describe('DsoPageSubscriptionButtonComponent', () => { describe('when is not authorized', () => { beforeEach(() => { - authorizationService.isAuthorized.and.returnValue(observableOf(false)) + authorizationService.isAuthorized.and.returnValue(observableOf(false)); fixture.detectChanges(); }); diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts index c693f1e168e..05fa1c4a771 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts @@ -106,7 +106,7 @@ describe('SubscriptionModalComponent', () => { fixture = TestBed.createComponent(SubscriptionModalComponent); component = fixture.componentInstance; component.dso = mockItem; - (component as any).subscriptionDefaultTypes = ['test1', 'test2'] + (component as any).subscriptionDefaultTypes = ['test1', 'test2']; de = fixture.debugElement; }); @@ -128,7 +128,7 @@ describe('SubscriptionModalComponent', () => { (component as any).frequencyDefaultValues.forEach((frequency) => { expect(component.subscriptionForm.get('test1').get('frequencies').get(frequency)).toBeTruthy(); expect(component.subscriptionForm.get('test2').get('frequencies').get(frequency)).toBeTruthy(); - }) + }); }); }); @@ -151,7 +151,7 @@ describe('SubscriptionModalComponent', () => { expect(component.subscriptionForm.get('test1').get('frequencies').get(frequency)).toBeTruthy(); expect(component.subscriptionForm.get('test2').get('frequencies').get(frequency)).toBeTruthy(); - }) + }); expect(component.subscriptionForm.get('test1').get('frequencies').get('D').value).toBeTrue(); expect(component.subscriptionForm.get('test1').get('frequencies').get('M').value).toBeTrue(); expect(component.subscriptionForm.get('test1').get('frequencies').get('W').value).toBeFalse(); @@ -169,7 +169,7 @@ describe('SubscriptionModalComponent', () => { component = fixture.componentInstance; component.dso = mockItem; component.subscription = subscriptionMock as any; - (component as any).subscriptionDefaultTypes = ['test1', 'test2'] + (component as any).subscriptionDefaultTypes = ['test1', 'test2']; de = fixture.debugElement; fixture.detectChanges(); }); @@ -184,7 +184,7 @@ describe('SubscriptionModalComponent', () => { expect(component.subscriptionForm.get('test1')).toBeTruthy(); (component as any).frequencyDefaultValues.forEach((frequency) => { expect(component.subscriptionForm.get('test1').get('frequencies').get(frequency)).toBeTruthy(); - }) + }); expect(component.subscriptionForm.get('test1').get('frequencies').get('D').value).toBeTrue(); expect(component.subscriptionForm.get('test1').get('frequencies').get('M').value).toBeTrue(); expect(component.subscriptionForm.get('test1').get('frequencies').get('W').value).toBeFalse(); diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index 7fcba2d16b5..6f1d1fd1580 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -104,13 +104,13 @@ export class SubscriptionModalComponent implements OnInit { private initFormByAllSubscriptions(): void { this.subscriptionForm = new FormGroup({}); for (let t of this.subscriptionDefaultTypes) { - const formGroup = new FormGroup({}) + const formGroup = new FormGroup({}); formGroup.addControl('subscriptionId', this.formBuilder.control('')); formGroup.addControl('frequencies', this.formBuilder.group({})); for (let f of this.frequencyDefaultValues) { - (formGroup.controls['frequencies'] as FormGroup).addControl(f, this.formBuilder.control(false)); + (formGroup.controls.frequencies as FormGroup).addControl(f, this.formBuilder.control(false)); } - this.subscriptionForm.addControl(t, formGroup) + this.subscriptionForm.addControl(t, formGroup); } this.initFormDataBySubscriptions(); @@ -120,13 +120,13 @@ export class SubscriptionModalComponent implements OnInit { * If the subscription is passed start the form with the information of subscription */ initFormByGivenSubscription(): void { - const formGroup = new FormGroup({}) + const formGroup = new FormGroup({}); formGroup.addControl('subscriptionId', this.formBuilder.control(this.subscription.id)); formGroup.addControl('frequencies', this.formBuilder.group({})); (formGroup.get('frequencies') as FormGroup).addValidators(Validators.required); for (let f of this.frequencyDefaultValues) { const value = findIndex(this.subscription.subscriptionParameterList, ['value', f]) !== -1; - (formGroup.controls['frequencies'] as FormGroup).addControl(f, this.formBuilder.control(value)); + (formGroup.controls.frequencies as FormGroup).addControl(f, this.formBuilder.control(value)); } this.subscriptionForm = this.formBuilder.group({ @@ -149,9 +149,9 @@ export class SubscriptionModalComponent implements OnInit { const type = subscription.subscriptionType; const subscriptionGroup: FormGroup = this.subscriptionForm.get(type) as FormGroup; if (isNotEmpty(subscriptionGroup)) { - subscriptionGroup.controls['subscriptionId'].setValue(subscription.id); + subscriptionGroup.controls.subscriptionId.setValue(subscription.id); for (let parameter of subscription.subscriptionParameterList.filter((p) => p.name === 'frequency')) { - (subscriptionGroup.controls['frequencies'] as FormGroup).controls[parameter.value]?.setValue(true); + (subscriptionGroup.controls.frequencies as FormGroup).controls[parameter.value]?.setValue(true); } } } @@ -177,9 +177,9 @@ export class SubscriptionModalComponent implements OnInit { const subscriptionGroup: FormGroup = this.subscriptionForm.controls[subscriptionType] as FormGroup; if (subscriptionGroup.touched && subscriptionGroup.dirty) { const body = this.createBody( - subscriptionGroup.controls['subscriptionId'].value, + subscriptionGroup.controls.subscriptionId.value, subscriptionType, - subscriptionGroup.controls['frequencies'] as FormGroup + subscriptionGroup.controls.frequencies as FormGroup ); if (isNotEmpty(body.id)) { @@ -197,7 +197,7 @@ export class SubscriptionModalComponent implements OnInit { mergeMap((subscriptionBody) => { return this.subscriptionService.createSubscription(subscriptionBody, this.ePersonId, this.dso.uuid).pipe( getFirstCompletedRemoteData() - ) + ); }), tap((res: RemoteData) => { if (res.hasSucceeded) { @@ -215,7 +215,7 @@ export class SubscriptionModalComponent implements OnInit { mergeMap((subscriptionBody) => { return this.subscriptionService.updateSubscription(subscriptionBody, this.ePersonId, this.dso.uuid).pipe( getFirstCompletedRemoteData() - ) + ); }), tap((res: RemoteData) => { if (res.hasSucceeded) { diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts index 4844be5b79c..b8aa4d2375c 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts @@ -100,7 +100,7 @@ export class SubscriptionViewComponent { this.modalRef.componentInstance.subscription = this.subscription; this.modalRef.componentInstance.updateSubscription.pipe(take(1)).subscribe((subscription: Subscription) => { this.subscription = subscription; - }) + }); } } From e4ce91fa73fa2d5bb90be43198d2b6baef8e2a53 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Wed, 28 Dec 2022 11:57:48 +0100 Subject: [PATCH 262/758] 97298: #3281 Self-register - type request query param --- .../forgot-email.component.html | 4 ++-- .../register-email-form.component.ts | 12 +++++++----- .../register-email/register-email.component.html | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.html b/src/app/forgot-password/forgot-password-email/forgot-email.component.html index 263f142c2e3..8be86f17ae0 100644 --- a/src/app/forgot-password/forgot-password-email/forgot-email.component.html +++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.html @@ -1,3 +1,3 @@ - \ No newline at end of file + [MESSAGE_PREFIX]="'forgot-email.form'" [typeRequest]="'forgot'"> + diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts index 9e7b7835446..f2a338537db 100644 --- a/src/app/register-email-form/register-email-form.component.ts +++ b/src/app/register-email-form/register-email-form.component.ts @@ -29,6 +29,12 @@ export class RegisterEmailFormComponent implements OnInit { @Input() MESSAGE_PREFIX: string; + /** + * Type of register request to be done, register new email or forgot password (same endpoint) + */ + @Input() + typeRequest: string = null; + validMailDomains: string[]; constructor( @@ -64,12 +70,8 @@ export class RegisterEmailFormComponent implements OnInit { * Register an email address */ register() { - const typeMap = new Map([ - ['register-page.registration', 'register'], - ['forgot-email.form', 'forgot'] - ]); if (!this.form.invalid) { - this.epersonRegistrationService.registerEmail(this.email.value, typeMap.get(this.MESSAGE_PREFIX)).subscribe((response: RemoteData) => { + this.epersonRegistrationService.registerEmail(this.email.value, this.typeRequest).subscribe((response: RemoteData) => { if (response.hasSucceeded) { this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value})); diff --git a/src/app/register-page/register-email/register-email.component.html b/src/app/register-page/register-email/register-email.component.html index a60dc4c31e0..80b6885272d 100644 --- a/src/app/register-page/register-email/register-email.component.html +++ b/src/app/register-page/register-email/register-email.component.html @@ -1,3 +1,3 @@ + [MESSAGE_PREFIX]="'register-page.registration'" [typeRequest]="'register'"> From 88eefc6b79d40f5050c3c8bf5a085aebea37101f Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 28 Dec 2022 15:29:13 +0100 Subject: [PATCH 263/758] [CST-7757] fix tests --- .../subscription-modal.component.ts | 3 +- .../testing/notifications-service.stub.ts | 3 - .../shared/testing/subscriptions-data.mock.ts | 4572 +---------------- .../subscriptions-page.component.html | 15 +- .../subscriptions-page.component.spec.ts | 114 +- .../subscriptions-page.component.ts | 30 +- 6 files changed, 197 insertions(+), 4540 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index 6f1d1fd1580..23faf33c54e 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -2,11 +2,11 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; - import { BehaviorSubject, combineLatest, from, shareReplay } from 'rxjs'; import { map, mergeMap, take, tap } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import findIndex from 'lodash/findIndex'; import { Subscription } from '../models/subscription.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; @@ -17,7 +17,6 @@ import { RemoteData } from '../../../core/data/remote-data'; import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; import { AuthService } from '../../../core/auth/auth.service'; import { isNotEmpty } from '../../empty.util'; -import { findIndex } from 'lodash'; @Component({ selector: 'ds-subscription-modal', diff --git a/src/app/shared/testing/notifications-service.stub.ts b/src/app/shared/testing/notifications-service.stub.ts index 829b65fc1d8..154c5b43516 100644 --- a/src/app/shared/testing/notifications-service.stub.ts +++ b/src/app/shared/testing/notifications-service.stub.ts @@ -9,9 +9,6 @@ export class NotificationsServiceStub { remove = jasmine.createSpy('remove'); removeAll = jasmine.createSpy('removeAll'); - notificationWithAnchor() { - } - private getDefaultOptions(): NotificationOptions { return new NotificationOptions(); } diff --git a/src/app/shared/testing/subscriptions-data.mock.ts b/src/app/shared/testing/subscriptions-data.mock.ts index 191fc46252b..8a4afc6d52b 100644 --- a/src/app/shared/testing/subscriptions-data.mock.ts +++ b/src/app/shared/testing/subscriptions-data.mock.ts @@ -1,4467 +1,135 @@ -export const findAllSubscriptionRes = { - 'type': { - 'value': 'paginated-list' - }, - 'pageInfo': { - 'elementsPerPage': 10, - 'totalElements': 10, - 'totalPages': 1, - 'currentPage': 1 - }, - '_links': { - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions?page=0&size=10' - }, - 'search': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/search' - }, - 'page': [ - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/23' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/24' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/25' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/26' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/27' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/30' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/31' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/32' - } - ] - }, - 'page': [ - { - 'id': 21, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 77, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 78, - 'name': 'frequency', - 'value': 'M' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'uuid': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'name': 'Bollini, Andrea', - 'handle': '123456789/43', - 'metadata': { - 'creativework.datePublished': [ - { - 'value': null, - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.orcid.access-token': [ - { - 'value': 'a456a1c3-1c9e-45f8-9e11-f273fa58de2e', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.authenticated': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.orcid.refresh-token': [ - { - 'value': '13a63f03-7c49-4dad-b39b-070f73cc7ac1', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.scope': [ - { - 'value': '/authenticate', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '/read-limited', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '/activities/update', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - }, - { - 'value': '/person/update', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 3, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-fundings': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-mode': [ - { - 'value': 'MANUAL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-profile': [ - { - 'value': 'AFFILIATION', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'EDUCATION', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'BIOGRAPHICAL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - }, - { - 'value': 'IDENTIFIERS', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 3, - 'securityLevel': 0 - } - ], - 'cris.orcid.sync-projects': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-publications': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.webhook': [ - { - 'value': '2021-05-26T12:47:27.971367', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.object.owner': [ - { - 'value': 'Demo Site Administrator', - 'language': null, - 'authority': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'confidence': 600, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.policy.group': [ - { - 'value': 'Administrator', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.sourceId': [ - { - 'value': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.workspace.shared': [ - { - 'value': 'fg', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.country': [ - { - 'value': 'IT', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.education': [ - { - 'value': 'Università degli Studi di Milano Bicocca', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Sapienza Università di Roma', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.end': [ - { - 'value': '2008', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2003', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.role': [ - { - 'value': 'Master post experience 2nd level', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Graduate Studies - Mathematics, Physics', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.start': [ - { - 'value': '2007', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '1998', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.name.translated': [ - { - 'value': null, - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.site.title': [ - { - 'value': 'LinkedIn', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'GitHub', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-09-14T09:36:02Z', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-09-14T09:36:02Z', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'I’m responsible for all the technological aspects of the company proposal, from the final solutions to tools, methodologies and technologies adopted for the production and support activities. Among my responsibilities, I define the infrastructure that best fits the project requirements. We provide support on premis on the customer data center and worldwide cloud providers. Our hosted solutions are powered by Amazon Web Services, our experience in their services allow us to offer best in class solutions, scalable and cost-optimized.\n\nI’m in charge of the planning, estimation and execution of the projects from the technical perspective, and of the preparation of technical annexes for national and international tenders.\n\nI lead the teams of software architects and developers, assuring the adoption of best practices and up-to-date technologies. I’m in charge of the scouting and integration of new technologies and products within our solutions with a particular focus on Open Source and Open Standards. I’m directly involved with open-source and domain communities to assure that our solutions remain aligned with the international trends both from the technical perspective and for the functional requirements.', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-09-14T09:36:02Z (GMT). No. of bitstreams: 0', - 'language': 'en', - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/43', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.title': [ - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Person', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.endDate': [ - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.role': [ - { - 'value': 'CTO', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Head of Open Source & Open Standards Strategy', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'Head of Open Source & Open Standards Strategy', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.startDate': [ - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2012', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '2012', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.identifier.url': [ - { - 'value': 'https://www.linkedin.com/in/andreabollini/', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'https://github.com/abollini', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'oairecerif.person.affiliation': [ - { - 'value': '4Science', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'CINECA', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'CINECA', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.person.gender': [ - { - 'value': 'm', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.affiliation.name': [ - { - 'value': '4Science', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.email': [ - { - 'value': 'andrea.bollini@4science.it', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.familyName': [ - { - 'value': 'Bollini', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.givenName': [ - { - 'value': 'Andrea', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.identifier.orcid': [ - { - 'value': '0000-0003-0864-8867', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.identifier.scopus-author-id': [ - { - 'value': '55484808800', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.jobTitle': [ - { - 'value': 'CTO', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.knowsLanguage': [ - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-08-23T10:44:57.768+00:00', - 'entityType': 'Person', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 22, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 138, - 'name': 'frequency', - 'value': 'D' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'uuid': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'name': 'Bollini, Andrea', - 'handle': '123456789/43', - 'metadata': { - 'creativework.datePublished': [ - { - 'value': null, - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.orcid.access-token': [ - { - 'value': 'a456a1c3-1c9e-45f8-9e11-f273fa58de2e', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.authenticated': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.orcid.refresh-token': [ - { - 'value': '13a63f03-7c49-4dad-b39b-070f73cc7ac1', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.scope': [ - { - 'value': '/authenticate', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '/read-limited', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '/activities/update', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - }, - { - 'value': '/person/update', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 3, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-fundings': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-mode': [ - { - 'value': 'MANUAL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-profile': [ - { - 'value': 'AFFILIATION', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'EDUCATION', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'BIOGRAPHICAL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - }, - { - 'value': 'IDENTIFIERS', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 3, - 'securityLevel': 0 - } - ], - 'cris.orcid.sync-projects': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-publications': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.webhook': [ - { - 'value': '2021-05-26T12:47:27.971367', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.object.owner': [ - { - 'value': 'Demo Site Administrator', - 'language': null, - 'authority': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'confidence': 600, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.policy.group': [ - { - 'value': 'Administrator', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.sourceId': [ - { - 'value': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.workspace.shared': [ - { - 'value': 'fg', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.country': [ - { - 'value': 'IT', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.education': [ - { - 'value': 'Università degli Studi di Milano Bicocca', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Sapienza Università di Roma', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.end': [ - { - 'value': '2008', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2003', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.role': [ - { - 'value': 'Master post experience 2nd level', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Graduate Studies - Mathematics, Physics', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.start': [ - { - 'value': '2007', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '1998', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.name.translated': [ - { - 'value': null, - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.site.title': [ - { - 'value': 'LinkedIn', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'GitHub', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-09-14T09:36:02Z', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-09-14T09:36:02Z', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'I’m responsible for all the technological aspects of the company proposal, from the final solutions to tools, methodologies and technologies adopted for the production and support activities. Among my responsibilities, I define the infrastructure that best fits the project requirements. We provide support on premis on the customer data center and worldwide cloud providers. Our hosted solutions are powered by Amazon Web Services, our experience in their services allow us to offer best in class solutions, scalable and cost-optimized.\n\nI’m in charge of the planning, estimation and execution of the projects from the technical perspective, and of the preparation of technical annexes for national and international tenders.\n\nI lead the teams of software architects and developers, assuring the adoption of best practices and up-to-date technologies. I’m in charge of the scouting and integration of new technologies and products within our solutions with a particular focus on Open Source and Open Standards. I’m directly involved with open-source and domain communities to assure that our solutions remain aligned with the international trends both from the technical perspective and for the functional requirements.', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-09-14T09:36:02Z (GMT). No. of bitstreams: 0', - 'language': 'en', - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/43', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.title': [ - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Person', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.endDate': [ - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.role': [ - { - 'value': 'CTO', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Head of Open Source & Open Standards Strategy', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'Head of Open Source & Open Standards Strategy', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.startDate': [ - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2012', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '2012', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.identifier.url': [ - { - 'value': 'https://www.linkedin.com/in/andreabollini/', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'https://github.com/abollini', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'oairecerif.person.affiliation': [ - { - 'value': '4Science', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'CINECA', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'CINECA', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.person.gender': [ - { - 'value': 'm', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.affiliation.name': [ - { - 'value': '4Science', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.email': [ - { - 'value': 'andrea.bollini@4science.it', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.familyName': [ - { - 'value': 'Bollini', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.givenName': [ - { - 'value': 'Andrea', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.identifier.orcid': [ - { - 'value': '0000-0003-0864-8867', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.identifier.scopus-author-id': [ - { - 'value': '55484808800', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.jobTitle': [ - { - 'value': 'CTO', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.knowsLanguage': [ - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-08-23T10:44:57.768+00:00', - 'entityType': 'Person', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 23, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 80, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 81, - 'name': 'frequency', - 'value': 'M' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/23/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/23/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/23' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'uuid': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'name': 'Bollini, Andrea', - 'handle': '123456789/43', - 'metadata': { - 'creativework.datePublished': [ - { - 'value': null, - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.orcid.access-token': [ - { - 'value': 'a456a1c3-1c9e-45f8-9e11-f273fa58de2e', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.authenticated': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.orcid.refresh-token': [ - { - 'value': '13a63f03-7c49-4dad-b39b-070f73cc7ac1', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.scope': [ - { - 'value': '/authenticate', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '/read-limited', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '/activities/update', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - }, - { - 'value': '/person/update', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 3, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-fundings': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-mode': [ - { - 'value': 'MANUAL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-profile': [ - { - 'value': 'AFFILIATION', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'EDUCATION', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'BIOGRAPHICAL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - }, - { - 'value': 'IDENTIFIERS', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 3, - 'securityLevel': 0 - } - ], - 'cris.orcid.sync-projects': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.sync-publications': [ - { - 'value': 'ALL', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.orcid.webhook': [ - { - 'value': '2021-05-26T12:47:27.971367', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.object.owner': [ - { - 'value': 'Demo Site Administrator', - 'language': null, - 'authority': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'confidence': 600, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.policy.group': [ - { - 'value': 'Administrator', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.sourceId': [ - { - 'value': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'cris.workspace.shared': [ - { - 'value': 'fg', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.country': [ - { - 'value': 'IT', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.education': [ - { - 'value': 'Università degli Studi di Milano Bicocca', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Sapienza Università di Roma', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.end': [ - { - 'value': '2008', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2003', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.role': [ - { - 'value': 'Master post experience 2nd level', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Graduate Studies - Mathematics, Physics', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.education.start': [ - { - 'value': '2007', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '1998', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'crisrp.name.translated': [ - { - 'value': null, - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0, - 'securityLevel': 0 - } - ], - 'crisrp.site.title': [ - { - 'value': 'LinkedIn', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'GitHub', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-09-14T09:36:02Z', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-09-14T09:36:02Z', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'I’m responsible for all the technological aspects of the company proposal, from the final solutions to tools, methodologies and technologies adopted for the production and support activities. Among my responsibilities, I define the infrastructure that best fits the project requirements. We provide support on premis on the customer data center and worldwide cloud providers. Our hosted solutions are powered by Amazon Web Services, our experience in their services allow us to offer best in class solutions, scalable and cost-optimized.\n\nI’m in charge of the planning, estimation and execution of the projects from the technical perspective, and of the preparation of technical annexes for national and international tenders.\n\nI lead the teams of software architects and developers, assuring the adoption of best practices and up-to-date technologies. I’m in charge of the scouting and integration of new technologies and products within our solutions with a particular focus on Open Source and Open Standards. I’m directly involved with open-source and domain communities to assure that our solutions remain aligned with the international trends both from the technical perspective and for the functional requirements.', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-09-14T09:36:02Z (GMT). No. of bitstreams: 0', - 'language': 'en', - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/43', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dc.title': [ - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Person', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.endDate': [ - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.role': [ - { - 'value': 'CTO', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'Head of Open Source & Open Standards Strategy', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'Head of Open Source & Open Standards Strategy', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.affiliation.startDate': [ - { - 'value': '2016', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': '2012', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': '2012', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.identifier.url': [ - { - 'value': 'https://www.linkedin.com/in/andreabollini/', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'https://github.com/abollini', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ], - 'oairecerif.person.affiliation': [ - { - 'value': '4Science', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'CINECA', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - }, - { - 'value': 'CINECA', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 2, - 'securityLevel': 0 - } - ], - 'oairecerif.person.gender': [ - { - 'value': 'm', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.affiliation.name': [ - { - 'value': '4Science', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.email': [ - { - 'value': 'andrea.bollini@4science.it', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.familyName': [ - { - 'value': 'Bollini', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.givenName': [ - { - 'value': 'Andrea', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.identifier.orcid': [ - { - 'value': '0000-0003-0864-8867', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.identifier.scopus-author-id': [ - { - 'value': '55484808800', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.jobTitle': [ - { - 'value': 'CTO', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - } - ], - 'person.knowsLanguage': [ - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 0, - 'securityLevel': 0 - }, - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': 0, - 'place': 1, - 'securityLevel': 0 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-08-23T10:44:57.768+00:00', - 'entityType': 'Person', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/092b59e8-8159-4e70-98b5-93ec60bd3431' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 24, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 82, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 83, - 'name': 'frequency', - 'value': 'M' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/24/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/24/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/24' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'uuid': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'name': 'DSpace-CRIS', - 'handle': '123456789/34', - 'metadata': { - 'crispj.coinvestigators': [ - { - 'value': 'Mornati, Susanna', - 'language': null, - 'authority': '1325093a-1ef4-4d87-920d-02ce544fea00', - 'confidence': 600, - 'place': 0 - }, - { - 'value': 'Lombardi, Corrado', - 'language': null, - 'authority': 'b5ad6864-012d-4989-8e0d-4acfa1156fd9', - 'confidence': 600, - 'place': 1 - } - ], - 'crispj.coordinator': [ - { - 'value': '4Science', - 'language': null, - 'authority': 'a14ba215-c0f0-4b74-b21a-06359bfabd45', - 'confidence': 600, - 'place': 0 - } - ], - 'crispj.investigator': [ - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'confidence': 600, - 'place': 0 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'DSpace-CRIS is the first free open-source extension of DSpace for the Research Data and Information Management ever developed. Differently from other (commercial) CRIS/RIMS (star), DSpace-CRIS has the institutional repository as its core component, providing high visibility on the web to all the collected information and objects. DSpace-CRIS broadens DSpace functionality and expands its data model while remaining aligned with its code base. \n\nDSpace-CRIS adopts/is compliant with international standards and practices to facilitate interoperability and data transfer:\n\n- ORCID API v2 (complete compliance including pull/push of info for profiles, publications, projects). ORCID API v3 compliance is being released.\n\n- Signposting and ResourceSync (which implement COAR NGR Recommended Behaviors)\n\n- OpenAIRE Guidelines for Literature Repository Managers v4, for Data Archives, for CRIS Managers v1.1.1 (based on CERIF, released Nov. 2019)\n\n- PlanS (by Coalition S)\n\n- FAIR principles\n\nThe main characteristic of DSpace-CRIS is its flexible data model, which allows you to collect and manage research data and information typical of a CRIS system, to define entities and attributes with their reciprocal links. If you would just want to enhance the management of authors, provide name variants and IDs such as the ORCiD, exploit the varied ecosystem of persistent identifiers, link researchers to projects, awards, etc., DSpace-CRIS flexible data model can support this without aggravating the management burden of a normal institutional repository, while giving a great added value. Besides, it has useful features such as the collaboration network graph, aggregated (by researcher, by department) bibliometrics and statistics with graphic reporting, CVs and bibliographies, integration with ORCiD API v.3 and much more, you can explore them vie the menu items here on the left. \n\nIts flexibility allows to configure different data models and metadata schemas, providing the community with new and creative uses of DSpace, such as DSpace-GLAM (Galleries, Libraries, Archives and Museums) for the Cultural Heritage.', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-09-05T16:33:33Z (GMT). No. of bitstreams: 1\nlayers.png: 295537 bytes, checksum: 001e24b05d2c5d6cd76e88580f10cb9b (MD5)', - 'language': 'en', - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/34', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.subject': [ - { - 'value': 'cerif', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': 'datamanagement', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - }, - { - 'value': 'opensource', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 2 - } - ], - 'dc.title': [ - { - 'value': 'DSpace-CRIS', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.type': [ - { - 'value': 'applied research', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Project', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.acronym': [ - { - 'value': 'DSC', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate.url': [ - { - 'value': 'https://www.4science.it/en/open-source/', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.startDate': [ - { - 'value': '2009-04', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.status': [ - { - 'value': 'ongoing', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-08-02T14:19:24.927+00:00', - 'entityType': 'Project', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 25, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 84, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 85, - 'name': 'frequency', - 'value': 'M' - }, - { - 'id': 86, - 'name': 'frequency', - 'value': 'W' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/25/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/25/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/25' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'uuid': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'name': 'DSpace-CRIS', - 'handle': '123456789/34', - 'metadata': { - 'crispj.coinvestigators': [ - { - 'value': 'Mornati, Susanna', - 'language': null, - 'authority': '1325093a-1ef4-4d87-920d-02ce544fea00', - 'confidence': 600, - 'place': 0 - }, - { - 'value': 'Lombardi, Corrado', - 'language': null, - 'authority': 'b5ad6864-012d-4989-8e0d-4acfa1156fd9', - 'confidence': 600, - 'place': 1 - } - ], - 'crispj.coordinator': [ - { - 'value': '4Science', - 'language': null, - 'authority': 'a14ba215-c0f0-4b74-b21a-06359bfabd45', - 'confidence': 600, - 'place': 0 - } - ], - 'crispj.investigator': [ - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'confidence': 600, - 'place': 0 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'DSpace-CRIS is the first free open-source extension of DSpace for the Research Data and Information Management ever developed. Differently from other (commercial) CRIS/RIMS (star), DSpace-CRIS has the institutional repository as its core component, providing high visibility on the web to all the collected information and objects. DSpace-CRIS broadens DSpace functionality and expands its data model while remaining aligned with its code base. \n\nDSpace-CRIS adopts/is compliant with international standards and practices to facilitate interoperability and data transfer:\n\n- ORCID API v2 (complete compliance including pull/push of info for profiles, publications, projects). ORCID API v3 compliance is being released.\n\n- Signposting and ResourceSync (which implement COAR NGR Recommended Behaviors)\n\n- OpenAIRE Guidelines for Literature Repository Managers v4, for Data Archives, for CRIS Managers v1.1.1 (based on CERIF, released Nov. 2019)\n\n- PlanS (by Coalition S)\n\n- FAIR principles\n\nThe main characteristic of DSpace-CRIS is its flexible data model, which allows you to collect and manage research data and information typical of a CRIS system, to define entities and attributes with their reciprocal links. If you would just want to enhance the management of authors, provide name variants and IDs such as the ORCiD, exploit the varied ecosystem of persistent identifiers, link researchers to projects, awards, etc., DSpace-CRIS flexible data model can support this without aggravating the management burden of a normal institutional repository, while giving a great added value. Besides, it has useful features such as the collaboration network graph, aggregated (by researcher, by department) bibliometrics and statistics with graphic reporting, CVs and bibliographies, integration with ORCiD API v.3 and much more, you can explore them vie the menu items here on the left. \n\nIts flexibility allows to configure different data models and metadata schemas, providing the community with new and creative uses of DSpace, such as DSpace-GLAM (Galleries, Libraries, Archives and Museums) for the Cultural Heritage.', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-09-05T16:33:33Z (GMT). No. of bitstreams: 1\nlayers.png: 295537 bytes, checksum: 001e24b05d2c5d6cd76e88580f10cb9b (MD5)', - 'language': 'en', - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/34', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.subject': [ - { - 'value': 'cerif', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': 'datamanagement', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - }, - { - 'value': 'opensource', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 2 - } - ], - 'dc.title': [ - { - 'value': 'DSpace-CRIS', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.type': [ - { - 'value': 'applied research', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Project', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.acronym': [ - { - 'value': 'DSC', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate.url': [ - { - 'value': 'https://www.4science.it/en/open-source/', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.startDate': [ - { - 'value': '2009-04', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.status': [ - { - 'value': 'ongoing', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-08-02T14:19:24.927+00:00', - 'entityType': 'Project', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 26, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 87, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 88, - 'name': 'frequency', - 'value': 'M' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/26/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/26/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/26' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'uuid': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'name': 'DSpace-CRIS', - 'handle': '123456789/34', - 'metadata': { - 'crispj.coinvestigators': [ - { - 'value': 'Mornati, Susanna', - 'language': null, - 'authority': '1325093a-1ef4-4d87-920d-02ce544fea00', - 'confidence': 600, - 'place': 0 - }, - { - 'value': 'Lombardi, Corrado', - 'language': null, - 'authority': 'b5ad6864-012d-4989-8e0d-4acfa1156fd9', - 'confidence': 600, - 'place': 1 - } - ], - 'crispj.coordinator': [ - { - 'value': '4Science', - 'language': null, - 'authority': 'a14ba215-c0f0-4b74-b21a-06359bfabd45', - 'confidence': 600, - 'place': 0 - } - ], - 'crispj.investigator': [ - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'confidence': 600, - 'place': 0 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'DSpace-CRIS is the first free open-source extension of DSpace for the Research Data and Information Management ever developed. Differently from other (commercial) CRIS/RIMS (star), DSpace-CRIS has the institutional repository as its core component, providing high visibility on the web to all the collected information and objects. DSpace-CRIS broadens DSpace functionality and expands its data model while remaining aligned with its code base. \n\nDSpace-CRIS adopts/is compliant with international standards and practices to facilitate interoperability and data transfer:\n\n- ORCID API v2 (complete compliance including pull/push of info for profiles, publications, projects). ORCID API v3 compliance is being released.\n\n- Signposting and ResourceSync (which implement COAR NGR Recommended Behaviors)\n\n- OpenAIRE Guidelines for Literature Repository Managers v4, for Data Archives, for CRIS Managers v1.1.1 (based on CERIF, released Nov. 2019)\n\n- PlanS (by Coalition S)\n\n- FAIR principles\n\nThe main characteristic of DSpace-CRIS is its flexible data model, which allows you to collect and manage research data and information typical of a CRIS system, to define entities and attributes with their reciprocal links. If you would just want to enhance the management of authors, provide name variants and IDs such as the ORCiD, exploit the varied ecosystem of persistent identifiers, link researchers to projects, awards, etc., DSpace-CRIS flexible data model can support this without aggravating the management burden of a normal institutional repository, while giving a great added value. Besides, it has useful features such as the collaboration network graph, aggregated (by researcher, by department) bibliometrics and statistics with graphic reporting, CVs and bibliographies, integration with ORCiD API v.3 and much more, you can explore them vie the menu items here on the left. \n\nIts flexibility allows to configure different data models and metadata schemas, providing the community with new and creative uses of DSpace, such as DSpace-GLAM (Galleries, Libraries, Archives and Museums) for the Cultural Heritage.', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-09-05T16:33:33Z (GMT). No. of bitstreams: 1\nlayers.png: 295537 bytes, checksum: 001e24b05d2c5d6cd76e88580f10cb9b (MD5)', - 'language': 'en', - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/34', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.subject': [ - { - 'value': 'cerif', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': 'datamanagement', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - }, - { - 'value': 'opensource', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 2 - } - ], - 'dc.title': [ - { - 'value': 'DSpace-CRIS', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.type': [ - { - 'value': 'applied research', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Project', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.acronym': [ - { - 'value': 'DSC', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate.url': [ - { - 'value': 'https://www.4science.it/en/open-source/', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.startDate': [ - { - 'value': '2009-04', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.status': [ - { - 'value': 'ongoing', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-08-02T14:19:24.927+00:00', - 'entityType': 'Project', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 27, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 89, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 90, - 'name': 'frequency', - 'value': 'M' - }, - { - 'id': 91, - 'name': 'frequency', - 'value': 'W' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/27/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/27/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/27' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'uuid': '90f3b9ce-db65-479c-90d7-8c794abf942c', - 'name': 'DSpace-CRIS', - 'handle': '123456789/34', - 'metadata': { - 'crispj.coinvestigators': [ - { - 'value': 'Mornati, Susanna', - 'language': null, - 'authority': '1325093a-1ef4-4d87-920d-02ce544fea00', - 'confidence': 600, - 'place': 0 - }, - { - 'value': 'Lombardi, Corrado', - 'language': null, - 'authority': 'b5ad6864-012d-4989-8e0d-4acfa1156fd9', - 'confidence': 600, - 'place': 1 - } - ], - 'crispj.coordinator': [ - { - 'value': '4Science', - 'language': null, - 'authority': 'a14ba215-c0f0-4b74-b21a-06359bfabd45', - 'confidence': 600, - 'place': 0 - } - ], - 'crispj.investigator': [ - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'confidence': 600, - 'place': 0 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-09-05T16:33:33Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'DSpace-CRIS is the first free open-source extension of DSpace for the Research Data and Information Management ever developed. Differently from other (commercial) CRIS/RIMS (star), DSpace-CRIS has the institutional repository as its core component, providing high visibility on the web to all the collected information and objects. DSpace-CRIS broadens DSpace functionality and expands its data model while remaining aligned with its code base. \n\nDSpace-CRIS adopts/is compliant with international standards and practices to facilitate interoperability and data transfer:\n\n- ORCID API v2 (complete compliance including pull/push of info for profiles, publications, projects). ORCID API v3 compliance is being released.\n\n- Signposting and ResourceSync (which implement COAR NGR Recommended Behaviors)\n\n- OpenAIRE Guidelines for Literature Repository Managers v4, for Data Archives, for CRIS Managers v1.1.1 (based on CERIF, released Nov. 2019)\n\n- PlanS (by Coalition S)\n\n- FAIR principles\n\nThe main characteristic of DSpace-CRIS is its flexible data model, which allows you to collect and manage research data and information typical of a CRIS system, to define entities and attributes with their reciprocal links. If you would just want to enhance the management of authors, provide name variants and IDs such as the ORCiD, exploit the varied ecosystem of persistent identifiers, link researchers to projects, awards, etc., DSpace-CRIS flexible data model can support this without aggravating the management burden of a normal institutional repository, while giving a great added value. Besides, it has useful features such as the collaboration network graph, aggregated (by researcher, by department) bibliometrics and statistics with graphic reporting, CVs and bibliographies, integration with ORCiD API v.3 and much more, you can explore them vie the menu items here on the left. \n\nIts flexibility allows to configure different data models and metadata schemas, providing the community with new and creative uses of DSpace, such as DSpace-GLAM (Galleries, Libraries, Archives and Museums) for the Cultural Heritage.', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-09-05T16:33:33Z (GMT). No. of bitstreams: 1\nlayers.png: 295537 bytes, checksum: 001e24b05d2c5d6cd76e88580f10cb9b (MD5)', - 'language': 'en', - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/34', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.subject': [ - { - 'value': 'cerif', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': 'datamanagement', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - }, - { - 'value': 'opensource', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 2 - } - ], - 'dc.title': [ - { - 'value': 'DSpace-CRIS', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.type': [ - { - 'value': 'applied research', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Project', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.acronym': [ - { - 'value': 'DSC', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.oamandate.url': [ - { - 'value': 'https://www.4science.it/en/open-source/', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.startDate': [ - { - 'value': '2009-04', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.project.status': [ - { - 'value': 'ongoing', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-08-02T14:19:24.927+00:00', - 'entityType': 'Project', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/90f3b9ce-db65-479c-90d7-8c794abf942c' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 30, - 'subscriptionType': 'statistics', - 'subscriptionParameterList': [ - { - 'id': 96, - 'name': 'frequency', - 'value': 'M' - }, - { - 'id': 97, - 'name': 'frequency', - 'value': 'D' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/30/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/30/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/30' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': 'b2140cd5-bfdf-4b5b-83fb-8bab4c899b40', - 'uuid': 'b2140cd5-bfdf-4b5b-83fb-8bab4c899b40', - 'name': 'DSpace administration issues: the community admin patch', - 'handle': '123456789/107', - 'metadata': { - 'dc.contributor.author': [ - { - 'value': 'Donohue, Tim', - 'language': null, - 'authority': 'fcae3ff0-6a04-4385-8cae-04a38bbe4969', - 'confidence': 600, - 'place': 0 - }, - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'confidence': 600, - 'place': 1 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-12-06T22:35:52Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-12-06T22:35:52Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.issued': [ - { - 'value': '2005', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'A large or medium repository, but also a small repository in some special cases, needs to allow a more decentralized management of administrative activities as: creation of new communities, creation of new collections, management of submitter and workflow groups, editing of published items, access policies and so on. Until now, DSpace allows only a partial decentralization of this functionalities thought into the role of COLLECTION ADMIN. After highlighting these needs, we will introduce the new role of COMMUNITY ADMIN and the changes made to the COLLECTION ADMIN role by our patch so to fix most of the previous needs. We will talk about the \'long history\' of this patch, made for the first time by Andrea against the 1.2 series and next kept updated, bug free and XMLUI aware by Tim from the 1.4 series. This \'pass the buck\', from Andrea to Tim and again together with some other people, shows how useful is for anyone to share results, experiences and customizations with the community so to get them back improved, reducing the cost of locale maintenance, debug and bug fix. We will close the presentation with the good news of the inclusion of this patch in the DSpace codebase for both XMLUI and JSPUI interfaces and also giving some notices about possible improvements in the next future. DSpace User Group Meeting 2009', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-12-06T22:35:52Z (GMT). No. of bitstreams: 0\n Previous issue date: 2005', - 'language': 'en', - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.other': [ - { - 'value': 'od______1149::b43204759808a65356e6cc3ba285d29f', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/107', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.language.iso': [ - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.source': [ - { - 'value': 'Göteborgs universitets publikationer - e-publicering och e-arkiv', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.subject': [ - { - 'value': 'dspace', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': 'open source', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - } - ], - 'dc.title': [ - { - 'value': 'DSpace administration issues: the community admin patch', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.type': [ - { - 'value': 'Controlled Vocabulary for Resource Type Genres::text::conference object', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Publication', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.author.affiliation': [ - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-05-31T21:41:41.737+00:00', - 'entityType': 'Publication', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 31, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 98, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 99, - 'name': 'frequency', - 'value': 'M' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/31/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/31/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/31' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': 'b2140cd5-bfdf-4b5b-83fb-8bab4c899b40', - 'uuid': 'b2140cd5-bfdf-4b5b-83fb-8bab4c899b40', - 'name': 'DSpace administration issues: the community admin patch', - 'handle': '123456789/107', - 'metadata': { - 'dc.contributor.author': [ - { - 'value': 'Donohue, Tim', - 'language': null, - 'authority': 'fcae3ff0-6a04-4385-8cae-04a38bbe4969', - 'confidence': 600, - 'place': 0 - }, - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'confidence': 600, - 'place': 1 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-12-06T22:35:52Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-12-06T22:35:52Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.issued': [ - { - 'value': '2005', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'A large or medium repository, but also a small repository in some special cases, needs to allow a more decentralized management of administrative activities as: creation of new communities, creation of new collections, management of submitter and workflow groups, editing of published items, access policies and so on. Until now, DSpace allows only a partial decentralization of this functionalities thought into the role of COLLECTION ADMIN. After highlighting these needs, we will introduce the new role of COMMUNITY ADMIN and the changes made to the COLLECTION ADMIN role by our patch so to fix most of the previous needs. We will talk about the \'long history\' of this patch, made for the first time by Andrea against the 1.2 series and next kept updated, bug free and XMLUI aware by Tim from the 1.4 series. This \'pass the buck\', from Andrea to Tim and again together with some other people, shows how useful is for anyone to share results, experiences and customizations with the community so to get them back improved, reducing the cost of locale maintenance, debug and bug fix. We will close the presentation with the good news of the inclusion of this patch in the DSpace codebase for both XMLUI and JSPUI interfaces and also giving some notices about possible improvements in the next future. DSpace User Group Meeting 2009', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-12-06T22:35:52Z (GMT). No. of bitstreams: 0\n Previous issue date: 2005', - 'language': 'en', - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.other': [ - { - 'value': 'od______1149::b43204759808a65356e6cc3ba285d29f', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/107', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.language.iso': [ - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.source': [ - { - 'value': 'Göteborgs universitets publikationer - e-publicering och e-arkiv', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.subject': [ - { - 'value': 'dspace', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': 'open source', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - } - ], - 'dc.title': [ - { - 'value': 'DSpace administration issues: the community admin patch', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.type': [ - { - 'value': 'Controlled Vocabulary for Resource Type Genres::text::conference object', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Publication', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.author.affiliation': [ - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-05-31T21:41:41.737+00:00', - 'entityType': 'Publication', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40' - } - } - } - }, - 'type': 'subscription' - }, - { - 'id': 32, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 100, - 'name': 'frequency', - 'value': 'W' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/32/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/32/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/32' - } - }, - '_embedded': { - 'ePerson': { - 'id': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'uuid': '335647b6-8a52-4ecb-a8c1-7ebabb199bda', - 'name': 'dspacedemo+admin@gmail.com', - 'handle': null, - 'metadata': { - 'dspace.agreements.cookies': [ - { - 'value': '{\'authentication\':true,\'preferences\':true,\'acknowledgement\':true,\'google-analytics\':true}', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.agreements.end-user': [ - { - 'value': 'true', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.firstname': [ - { - 'value': 'Demo', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'eperson.lastname': [ - { - 'value': 'Site Administrator', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ] - }, - 'netid': null, - 'lastActive': '2021-09-01T12:06:19.000+00:00', - 'canLogIn': true, - 'email': 'dspacedemo+admin@gmail.com', - 'requireCertificate': false, - 'selfRegistered': false, - 'type': 'eperson', - '_links': { - 'groups': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda/groups' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/eperson/epersons/335647b6-8a52-4ecb-a8c1-7ebabb199bda' - } - } - }, - 'dSpaceObject': { - 'id': 'b2140cd5-bfdf-4b5b-83fb-8bab4c899b40', - 'uuid': 'b2140cd5-bfdf-4b5b-83fb-8bab4c899b40', - 'name': 'DSpace administration issues: the community admin patch', - 'handle': '123456789/107', - 'metadata': { - 'dc.contributor.author': [ - { - 'value': 'Donohue, Tim', - 'language': null, - 'authority': 'fcae3ff0-6a04-4385-8cae-04a38bbe4969', - 'confidence': 600, - 'place': 0 - }, - { - 'value': 'Bollini, Andrea', - 'language': null, - 'authority': '092b59e8-8159-4e70-98b5-93ec60bd3431', - 'confidence': 600, - 'place': 1 - } - ], - 'dc.date.accessioned': [ - { - 'value': '2020-12-06T22:35:52Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.available': [ - { - 'value': '2020-12-06T22:35:52Z', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.date.issued': [ - { - 'value': '2005', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.abstract': [ - { - 'value': 'A large or medium repository, but also a small repository in some special cases, needs to allow a more decentralized management of administrative activities as: creation of new communities, creation of new collections, management of submitter and workflow groups, editing of published items, access policies and so on. Until now, DSpace allows only a partial decentralization of this functionalities thought into the role of COLLECTION ADMIN. After highlighting these needs, we will introduce the new role of COMMUNITY ADMIN and the changes made to the COLLECTION ADMIN role by our patch so to fix most of the previous needs. We will talk about the \'long history\' of this patch, made for the first time by Andrea against the 1.2 series and next kept updated, bug free and XMLUI aware by Tim from the 1.4 series. This \'pass the buck\', from Andrea to Tim and again together with some other people, shows how useful is for anyone to share results, experiences and customizations with the community so to get them back improved, reducing the cost of locale maintenance, debug and bug fix. We will close the presentation with the good news of the inclusion of this patch in the DSpace codebase for both XMLUI and JSPUI interfaces and also giving some notices about possible improvements in the next future. DSpace User Group Meeting 2009', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.description.provenance': [ - { - 'value': 'Made available in DSpace on 2020-12-06T22:35:52Z (GMT). No. of bitstreams: 0\n Previous issue date: 2005', - 'language': 'en', - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.other': [ - { - 'value': 'od______1149::b43204759808a65356e6cc3ba285d29f', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.identifier.uri': [ - { - 'value': 'https://dspacecris7.4science.cloud/handle/123456789/107', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.language.iso': [ - { - 'value': 'en', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.source': [ - { - 'value': 'Göteborgs universitets publikationer - e-publicering och e-arkiv', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.subject': [ - { - 'value': 'dspace', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': 'open source', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - } - ], - 'dc.title': [ - { - 'value': 'DSpace administration issues: the community admin patch', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dc.type': [ - { - 'value': 'Controlled Vocabulary for Resource Type Genres::text::conference object', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'dspace.entity.type': [ - { - 'value': 'Publication', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - } - ], - 'oairecerif.author.affiliation': [ - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 0 - }, - { - 'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#', - 'language': null, - 'authority': null, - 'confidence': -1, - 'place': 1 - } - ] - }, - 'inArchive': true, - 'discoverable': true, - 'withdrawn': false, - 'lastModified': '2021-05-31T21:41:41.737+00:00', - 'entityType': 'Publication', - 'type': 'item', - '_links': { - 'bundles': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/bundles' - }, - 'mappedCollections': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/mappedCollections' - }, - 'owningCollection': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/owningCollection' - }, - 'relationships': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/relationships' - }, - 'version': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/version' - }, - 'templateItemOf': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/templateItemOf' - }, - 'metrics': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/metrics' - }, - 'thumbnail': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40/thumbnail' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/items/b2140cd5-bfdf-4b5b-83fb-8bab4c899b40' - } - } - } - }, - 'type': 'subscription' - } +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; +import { Item } from '../../core/shared/item.model'; +import { ITEM_TYPE } from '../../core/shared/item-relationships/item-type.resource-type'; + +export const mockSubscriptionEperson = Object.assign(new EPerson(), { + 'id': 'fake-eperson-id', + 'uuid': 'fake-eperson-id', + 'handle': null, + 'metadata': { + 'eperson.firstname': [ + { + 'value': 'user', + 'language': null, + 'authority': null, + 'confidence': -1, + 'place': 0 + } + ], + 'eperson.lastname': [ + { + 'value': 'testr', + 'language': null, + 'authority': null, + 'confidence': -1, + 'place': 0 + } ] -}; + }, + 'netid': null, + 'lastActive': '2021-09-01T12:06:19.000+00:00', + 'canLogIn': true, + 'email': 'user@test.com', + 'requireCertificate': false, + 'selfRegistered': false, + 'type': 'eperson', + '_links': { + 'groups': { + 'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id/groups' + }, + 'self': { + 'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id' + } + } +}); -export const findByEPersonAndDsoRes = { - 'type': { - 'value': 'paginated-list' +export const mockSubscriptionDSO = Object.assign(new Item(), + { + id: 'fake-item-id', + uuid: 'fake-item-id', + metadata: { + 'dc.title': [{ value: 'test item subscription' }] }, - 'pageInfo': { - 'elementsPerPage': 20, - 'totalElements': 2, - 'totalPages': 1, - 'currentPage': 1 + type: ITEM_TYPE, + _links: { + self: { + href: 'https://dspace.org/server/api/core/items/fake-item-id' + } + } + } +); + +export const mockSubscriptionDSO2 = Object.assign(new Item(), + { + id: 'fake-item-id2', + uuid: 'fake-item-id2', + metadata: { + 'dc.title': [{ value: 'test item subscription 2' }] }, - '_links': { - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/search/findByEPersonAndDso?dspace_object_id=092b59e8-8159-4e70-98b5-93ec60bd3431&eperson_id=335647b6-8a52-4ecb-a8c1-7ebabb199bda' - }, - 'page': [ - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48' - } - ] + type: ITEM_TYPE, + _links: { + self: { + href: 'https://dspace.org/server/api/core/items/fake-item-id2' + } + } + } +); +export const findByEPersonAndDsoResEmpty = { + 'type': { + 'value': 'paginated-list' + }, + 'pageInfo': { + 'elementsPerPage': 0, + 'totalElements': 0, + 'totalPages': 1, + 'currentPage': 1 + }, + '_links': { + 'self': { + 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/search/findByEPersonAndDso?dspace_object_id=092b59e8-8159-4e70-98b5-93ec60bd3431&eperson_id=335647b6-8a52-4ecb-a8c1-7ebabb199bda' }, 'page': [ - { - 'id': 22, - 'subscriptionType': 'content', - 'subscriptionParameterList': [ - { - 'id': 161, - 'name': 'frequency', - 'value': 'M' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22' - } - }, - 'type': 'subscription' - }, - { - 'id': 48, - 'subscriptionType': 'statistics', - 'subscriptionParameterList': [ - { - 'id': 159, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 160, - 'name': 'frequency', - 'value': 'M' - } - ], - '_links': { - 'dSpaceObject': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48/ePerson' - }, - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48' - } - }, - 'type': 'subscription' - } + { + 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22' + }, + { + 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48' + } ] + }, + 'page': [] }; - -export const findByEPersonAndDsoResEmpty = { - 'type': { - 'value': 'paginated-list' +export const subscriptionMock = { + 'id': 21, + 'type': 'subscription', + 'subscriptionParameterList': [ + { + 'id': 77, + 'name': 'frequency', + 'value': 'D' }, - 'pageInfo': { - 'elementsPerPage': 0, - 'totalElements': 0, - 'totalPages': 1, - 'currentPage': 1 + { + 'id': 78, + 'name': 'frequency', + 'value': 'M' + } + ], + 'subscriptionType': 'test1', + 'ePerson': createSuccessfulRemoteDataObject$(mockSubscriptionEperson), + 'dSpaceObject': createSuccessfulRemoteDataObject$(mockSubscriptionDSO), + '_links': { + 'dSpaceObject': { + 'href': 'https://dspace/server/api/core/subscriptions/21/dSpaceObject' }, - '_links': { - 'self': { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/search/findByEPersonAndDso?dspace_object_id=092b59e8-8159-4e70-98b5-93ec60bd3431&eperson_id=335647b6-8a52-4ecb-a8c1-7ebabb199bda' - }, - 'page': [ - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22' - }, - { - 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48' - } - ] + 'ePerson': { + 'href': 'https://dspace/server/api/core/subscriptions/21/ePerson' }, - 'page': [] -}; - -export const subscriptionMock = { - 'id': 21, - 'type': 'subscription', - 'subscriptionParameterList': [ - { - 'id': 77, - 'name': 'frequency', - 'value': 'D' - }, - { - 'id': 78, - 'name': 'frequency', - 'value': 'M' - } - ], - 'subscriptionType': 'test1', - '_links': { - 'dSpaceObject': { - 'href': 'https://dspace/server/api/core/subscriptions/21/dSpaceObject' - }, - 'ePerson': { - 'href': 'https://dspace/server/api/core/subscriptions/21/ePerson' - }, - 'self': { - 'href': 'https://dspace/server/api/core/subscriptions/21' - } + 'self': { + 'href': 'https://dspace/server/api/core/subscriptions/21' } + } }; export const subscriptionMock2 = { @@ -4475,6 +143,8 @@ export const subscriptionMock2 = { }, ], 'subscriptionType': 'test2', + 'ePerson': createSuccessfulRemoteDataObject$(mockSubscriptionEperson), + 'dSpaceObject': createSuccessfulRemoteDataObject$(mockSubscriptionDSO2), '_links': { 'dSpaceObject': { 'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/dSpaceObject' diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html index 56e4980ca7c..37b882fe44c 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.html +++ b/src/app/subscriptions-page/subscriptions-page.component.html @@ -7,14 +7,13 @@

    {{'subscriptions.title' | translate}}

    - +
    - +
    @@ -35,7 +34,7 @@

    {{'subscriptions.title' | translate}}

    - + {{ 'subscriptions.table.empty.message' | translate }} diff --git a/src/app/subscriptions-page/subscriptions-page.component.spec.ts b/src/app/subscriptions-page/subscriptions-page.component.spec.ts index 77d2f6805a5..9b17d72deb6 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.spec.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.spec.ts @@ -1,41 +1,31 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; - - -// Import modules import { CommonModule } from '@angular/common'; import { BrowserModule, By } from '@angular/platform-browser'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { of as observableOf } from 'rxjs'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -// Import components import { SubscriptionsPageComponent } from './subscriptions-page.component'; - -// Import services import { PaginationService } from '../core/pagination/pagination.service'; import { SubscriptionService } from '../shared/subscriptions/subscription.service'; import { PaginationServiceStub } from '../shared/testing/pagination-service.stub'; import { AuthService } from '../core/auth/auth.service'; - -// Import utils -import { HostWindowService } from '../shared/host-window.service'; -import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub'; - - -// Import mocks import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; -import { findAllSubscriptionRes } from '../shared/testing/subscriptions-data.mock'; +import { + mockSubscriptionEperson, + subscriptionMock, + subscriptionMock2 +} from '../shared/testing/subscriptions-data.mock'; import { MockActivatedRoute } from '../shared/mocks/active-router.mock'; -import { of as observableOf } from 'rxjs'; -import { EPersonMock } from '../shared/testing/eperson.mock'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { VarDirective } from '../shared/utils/var.directive'; -import { - SubscriptionViewComponent -} from '../shared/subscriptions/components/subscription-view/subscription-view.component'; - +import { SubscriptionViewComponent } from '../shared/subscriptions/subscription-view/subscription-view.component'; +import { PageInfo } from '../core/shared/page-info.model'; +import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; +import { buildPaginatedList } from '../core/data/paginated-list.model'; describe('SubscriptionsPageComponent', () => { let component: SubscriptionsPageComponent; @@ -43,15 +33,26 @@ describe('SubscriptionsPageComponent', () => { let de: DebugElement; const authServiceStub = jasmine.createSpyObj('authorizationService', { - getAuthenticatedUserFromStore: observableOf(EPersonMock) + getAuthenticatedUserFromStore: observableOf(mockSubscriptionEperson) }); const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - findByEPerson: observableOf(findAllSubscriptionRes) + findByEPerson: jasmine.createSpy('findByEPerson') }); + const paginationService = new PaginationServiceStub(); - beforeEach(waitForAsync( () => { + const mockSubscriptionList = [subscriptionMock, subscriptionMock2]; + + const emptyPageInfo = Object.assign(new PageInfo(), { + totalElements: 0 + }); + + const pageInfo = Object.assign(new PageInfo(), { + totalElements: 2 + }); + + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ CommonModule, @@ -65,63 +66,62 @@ describe('SubscriptionsPageComponent', () => { }), NoopAnimationsModule ], - declarations: [ SubscriptionsPageComponent, SubscriptionViewComponent, VarDirective ], - providers:[ + declarations: [SubscriptionsPageComponent, SubscriptionViewComponent, VarDirective], + providers: [ { provide: SubscriptionService, useValue: subscriptionServiceStub }, - { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, { provide: AuthService, useValue: authServiceStub }, { provide: PaginationService, useValue: paginationService } ], schemas: [NO_ERRORS_SCHEMA] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(SubscriptionsPageComponent); component = fixture.componentInstance; de = fixture.debugElement; - fixture.detectChanges(); - }); - - it('should create', () => { - fixture.detectChanges(); - expect(component).toBeTruthy(); }); - describe('when table', () => { + describe('when there are subscriptions', () => { - it('should show table', async() => { - await fixture.whenStable(); + beforeEach(() => { + subscriptionServiceStub.findByEPerson.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(pageInfo, mockSubscriptionList))); fixture.detectChanges(); - const table = de.query(By.css('table')); - expect(table).toBeTruthy(); }); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); - it('should show all the results', () => { - expect(de.queryAll(By.css('tbody > tr')).length).toEqual(10); - }); + it('should show table', () => { + expect(de.query(By.css('[data-test="subscription-table"]'))).toBeTruthy(); + expect(de.query(By.css('[data-test="empty-alert"]'))).toBeNull(); + }); - it('should have dso object info', () => { - expect(de.query(By.css('.dso-info > span'))).toBeTruthy(); - expect(de.query(By.css('.dso-info > p > a'))).toBeTruthy(); + it('should show a row for each results entry',() => { + expect(de.query(By.css('[data-test="subscription-table"]'))).toBeTruthy(); + expect(de.query(By.css('[data-test="empty-alert"]'))).toBeNull(); + expect(de.queryAll(By.css('tbody > tr')).length).toEqual(2); + }); }); - it('should have subscription type info', () => { - expect(de.query(By.css('.subscription-type'))).toBeTruthy(); - }); + describe('when there are no subscriptions', () => { - it('should have subscription paramenter info', () => { - expect(de.query(By.css('.subscription-parmenters > span'))).toBeTruthy(); - }); + beforeEach(() => { + subscriptionServiceStub.findByEPerson.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(emptyPageInfo, []))); + fixture.detectChanges(); + }); - it('should have subscription action info', () => { - expect(de.query(By.css('.btn-outline-primary'))).toBeTruthy(); - expect(de.query(By.css('.btn-outline-danger'))).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); + it('should not show table', () => { + expect(de.query(By.css('[data-test="subscription-table"]'))).toBeNull(); + expect(de.query(By.css('[data-test="empty-alert"]'))).toBeTruthy(); + }); + }); }); diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index a99daa9d683..2eed8b5fa5f 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -11,7 +11,8 @@ import { PaginationService } from '../core/pagination/pagination.service'; import { PageInfo } from '../core/shared/page-info.model'; import { AuthService } from '../core/auth/auth.service'; import { EPerson } from '../core/eperson/models/eperson.model'; -import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../core/shared/operators'; +import { RemoteData } from '../core/data/remote-data'; @Component({ selector: 'ds-subscriptions-page', @@ -43,7 +44,7 @@ export class SubscriptionsPageComponent implements OnInit { ePersonId$: Observable; /** - * EPerson id of the logged in user + * EPerson id of the logged-in user */ // ePersonId: string; @@ -61,35 +62,26 @@ export class SubscriptionsPageComponent implements OnInit { this.ePersonId$ = this.authService.getAuthenticatedUserFromStore().pipe( take(1), map((ePerson: EPerson) => ePerson.id), - shareReplay(), - /*tap((ePersonId: string) => { // TODO unused - this.ePersonId = ePersonId; - }),*/ + shareReplay() ); this.retrieveSubscriptions(); } private retrieveSubscriptions() { this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( - tap(console.log), combineLatestWith(this.ePersonId$), - tap(() => {this.loading$.next(true);}), + tap(() => this.loading$.next(true)), switchMap(([currentPagination, ePersonId]) => this.subscriptionService.findByEPerson(ePersonId,{ currentPage: currentPagination.currentPage, elementsPerPage: currentPagination.pageSize })), - getFirstSucceededRemoteDataPayload(), - tap((x) => console.log('find', x)), - // getFirstSucceededRemoteDataPayload(), - ).subscribe({ - next: (res: any) => { - console.log('next',res); - this.subscriptions$.next(res); - this.loading$.next(false); - }, - error: () => { - this.loading$.next(false); + getFirstCompletedRemoteData() + + ).subscribe((res: RemoteData>) => { + if (res.hasSucceeded) { + this.subscriptions$.next(res.payload); } + this.loading$.next(false); }); } /** From 31b17731f25403f79b04b2d2966f340efbda8198 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Wed, 28 Dec 2022 12:28:27 +0100 Subject: [PATCH 264/758] 97298: #3281 Self-register - test fixes --- .../data/eperson-registration.service.spec.ts | 4 +++- .../core/data/eperson-registration.service.ts | 6 +++++- .../register-email-form.component.spec.ts | 19 ++++++++++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/app/core/data/eperson-registration.service.spec.ts b/src/app/core/data/eperson-registration.service.spec.ts index 24072496154..32688d050b8 100644 --- a/src/app/core/data/eperson-registration.service.spec.ts +++ b/src/app/core/data/eperson-registration.service.spec.ts @@ -9,6 +9,7 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { of as observableOf } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; describe('EpersonRegistrationService', () => { let testScheduler; @@ -79,8 +80,9 @@ describe('EpersonRegistrationService', () => { it('should send an email registration', () => { const expected = service.registerEmail('test@mail.org'); + const options: HttpOptions = Object.create({}); - expect(requestService.send).toHaveBeenCalledWith(new PostRequest('request-id', 'rest-url/registrations', registration)); + expect(requestService.send).toHaveBeenCalledWith(new PostRequest('request-id', 'rest-url/registrations', registration, options)); expect(expected).toBeObservable(cold('(a|)', { a: rd })); }); }); diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts index 24c2263fd14..6a8d9c94f74 100644 --- a/src/app/core/data/eperson-registration.service.ts +++ b/src/app/core/data/eperson-registration.service.ts @@ -13,6 +13,7 @@ import { RegistrationResponseParsingService } from './registration-response-pars import { RemoteData } from './remote-data'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import {HttpParams} from '@angular/common/http'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; @Injectable( { @@ -63,7 +64,10 @@ export class EpersonRegistrationService { const href$ = this.getRegistrationEndpoint(); - const options = type ? {params: new HttpParams({fromString:'type=' + type})} : {}; + const options: HttpOptions = Object.create({}); + if (hasValue(type)) { + options.params = type ? new HttpParams({ fromString: 'type=' + type }) : new HttpParams(); + } href$.pipe( find((href: string) => hasValue(href)), diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts index a415ef48080..585e69405a5 100644 --- a/src/app/register-email-form/register-email-form.component.spec.ts +++ b/src/app/register-email-form/register-email-form.component.spec.ts @@ -14,8 +14,10 @@ import { RouterStub } from '../shared/testing/router.stub'; import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub'; import { RegisterEmailFormComponent } from './register-email-form.component'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; +import { ConfigurationDataService } from '../core/data/configuration-data.service'; +import { ConfigurationProperty } from '../core/shared/configuration-property.model'; -describe('RegisterEmailComponent', () => { +describe('RegisterEmailFormComponent', () => { let comp: RegisterEmailFormComponent; let fixture: ComponentFixture; @@ -23,6 +25,7 @@ describe('RegisterEmailComponent', () => { let router; let epersonRegistrationService: EpersonRegistrationService; let notificationsService; + let configurationDataService: ConfigurationDataService; beforeEach(waitForAsync(() => { @@ -33,6 +36,15 @@ describe('RegisterEmailComponent', () => { registerEmail: createSuccessfulRemoteDataObject$({}) }); + configurationDataService = jasmine.createSpyObj('configurationDataService', { + findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'authentication-password.domain.valid', + values: [ + 'example.com, @gmail.com' + ] + })) + }); + TestBed.configureTestingModule({ imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule], declarations: [RegisterEmailFormComponent], @@ -41,6 +53,7 @@ describe('RegisterEmailComponent', () => { {provide: EpersonRegistrationService, useValue: epersonRegistrationService}, {provide: FormBuilder, useValue: new FormBuilder()}, {provide: NotificationsService, useValue: notificationsService}, + {provide: ConfigurationDataService, useValue: configurationDataService}, ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); @@ -75,7 +88,7 @@ describe('RegisterEmailComponent', () => { comp.form.patchValue({email: 'valid@email.org'}); comp.register(); - expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org'); + expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null); expect(notificationsService.success).toHaveBeenCalled(); expect(router.navigate).toHaveBeenCalledWith(['/home']); }); @@ -85,7 +98,7 @@ describe('RegisterEmailComponent', () => { comp.form.patchValue({email: 'valid@email.org'}); comp.register(); - expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org'); + expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null); expect(notificationsService.error).toHaveBeenCalled(); expect(router.navigate).not.toHaveBeenCalled(); }); From 27d5097f4b24795224579dd2bc4e08585ee28390 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 28 Dec 2022 16:22:17 +0100 Subject: [PATCH 265/758] [CST-7757] Add subscribe button to all dso pages --- .../collection-page.component.html | 1 + .../community-page.component.html | 1 + .../journal-issue/journal-issue.component.html | 1 + .../journal-volume.component.html | 1 + .../item-pages/journal/journal.component.html | 1 + .../org-unit/org-unit.component.html | 1 + .../item-pages/person/person.component.html | 1 + .../item-pages/project/project.component.html | 1 + .../full/full-item-page.component.html | 1 + .../untyped-item/untyped-item.component.html | 1 + .../dso-page-subscription-button.component.ts | 18 ++++++++++-------- 11 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html index eebfdbd8292..b236365df55 100644 --- a/src/app/collection-page/collection-page.component.html +++ b/src/app/collection-page/collection-page.component.html @@ -35,6 +35,7 @@
    +
    diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html index 368fec08a5d..1b88877f8ba 100644 --- a/src/app/community-page/community-page.component.html +++ b/src/app/community-page/community-page.component.html @@ -22,6 +22,7 @@
    +
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index bf73a624478..e12b8a5ceb3 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -6,6 +6,7 @@ [tooltipMsgCreate]="'item.page.version.create'" [tooltipMsgHasDraft]="'item.page.version.hasDraft'"> +
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index b370431a27f..1bc9ec11377 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -6,6 +6,7 @@ [tooltipMsgCreate]="'item.page.version.create'" [tooltipMsgHasDraft]="'item.page.version.hasDraft'"> +
    diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index 27ee373237b..b787e937d6b 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -6,6 +6,7 @@ [tooltipMsgCreate]="'item.page.version.create'" [tooltipMsgHasDraft]="'item.page.version.hasDraft'"> +
    diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index ac92e4ad6d0..524adae4ce5 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -6,6 +6,7 @@ [tooltipMsgCreate]="'item.page.version.create'" [tooltipMsgHasDraft]="'item.page.version.hasDraft'"> +
    diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index a73236006b8..998c07777f1 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -7,6 +7,7 @@ [tooltipMsgCreate]="'item.page.version.create'" [tooltipMsgHasDraft]="'item.page.version.hasDraft'"> +
    diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index 3fb5e2d5206..b52f5aa8ddd 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -6,6 +6,7 @@ [tooltipMsgCreate]="'item.page.version.create'" [tooltipMsgHasDraft]="'item.page.version.hasDraft'"> +
    diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html index ee4ead28356..60aa6d6f863 100644 --- a/src/app/item-page/full/full-item-page.component.html +++ b/src/app/item-page/full/full-item-page.component.html @@ -10,6 +10,7 @@
    +
    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 5c3e5e77b01..806bd4baaf8 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 @@ -15,6 +15,7 @@ [tooltipMsgCreate]="'item.page.version.create'" [tooltipMsgHasDraft]="'item.page.version.hasDraft'"> +
    diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts index 39e685b4656..f97439c1a11 100644 --- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts +++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts @@ -1,8 +1,10 @@ import { Component, Input, OnInit } from '@angular/core'; + import { Observable, of } from 'rxjs'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; + import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { SubscriptionModalComponent } from '../../subscriptions/subscription-modal/subscription-modal.component'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; @@ -23,16 +25,10 @@ export class DsoPageSubscriptionButtonComponent implements OnInit { */ public modalRef: NgbModalRef; - /** - * EPerson id of the logged user - */ - ePersonId: string; - /** * DSpaceObject that is being viewed */ - @Input() - dso: DSpaceObject; + @Input() dso: DSpaceObject; constructor( protected authorizationService: AuthorizationDataService, @@ -40,10 +36,16 @@ export class DsoPageSubscriptionButtonComponent implements OnInit { ) { } + /** + * check if the current DSpaceObject can be subscribed by the user + */ ngOnInit(): void { this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanSubscribe, this.dso.self); } + /** + * Open the modal to subscribe to the related DSpaceObject + */ public openSubscriptionModal() { this.modalRef = this.modalService.open(SubscriptionModalComponent); this.modalRef.componentInstance.dso = this.dso; From 90a923889510b3f304ac04d5c5231f351ad3fcd8 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 28 Dec 2022 16:23:08 +0100 Subject: [PATCH 266/758] [CST-7757] fix pagination --- .../subscription-modal.component.html | 24 ++++----- .../subscriptions-page.component.html | 4 +- .../subscriptions-page.component.ts | 51 +++++++++++++------ 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index ef9e26032d6..f78567ee7bc 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -6,15 +6,11 @@

    {{'item.page.subscriptions.modal.title' | translate}}

    -
    -
    - {{ 'item.page.subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}: -
    @@ -27,20 +23,20 @@

    {{'item.page.subscriptions.modal.title' | translate}}

    - -
    + - -
    - diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html index 37b882fe44c..a327ec658c6 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.html +++ b/src/app/subscriptions-page/subscriptions-page.component.html @@ -9,14 +9,14 @@

    {{'subscriptions.title' | translate}}

    {{'subscriptions.table.dso' | translate}}
    - + diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 2eed8b5fa5f..242d5145ac9 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; -import { BehaviorSubject, combineLatestWith, Observable, shareReplay } from 'rxjs'; +import { BehaviorSubject, combineLatestWith, Observable, shareReplay, Subscription as rxjsSubscription } from 'rxjs'; import { map, switchMap, take, tap } from 'rxjs/operators'; import { Subscription } from '../shared/subscriptions/models/subscription.model'; @@ -11,15 +11,16 @@ import { PaginationService } from '../core/pagination/pagination.service'; import { PageInfo } from '../core/shared/page-info.model'; import { AuthService } from '../core/auth/auth.service'; import { EPerson } from '../core/eperson/models/eperson.model'; -import { getFirstCompletedRemoteData } from '../core/shared/operators'; +import { getAllCompletedRemoteData } from '../core/shared/operators'; import { RemoteData } from '../core/data/remote-data'; +import { hasValue } from '../shared/empty.util'; @Component({ selector: 'ds-subscriptions-page', templateUrl: './subscriptions-page.component.html', styleUrls: ['./subscriptions-page.component.scss'] }) -export class SubscriptionsPageComponent implements OnInit { +export class SubscriptionsPageComponent implements OnInit, OnDestroy { /** * The subscriptions to show on this page, as an Observable list. @@ -27,8 +28,7 @@ export class SubscriptionsPageComponent implements OnInit { subscriptions$: BehaviorSubject> = new BehaviorSubject(buildPaginatedList(new PageInfo(), [])); /** - * The current pagination configuration for the page used by the FindAll method - * Currently simply renders subscriptions + * The current pagination configuration for the page */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'elp', @@ -41,22 +41,26 @@ export class SubscriptionsPageComponent implements OnInit { */ loading$: BehaviorSubject = new BehaviorSubject(false); + /** + * The current eperson id + */ ePersonId$: Observable; /** - * EPerson id of the logged-in user + * The rxjs subscription used to retrieve the result list */ - // ePersonId: string; + sub: rxjsSubscription = null; constructor( private paginationService: PaginationService, private authService: AuthService, private subscriptionService: SubscriptionService - ) { } + ) { + + } /** - * Subscribe the pagination service to send a request with specific pagination - * When page is changed it will request the new subscriptions for the new page config + * Retrieve the current eperson id and call method to retrieve the subscriptions */ ngOnInit(): void { this.ePersonId$ = this.authService.getAuthenticatedUserFromStore().pipe( @@ -67,16 +71,21 @@ export class SubscriptionsPageComponent implements OnInit { this.retrieveSubscriptions(); } - private retrieveSubscriptions() { - this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( + /** + * Retrieve subscription list related to the current user. + * When page is changed it will request the new subscriptions for the new page config + * @private + */ + private retrieveSubscriptions(): void { + this.sub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( + tap(console.log), combineLatestWith(this.ePersonId$), tap(() => this.loading$.next(true)), switchMap(([currentPagination, ePersonId]) => this.subscriptionService.findByEPerson(ePersonId,{ currentPage: currentPagination.currentPage, elementsPerPage: currentPagination.pageSize })), - getFirstCompletedRemoteData() - + getAllCompletedRemoteData() ).subscribe((res: RemoteData>) => { if (res.hasSucceeded) { this.subscriptions$.next(res.payload); @@ -85,10 +94,20 @@ export class SubscriptionsPageComponent implements OnInit { }); } /** - * When an action is made and the information is changed refresh the information + * When a subscription is deleted refresh the subscription list */ refresh(): void { + if (hasValue(this.sub)) { + this.sub.unsubscribe(); + } + this.retrieveSubscriptions(); } + ngOnDestroy(): void { + if (hasValue(this.sub)) { + this.sub.unsubscribe(); + } + } + } From 09781c90573084bd56e76136702584a558882bb6 Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Thu, 29 Dec 2022 18:16:54 +0530 Subject: [PATCH 267/758] [CST-7755] LYRASIS: Supervisor orders (Angular) --- .../admin-workflow-page.component.html | 2 +- ...admin-workflow-list-element.component.html | 5 +- ...t-admin-workflow-list-element.component.ts | 2 + ...item-admin-workflow-actions.component.html | 7 + ...m-admin-workflow-actions.component.spec.ts | 15 + ...w-item-admin-workflow-actions.component.ts | 33 +++ src/app/core/core.module.ts | 2 + src/app/core/shared/context.model.ts | 1 + .../models/submission-object.model.ts | 10 + .../models/action-type.model.ts | 44 +++ .../models/supervision-order.model.ts | 74 +++++ .../models/supervision-order.resource-type.ts | 9 + .../supervision-order-data.service.spec.ts | 277 ++++++++++++++++++ .../supervision-order-data.service.ts | 181 ++++++++++++ ...arch-result-list-element.component.spec.ts | 67 ++++- ...arch-result-list-element.component.spec.ts | 66 +++++ ...arch-result-list-element.component.spec.ts | 66 +++++ ...arch-result-list-element.component.spec.ts | 64 +++- ...arch-result-list-element.component.spec.ts | 63 +++- ...on-search-result-list-element.component.ts | 12 +- ...arch-result-list-element.component.spec.ts | 67 ++++- .../my-dspace-configuration-value-type.ts | 1 + .../my-dspace-configuration.service.spec.ts | 4 +- .../my-dspace-configuration.service.ts | 2 + .../supervision-group-selector.component.html | 40 +++ ...supervision-group-selector.component.scss} | 0 ...pervision-group-selector.component.spec.ts | 70 +++++ .../supervision-group-selector.component.ts | 90 ++++++ .../eperson-group-list.component.html | 0 .../eperson-group-list.component.scss | 0 .../eperson-group-list.component.spec.ts | 26 +- .../eperson-group-list.component.ts | 32 +- .../eperson-search-box.component.html | 0 .../eperson-search-box.component.spec.ts | 2 +- .../eperson-search-box.component.ts | 2 +- .../group-search-box.component.html | 0 .../group-search-box.component.spec.ts | 2 +- .../group-search-box.component.ts | 2 +- ...-search-result-list-element.component.html | 13 + ...-search-result-list-element.component.scss | 6 + ...arch-result-list-element.component.spec.ts | 66 +++++ ...em-search-result-list-element.component.ts | 76 ++++- .../resource-policy-form.component.spec.ts | 2 +- .../resource-policies.module.ts | 6 - src/app/shared/search/search.component.ts | 6 +- src/app/shared/shared.module.ts | 12 + src/assets/i18n/en.json5 | 56 ++++ 47 files changed, 1531 insertions(+), 52 deletions(-) create mode 100644 src/app/core/supervision-order/models/action-type.model.ts create mode 100644 src/app/core/supervision-order/models/supervision-order.model.ts create mode 100644 src/app/core/supervision-order/models/supervision-order.resource-type.ts create mode 100644 src/app/core/supervision-order/supervision-order-data.service.spec.ts create mode 100644 src/app/core/supervision-order/supervision-order-data.service.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html rename src/app/shared/{resource-policies/form/eperson-group-list/eperson-group-list.component.scss => dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.scss} (100%) create mode 100644 src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.spec.ts create mode 100644 src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts rename src/app/shared/{resource-policies => }/form/eperson-group-list/eperson-group-list.component.html (100%) create mode 100644 src/app/shared/form/eperson-group-list/eperson-group-list.component.scss rename src/app/shared/{resource-policies => }/form/eperson-group-list/eperson-group-list.component.spec.ts (88%) rename src/app/shared/{resource-policies => }/form/eperson-group-list/eperson-group-list.component.ts (81%) rename src/app/shared/{resource-policies => }/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html (100%) rename src/app/shared/{resource-policies => }/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts (97%) rename src/app/shared/{resource-policies => }/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts (96%) rename src/app/shared/{resource-policies => }/form/eperson-group-list/group-search-box/group-search-box.component.html (100%) rename src/app/shared/{resource-policies => }/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts (97%) rename src/app/shared/{resource-policies => }/form/eperson-group-list/group-search-box/group-search-box.component.ts (96%) diff --git a/src/app/admin/admin-workflow-page/admin-workflow-page.component.html b/src/app/admin/admin-workflow-page/admin-workflow-page.component.html index 404af131d1f..d12cefb3313 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.html +++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.html @@ -1 +1 @@ - + diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html index 192cc751f2c..77ece5254d6 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html @@ -1,6 +1,9 @@ -
    +
    {{ "admin.workflow.item.workflow" | translate }}
    +
    + {{ "admin.workflow.item.workspace" | translate }} +
    {{"admin.workflow.item.send-back" | translate}} + + {{'admin.workflow.item.policies' | translate}} + + + {{'admin.workflow.item.supervision' | translate}} +
    diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts index 75e0e2e7a8e..9b2bffffef6 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts @@ -11,17 +11,25 @@ import { getWorkflowItemDeleteRoute, getWorkflowItemSendBackRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; +import { of } from 'rxjs'; +import { Item } from 'src/app/core/shared/item.model'; +import { RemoteData } from 'src/app/core/data/remote-data'; +import { RequestEntryState } from 'src/app/core/data/request-entry-state.model'; describe('WorkflowItemAdminWorkflowActionsComponent', () => { let component: WorkflowItemAdminWorkflowActionsComponent; let fixture: ComponentFixture; let id; let wfi; + let item = new Item(); + item.uuid = 'itemUUID1111'; + const rd = new RemoteData(undefined, undefined, undefined, RequestEntryState.Success, undefined, item, 200); function init() { id = '780b2588-bda5-4112-a1cd-0b15000a5339'; wfi = new WorkflowItem(); wfi.id = id; + wfi.item = of(rd); } beforeEach(waitForAsync(() => { @@ -59,4 +67,11 @@ describe('WorkflowItemAdminWorkflowActionsComponent', () => { const link = a.nativeElement.href; expect(link).toContain(new URLCombiner(getWorkflowItemSendBackRoute(wfi.id)).toString()); }); + + it('should render a policies button with the correct link', () => { + const a = fixture.debugElement.query(By.css('a.policies-link')); + const link = a.nativeElement.href; + expect(link).toContain(new URLCombiner('/items/itemUUID1111/edit/bitstreams').toString()); + }); + }); diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts index 32725a0e7a7..924f24e738d 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts @@ -1,4 +1,9 @@ import { Component, Input } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { map, Observable } from 'rxjs'; +import { Item } from '../../../core/shared/item.model'; +import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; +import { SupervisionGroupSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component'; import { WorkflowItem } from '../../../core/submission/models/workflowitem.model'; import { getWorkflowItemSendBackRoute, @@ -25,6 +30,10 @@ export class WorkflowItemAdminWorkflowActionsComponent { */ @Input() public small: boolean; + constructor( + private modalService: NgbModal + ) { } + /** * Returns the path to the delete page of this workflow item */ @@ -39,4 +48,28 @@ export class WorkflowItemAdminWorkflowActionsComponent { getSendBackRoute(): string { return getWorkflowItemSendBackRoute(this.wfi.id); } + + /** + * Returns the path to the to administrative edit page policies tab + */ + getPoliciesRoute(): Observable { + return this.wfi.item.pipe( + getFirstSucceededRemoteDataPayload(), + map((item: Item) => { + return '/items/' + item.uuid + '/edit/bitstreams'; + }) + ); + } + + /** + * Opens the Supervision Modal to create a supervision order + */ + openSupervisionModal() { + this.wfi.item.pipe( + getFirstSucceededRemoteDataPayload(), + ).subscribe((item: Item) => { + const supervisionModal = this.modalService.open(SupervisionGroupSelectorComponent, { size: 'lg', backdrop: 'static' }); + supervisionModal.componentInstance.itemUUID = item.uuid; + }); + } } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index ede23ba43b7..845bab2ea81 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -170,6 +170,7 @@ import { OrcidHistory } from './orcid/model/orcid-history.model'; import { OrcidAuthService } from './orcid/orcid-auth.service'; import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service'; import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service'; +import { SupervisionOrderDataService } from './supervision-order/supervision-order-data.service'; /** * When not in production, endpoint responses can be mocked for testing purposes @@ -292,6 +293,7 @@ const PROVIDERS = [ OrcidAuthService, OrcidQueueDataService, OrcidHistoryDataService, + SupervisionOrderDataService ]; /** diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts index 126896e3e12..0f1130ebdad 100644 --- a/src/app/core/shared/context.model.ts +++ b/src/app/core/shared/context.model.ts @@ -8,6 +8,7 @@ export enum Context { Search = 'search', Workflow = 'workflow', Workspace = 'workspace', + SupervisedItems = 'otherworkspace', AdminMenu = 'adminMenu', EntitySearchModalWithNameVariants = 'EntitySearchModalWithNameVariants', EntitySearchModal = 'EntitySearchModal', diff --git a/src/app/core/submission/models/submission-object.model.ts b/src/app/core/submission/models/submission-object.model.ts index 3d7c0a3678a..3d373d25229 100644 --- a/src/app/core/submission/models/submission-object.model.ts +++ b/src/app/core/submission/models/submission-object.model.ts @@ -14,6 +14,7 @@ import { ITEM } from '../../shared/item.resource-type'; import { excludeFromEquals } from '../../utilities/equals.decorators'; import { WorkspaceitemSectionsObject } from './workspaceitem-sections.model'; import { CacheableObject } from '../../cache/cacheable-object.model'; +import { SUPERVISION_ORDER } from '../../supervision-order/models/supervision-order.resource-type'; export interface SubmissionObjectError { message: string; @@ -65,6 +66,7 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable item: HALLink; submissionDefinition: HALLink; submitter: HALLink; + supervisionOrders: HALLink; }; get self(): string { @@ -93,4 +95,12 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable @link(EPERSON) submitter?: Observable> | EPerson; + /** + * The submission supervision order + * Will be undefined unless the workspace item {@link HALLink} has been resolved. + */ + @link(SUPERVISION_ORDER) + /* This was changed from 'Observable> | WorkspaceItem' to 'any' to prevent issues in templates with async */ + supervisionOrders?: any; + } diff --git a/src/app/core/supervision-order/models/action-type.model.ts b/src/app/core/supervision-order/models/action-type.model.ts new file mode 100644 index 00000000000..0e556890698 --- /dev/null +++ b/src/app/core/supervision-order/models/action-type.model.ts @@ -0,0 +1,44 @@ +/** + * Enum representing the Action Type of a Resource Policy + */ +export enum ActionType { + /** + * Action of reading, viewing or downloading something + */ + READ = 'READ', + + /** + * Action of modifying something + */ + WRITE = 'WRITE', + + /** + * Action of deleting something + */ + DELETE = 'DELETE', + + /** + * Action of adding something to a container + */ + ADD = 'ADD', + + /** + * Action of removing something from a container + */ + REMOVE = 'REMOVE', + + /** + * None Type of Supervision Order + */ + NONE = 'NONE', + + /** + * Editor Type of Supervision Order + */ + EDITOR = 'EDITOR', + + /** + * Observer Type of Supervision Order + */ + OBSERVER = 'OBSERVER', +} diff --git a/src/app/core/supervision-order/models/supervision-order.model.ts b/src/app/core/supervision-order/models/supervision-order.model.ts new file mode 100644 index 00000000000..e881c06d1b0 --- /dev/null +++ b/src/app/core/supervision-order/models/supervision-order.model.ts @@ -0,0 +1,74 @@ +import { autoserialize, deserialize, deserializeAs } from 'cerialize'; +import { link, typedObject } from '../../cache/builders/build-decorators'; +import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer'; +import { HALLink } from '../../shared/hal-link.model'; +import { SUPERVISION_ORDER } from './supervision-order.resource-type'; +import { excludeFromEquals } from '../../utilities/equals.decorators'; +import { ResourceType } from '../../shared/resource-type'; +import { Observable } from 'rxjs'; +import { RemoteData } from '../../data/remote-data'; +import { GROUP } from '../../eperson/models/group.resource-type'; +import { Group } from '../../eperson/models/group.model'; +import { CacheableObject } from '../../cache/cacheable-object.model'; +import { ITEM } from '../../shared/item.resource-type'; +import { Item } from '../../shared/item.model'; + +/** + * Model class for a Supervision Order + */ +@typedObject +export class SupervisionOrder implements CacheableObject { + static type = SUPERVISION_ORDER; + + /** + * The identifier for this Supervision Order + */ + @autoserialize + id: string; + + /** + * The object type + */ + @excludeFromEquals + @autoserialize + type: ResourceType; + + /** + * The object type + */ + @excludeFromEquals + @autoserialize + ordertype: string; + + /** + * The universally unique identifier for this Supervision Order + * This UUID is generated client-side and isn't used by the backend. + * It is based on the ID, so it will be the same for each refresh. + */ + @deserializeAs(new IDToUUIDSerializer('supervision-order'), 'id') + uuid: string; + + /** + * The {@link HALLink}s for this SupervisionOrder + */ + @deserialize + _links: { + item: HALLink, + group: HALLink, + self: HALLink, + }; + + /** + * The related supervision Item + * Will be undefined unless the item {@link HALLink} has been resolved. + */ + @link(ITEM) + item?: Observable>; + + /** + * The group linked by this supervision order + * Will be undefined unless the version {@link HALLink} has been resolved. + */ + @link(GROUP) + group?: Observable>; +} diff --git a/src/app/core/supervision-order/models/supervision-order.resource-type.ts b/src/app/core/supervision-order/models/supervision-order.resource-type.ts new file mode 100644 index 00000000000..994c93ab741 --- /dev/null +++ b/src/app/core/supervision-order/models/supervision-order.resource-type.ts @@ -0,0 +1,9 @@ +import { ResourceType } from '../../shared/resource-type'; + +/** + * The resource type for SupervisionOrder + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const SUPERVISION_ORDER = new ResourceType('supervisionorder'); diff --git a/src/app/core/supervision-order/supervision-order-data.service.spec.ts b/src/app/core/supervision-order/supervision-order-data.service.spec.ts new file mode 100644 index 00000000000..b12817fa1af --- /dev/null +++ b/src/app/core/supervision-order/supervision-order-data.service.spec.ts @@ -0,0 +1,277 @@ +import { cold, getTestScheduler, hot } from 'jasmine-marbles'; +import { of as observableOf } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; + +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { RequestService } from '../data/request.service'; +import { SupervisionOrderDataService } from './supervision-order-data.service'; +import { ActionType } from './models/action-type.model'; +import { RequestParam } from '../cache/models/request-param.model'; +import { PageInfo } from '../shared/page-info.model'; +import { buildPaginatedList } from '../data/paginated-list.model'; +import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; +import { RestResponse } from '../cache/response.models'; +import { RequestEntry } from '../data/request-entry.model'; +import { FindListOptions } from '../data/find-list-options.model'; +import { GroupDataService } from '../eperson/group-data.service'; + +describe('SupervisionOrderService', () => { + let scheduler: TestScheduler; + let service: SupervisionOrderDataService; + let requestService: RequestService; + let rdbService: RemoteDataBuildService; + let objectCache: ObjectCacheService; + let halService: HALEndpointService; + let responseCacheEntry: RequestEntry; + let groupService: GroupDataService; + + const supervisionOrder: any = { + id: '1', + name: null, + description: null, + action: ActionType.READ, + startDate: null, + endDate: null, + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorder/1' + }, + } + }; + + const anothersupervisionOrder: any = { + id: '2', + name: null, + description: null, + action: ActionType.WRITE, + startDate: null, + endDate: null, + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorder/1' + }, + } + }; + const endpointURL = `https://rest.api/rest/api/supervisionorder`; + const requestURL = `https://rest.api/rest/api/supervisionorder/${supervisionOrder.id}`; + const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a'; + const supervisionOrderId = '1'; + const groupUUID = '8b39g7ya-5a4b-438b-9686-be1d5b4a1c5a'; + const itemUUID = '8b39g7ya-5a4b-438b-851f-be1d5b4a1c5a'; + const supervisionOrderType = 'NONE'; + + const pageInfo = new PageInfo(); + const array = [supervisionOrder, anothersupervisionOrder]; + const paginatedList = buildPaginatedList(pageInfo, array); + const supervisionOrderRD = createSuccessfulRemoteDataObject(supervisionOrder); + const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + + const groupEndpoint = 'group_EP'; + + beforeEach(() => { + scheduler = getTestScheduler(); + + halService = jasmine.createSpyObj('halService', { + getEndpoint: cold('a', { a: endpointURL }) + }); + + responseCacheEntry = new RequestEntry(); + responseCacheEntry.request = { href: 'https://rest.api/' } as any; + responseCacheEntry.response = new RestResponse(true, 200, 'Success'); + + requestService = jasmine.createSpyObj('requestService', { + generateRequestId: requestUUID, + send: true, + removeByHrefSubstring: {}, + getByHref: observableOf(responseCacheEntry), + getByUUID: observableOf(responseCacheEntry), + setStaleByHrefSubstring: {}, + }); + rdbService = jasmine.createSpyObj('rdbService', { + buildSingle: hot('a|', { + a: supervisionOrderRD + }), + buildList: hot('a|', { + a: paginatedListRD + }), + buildFromRequestUUID: hot('a|', { + a: supervisionOrderRD + }), + buildFromRequestUUIDAndAwait: hot('a|', { + a: supervisionOrderRD + }) + }); + groupService = jasmine.createSpyObj('groupService', { + getBrowseEndpoint: hot('a', { + a: groupEndpoint + }), + getIDHrefObs: cold('a', { + a: 'https://rest.api/rest/api/group/groups/' + groupUUID + }), + }); + groupService = jasmine.createSpyObj('groupService', { + getIDHrefObs: cold('a', { + a: 'https://rest.api/rest/api/group/groups/' + groupUUID + }), + }); + objectCache = {} as ObjectCacheService; + const notificationsService = {} as NotificationsService; + const comparator = {} as any; + + service = new SupervisionOrderDataService( + requestService, + rdbService, + objectCache, + halService, + notificationsService, + comparator, + groupService, + ); + + spyOn(service, 'findById').and.callThrough(); + spyOn(service, 'findByHref').and.callThrough(); + spyOn(service, 'invalidateByHref').and.returnValue(observableOf(true)); + spyOn((service as any).createData, 'create').and.callThrough(); + spyOn((service as any).deleteData, 'delete').and.callThrough(); + spyOn((service as any).patchData, 'update').and.callThrough(); + spyOn((service as any).searchData, 'searchBy').and.callThrough(); + spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(observableOf(requestURL)); + }); + + describe('create', () => { + it('should proxy the call to createData.create with group UUID', () => { + scheduler.schedule(() => service.create(supervisionOrder, itemUUID, groupUUID, supervisionOrderType)); + const params = [ + new RequestParam('uuid', itemUUID), + new RequestParam('group', groupUUID), + new RequestParam('type', supervisionOrderType), + ]; + scheduler.flush(); + + expect((service as any).createData.create).toHaveBeenCalledWith(supervisionOrder, ...params); + }); + + it('should proxy the call to createData.create with group UUID', () => { + scheduler.schedule(() => service.create(supervisionOrder, itemUUID, groupUUID, supervisionOrderType)); + const params = [ + new RequestParam('uuid', itemUUID), + new RequestParam('group', groupUUID), + new RequestParam('type', supervisionOrderType), + ]; + scheduler.flush(); + + expect((service as any).createData.create).toHaveBeenCalledWith(supervisionOrder, ...params); + }); + + it('should return a RemoteData for the object with the given id', () => { + const result = service.create(supervisionOrder, itemUUID, groupUUID, supervisionOrderType); + const expected = cold('a|', { + a: supervisionOrderRD + }); + expect(result).toBeObservable(expected); + }); + }); + + describe('delete', () => { + it('should proxy the call to deleteData.delete', () => { + scheduler.schedule(() => service.delete(supervisionOrderId)); + scheduler.flush(); + + expect((service as any).deleteData.delete).toHaveBeenCalledWith(supervisionOrderId); + }); + }); + + describe('update', () => { + it('should proxy the call to updateData.update', () => { + scheduler.schedule(() => service.update(supervisionOrder)); + scheduler.flush(); + + expect((service as any).patchData.update).toHaveBeenCalledWith(supervisionOrder); + }); + }); + + describe('findById', () => { + it('should return a RemoteData for the object with the given id', () => { + const result = service.findById(supervisionOrderId); + const expected = cold('a|', { + a: supervisionOrderRD + }); + expect(result).toBeObservable(expected); + }); + }); + + describe('findByHref', () => { + it('should return a RemoteData for the object with the given URL', () => { + const result = service.findByHref(requestURL); + const expected = cold('a|', { + a: supervisionOrderRD + }); + expect(result).toBeObservable(expected); + }); + }); + + describe('searchByGroup', () => { + it('should proxy the call to searchData.searchBy', () => { + const options = new FindListOptions(); + options.searchParams = [new RequestParam('uuid', groupUUID)]; + scheduler.schedule(() => service.searchByGroup(groupUUID)); + scheduler.flush(); + + expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true); + }); + + it('should proxy the call to searchData.searchBy with additional search param', () => { + const options = new FindListOptions(); + options.searchParams = [ + new RequestParam('uuid', groupUUID), + new RequestParam('item', itemUUID), + ]; + scheduler.schedule(() => service.searchByGroup(groupUUID, itemUUID)); + scheduler.flush(); + + expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true); + }); + + it('should return a RemoteData) for the search', () => { + const result = service.searchByGroup(groupUUID); + const expected = cold('a|', { + a: paginatedListRD + }); + expect(result).toBeObservable(expected); + }); + + }); + + describe('searchByItem', () => { + it('should proxy the call to searchData.searchBy', () => { + const options = new FindListOptions(); + options.searchParams = [new RequestParam('uuid', itemUUID)]; + scheduler.schedule(() => service.searchByItem(itemUUID)); + scheduler.flush(); + + expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByItemMethod, options, true, true); + }); + + it('should return a RemoteData) for the search', () => { + const result = service.searchByItem(itemUUID); + const expected = cold('a|', { + a: paginatedListRD + }); + expect(result).toBeObservable(expected); + }); + }); + +}); diff --git a/src/app/core/supervision-order/supervision-order-data.service.ts b/src/app/core/supervision-order/supervision-order-data.service.ts new file mode 100644 index 00000000000..fed0c57b096 --- /dev/null +++ b/src/app/core/supervision-order/supervision-order-data.service.ts @@ -0,0 +1,181 @@ +import { Injectable } from '@angular/core'; +import { HttpHeaders } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { RequestService } from '../data/request.service'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { SupervisionOrder } from './models/supervision-order.model'; +import { RemoteData } from '../data/remote-data'; +import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { SUPERVISION_ORDER } from './models/supervision-order.resource-type'; +import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service'; +import { PaginatedList } from '../data/paginated-list.model'; +import { RequestParam } from '../cache/models/request-param.model'; +import { isNotEmpty } from '../../shared/empty.util'; +import { first, map } from 'rxjs/operators'; +import { NoContent } from '../shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '../shared/operators'; +import { FindListOptions } from '../data/find-list-options.model'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; +import { PutRequest } from '../data/request.models'; +import { GenericConstructor } from '../shared/generic-constructor'; +import { ResponseParsingService } from '../data/parsing.service'; +import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-response-parsing.service'; +import { GroupDataService } from '../eperson/group-data.service'; +import { IdentifiableDataService } from '../data/base/identifiable-data.service'; +import { CreateDataImpl } from '../data/base/create-data'; +import { SearchDataImpl } from '../data/base/search-data'; +import { PatchDataImpl } from '../data/base/patch-data'; +import { DeleteDataImpl } from '../data/base/delete-data'; +import { dataService } from '../data/base/data-service.decorator'; + +/** + * A service responsible for fetching/sending data from/to the REST API on the supervisionorders endpoint + */ +@Injectable() +@dataService(SUPERVISION_ORDER) +export class SupervisionOrderDataService extends IdentifiableDataService { + protected searchByGroupMethod = 'group'; + protected searchByItemMethod = 'byItem'; + + private createData: CreateDataImpl; + private searchData: SearchDataImpl; + private patchData: PatchDataImpl; + private deleteData: DeleteDataImpl; + + constructor( + protected requestService: RequestService, + protected rdbService: RemoteDataBuildService, + protected objectCache: ObjectCacheService, + protected halService: HALEndpointService, + protected notificationsService: NotificationsService, + protected comparator: DefaultChangeAnalyzer, + protected groupService: GroupDataService, + ) { + super('supervisionorders', requestService, rdbService, objectCache, halService); + + this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive); + this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive); + this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint); + this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint); + } + + /** + * Create a new SupervisionOrder on the server, and store the response + * in the object cache + * + * @param {SupervisionOrder} supervisionOrder + * The supervision order to create + * @param {string} itemUUID + * The uuid of the item that will be grant of the permission. + * @param {string} groupUUID + * The uuid of the group that will be grant of the permission. + * @param {string} type + * The type of the supervision order that will be grant of the permission. + */ + create(supervisionOrder: SupervisionOrder, itemUUID: string, groupUUID: string, type: string): Observable> { + const params = []; + params.push(new RequestParam('uuid', itemUUID)); + params.push(new RequestParam('group', groupUUID)); + params.push(new RequestParam('type', type)); + return this.createData.create(supervisionOrder, ...params); + } + + /** + * Delete an existing SupervisionOrder on the server + * + * @param supervisionOrderID The supervision order's id to be removed + * @return an observable that emits true when the deletion was successful, false when it failed + */ + delete(supervisionOrderID: string): Observable { + return this.deleteData.delete(supervisionOrderID).pipe( + getFirstCompletedRemoteData(), + map((response: RemoteData) => response.hasSucceeded), + ); + } + + /** + * Add a new patch to the object cache + * The patch is derived from the differences between the given object and its version in the object cache + * @param {SupervisionOrder} object The given object + */ + update(object: SupervisionOrder): Observable> { + return this.patchData.update(object); + } + + /** + * Return the {@link SupervisionOrder} list for a {@link Group} + * + * @param UUID UUID of a given {@link Group} + * @param itemUUID Limit the returned policies to the specified DSO + * @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 linksToFollow List of {@link FollowLinkConfig} that indicate which + * {@link HALLink}s should be automatically resolved + */ + searchByGroup(UUID: string, itemUUID?: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[]): Observable>> { + const options = new FindListOptions(); + options.searchParams = [new RequestParam('uuid', UUID)]; + if (isNotEmpty(itemUUID)) { + options.searchParams.push(new RequestParam('item', itemUUID)); + } + return this.searchData.searchBy(this.searchByGroupMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + } + + /** + * Return the {@link SupervisionOrder} list for a given DSO + * + * @param UUID UUID of a given DSO + * @param action Limit the returned policies to the specified {@link ActionType} + * @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 linksToFollow List of {@link FollowLinkConfig} that indicate which + * {@link HALLink}s should be automatically resolved + */ + searchByItem(UUID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[]): Observable>> { + const options = new FindListOptions(); + options.searchParams = [new RequestParam('uuid', UUID)]; + return this.searchData.searchBy(this.searchByItemMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + } + + /** + * Update the target of the supervision order + * @param supervisionOrderId the ID of the supervision order + * @param supervisionOrderHref the link to the supervision order + * @param targetUUID the UUID of the target to which the permission is being granted + * @param targetType the type of the target (eperson or group) to which the permission is being granted + */ + updateTarget(supervisionOrderId: string, supervisionOrderHref: string, targetUUID: string, targetType: string): Observable> { + const targetService = this.groupService; + const targetEndpoint$ = targetService.getIDHrefObs(targetUUID); + + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'text/uri-list'); + options.headers = headers; + + const requestId = this.requestService.generateRequestId(); + + targetEndpoint$.pipe( + first(), + ).subscribe((targetEndpoint) => { + const resourceEndpoint = supervisionOrderHref + '/' + targetType; + const request = new PutRequest(requestId, resourceEndpoint, targetEndpoint, options); + Object.assign(request, { + getResponseParser(): GenericConstructor { + return StatusCodeOnlyResponseParsingService; + } + }); + this.requestService.send(request); + }); + + return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => this.invalidateByHref(supervisionOrderHref)); + } + +} diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts index 178ed86c40c..be110db101b 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts @@ -10,6 +10,14 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; +import { GroupMock } from '../../../../../shared/testing/group-mock'; +import { hot } from 'jasmine-marbles'; let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent; let fixture: ComponentFixture; @@ -70,12 +78,61 @@ const enviromentNoThumbs = { } }; +const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + searchByItem: jasmine.createSpy('searchByItem'), +}); + +const supervisionOrder: any = { + id: '1', + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; +const anothersupervisionOrder: any = { + id: '2', + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; + +const pageInfo = new PageInfo(); +const array = [supervisionOrder, anothersupervisionOrder]; +const paginatedList = buildPaginatedList(pageInfo, array); +const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + describe('JournalIssueSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, + { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, + {provide: TranslateService, useValue: {}}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -87,6 +144,9 @@ describe('JournalIssueSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent); journalIssueListElementComponent = fixture.componentInstance; @@ -164,6 +224,9 @@ describe('JournalIssueSearchResultListElementComponent', () => { declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, + {provide: TranslateService, useValue: {}}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -181,7 +244,9 @@ describe('JournalIssueSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); journalIssueListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts index 71fa83a3b1e..76d516e76eb 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts @@ -10,6 +10,14 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; +import { GroupMock } from '../../../../../shared/testing/group-mock'; +import { hot } from 'jasmine-marbles'; let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent; let fixture: ComponentFixture; @@ -69,12 +77,61 @@ const enviromentNoThumbs = { } }; +const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + searchByItem: jasmine.createSpy('searchByItem'), +}); + +const supervisionOrder: any = { + id: '1', + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; +const anothersupervisionOrder: any = { + id: '2', + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; + +const pageInfo = new PageInfo(); +const array = [supervisionOrder, anothersupervisionOrder]; +const paginatedList = buildPaginatedList(pageInfo, array); +const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + describe('JournalVolumeSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, + { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + { provide: NotificationsService, useValue: {}}, + { provide: TranslateService, useValue: {}}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -86,6 +143,9 @@ describe('JournalVolumeSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent); journalVolumeListElementComponent = fixture.componentInstance; @@ -162,6 +222,9 @@ describe('JournalVolumeSearchResultListElementComponent', () => { declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, + {provide: TranslateService, useValue: {}}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -173,6 +236,9 @@ describe('JournalVolumeSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent); journalVolumeListElementComponent = fixture.componentInstance; })); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts index 07970d71282..55f08757319 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts @@ -10,6 +10,14 @@ import { ItemSearchResult } from '../../../../../shared/object-collection/shared import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; +import { GroupMock } from '../../../../../shared/testing/group-mock'; +import { hot } from 'jasmine-marbles'; let journalListElementComponent: JournalSearchResultListElementComponent; let fixture: ComponentFixture; @@ -65,12 +73,61 @@ const enviromentNoThumbs = { } }; +const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + searchByItem: jasmine.createSpy('searchByItem'), +}); + +const supervisionOrder: any = { + id: '1', + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; +const anothersupervisionOrder: any = { + id: '2', + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; + +const pageInfo = new PageInfo(); +const array = [supervisionOrder, anothersupervisionOrder]; +const paginatedList = buildPaginatedList(pageInfo, array); +const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + describe('JournalSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [JournalSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, + { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + { provide: NotificationsService, useValue: {}}, + { provide: TranslateService, useValue: {}}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -82,6 +139,9 @@ describe('JournalSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(JournalSearchResultListElementComponent); journalListElementComponent = fixture.componentInstance; @@ -134,6 +194,9 @@ describe('JournalSearchResultListElementComponent', () => { declarations: [JournalSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, + {provide: TranslateService, useValue: {}}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -145,6 +208,9 @@ describe('JournalSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(JournalSearchResultListElementComponent); journalListElementComponent = fixture.componentInstance; })); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts index 9609a9582aa..b8f30fe66e2 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts @@ -12,6 +12,13 @@ import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; +import { GroupMock } from '../../../../../shared/testing/group-mock'; +import { hot } from 'jasmine-marbles'; let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent; let fixture: ComponentFixture; @@ -65,6 +72,52 @@ const enviromentNoThumbs = { } }; +const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + searchByItem: jasmine.createSpy('searchByItem'), +}); + +const supervisionOrder: any = { + id: '1', + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; +const anothersupervisionOrder: any = { + id: '2', + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; + +const pageInfo = new PageInfo(); +const array = [supervisionOrder, anothersupervisionOrder]; +const paginatedList = buildPaginatedList(pageInfo, array); +const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + describe('OrgUnitSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ @@ -78,6 +131,8 @@ describe('OrgUnitSearchResultListElementComponent', () => { declarations: [ OrgUnitSearchResultListElementComponent , TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -89,6 +144,9 @@ describe('OrgUnitSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent); orgUnitListElementComponent = fixture.componentInstance; @@ -148,6 +206,8 @@ describe('OrgUnitSearchResultListElementComponent', () => { declarations: [OrgUnitSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -165,7 +225,9 @@ describe('OrgUnitSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); orgUnitListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts index 31018520f62..3f4cc1d2949 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts @@ -12,9 +12,19 @@ import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { hot } from 'jasmine-marbles'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { GroupMock } from '../../../../../shared/testing/group-mock'; +import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; let personListElementComponent: PersonSearchResultListElementComponent; let fixture: ComponentFixture; +const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + searchByItem: jasmine.createSpy('searchByItem'), +}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -65,6 +75,48 @@ const enviromentNoThumbs = { } }; +const supervisionOrder: any = { + id: '1', + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; +const anothersupervisionOrder: any = { + id: '2', + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; + +const pageInfo = new PageInfo(); +const array = [supervisionOrder, anothersupervisionOrder]; +const paginatedList = buildPaginatedList(pageInfo, array); +const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + describe('PersonSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ @@ -78,6 +130,8 @@ describe('PersonSearchResultListElementComponent', () => { declarations: [PersonSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, + { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + { provide: NotificationsService, useValue: {} }, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -89,6 +143,9 @@ describe('PersonSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(PersonSearchResultListElementComponent); personListElementComponent = fixture.componentInstance; @@ -148,6 +205,8 @@ describe('PersonSearchResultListElementComponent', () => { declarations: [PersonSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService}, + {provide: NotificationsService, useValue: {}}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -165,7 +224,9 @@ describe('PersonSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); personListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts index 217d7baef95..6f78c709ba9 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts @@ -9,6 +9,10 @@ import { import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; @listableObjectComponent('PersonSearchResult', ViewMode.ListElement) @Component({ @@ -24,9 +28,13 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList public constructor( protected truncatableService: TruncatableService, protected dsoNameService: DSONameService, - @Inject(APP_CONFIG) protected appConfig: AppConfig + @Inject(APP_CONFIG) protected appConfig: AppConfig, + protected supervisionOrderDataService: SupervisionOrderDataService, + protected modalService: NgbModal, + protected notificationsService: NotificationsService, + protected translateService: TranslateService, ) { - super(truncatableService, dsoNameService, appConfig); + super(truncatableService, dsoNameService, appConfig, supervisionOrderDataService, modalService, notificationsService, translateService); } /** diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts index 0cb3e63e870..f3ef14e4f65 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts @@ -10,6 +10,14 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { By } from '@angular/platform-browser'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { createSuccessfulRemoteDataObject } from '../../../../../shared/remote-data.utils'; +import { PageInfo } from '../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; +import { GroupMock } from '../../../../../shared/testing/group-mock'; +import { hot } from 'jasmine-marbles'; let projectListElementComponent: ProjectSearchResultListElementComponent; let fixture: ComponentFixture; @@ -64,12 +72,61 @@ const enviromentNoThumbs = { } }; +const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + searchByItem: jasmine.createSpy('searchByItem'), +}); + +const supervisionOrder: any = { + id: '1', + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; +const anothersupervisionOrder: any = { + id: '2', + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; + +const pageInfo = new PageInfo(); +const array = [supervisionOrder, anothersupervisionOrder]; +const paginatedList = buildPaginatedList(pageInfo, array); +const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + describe('ProjectSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ProjectSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, + { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + { provide: NotificationsService, useValue: {}}, + {provide: TranslateService, useValue: {}}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -81,6 +138,9 @@ describe('ProjectSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(ProjectSearchResultListElementComponent); projectListElementComponent = fixture.componentInstance; @@ -133,6 +193,9 @@ describe('ProjectSearchResultListElementComponent', () => { declarations: [ProjectSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, + {provide: TranslateService, useValue: {}}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } @@ -151,7 +214,9 @@ describe('ProjectSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); projectListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); diff --git a/src/app/my-dspace-page/my-dspace-configuration-value-type.ts b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts index baf2f0b9208..52e6b01c113 100644 --- a/src/app/my-dspace-page/my-dspace-configuration-value-type.ts +++ b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts @@ -1,4 +1,5 @@ export enum MyDSpaceConfigurationValueType { Workspace = 'workspace', + SupervisedItems = 'otherworkspace', Workflow = 'workflow' } diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts index 669a97764a5..34bfd946b61 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts @@ -184,7 +184,8 @@ describe('MyDSpaceConfigurationService', () => { expect(list$).toBeObservable(cold('(b|)', { b: [ - MyDSpaceConfigurationValueType.Workspace + MyDSpaceConfigurationValueType.Workspace, + MyDSpaceConfigurationValueType.SupervisedItems ] })); }); @@ -227,6 +228,7 @@ describe('MyDSpaceConfigurationService', () => { expect(list$).toBeObservable(cold('(b|)', { b: [ MyDSpaceConfigurationValueType.Workspace, + MyDSpaceConfigurationValueType.SupervisedItems, MyDSpaceConfigurationValueType.Workflow ] })); diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts index dec86589102..86bbf0050c0 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.ts @@ -20,6 +20,7 @@ import { Context } from '../core/shared/context.model'; export const MyDSpaceConfigurationToContextMap = new Map([ [MyDSpaceConfigurationValueType.Workspace, Context.Workspace], + [MyDSpaceConfigurationValueType.SupervisedItems, Context.SupervisedItems], [MyDSpaceConfigurationValueType.Workflow, Context.Workflow] ]); @@ -107,6 +108,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService { const availableConf: MyDSpaceConfigurationValueType[] = []; if (isSubmitter) { availableConf.push(MyDSpaceConfigurationValueType.Workspace); + availableConf.push(MyDSpaceConfigurationValueType.SupervisedItems); } if (isController || isAdmin) { availableConf.push(MyDSpaceConfigurationValueType.Workflow); diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html new file mode 100644 index 00000000000..f6a5c339cec --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html @@ -0,0 +1,40 @@ +
    +
    {{'supervision-group-selector.header' | translate}} + +
    +
    +
    +
    + + + +
    +
    +
    +
    + + + + + + +
    +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.scss b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.scss similarity index 100% rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.scss rename to src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.scss diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.spec.ts new file mode 100644 index 00000000000..b5e62ef8aca --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.spec.ts @@ -0,0 +1,70 @@ +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 { SupervisionGroupSelectorComponent } from './supervision-group-selector.component'; +import { SupervisionOrderDataService } from '../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { SupervisionOrder } from '../../../../core/supervision-order/models/supervision-order.model'; +import { of } from 'rxjs'; + +describe('SupervisionGroupSelectorComponent', () => { + let component: SupervisionGroupSelectorComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + const modalStub = jasmine.createSpyObj('modalStub', ['close']); + + const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + create: of(new SupervisionOrder()) + }); + + const selectedOrderType = 'NONE'; + const itemUUID = 'itemUUID1234'; + + const selectedGroup = new Group(); + selectedGroup.uuid = 'GroupUUID1234'; + + const supervisionDataObject = new SupervisionOrder(); + supervisionDataObject.ordertype = selectedOrderType; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [SupervisionGroupSelectorComponent], + providers: [ + { provide: NgbActiveModal, useValue: modalStub }, + { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + { provide: NotificationsService, useValue: {} }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + + })); + + beforeEach(waitForAsync(() => { + fixture = TestBed.createComponent(SupervisionGroupSelectorComponent); + component = fixture.componentInstance; + + })); + + beforeEach(() => { + component.itemUUID = itemUUID; + component.selectedGroup = selectedGroup; + component.selectedOrderType = selectedOrderType; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should create component', () => { + expect(component).toBeTruthy(); + }); + + it('should call create for supervision order', () => { + component.save(); + fixture.detectChanges(); + expect(supervisionOrderDataService.create).toHaveBeenCalledWith(supervisionDataObject, itemUUID, selectedGroup.uuid, selectedOrderType); + }); + +}); diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts new file mode 100644 index 00000000000..c69c5d51774 --- /dev/null +++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts @@ -0,0 +1,90 @@ +import { Component } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; +import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; +import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; +import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { SupervisionOrder } from '../../../../core/supervision-order/models/supervision-order.model'; +import { SupervisionOrderDataService } from '../../../../core/supervision-order/supervision-order-data.service'; + +/** + * Component to wrap a dropdown - for type of order - + * and a list of groups + * inside a modal + * Used to create a new supervision order + */ + +@Component({ + selector: 'ds-supervision-group-selector', + styleUrls: ['./supervision-group-selector.component.scss'], + templateUrl: './supervision-group-selector.component.html', +}) +export class SupervisionGroupSelectorComponent { + + /** + * The item to perform the actions on + */ + itemUUID: string; + + /** + * The selected supervision order type + */ + selectedOrderType: string; + + /** + * selected group for supervision + */ + selectedGroup: Group; + + /** + * boolean flag for the validations + */ + isSubmitted = false; + + constructor( + public dsoNameService: DSONameService, + private activeModal: NgbActiveModal, + private supervisionOrderDataService: SupervisionOrderDataService, + protected notificationsService: NotificationsService, + protected translateService: TranslateService, + ) { } + + /** + * Close the modal + */ + close() { + this.activeModal.close(); + } + + /** + * Assign the value of group on select + */ + updateGroupObjectSelected(object) { + this.selectedGroup = object; + } + + /** + * Save the supervision order + */ + save() { + this.isSubmitted = true; + if (this.selectedOrderType && this.selectedGroup) { + let supervisionDataObject = new SupervisionOrder(); + supervisionDataObject.ordertype = this.selectedOrderType; + this.supervisionOrderDataService.create(supervisionDataObject, this.itemUUID, this.selectedGroup.uuid, this.selectedOrderType).pipe( + getFirstCompletedRemoteData(), + ).subscribe(rd => { + if (rd.state === 'Success') { + this.notificationsService.success(this.translateService.get('supervision-group-selector.notification.create.success.title', { name: this.selectedGroup.name })); + } else { + this.notificationsService.error( + this.translateService.get('supervision-group-selector.notification.create.failure.title'), + rd.errorMessage); + } + }); + this.close(); + } + } + +} diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.html b/src/app/shared/form/eperson-group-list/eperson-group-list.component.html similarity index 100% rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.html rename to src/app/shared/form/eperson-group-list/eperson-group-list.component.html diff --git a/src/app/shared/form/eperson-group-list/eperson-group-list.component.scss b/src/app/shared/form/eperson-group-list/eperson-group-list.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts b/src/app/shared/form/eperson-group-list/eperson-group-list.component.spec.ts similarity index 88% rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts rename to src/app/shared/form/eperson-group-list/eperson-group-list.component.spec.ts index cec67e721c5..399080c0ef6 100644 --- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts +++ b/src/app/shared/form/eperson-group-list/eperson-group-list.component.spec.ts @@ -6,21 +6,21 @@ import { TranslateModule } from '@ngx-translate/core'; import { cold } from 'jasmine-marbles'; import uniqueId from 'lodash/uniqueId'; -import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; -import { createTestComponent } from '../../../testing/utils.test'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { RequestService } from '../../../../core/data/request.service'; -import { getMockRequestService } from '../../../mocks/request.service.mock'; +import { createSuccessfulRemoteDataObject } from '../../remote-data.utils'; +import { createTestComponent } from '../../testing/utils.test'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../core/eperson/group-data.service'; +import { RequestService } from '../../../core/data/request.service'; +import { getMockRequestService } from '../../mocks/request.service.mock'; import { EpersonGroupListComponent, SearchEvent } from './eperson-group-list.component'; -import { EPersonMock } from '../../../testing/eperson.mock'; -import { GroupMock } from '../../../testing/group-mock'; -import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; +import { EPersonMock } from '../../testing/eperson.mock'; +import { GroupMock } from '../../testing/group-mock'; +import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; +import { buildPaginatedList } from '../../../core/data/paginated-list.model'; +import { PageInfo } from '../../../core/shared/page-info.model'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { PaginationServiceStub } from '../../../testing/pagination-service.stub'; +import { PaginationService } from '../../../core/pagination/pagination.service'; +import { PaginationServiceStub } from '../../testing/pagination-service.stub'; describe('EpersonGroupListComponent test suite', () => { let comp: EpersonGroupListComponent; diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/form/eperson-group-list/eperson-group-list.component.ts similarity index 81% rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts rename to src/app/shared/form/eperson-group-list/eperson-group-list.component.ts index b8591848455..e2b56859dc1 100644 --- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts +++ b/src/app/shared/form/eperson-group-list/eperson-group-list.component.ts @@ -4,22 +4,22 @@ import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import uniqueId from 'lodash/uniqueId'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { PaginatedList } from '../../../../core/data/paginated-list.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; -import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model'; -import { hasValue, isNotEmpty } from '../../../empty.util'; -import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; -import { EPERSON } from '../../../../core/eperson/models/eperson.resource-type'; -import { GROUP } from '../../../../core/eperson/models/group.resource-type'; -import { ResourceType } from '../../../../core/shared/resource-type'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { fadeInOut } from '../../../animations/fade'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { FindListOptions } from '../../../../core/data/find-list-options.model'; -import { getDataServiceFor } from '../../../../core/data/base/data-service.decorator'; +import { RemoteData } from '../../../core/data/remote-data'; +import { PaginatedList } from '../../../core/data/paginated-list.model'; +import { DSpaceObject } from '../../../core/shared/dspace-object.model'; +import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; +import { hasValue, isNotEmpty } from '../../empty.util'; +import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; +import { EPERSON } from '../../../core/eperson/models/eperson.resource-type'; +import { GROUP } from '../../../core/eperson/models/group.resource-type'; +import { ResourceType } from '../../../core/shared/resource-type'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../core/eperson/group-data.service'; +import { fadeInOut } from '../../animations/fade'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { PaginationService } from '../../../core/pagination/pagination.service'; +import { FindListOptions } from '../../../core/data/find-list-options.model'; +import { getDataServiceFor } from '../../../core/data/base/data-service.decorator'; export interface SearchEvent { scope: string; diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html b/src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html similarity index 100% rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html rename to src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts b/src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts similarity index 97% rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts rename to src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts index 311d911b265..db16af5edfa 100644 --- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts +++ b/src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts @@ -4,7 +4,7 @@ import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { createTestComponent } from '../../../../testing/utils.test'; +import { createTestComponent } from '../../../testing/utils.test'; import { EpersonSearchBoxComponent } from './eperson-search-box.component'; import { SearchEvent } from '../eperson-group-list.component'; diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts b/src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts similarity index 96% rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts rename to src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts index 11c3dcd1027..6ae3200d0b4 100644 --- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts +++ b/src/app/shared/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts @@ -4,7 +4,7 @@ import { FormBuilder } from '@angular/forms'; import { Subscription } from 'rxjs'; import { SearchEvent } from '../eperson-group-list.component'; -import { isNotNull } from '../../../../empty.util'; +import { isNotNull } from '../../../empty.util'; /** * A component used to show a search box for epersons. diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.html b/src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.html similarity index 100% rename from src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.html rename to src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.html diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts b/src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts similarity index 97% rename from src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts rename to src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts index dc39e30d3b8..17e96fc71ca 100644 --- a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts +++ b/src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts @@ -4,7 +4,7 @@ import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { createTestComponent } from '../../../../testing/utils.test'; +import { createTestComponent } from '../../../testing/utils.test'; import { GroupSearchBoxComponent } from './group-search-box.component'; import { SearchEvent } from '../eperson-group-list.component'; diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts b/src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.ts similarity index 96% rename from src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts rename to src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.ts index baef19f14a5..ad181bdb647 100644 --- a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts +++ b/src/app/shared/form/eperson-group-list/group-search-box/group-search-box.component.ts @@ -4,7 +4,7 @@ import { FormBuilder } from '@angular/forms'; import { Subscription } from 'rxjs'; import { SearchEvent } from '../eperson-group-list.component'; -import { isNotNull } from '../../../../empty.util'; +import { isNotNull } from '../../../empty.util'; /** * A component used to show a search box for groups. diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index 6b2951495d4..64108681f62 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -41,6 +41,19 @@ [innerHTML]="firstMetadataValue('dc.description.abstract')"> + +
    +
    + {{'item.search.result.list.element.supervised-by' | translate}} +
    +
    + + {{supervisionOrder.group._name}} + X + +
    +
    +     diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss index 5e4536cf958..0d93ec744bf 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss @@ -1 +1,7 @@ @import '../../../../../../../styles/variables'; + +.item-list-supervision { + a { + cursor: pointer; + } +} \ No newline at end of file diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index d1e6c27ba43..887ecb30a0b 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -10,6 +10,14 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../../config/app-config.interface'; +import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service'; +import { NotificationsService } from '../../../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { createSuccessfulRemoteDataObject } from '../../../../../../shared/remote-data.utils'; +import { PageInfo } from '../../../../../../core/shared/page-info.model'; +import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model'; +import { GroupMock } from '../../../../../../shared/testing/group-mock'; +import { hot } from 'jasmine-marbles'; let publicationListElementComponent: ItemSearchResultListElementComponent; let fixture: ComponentFixture; @@ -72,12 +80,61 @@ const enviromentNoThumbs = { } }; +const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { + searchByItem: jasmine.createSpy('searchByItem'), +}); + +const supervisionOrder: any = { + id: '1', + type: 'supervisionOrder', + uuid: 'supervision-order-1', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; +const anothersupervisionOrder: any = { + id: '2', + type: 'supervisionOrder', + uuid: 'supervision-order-2', + _links: { + item: { + href: 'https://rest.api/rest/api/eperson' + }, + group: { + href: 'https://rest.api/rest/api/group' + }, + self: { + href: 'https://rest.api/rest/api/supervisionorders/1' + }, + }, + item: observableOf(createSuccessfulRemoteDataObject({})), + group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) +}; + +const pageInfo = new PageInfo(); +const array = [supervisionOrder, anothersupervisionOrder]; +const paginatedList = buildPaginatedList(pageInfo, array); +const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + describe('ItemSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ItemSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, + { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + { provide: NotificationsService, useValue: {}}, + { provide: TranslateService, useValue: {}}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -89,6 +146,9 @@ describe('ItemSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(ItemSearchResultListElementComponent); publicationListElementComponent = fixture.componentInstance; @@ -225,6 +285,9 @@ describe('ItemSearchResultListElementComponent', () => { declarations: [ItemSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, + {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, + {provide: NotificationsService, useValue: {}}, + {provide: TranslateService, useValue: {}}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -236,6 +299,9 @@ describe('ItemSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { + supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { + a: paginatedListRD + })); fixture = TestBed.createComponent(ItemSearchResultListElementComponent); publicationListElementComponent = fixture.componentInstance; })); diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index f84ae642ad2..b1b5b0d1a71 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -1,10 +1,24 @@ -import { Component } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator'; import { ViewMode } from '../../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model'; import { SearchResultListElementComponent } from '../../../search-result-list-element.component'; import { Item } from '../../../../../../core/shared/item.model'; import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths'; +import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service'; +import { TruncatableService } from '../../../../../../shared/truncatable/truncatable.service'; +import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; +import { AppConfig, APP_CONFIG } from '../../../../../../../config/app-config.interface'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { combineLatest, map, Observable, switchMap, take } from 'rxjs'; +import { ConfirmationModalComponent } from '../../../../../../shared/confirmation-modal/confirmation-modal.component'; +import { hasValue } from '../../../../../../shared/empty.util'; +import { NotificationsService } from '../../../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { followLink } from '../../../../../../shared/utils/follow-link-config.model'; +import { getAllSucceededRemoteListPayload, getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; +import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model'; +import { Group } from '../../../../../../core/eperson/models/group.model'; @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement) @listableObjectComponent(ItemSearchResult, ViewMode.ListElement) @@ -17,6 +31,8 @@ import { getItemPageRoute } from '../../../../../../item-page/item-page-routing- * The component for displaying a list element for an item search result of the type Publication */ export class ItemSearchResultListElementComponent extends SearchResultListElementComponent { + messagePrefix = 'item.search.result'; + /** * Route to the item's page */ @@ -27,9 +43,67 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen */ showThumbnails: boolean; + /** + * List of the supervision orders combined with the group + */ + supervisionOrder$: Observable<{ supervisionOrder: SupervisionOrder; group: Group; }[]>; + + constructor( + protected truncatableService: TruncatableService, + protected dsoNameService: DSONameService, + @Inject(APP_CONFIG) protected appConfig: AppConfig, + protected supervisionOrderDataService: SupervisionOrderDataService, + protected modalService: NgbModal, + protected notificationsService: NotificationsService, + protected translateService: TranslateService, + ) { super(truncatableService, dsoNameService, appConfig); } + ngOnInit(): void { super.ngOnInit(); this.showThumbnails = this.appConfig.browseBy.showThumbnails; this.itemPageRoute = getItemPageRoute(this.dso); + this.supervisionOrder$ = this.supervisionOrderDataService.searchByItem(this.dso.uuid, null, null, followLink('group')).pipe( + getAllSucceededRemoteListPayload(), + switchMap((supervisionOrders: SupervisionOrder[]) => { + const supervisionOrdersArray = supervisionOrders.map((supervisionOrder: SupervisionOrder) => { + return supervisionOrder.group.pipe( + getFirstSucceededRemoteDataPayload(), + map((group: Group) => ({ supervisionOrder, group })) + ); + }); + return combineLatest(supervisionOrdersArray); + }) + ); + } + + /** + * Deletes the Group from the Repository. The Group 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. + */ + deleteSupervisionOrder(supervisionOrder) { + const modalRef = this.modalService.open(ConfirmationModalComponent); + modalRef.componentInstance.dso = supervisionOrder.group; + modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-supervision.modal.header'; + modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-supervision.modal.info'; + modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-supervision.modal.cancel'; + modalRef.componentInstance.confirmLabel = this.messagePrefix + '.delete-supervision.modal.confirm'; + modalRef.componentInstance.brandColor = 'danger'; + modalRef.componentInstance.confirmIcon = 'fas fa-trash'; + modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => { + if (confirm) { + if (hasValue(supervisionOrder.supervisionOrder.id)) { + this.supervisionOrderDataService.delete(supervisionOrder.supervisionOrder.id) + .subscribe((rd: boolean) => { + if (rd) { + this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.deleted.success', { name: supervisionOrder.group._name })); + } else { + this.notificationsService.error( + this.translateService.get(this.messagePrefix + '.notification.deleted.failure.title', { name: supervisionOrder.group._name }), + this.translateService.get(this.messagePrefix + '.notification.deleted.failure.content')); + } + }); + } + } + }); } } diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts index e555522c793..1a84270f1b5 100644 --- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts +++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts @@ -24,7 +24,7 @@ import { ResourcePolicyEvent, ResourcePolicyFormComponent } from './resource-pol import { FormService } from '../../form/form.service'; import { getMockFormService } from '../../mocks/form-service.mock'; import { FormBuilderService } from '../../form/builder/form-builder.service'; -import { EpersonGroupListComponent } from './eperson-group-list/eperson-group-list.component'; +import { EpersonGroupListComponent } from '../../form/eperson-group-list/eperson-group-list.component'; import { FormComponent } from '../../form/form.component'; import { stringToNgbDateStruct, dateToISOFormat } from '../../date.util'; import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model'; diff --git a/src/app/shared/resource-policies/resource-policies.module.ts b/src/app/shared/resource-policies/resource-policies.module.ts index a7dc19b83e4..8a7f6dca793 100644 --- a/src/app/shared/resource-policies/resource-policies.module.ts +++ b/src/app/shared/resource-policies/resource-policies.module.ts @@ -10,9 +10,6 @@ import { ResourcePolicyCreateComponent } from './create/resource-policy-create.c import { FormModule } from '../form/form.module'; import { ResourcePolicyResolver } from './resolvers/resource-policy.resolver'; import { ResourcePolicyTargetResolver } from './resolvers/resource-policy-target.resolver'; -import { EpersonGroupListComponent } from './form/eperson-group-list/eperson-group-list.component'; -import { GroupSearchBoxComponent } from './form/eperson-group-list/group-search-box/group-search-box.component'; -import { EpersonSearchBoxComponent } from './form/eperson-group-list/eperson-search-box/eperson-search-box.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { SharedModule } from '../shared.module'; import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component'; @@ -23,9 +20,6 @@ const COMPONENTS = [ ResourcePolicyFormComponent, ResourcePolicyEditComponent, ResourcePolicyCreateComponent, - EpersonGroupListComponent, - EpersonSearchBoxComponent, - GroupSearchBoxComponent ]; const PROVIDERS = [ diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts index c094e37ef23..e9a72ae338e 100644 --- a/src/app/shared/search/search.component.ts +++ b/src/app/shared/search/search.component.ts @@ -34,6 +34,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme import { environment } from 'src/environments/environment'; import { SubmissionObject } from '../../core/submission/models/submission-object.model'; import { SearchFilterConfig } from './models/search-filter-config.model'; +import { WorkspaceItem } from '../..//core/submission/models/workspaceitem.model'; @Component({ selector: 'ds-search', @@ -405,8 +406,9 @@ export class SearchComponent implements OnInit { true, followLink('thumbnail', { isOptional: true }), followLink('item', { isOptional: true }, followLink('thumbnail', { isOptional: true })) as any, - followLink('accessStatus', { isOptional: true, shouldEmbed: environment.item.showAccessStatuses }) - ).pipe(getFirstCompletedRemoteData()) + followLink('supervisionOrders', { isOptional: true }) as any, + followLink('accessStatus', { isOptional: true, shouldEmbed: environment.item.showAccessStatuses }), + ).pipe(getFirstCompletedRemoteData()) .subscribe((results: RemoteData>) => { if (results.hasSucceeded) { if (this.trackStatistics) { diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 13fdd3e12c4..bd87b35c826 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -315,6 +315,10 @@ import { MenuModule } from './menu/menu.module'; import { ListableNotificationObjectComponent } from './object-list/listable-notification-object/listable-notification-object.component'; +import { SupervisionGroupSelectorComponent } from './dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component'; +import { EpersonGroupListComponent } from './form/eperson-group-list/eperson-group-list.component'; +import { EpersonSearchBoxComponent } from './form/eperson-group-list/eperson-search-box/eperson-search-box.component'; +import { GroupSearchBoxComponent } from './form/eperson-group-list/group-search-box/group-search-box.component'; const MODULES = [ CommonModule, @@ -436,6 +440,10 @@ const COMPONENTS = [ ItemPageTitleFieldComponent, ThemedSearchNavbarComponent, ListableNotificationObjectComponent, + EpersonGroupListComponent, + EpersonSearchBoxComponent, + GroupSearchBoxComponent, + SupervisionGroupSelectorComponent ]; const ENTRY_COMPONENTS = [ @@ -498,6 +506,10 @@ const ENTRY_COMPONENTS = [ CommunitySidebarSearchListElementComponent, ScopeSelectorModalComponent, ListableNotificationObjectComponent, + EpersonGroupListComponent, + EpersonSearchBoxComponent, + GroupSearchBoxComponent, + SupervisionGroupSelectorComponent ]; const SHARED_ITEM_PAGE_COMPONENTS = [ diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d043d61ae5d..26f9983c178 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -536,10 +536,16 @@ "admin.workflow.item.workflow": "Workflow", + "admin.workflow.item.workspace": "Workspace", + "admin.workflow.item.delete": "Delete", "admin.workflow.item.send-back": "Send back", + "admin.workflow.item.policies": "Policies", + + "admin.workflow.item.supervision": "Supervision", + "admin.metadata-import.breadcrumbs": "Import Metadata", @@ -1418,6 +1424,28 @@ "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻", + "supervision-group-selector.header": "Supervision Group Selector", + + "supervision-group-selector.select.type-of-order.label": "Select a type of Order", + + "supervision-group-selector.select.type-of-order.option.none": "NONE", + + "supervision-group-selector.select.type-of-order.option.editor": "EDITOR", + + "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER", + + "supervision-group-selector.select.group.label": "Select a Group", + + "supervision-group-selector.button.save": "Save", + + "supervision-group-selector.select.type-of-order.error": "Please select a type of order", + + "supervision-group-selector.select.group.error": "Please select a group", + + "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}", + + "supervision-group-selector.notification.create.failure.title": "Error", + "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}", @@ -2222,6 +2250,22 @@ "item.truncatable-part.show-less": "Collapse", + "item.search.result.delete-supervision.modal.header": "Delete Supervision Order", + + "item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", + + "item.search.result.delete-supervision.modal.cancel": "Cancel", + + "item.search.result.delete-supervision.modal.confirm": "Delete", + + "item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"", + + "item.search.result.notification.deleted.failure.title": "Failed to delete supervision order \"{{name}}\"", + + "item.search.result.notification.deleted.failure.content": "Failed to delete supervision order", + + "item.search.result.list.element.supervised-by": "Supervised by:", + "item.page.abstract": "Abstract", @@ -2851,6 +2895,8 @@ "mydspace.show.workspace": "Your Submissions", + "mydspace.show.otherworkspace": "Supervised items", + "mydspace.status.archived": "Archived", "mydspace.status.validation": "Validation", @@ -3640,6 +3686,12 @@ "search.filters.filter.submitter.label": "Search submitter", + "search.filters.filter.supervisedBy.head": "Supervised By", + + "search.filters.filter.supervisedBy.placeholder": "Supervised By", + + "search.filters.filter.supervisedBy.label": "Search Supervised By", + "search.filters.entityType.JournalIssue": "Journal Issue", @@ -4534,12 +4586,16 @@ + "otherworkspace.search.results.head": "Supervised Items", + "workspace.search.results.head": "Your submissions", "workflowAdmin.search.results.head": "Administer Workflow", "workflow.search.results.head": "Workflow tasks", + "supervision.search.results.head": "Supervision tasks", + "workflow-item.edit.breadcrumbs": "Edit workflowitem", From 710b11655d99ce72a47fe2328c2c716a201d27e1 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 29 Dec 2022 18:46:19 +0100 Subject: [PATCH 268/758] [CST-7757] Rename type property to subscriptionType --- .../subscription-modal.component.spec.ts | 6 +++--- .../subscription-modal/subscription-modal.component.ts | 8 ++++---- .../subscription-view/subscription-view.component.spec.ts | 6 +++--- .../subscription-view/subscription-view.component.ts | 4 ++-- ...scription.service.ts => subscriptions-data.service.ts} | 4 ++-- .../subscriptions-page.component.spec.ts | 6 +++--- .../subscriptions-page/subscriptions-page.component.ts | 5 ++--- 7 files changed, 19 insertions(+), 20 deletions(-) rename src/app/shared/subscriptions/{subscription.service.ts => subscriptions-data.service.ts} (97%) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts index 05fa1c4a771..221f70f77d3 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts @@ -8,7 +8,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { SubscriptionModalComponent } from './subscription-modal.component'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { NotificationsService } from '../../notifications/notifications.service'; -import { SubscriptionService } from '../subscription.service'; +import { SubscriptionsDataService } from '../subscriptions-data.service'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { Item } from '../../../core/shared/item.model'; import { AuthService } from '../../../core/auth/auth.service'; @@ -67,7 +67,7 @@ describe('SubscriptionModalComponent', () => { getAuthenticatedUserFromStore: createSuccessfulRemoteDataObject$(mockEperson) }); - subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { + subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', { getSubscriptionsByPersonDSO: jasmine.createSpy('getSubscriptionsByPersonDSO'), createSubscription: createSuccessfulRemoteDataObject$({}), updateSubscription: createSuccessfulRemoteDataObject$({}), @@ -92,7 +92,7 @@ describe('SubscriptionModalComponent', () => { NgbActiveModal, { provide: AuthService, useValue: authService }, { provide: NotificationsService, useValue: notificationServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, + { provide: SubscriptionsDataService, useValue: subscriptionServiceStub }, ], schemas: [ NO_ERRORS_SCHEMA diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index 23faf33c54e..c7ff9882ac3 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -10,7 +10,7 @@ import findIndex from 'lodash/findIndex'; import { Subscription } from '../models/subscription.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; -import { SubscriptionService } from '../subscription.service'; +import { SubscriptionsDataService } from '../subscriptions-data.service'; import { NotificationsService } from '../../notifications/notifications.service'; import { PaginatedList } from '../../../core/data/paginated-list.model'; import { RemoteData } from '../../../core/data/remote-data'; @@ -59,7 +59,7 @@ export class SubscriptionModalComponent implements OnInit { /** * Types of subscription to be shown on select */ - private subscriptionDefaultTypes = ['content', 'statistics']; + private subscriptionDefaultTypes = ['content']; /** * Frequencies to be shown as checkboxes @@ -75,7 +75,7 @@ export class SubscriptionModalComponent implements OnInit { private formBuilder: FormBuilder, private modalService: NgbModal, private notificationsService: NotificationsService, - private subscriptionService: SubscriptionService, + private subscriptionService: SubscriptionsDataService, public activeModal: NgbActiveModal, private authService: AuthService, private translate: TranslateService, @@ -239,7 +239,7 @@ export class SubscriptionModalComponent implements OnInit { private createBody(subscriptionId: string, subscriptionType: string, frequencies: FormGroup): Partial { const body = { id: (isNotEmpty(subscriptionId) ? subscriptionId : null), - type: subscriptionType, + subscriptionType: subscriptionType, subscriptionParameterList: [] }; diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts index 3ec826d6c53..a0caba97ee8 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts @@ -19,7 +19,7 @@ import { findByEPersonAndDsoResEmpty, subscriptionMock } from '../../testing/sub // Import utils import { NotificationsService } from '../../notifications/notifications.service'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; -import { SubscriptionService } from '../subscription.service'; +import { SubscriptionsDataService } from '../subscriptions-data.service'; import { Subscription } from '../models/subscription.model'; import { of as observableOf } from 'rxjs'; @@ -34,7 +34,7 @@ describe('SubscriptionViewComponent', () => { let de: DebugElement; let modalService; - const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { + const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', { getSubscriptionByPersonDSO: observableOf(findByEPersonAndDsoResEmpty), deleteSubscription: createSuccessfulRemoteDataObject$({}), updateSubscription: createSuccessfulRemoteDataObject$({}), @@ -73,7 +73,7 @@ describe('SubscriptionViewComponent', () => { providers: [ { provide: ComponentFixtureAutoDetect, useValue: true }, { provide: NotificationsService, useValue: NotificationsServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, + { provide: SubscriptionsDataService, useValue: subscriptionServiceStub }, ] }) .compileComponents(); diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts index b8aa4d2375c..9f7fca7caf6 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts @@ -7,7 +7,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { hasValue } from '../../empty.util'; import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component'; -import { SubscriptionService } from '../subscription.service'; +import { SubscriptionsDataService } from '../subscriptions-data.service'; import { getCommunityModuleRoute } from '../../../community-page/community-page-routing-paths'; import { getCollectionModuleRoute } from '../../../collection-page/collection-page-routing-paths'; import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths'; @@ -48,7 +48,7 @@ export class SubscriptionViewComponent { constructor( private modalService: NgbModal, - private subscriptionService: SubscriptionService, + private subscriptionService: SubscriptionsDataService, ) { } /** diff --git a/src/app/shared/subscriptions/subscription.service.ts b/src/app/shared/subscriptions/subscriptions-data.service.ts similarity index 97% rename from src/app/shared/subscriptions/subscription.service.ts rename to src/app/shared/subscriptions/subscriptions-data.service.ts index 480598a15ad..9576d985369 100644 --- a/src/app/shared/subscriptions/subscription.service.ts +++ b/src/app/shared/subscriptions/subscriptions-data.service.ts @@ -41,7 +41,7 @@ import { followLink } from '../utils/follow-link-config.model'; providedIn: 'root' }) @dataService(SUBSCRIPTION) -export class SubscriptionService extends IdentifiableDataService { +export class SubscriptionsDataService extends IdentifiableDataService { protected findByEpersonLinkPath = 'findByEPerson'; private deleteData: DeleteDataImpl; @@ -89,7 +89,7 @@ export class SubscriptionService extends IdentifiableDataService { * @param ePerson The ePerson to create for * @param uuid The uuid of the dsobjcet to create for */ - createSubscription(subscription, ePerson: string, uuid: string): Observable> { + createSubscription(subscription: Subscription, ePerson: string, uuid: string): Observable> { return this.halService.getEndpoint(this.linkPath).pipe( isNotEmptyOperator(), diff --git a/src/app/subscriptions-page/subscriptions-page.component.spec.ts b/src/app/subscriptions-page/subscriptions-page.component.spec.ts index 9b17d72deb6..4f443924281 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.spec.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.spec.ts @@ -11,7 +11,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { SubscriptionsPageComponent } from './subscriptions-page.component'; import { PaginationService } from '../core/pagination/pagination.service'; -import { SubscriptionService } from '../shared/subscriptions/subscription.service'; +import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service'; import { PaginationServiceStub } from '../shared/testing/pagination-service.stub'; import { AuthService } from '../core/auth/auth.service'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; @@ -36,7 +36,7 @@ describe('SubscriptionsPageComponent', () => { getAuthenticatedUserFromStore: observableOf(mockSubscriptionEperson) }); - const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { + const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', { findByEPerson: jasmine.createSpy('findByEPerson') }); @@ -68,7 +68,7 @@ describe('SubscriptionsPageComponent', () => { ], declarations: [SubscriptionsPageComponent, SubscriptionViewComponent, VarDirective], providers: [ - { provide: SubscriptionService, useValue: subscriptionServiceStub }, + { provide: SubscriptionsDataService, useValue: subscriptionServiceStub }, { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, { provide: AuthService, useValue: authServiceStub }, { provide: PaginationService, useValue: paginationService } diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 242d5145ac9..7307218d0a4 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -5,7 +5,7 @@ import { map, switchMap, take, tap } from 'rxjs/operators'; import { Subscription } from '../shared/subscriptions/models/subscription.model'; import { buildPaginatedList, PaginatedList } from '../core/data/paginated-list.model'; -import { SubscriptionService } from '../shared/subscriptions/subscription.service'; +import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; import { PaginationService } from '../core/pagination/pagination.service'; import { PageInfo } from '../core/shared/page-info.model'; @@ -54,7 +54,7 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { constructor( private paginationService: PaginationService, private authService: AuthService, - private subscriptionService: SubscriptionService + private subscriptionService: SubscriptionsDataService ) { } @@ -78,7 +78,6 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { */ private retrieveSubscriptions(): void { this.sub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( - tap(console.log), combineLatestWith(this.ePersonId$), tap(() => this.loading$.next(true)), switchMap(([currentPagination, ePersonId]) => this.subscriptionService.findByEPerson(ePersonId,{ From 928431284f2a49b0a466c3ddc55a3cdbc88f1690 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 30 Dec 2022 10:12:15 +0100 Subject: [PATCH 269/758] [CST-7217] Improve fix --- .../search-facet-option/search-facet-option.component.html | 6 +++--- .../search-facet-option/search-facet-option.component.scss | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html index bf165274d50..967f0ff0d8b 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html @@ -2,9 +2,9 @@ [tabIndex]="-1" [routerLink]="[searchLink]" [queryParams]="addQueryParams" queryParamsHandling="merge"> -     - - - diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss deleted file mode 100644 index a2a6786b36f..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss +++ /dev/null @@ -1,13 +0,0 @@ -.btn[disabled] { - color: var(--bs-gray-600); - border-color: var(--bs-gray-600); - z-index: 0; // prevent border colors jumping on hover -} - -.metadata-field { - width: var(--ds-edit-item-metadata-field-width); -} - -.language-field { - width: var(--ds-edit-item-language-field-width); -} 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 deleted file mode 100644 index 03e8e5d7207..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts +++ /dev/null @@ -1,505 +0,0 @@ -import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; -import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; -import { FormsModule } from '@angular/forms'; -import { By } from '@angular/platform-browser'; -import { TranslateModule } from '@ngx-translate/core'; -import { getTestScheduler } from 'jasmine-marbles'; -import { of as observableOf } from 'rxjs'; -import { TestScheduler } from 'rxjs/testing'; -import { MetadataFieldDataService } from '../../../../core/data/metadata-field-data.service'; -import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { MetadataField } from '../../../../core/metadata/metadata-field.model'; -import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model'; -import { RegistryService } from '../../../../core/registry/registry.service'; -import { MetadatumViewModel } from '../../../../core/shared/metadata.models'; -import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model'; -import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { followLink } from '../../../../shared/utils/follow-link-config.model'; -import { EditInPlaceFieldComponent } from './edit-in-place-field.component'; -import { MockComponent, MockDirective } from 'ng-mocks'; -import { DebounceDirective } from '../../../../shared/utils/debounce.directive'; -import { ValidationSuggestionsComponent } from '../../../../shared/input-suggestions/validation-suggestions/validation-suggestions.component'; - -let comp: EditInPlaceFieldComponent; -let fixture: ComponentFixture; -let de: DebugElement; -let el: HTMLElement; -let metadataFieldService; -let objectUpdatesService; -let paginatedMetadataFields; -const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' }); -const mdSchemaRD$ = createSuccessfulRemoteDataObject$(mdSchema); -const mdField1 = Object.assign(new MetadataField(), { - schema: mdSchemaRD$, - element: 'contributor', - qualifier: 'author' -}); -const mdField2 = Object.assign(new MetadataField(), { - schema: mdSchemaRD$, - element: 'title' -}); -const mdField3 = Object.assign(new MetadataField(), { - schema: mdSchemaRD$, - element: 'description', - qualifier: 'abstract', -}); - -const metadatum = Object.assign(new MetadatumViewModel(), { - key: 'dc.description.abstract', - value: 'Example abstract', - language: 'en' -}); - -const url = 'http://test-url.com/test-url'; -const fieldUpdate = { - field: metadatum, - changeType: undefined -}; -let scheduler: TestScheduler; - -describe('EditInPlaceFieldComponent', () => { - - beforeEach(waitForAsync(() => { - scheduler = getTestScheduler(); - - paginatedMetadataFields = buildPaginatedList(undefined, [mdField1, mdField2, mdField3]); - - metadataFieldService = jasmine.createSpyObj({ - queryMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields), - }); - objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', - { - saveChangeFieldUpdate: {}, - saveRemoveFieldUpdate: {}, - setEditableFieldUpdate: {}, - setValidFieldUpdate: {}, - removeSingleFieldUpdate: {}, - isEditable: observableOf(false), // should always return something --> its in ngOnInit - isValid: observableOf(true) // should always return something --> its in ngOnInit - } - ); - - TestBed.configureTestingModule({ - imports: [FormsModule, TranslateModule.forRoot()], - declarations: [ - EditInPlaceFieldComponent, - MockDirective(DebounceDirective), - MockComponent(ValidationSuggestionsComponent) - ], - providers: [ - { provide: RegistryService, useValue: metadataFieldService }, - { provide: ObjectUpdatesService, useValue: objectUpdatesService }, - { provide: MetadataFieldDataService, useValue: {} } - ], schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EditInPlaceFieldComponent); - comp = fixture.componentInstance; // EditInPlaceFieldComponent test instance - de = fixture.debugElement; - el = de.nativeElement; - - comp.url = url; - comp.fieldUpdate = fieldUpdate; - comp.metadata = metadatum; - }); - - describe('update', () => { - beforeEach(() => { - comp.update(); - fixture.detectChanges(); - }); - - it('it should call saveChangeFieldUpdate on the objectUpdatesService with the correct url and metadata', () => { - expect(objectUpdatesService.saveChangeFieldUpdate).toHaveBeenCalledWith(url, metadatum); - }); - }); - - describe('setEditable', () => { - const editable = false; - beforeEach(() => { - comp.setEditable(editable); - fixture.detectChanges(); - }); - - it('it should call setEditableFieldUpdate on the objectUpdatesService with the correct url and uuid and false', () => { - expect(objectUpdatesService.setEditableFieldUpdate).toHaveBeenCalledWith(url, metadatum.uuid, editable); - }); - }); - - describe('editable is true', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - it('the div should contain input fields or textareas', () => { - const inputField = de.queryAll(By.css('input')); - const textAreas = de.queryAll(By.css('textarea')); - expect(inputField.length + textAreas.length).toBeGreaterThan(0); - }); - }); - - describe('editable is false', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - it('the div should contain no input fields or textareas', () => { - const inputField = de.queryAll(By.css('input')); - const textAreas = de.queryAll(By.css('textarea')); - expect(inputField.length + textAreas.length).toBe(0); - }); - }); - - describe('isValid is true', () => { - beforeEach(() => { - objectUpdatesService.isValid.and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - it('the div should not contain an error message', () => { - const errorMessages = de.queryAll(By.css('small.text-danger')); - expect(errorMessages.length).toBe(0); - - }); - }); - - describe('isValid is false', () => { - beforeEach(() => { - objectUpdatesService.isValid.and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - it('there should be an error message', () => { - const errorMessages = de.queryAll(By.css('small.text-danger')); - expect(errorMessages.length).toBeGreaterThan(0); - - }); - }); - - describe('remove', () => { - beforeEach(() => { - comp.remove(); - fixture.detectChanges(); - }); - - it('it should call saveRemoveFieldUpdate on the objectUpdatesService with the correct url and metadata', () => { - expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, metadatum); - }); - }); - - describe('removeChangesFromField', () => { - beforeEach(() => { - comp.removeChangesFromField(); - fixture.detectChanges(); - }); - - it('it should call removeChangesFromField on the objectUpdatesService with the correct url and uuid', () => { - expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, metadatum.uuid); - }); - }); - - describe('findMetadataFieldSuggestions', () => { - const query = 'query string'; - - const metadataFieldSuggestions: InputSuggestion[] = - [ - { - displayValue: ('dc.' + mdField1.toString()).split('.').join('.​'), - value: ('dc.' + mdField1.toString()) - }, - { - displayValue: ('dc.' + mdField2.toString()).split('.').join('.​'), - value: ('dc.' + mdField2.toString()) - }, - { - displayValue: ('dc.' + mdField3.toString()).split('.').join('.​'), - value: ('dc.' + mdField3.toString()) - } - ]; - - beforeEach(fakeAsync(() => { - comp.findMetadataFieldSuggestions(query); - tick(); - fixture.detectChanges(); - })); - - it('it should call queryMetadataFields on the metadataFieldService with the correct query', () => { - expect(metadataFieldService.queryMetadataFields).toHaveBeenCalledWith(query, null, true, false, followLink('schema')); - }); - - it('it should set metadataFieldSuggestions to the right value', () => { - const expected = 'a'; - scheduler.expectObservable(comp.metadataFieldSuggestions).toBe(expected, { a: metadataFieldSuggestions }); - }); - }); - - describe('canSetEditable', () => { - describe('when editable is currently true', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - - it('canSetEditable should return an observable emitting false', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: false }); - }); - }); - - describe('when editable is currently false', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - - describe('when the fieldUpdate\'s changeType is currently not REMOVE', () => { - beforeEach(() => { - comp.fieldUpdate.changeType = FieldChangeType.ADD; - fixture.detectChanges(); - }); - it('canSetEditable should return an observable emitting true', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: true }); - }); - }); - - describe('when the fieldUpdate\'s changeType is currently REMOVE', () => { - beforeEach(() => { - comp.fieldUpdate.changeType = FieldChangeType.REMOVE; - fixture.detectChanges(); - }); - it('canSetEditable should return an observable emitting false', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: false }); - }); - }); - }); - }); - - describe('canSetUneditable', () => { - describe('when editable is currently true', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - - it('canSetUneditable should return an observable emitting true', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canSetUneditable()).toBe(expected, { a: true }); - }); - }); - - describe('when editable is currently false', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - - it('canSetUneditable should return an observable emitting false', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canSetUneditable()).toBe(expected, { a: false }); - }); - }); - }); - - describe('when canSetEditable emits true', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(false)); - spyOn(comp, 'canSetEditable').and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - it('the div should have an enabled button with an edit icon', () => { - const editIcon = de.query(By.css('i.fa-edit')).parent.nativeElement.disabled; - expect(editIcon).toBe(false); - }); - }); - - describe('when canSetEditable emits false', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(false)); - spyOn(comp, 'canSetEditable').and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - it('the div should have a disabled button with an edit icon', () => { - const editIcon = de.query(By.css('i.fa-edit')).parent.nativeElement.disabled; - expect(editIcon).toBe(true); - }); - }); - - describe('when canSetUneditable emits true', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(true)); - spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - it('the div should have an enabled button with a check icon', () => { - const checkButtonAttrs = de.query(By.css('i.fa-check')).parent.nativeElement.disabled; - expect(checkButtonAttrs).toBe(false); - }); - }); - - describe('when canSetUneditable emits false', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(true)); - spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - it('the div should have a disabled button with a check icon', () => { - const checkButtonAttrs = de.query(By.css('i.fa-check')).parent.nativeElement.disabled; - expect(checkButtonAttrs).toBe(true); - }); - }); - - describe('when canRemove emits true', () => { - beforeEach(() => { - spyOn(comp, 'canRemove').and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - it('the div should have an enabled button with a trash icon', () => { - const trashButtonAttrs = de.query(By.css('i.fa-trash-alt')).parent.nativeElement.disabled; - expect(trashButtonAttrs).toBe(false); - }); - }); - - describe('when canRemove emits false', () => { - beforeEach(() => { - spyOn(comp, 'canRemove').and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - it('the div should have a disabled button with a trash icon', () => { - const trashButtonAttrs = de.query(By.css('i.fa-trash-alt')).parent.nativeElement.disabled; - expect(trashButtonAttrs).toBe(true); - }); - }); - - describe('when canUndo emits true', () => { - beforeEach(() => { - spyOn(comp, 'canUndo').and.returnValue(observableOf(true)); - fixture.detectChanges(); - }); - it('the div should have an enabled button with an undo icon', () => { - const undoIcon = de.query(By.css('i.fa-undo-alt')).parent.nativeElement.disabled; - expect(undoIcon).toBe(false); - }); - }); - - describe('when canUndo emits false', () => { - beforeEach(() => { - spyOn(comp, 'canUndo').and.returnValue(observableOf(false)); - fixture.detectChanges(); - }); - it('the div should have a disabled button with an undo icon', () => { - const undoIcon = de.query(By.css('i.fa-undo-alt')).parent.nativeElement.disabled; - expect(undoIcon).toBe(true); - }); - }); - - describe('canRemove', () => { - describe('when the fieldUpdate\'s changeType is currently not REMOVE or ADD', () => { - beforeEach(() => { - comp.fieldUpdate.changeType = FieldChangeType.UPDATE; - fixture.detectChanges(); - }); - it('canRemove should return an observable emitting true', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canRemove()).toBe(expected, { a: true }); - }); - }); - - describe('when the fieldUpdate\'s changeType is currently ADD', () => { - beforeEach(() => { - comp.fieldUpdate.changeType = FieldChangeType.ADD; - fixture.detectChanges(); - }); - it('canRemove should return an observable emitting false', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canRemove()).toBe(expected, { a: false }); - }); - }); - }); - - describe('canUndo', () => { - - describe('when editable is currently true', () => { - beforeEach(() => { - objectUpdatesService.isEditable.and.returnValue(observableOf(true)); - comp.fieldUpdate.changeType = undefined; - fixture.detectChanges(); - }); - it('canUndo should return an observable emitting true', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: true }); - }); - }); - - describe('when editable is currently false', () => { - describe('when the fieldUpdate\'s changeType is currently ADD, UPDATE or REMOVE', () => { - beforeEach(() => { - comp.fieldUpdate.changeType = FieldChangeType.ADD; - fixture.detectChanges(); - }); - - it('canUndo should return an observable emitting true', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: true }); - }); - }); - - describe('when the fieldUpdate\'s changeType is currently undefined', () => { - beforeEach(() => { - comp.fieldUpdate.changeType = undefined; - fixture.detectChanges(); - }); - - it('canUndo should return an observable emitting false', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: false }); - }); - }); - }); - - }); - - 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/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts deleted file mode 100644 index 27827479164..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts +++ /dev/null @@ -1,201 +0,0 @@ -import { Component, Input, OnChanges, OnInit } from '@angular/core'; -import { - metadataFieldsToString, - getFirstSucceededRemoteData -} from '../../../../core/shared/operators'; -import { hasValue, isNotEmpty } from '../../../../shared/empty.util'; -import { RegistryService } from '../../../../core/registry/registry.service'; -import { cloneDeep } from 'lodash'; -import { BehaviorSubject, Observable, of as observableOf } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; -import { FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer'; -import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { NgModel } from '@angular/forms'; -import { MetadatumViewModel } from '../../../../core/shared/metadata.models'; -import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model'; -import { followLink } from '../../../../shared/utils/follow-link-config.model'; - -@Component({ - // tslint:disable-next-line:component-selector - selector: '[ds-edit-in-place-field]', - styleUrls: ['./edit-in-place-field.component.scss'], - templateUrl: './edit-in-place-field.component.html', -}) -/** - * Component that displays a single metadatum of an item on the edit page - */ -export class EditInPlaceFieldComponent implements OnInit, OnChanges { - /** - * The current field, value and state of the metadatum - */ - @Input() fieldUpdate: FieldUpdate; - - /** - * The current url of this page - */ - @Input() url: string; - - /** - * The metadatum of this field - */ - @Input() metadata: MetadatumViewModel; - - /** - * Emits whether or not this field is currently editable - */ - editable: Observable; - - /** - * Emits whether or not this field is currently valid - */ - valid: Observable; - - /** - * The current suggestions for the metadatafield when editing - */ - metadataFieldSuggestions: BehaviorSubject = new BehaviorSubject([]); - - constructor( - private registryService: RegistryService, - private objectUpdatesService: ObjectUpdatesService, - ) { - } - - /** - * Sets up an observable that keeps track of the current editable and valid state of this field - */ - ngOnInit(): void { - this.editable = this.objectUpdatesService.isEditable(this.url, this.metadata.uuid); - this.valid = this.objectUpdatesService.isValid(this.url, this.metadata.uuid); - } - - /** - * Sends a new change update for this field to the object updates service - */ - update(ngModel?: NgModel) { - this.objectUpdatesService.saveChangeFieldUpdate(this.url, cloneDeep(this.metadata)); - if (hasValue(ngModel)) { - this.checkValidity(ngModel); - } - } - - /** - * Method to check the validity of a form control - * @param ngModel - */ - public checkValidity(ngModel: NgModel) { - ngModel.control.setValue(ngModel.viewModel); - ngModel.control.updateValueAndValidity(); - this.objectUpdatesService.setValidFieldUpdate(this.url, this.metadata.uuid, ngModel.control.valid); - } - - /** - * Sends a new editable state for this field to the service to change it - * @param editable The new editable state for this field - */ - setEditable(editable: boolean) { - this.objectUpdatesService.setEditableFieldUpdate(this.url, this.metadata.uuid, editable); - } - - /** - * Sends a new remove update for this field to the object updates service - */ - remove() { - this.objectUpdatesService.saveRemoveFieldUpdate(this.url, cloneDeep(this.metadata)); - } - - /** - * Notifies the object updates service that the updates for the current field can be removed - */ - removeChangesFromField() { - this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.metadata.uuid); - } - - /** - * Sets the current metadatafield based on the fieldUpdate input field - */ - ngOnChanges(): void { - this.metadata = cloneDeep(this.fieldUpdate.field) as MetadatumViewModel; - } - - /** - * Requests all metadata fields that contain the query string in their key - * Then sets all found metadata fields as metadataFieldSuggestions - * Ignores fields from metadata schemas "relation" and "relationship" - * @param query The query to look for - */ - findMetadataFieldSuggestions(query: string) { - if (isNotEmpty(query)) { - return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe( - getFirstSucceededRemoteData(), - metadataFieldsToString(), - ).subscribe((fieldNames: string[]) => { - this.setInputSuggestions(fieldNames); - }); - } else { - this.metadataFieldSuggestions.next([]); - } - } - - /** - * Set the list of input suggestion with the given Metadata fields, which all require a resolved MetadataSchema - * @param fields list of Metadata fields, which all require a resolved MetadataSchema - */ - setInputSuggestions(fields: string[]) { - this.metadataFieldSuggestions.next( - fields.map((fieldName: string) => { - return { - displayValue: fieldName.split('.').join('.​'), - value: fieldName - }; - }) - ); - } - - /** - * Check if a user should be allowed to edit this field - * @return an observable that emits true when the user should be able to edit this field and false when they should not - */ - canSetEditable(): Observable { - return this.editable.pipe( - map((editable: boolean) => { - if (editable) { - return false; - } else { - return this.fieldUpdate.changeType !== FieldChangeType.REMOVE; - } - }) - ); - } - - /** - * Check if a user should be allowed to disabled editing this field - * @return an observable that emits true when the user should be able to disable editing this field and false when they should not - */ - canSetUneditable(): Observable { - return this.editable; - } - - /** - * Check if a user should be allowed to remove this field - * @return an observable that emits true when the user should be able to remove this field and false when they should not - */ - canRemove(): Observable { - return observableOf(this.fieldUpdate.changeType !== FieldChangeType.REMOVE && this.fieldUpdate.changeType !== FieldChangeType.ADD); - } - - /** - * Check if a user should be allowed to undo changes to this field - * @return an observable that emits true when the user should be able to undo changes to this field and false when they should not - */ - canUndo(): Observable { - return this.editable.pipe( - map((editable: boolean) => this.fieldUpdate.changeType >= 0 || editable) - ); - } - - protected isNotEmpty(value): boolean { - return isNotEmpty(value); - } -} 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 deleted file mode 100644 index 70cd2aaa398..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html +++ /dev/null @@ -1,69 +0,0 @@ -
    -
    - - - - -
    -
    {{'subscriptions.table.dso' | translate}}{{'subscriptions.table.dso' | translate}} {{'subscriptions.table.subscription_type' | translate}} {{'subscriptions.table.subscription_frequency' | translate}} {{'subscriptions.table.action' | translate}} -
    -
    - {{metadata?.key?.split('.').join('.​')}} -
    -
    - -
    - {{"item.edit.metadata.metadatafield.invalid" | translate}} -
    -    		 -
    -
    - {{metadata?.value}} -
    -
    - -
    -
    -    		 -
    -
    - {{metadata?.language}} -
    -
    - -
    -
    -    		 -
    - - - - -
    -
    - - - - - - - - - - - - - -
    {{'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-metadata/item-metadata.component.scss b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss deleted file mode 100644 index 46ce1a6f4bd..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss +++ /dev/null @@ -1,20 +0,0 @@ -.button-row { - .btn { - margin-right: calc(0.5 * var(--bs-spacer)); - - &:last-child { - margin-right: 0; - } - - @media screen and (min-width: map-get($grid-breakpoints, sm)) { - min-width: var(--ds-edit-item-button-min-width); - } - } - - &.top .btn { - margin-top: calc(var(--bs-spacer) / 2); - margin-bottom: calc(var(--bs-spacer) / 2); - } - - -} diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts deleted file mode 100644 index 0f01efcc552..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts +++ /dev/null @@ -1,290 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; -import { of as observableOf } from 'rxjs'; -import { getTestScheduler } from 'jasmine-marbles'; -import { ItemMetadataComponent } from './item-metadata.component'; -import { TestScheduler } from 'rxjs/testing'; -import { SharedModule } from '../../../shared/shared.module'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { ActivatedRoute, Router } from '@angular/router'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { TranslateModule } from '@ngx-translate/core'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { By } from '@angular/platform-browser'; -import { INotification, Notification } from '../../../shared/notifications/models/notification.model'; -import { NotificationType } from '../../../shared/notifications/models/notification-type'; -import { RouterStub } from '../../../shared/testing/router.stub'; -import { Item } from '../../../core/shared/item.model'; -import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions'; -import { MetadatumViewModel } from '../../../core/shared/metadata.models'; -import { RegistryService } from '../../../core/registry/registry.service'; -import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; -import { MetadataField } from '../../../core/metadata/metadata-field.model'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; -import { ObjectCacheService } from '../../../core/cache/object-cache.service'; -import { DSOSuccessResponse } from '../../../core/cache/response.models'; -import { createPaginatedList } from '../../../shared/testing/utils.test'; - -let comp: any; -let fixture: ComponentFixture; -let de: DebugElement; -let el: HTMLElement; -let objectUpdatesService; -const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info'); -const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning'); -const successNotification: INotification = new Notification('id', NotificationType.Success, 'success'); -const date = new Date(); -const router = new RouterStub(); -let metadataFieldService; -let paginatedMetadataFields; -let routeStub; -let objectCacheService; - -const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' }); -const mdField1 = Object.assign(new MetadataField(), { - schema: mdSchema, - element: 'contributor', - qualifier: 'author' -}); -const mdField2 = Object.assign(new MetadataField(), { schema: mdSchema, element: 'title' }); -const mdField3 = Object.assign(new MetadataField(), { - schema: mdSchema, - element: 'description', - qualifier: 'abstract' -}); - -let itemService; -const notificationsService = jasmine.createSpyObj('notificationsService', - { - info: infoNotification, - warning: warningNotification, - success: successNotification - } -); -const metadatum1 = Object.assign(new MetadatumViewModel(), { - key: 'dc.description.abstract', - value: 'Example abstract', - language: 'en' -}); - -const metadatum2 = Object.assign(new MetadatumViewModel(), { - key: 'dc.title', - value: 'Title test', - language: 'de' -}); - -const metadatum3 = Object.assign(new MetadatumViewModel(), { - key: 'dc.contributor.author', - value: 'Shakespeare, William', -}); - -const url = 'http://test-url.com/test-url'; - -router.url = url; - -const fieldUpdate1 = { - field: metadatum1, - changeType: undefined -}; - -const fieldUpdate2 = { - field: metadatum2, - changeType: FieldChangeType.REMOVE -}; - -const fieldUpdate3 = { - field: metadatum3, - changeType: undefined -}; - -const operation1 = { op: 'remove', path: '/metadata/dc.title/1' }; - -let scheduler: TestScheduler; -let item; -describe('ItemMetadataComponent', () => { - beforeEach(waitForAsync(() => { - item = Object.assign(new Item(), { - metadata: { - [metadatum1.key]: [metadatum1], - [metadatum2.key]: [metadatum2], - [metadatum3.key]: [metadatum3] - }, - _links: { - self: { - href: 'https://rest.api/core/items/a36d8bd2-8e8c-4969-9b1f-a574c2064983' - } - } - }, - { - lastModified: date - } - ) - ; - itemService = jasmine.createSpyObj('itemService', { - update: createSuccessfulRemoteDataObject$(item), - commitUpdates: {}, - patch: observableOf(new DSOSuccessResponse(['item-selflink'], 200, 'OK')), - findByHref: createSuccessfulRemoteDataObject$(item) - }); - routeStub = { - data: observableOf({}), - parent: { - data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }) - } - }; - paginatedMetadataFields = createPaginatedList([mdField1, mdField2, mdField3]); - - metadataFieldService = jasmine.createSpyObj({ - getAllMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields) - }); - scheduler = getTestScheduler(); - objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', - { - getFieldUpdates: observableOf({ - [metadatum1.uuid]: fieldUpdate1, - [metadatum2.uuid]: fieldUpdate2, - [metadatum3.uuid]: fieldUpdate3 - }), - saveAddFieldUpdate: {}, - discardFieldUpdates: {}, - reinstateFieldUpdates: observableOf(true), - initialize: {}, - getUpdatedFields: observableOf([metadatum1, metadatum2, metadatum3]), - getLastModified: observableOf(date), - hasUpdates: observableOf(true), - isReinstatable: observableOf(false), // should always return something --> its in ngOnInit - isValidPage: observableOf(true), - createPatch: observableOf([ - operation1 - ]) - } - ); - objectCacheService = jasmine.createSpyObj('objectCacheService', ['addPatch']); - - TestBed.configureTestingModule({ - imports: [SharedModule, TranslateModule.forRoot()], - declarations: [ItemMetadataComponent], - providers: [ - { provide: ItemDataService, useValue: itemService }, - { provide: ObjectUpdatesService, useValue: objectUpdatesService }, - { provide: Router, useValue: router }, - { provide: ActivatedRoute, useValue: routeStub }, - { provide: NotificationsService, useValue: notificationsService }, - { provide: RegistryService, useValue: metadataFieldService }, - { provide: ObjectCacheService, useValue: objectCacheService }, - ], schemas: [ - NO_ERRORS_SCHEMA - ] - }).compileComponents(); - }) - ); - - beforeEach(() => { - fixture = TestBed.createComponent(ItemMetadataComponent); - comp = fixture.componentInstance; // EditInPlaceFieldComponent test instance - de = fixture.debugElement; - el = de.nativeElement; - comp.url = url; - fixture.detectChanges(); - }); - - describe('add', () => { - const md = new MetadatumViewModel(); - beforeEach(() => { - comp.add(md); - }); - - it('it should call saveAddFieldUpdate on the objectUpdatesService with the correct url and metadata', () => { - expect(objectUpdatesService.saveAddFieldUpdate).toHaveBeenCalledWith(url, md); - }); - }); - - describe('discard', () => { - beforeEach(() => { - comp.discard(); - }); - - it('it should call discardFieldUpdates on the objectUpdatesService with the correct url and notification', () => { - expect(objectUpdatesService.discardFieldUpdates).toHaveBeenCalledWith(url, infoNotification); - }); - }); - - describe('reinstate', () => { - beforeEach(() => { - comp.reinstate(); - }); - - it('it should call reinstateFieldUpdates on the objectUpdatesService with the correct url', () => { - expect(objectUpdatesService.reinstateFieldUpdates).toHaveBeenCalledWith(url); - }); - }); - - describe('submit', () => { - beforeEach(() => { - comp.submit(); - }); - - it('it should call reinstateFieldUpdates on the objectUpdatesService with the correct url and metadata', () => { - expect(objectUpdatesService.createPatch).toHaveBeenCalledWith(url); - expect(itemService.patch).toHaveBeenCalledWith(comp.item, [operation1]); - expect(objectUpdatesService.getFieldUpdates).toHaveBeenCalledWith(url, comp.item.metadataAsList); - }); - }); - - describe('hasChanges', () => { - describe('when the objectUpdatesService\'s hasUpdated method returns true', () => { - beforeEach(() => { - objectUpdatesService.hasUpdates.and.returnValue(observableOf(true)); - }); - - it('should return an observable that emits true', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.hasChanges()).toBe(expected, { a: true }); - }); - }); - - describe('when the objectUpdatesService\'s hasUpdated method returns false', () => { - beforeEach(() => { - objectUpdatesService.hasUpdates.and.returnValue(observableOf(false)); - }); - - it('should return an observable that emits false', () => { - const expected = '(a|)'; - scheduler.expectObservable(comp.hasChanges()).toBe(expected, { a: false }); - }); - }); - }); - - describe('changeType is UPDATE', () => { - beforeEach(() => { - fieldUpdate1.changeType = FieldChangeType.UPDATE; - fixture.detectChanges(); - }); - it('the div should have class table-warning', () => { - const element = de.queryAll(By.css('tr'))[1].nativeElement; - expect(element.classList).toContain('table-warning'); - }); - }); - - describe('changeType is ADD', () => { - beforeEach(() => { - fieldUpdate1.changeType = FieldChangeType.ADD; - fixture.detectChanges(); - }); - it('the div should have class table-success', () => { - const element = de.queryAll(By.css('tr'))[1].nativeElement; - expect(element.classList).toContain('table-success'); - }); - }); - - describe('changeType is REMOVE', () => { - beforeEach(() => { - fieldUpdate1.changeType = FieldChangeType.REMOVE; - fixture.detectChanges(); - }); - it('the div should have class table-danger', () => { - const element = de.queryAll(By.css('tr'))[1].nativeElement; - expect(element.classList).toContain('table-danger'); - }); - }); -}); diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts deleted file mode 100644 index 5030ef3bb3d..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts +++ /dev/null @@ -1,135 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Item } from '../../../core/shared/item.model'; -import { ItemDataService } from '../../../core/data/item-data.service'; -import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service'; -import { ActivatedRoute, Router } from '@angular/router'; -import { cloneDeep } from 'lodash'; -import { first, switchMap } from 'rxjs/operators'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { RemoteData } from '../../../core/data/remote-data'; -import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { MetadataValue, MetadatumViewModel } from '../../../core/shared/metadata.models'; -import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component'; -import { UpdateDataService } from '../../../core/data/update-data.service'; -import { hasNoValue, hasValue } from '../../../shared/empty.util'; -import { AlertType } from '../../../shared/alert/aletr-type'; -import { Operation } from 'fast-json-patch'; -import { MetadataPatchOperationService } from '../../../core/data/object-updates/patch-operation-service/metadata-patch-operation.service'; - -@Component({ - selector: 'ds-item-metadata', - styleUrls: ['./item-metadata.component.scss'], - templateUrl: './item-metadata.component.html', -}) -/** - * Component for displaying an item's metadata edit page - */ -export class ItemMetadataComponent extends AbstractItemUpdateComponent { - - /** - * The AlertType enumeration - * @type {AlertType} - */ - public AlertTypeEnum = AlertType; - - /** - * A custom update service to use for adding and committing patches - * This will default to the ItemDataService - */ - @Input() updateService: UpdateDataService; - - constructor( - public itemService: ItemDataService, - public objectUpdatesService: ObjectUpdatesService, - public router: Router, - public notificationsService: NotificationsService, - public translateService: TranslateService, - public route: ActivatedRoute, - ) { - super(itemService, objectUpdatesService, router, notificationsService, translateService, route); - } - - /** - * Set up and initialize all fields - */ - ngOnInit(): void { - super.ngOnInit(); - if (hasNoValue(this.updateService)) { - this.updateService = this.itemService; - } - } - - /** - * Initialize the values and updates of the current item's metadata fields - */ - public initializeUpdates(): void { - this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadataAsList); - } - - /** - * Initialize the prefix for notification messages - */ - public initializeNotificationsPrefix(): void { - this.notificationsPrefix = 'item.edit.metadata.notifications.'; - } - - /** - * Sends a new add update for a field to the object updates service - * @param metadata The metadata to add, if no parameter is supplied, create a new Metadatum - */ - add(metadata: MetadatumViewModel = new MetadatumViewModel()) { - this.objectUpdatesService.saveAddFieldUpdate(this.url, metadata); - } - - /** - * Sends all initial values of this item to the object updates service - */ - public initializeOriginalFields() { - this.objectUpdatesService.initialize(this.url, this.item.metadataAsList, this.item.lastModified, MetadataPatchOperationService); - } - - /** - * Requests all current metadata for this item and requests the item service to update the item - * Makes sure the new version of the item is rendered on the page - */ - public submit() { - this.isValid().pipe(first()).subscribe((isValid) => { - if (isValid) { - this.objectUpdatesService.createPatch(this.url).pipe( - first(), - switchMap((patch: Operation[]) => { - return this.updateService.patch(this.item, patch).pipe( - getFirstCompletedRemoteData() - ); - }) - ).subscribe( - (rd: RemoteData) => { - if (rd.hasFailed) { - this.notificationsService.error(this.getNotificationTitle('error'), rd.errorMessage); - } else { - this.item = rd.payload; - this.checkAndFixMetadataUUIDs(); - this.initializeOriginalFields(); - this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadataAsList); - this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved')); - } - } - ); - } else { - this.notificationsService.error(this.getNotificationTitle('invalid'), this.getNotificationContent('invalid')); - } - }); - } - - /** - * Check for empty metadata UUIDs and fix them (empty UUIDs would break the object-update service) - */ - checkAndFixMetadataUUIDs() { - const metadata = cloneDeep(this.item.metadata); - Object.keys(this.item.metadata).forEach((key: string) => { - metadata[key] = this.item.metadata[key].map((value) => hasValue(value.uuid) ? value : Object.assign(new MetadataValue(), value)); - }); - this.item.metadata = metadata; - } -} diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 0140bad6dd2..fd2b049d54b 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1815,6 +1815,8 @@ "item.edit.metadata.headers.value": "Value", + "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", + "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", @@ -2270,6 +2272,64 @@ + "itemtemplate.edit.metadata.add-button": "Add", + + "itemtemplate.edit.metadata.discard-button": "Discard", + + "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm", + + "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder", + + "itemtemplate.edit.metadata.edit.buttons.edit": "Edit", + + "itemtemplate.edit.metadata.edit.buttons.remove": "Remove", + + "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes", + + "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing", + + "itemtemplate.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab", + + "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.", + + "itemtemplate.edit.metadata.headers.edit": "Edit", + + "itemtemplate.edit.metadata.headers.field": "Field", + + "itemtemplate.edit.metadata.headers.language": "Lang", + + "itemtemplate.edit.metadata.headers.value": "Value", + + "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", + + "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", + + "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + + "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded", + + "itemtemplate.edit.metadata.notifications.error.title": "An error occurred", + + "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", + + "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid", + + "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + + "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated", + + "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.", + + "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved", + + "itemtemplate.edit.metadata.reinstate-button": "Undo", + + "itemtemplate.edit.metadata.reset-order-button": "Undo reorder", + + "itemtemplate.edit.metadata.save-button": "Save", + + + "journal.listelement.badge": "Journal", "journal.page.description": "Description", From ceb6ea3672961f7bba0ffba7959a8b94e870b48d Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 4 Jan 2023 14:29:48 +0100 Subject: [PATCH 287/758] 93747: Fixed and improved ArrayMoveChangeAnalyzer --- ...array-move-change-analyzer.service.spec.ts | 13 ++++-- .../array-move-change-analyzer.service.ts | 41 +++++++++++-------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/app/core/data/array-move-change-analyzer.service.spec.ts b/src/app/core/data/array-move-change-analyzer.service.spec.ts index 5f5388d935f..025791d6dc4 100644 --- a/src/app/core/data/array-move-change-analyzer.service.spec.ts +++ b/src/app/core/data/array-move-change-analyzer.service.spec.ts @@ -41,21 +41,28 @@ describe('ArrayMoveChangeAnalyzer', () => { ], new MoveTest(0, 3)); testMove([ + { op: 'move', from: '/2', path: '/3' }, { op: 'move', from: '/0', path: '/3' }, - { op: 'move', from: '/2', path: '/1' } ], new MoveTest(0, 3), new MoveTest(1, 2)); testMove([ + { op: 'move', from: '/3', path: '/4' }, { op: 'move', from: '/0', path: '/1' }, - { op: 'move', from: '/3', path: '/4' } ], new MoveTest(0, 1), new MoveTest(3, 4)); testMove([], new MoveTest(0, 4), new MoveTest(4, 0)); testMove([ + { op: 'move', from: '/2', path: '/3' }, { op: 'move', from: '/0', path: '/3' }, - { op: 'move', from: '/2', path: '/1' } ], new MoveTest(0, 4), new MoveTest(1, 3), new MoveTest(2, 4)); + + testMove([ + { op: 'move', from: '/3', path: '/4' }, + { op: 'move', from: '/2', path: '/4' }, + { op: 'move', from: '/1', path: '/3' }, + { op: 'move', from: '/0', path: '/3' }, + ], new MoveTest(4, 1), new MoveTest(4, 2), new MoveTest(0, 3)); }); describe('when some values are undefined (index 2 and 3)', () => { diff --git a/src/app/core/data/array-move-change-analyzer.service.ts b/src/app/core/data/array-move-change-analyzer.service.ts index f6e07608f6c..36744e9f96e 100644 --- a/src/app/core/data/array-move-change-analyzer.service.ts +++ b/src/app/core/data/array-move-change-analyzer.service.ts @@ -16,22 +16,31 @@ export class ArrayMoveChangeAnalyzer { * @param array2 The custom array to compare with the original */ diff(array1: T[], array2: T[]): MoveOperation[] { - const result = []; - const moved = [...array1]; - array1.forEach((value: T, index: number) => { - if (hasValue(value)) { - const otherIndex = array2.indexOf(value); - const movedIndex = moved.indexOf(value); - if (index !== otherIndex && movedIndex !== otherIndex) { - moveItemInArray(moved, movedIndex, otherIndex); - result.push(Object.assign({ - op: 'move', - from: '/' + movedIndex, - path: '/' + otherIndex - }) as MoveOperation); - } + return this.getMoves(array1, array2).map((move) => Object.assign({ + op: 'move', + from: '/' + move[0], + path: '/' + move[1], + }) as MoveOperation); + } + + /** + * Determine a set of moves required to transform array1 into array2 + * The moves are returned as an array of pairs of numbers where the first number is the original index and the second + * is the new index + * It is assumed the operations are executed in the order they're returned (and not simultaneously) + * @param array1 + * @param array2 + */ + private getMoves(array1: any[], array2: any[]): number[][] { + const moved = [...array2]; + + return array1.reduce((moves, item, index) => { + if (hasValue(item) && item !== moved[index]) { + const last = moved.lastIndexOf(item); + moveItemInArray(moved, last, index); + moves.unshift([index, last]); } - }); - return result; + return moves; + }, []); } } From 124469209a1bbeedd46d8f12c3ca852728bbe40c Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Wed, 4 Jan 2023 17:51:34 +0100 Subject: [PATCH 288/758] 97742: Post merge test & build fixes --- .../dso-edit-metadata-value.component.spec.ts | 6 ++-- .../dso-edit-metadata-value.component.ts | 4 +-- .../dso-edit-metadata.component.spec.ts | 24 +++++++------ .../dso-edit-metadata.component.ts | 11 +++--- .../themed-item-metadata.component.ts | 34 ------------------- .../item-metadata.component.html | 0 .../item-metadata.component.scss | 0 .../item-metadata/item-metadata.component.ts | 17 ---------- src/themes/custom/lazy-theme.module.ts | 2 -- 9 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts delete mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html delete mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss delete mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts index 08f041c4cdc..10b3016a52d 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts @@ -4,7 +4,7 @@ import { VarDirective } from '../../../shared/utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; -import { RelationshipService } from '../../../core/data/relationship.service'; +import { RelationshipDataService } from '../../../core/data/relationship-data.service'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { of } from 'rxjs/internal/observable/of'; import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; @@ -22,7 +22,7 @@ describe('DsoEditMetadataValueComponent', () => { let component: DsoEditMetadataValueComponent; let fixture: ComponentFixture; - let relationshipService: RelationshipService; + let relationshipService: RelationshipDataService; let dsoNameService: DSONameService; let editMetadataValue: DsoEditMetadataValue; @@ -52,7 +52,7 @@ describe('DsoEditMetadataValueComponent', () => { declarations: [DsoEditMetadataValueComponent, VarDirective], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ - { provide: RelationshipService, useValue: relationshipService }, + { provide: RelationshipDataService, useValue: relationshipService }, { provide: DSONameService, useValue: dsoNameService }, ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index dce0ec68b0e..3fdcd381abc 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -5,7 +5,7 @@ import { MetadataRepresentation, MetadataRepresentationType } from '../../../core/shared/metadata-representation/metadata-representation.model'; -import { RelationshipService } from '../../../core/data/relationship.service'; +import { RelationshipDataService } from '../../../core/data/relationship-data.service'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model'; import { map } from 'rxjs/operators'; @@ -97,7 +97,7 @@ export class DsoEditMetadataValueComponent implements OnInit { */ mdRepresentationName$: Observable; - constructor(protected relationshipService: RelationshipService, + constructor(protected relationshipService: RelationshipDataService, protected dsoNameService: DSONameService) { } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts index b3650114c9b..7067c44fbb4 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts @@ -3,22 +3,32 @@ 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 { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; +import { DebugElement, Injectable, NO_ERRORS_SCHEMA } from '@angular/core'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { Item } from '../../core/shared/item.model'; -import { ItemDataService } from '../../core/data/item-data.service'; import { MetadataValue } from '../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { By } from '@angular/platform-browser'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; import { ITEM } from '../../core/shared/item.resource-type'; +import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator'; +import { Operation } from 'fast-json-patch'; +import { RemoteData } from '../../core/data/remote-data'; +import { Observable } from 'rxjs/internal/Observable'; const ADD_BTN = 'add'; const REINSTATE_BTN = 'reinstate'; const SAVE_BTN = 'save'; const DISCARD_BTN = 'discard'; +@Injectable() +class TestDataService { + patch(object: Item, operations: Operation[]): Observable> { + return createSuccessfulRemoteDataObject$(object); + } +} + describe('DsoEditMetadataComponent', () => { let component: DsoEditMetadataComponent; let fixture: ComponentFixture; @@ -26,8 +36,6 @@ describe('DsoEditMetadataComponent', () => { let notificationsService: NotificationsService; let dso: DSpaceObject; - let updatedDso: DSpaceObject; - let dataService: ItemDataService; beforeEach(waitForAsync(() => { dso = Object.assign(new Item(), { @@ -59,11 +67,6 @@ describe('DsoEditMetadataComponent', () => { ], }, }); - updatedDso = Object.assign(new Item(), dso); - updatedDso.metadata['dc.title'][0].value = 'Updated Title'; - dataService = jasmine.createSpyObj('itemDataService', { - patch: createSuccessfulRemoteDataObject$(updatedDso), - }); notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']); @@ -71,7 +74,8 @@ describe('DsoEditMetadataComponent', () => { declarations: [DsoEditMetadataComponent, VarDirective], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ - { provide: ItemDataService, useValue: dataService }, + TestDataService, + { provide: DATA_SERVICE_FACTORY, useValue: jasmine.createSpy('getDataServiceFor').and.returnValue(TestDataService) }, { provide: NotificationsService, useValue: notificationsService }, ArrayMoveChangeAnalyzer, ], diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index a2ceaa21d62..d67a7ea738d 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -1,4 +1,4 @@ -import { Component, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Component, Inject, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AlertType } from '../../shared/alert/aletr-type'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; import { DsoEditMetadataForm } from './dso-edit-metadata-form'; @@ -13,13 +13,15 @@ import { getFirstCompletedRemoteData, } from '../../core/shared/operators'; import { UpdateDataService } from '../../core/data/update-data.service'; -import { getDataServiceFor } from '../../core/cache/builders/build-decorators'; import { ResourceType } from '../../core/shared/resource-type'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component'; import { Observable } from 'rxjs/internal/Observable'; import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; +import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator'; +import { GenericConstructor } from '../../core/shared/generic-constructor'; +import { HALDataService } from '../../core/data/base/hal-data-service.interface'; @Component({ selector: 'ds-dso-edit-metadata', @@ -107,7 +109,8 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { protected notificationsService: NotificationsService, protected translateService: TranslateService, protected parentInjector: Injector, - protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer) { + protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer, + @Inject(DATA_SERVICE_FACTORY) protected getDataServiceFor: (resourceType: ResourceType) => GenericConstructor>) { } /** @@ -144,7 +147,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { type = this.dso.type; } if (hasNoValue(this.updateDataService)) { - const provider = getDataServiceFor(type); + const provider = this.getDataServiceFor(type); this.updateDataService = Injector.create({ providers: [], parent: this.parentInjector diff --git a/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts deleted file mode 100644 index 53f0120015c..00000000000 --- a/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Item } from '../../../core/shared/item.model'; -import { UpdateDataService } from '../../../core/data/update-data.service'; -import { ItemMetadataComponent } from './item-metadata.component'; -import { ThemedComponent } from '../../../shared/theme-support/themed.component'; - -@Component({ - selector: 'ds-themed-item-metadata', - styleUrls: [], - templateUrl: './../../../shared/theme-support/themed.component.html', -}) -/** - * Component for displaying an item's metadata edit page - */ -export class ThemedItemMetadataComponent extends ThemedComponent { - - @Input() item: Item; - - @Input() updateService: UpdateDataService; - - protected inAndOutputNames: (keyof ItemMetadataComponent & keyof this)[] = ['item', 'updateService']; - - protected getComponentName(): string { - return 'ItemMetadataComponent'; - } - - protected importThemedComponent(themeName: string): Promise { - return import(`../../../../themes/${themeName}/app/item-page/edit-item-page/item-metadata/item-metadata.component`); - } - - protected importUnthemedComponent(): Promise { - return import(`./item-metadata.component`); - } -} diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts deleted file mode 100644 index d6d7c4b8fb7..00000000000 --- a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; -import { - ItemMetadataComponent as BaseComponent -} from '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component'; - -@Component({ - selector: 'ds-item-metadata', - // styleUrls: ['./item-metadata.component.scss'], - styleUrls: ['../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.scss'], - // templateUrl: './item-metadata.component.html', - templateUrl: '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.html', -}) -/** - * Component for displaying an item's metadata edit page - */ -export class ItemMetadataComponent extends BaseComponent { -} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index d2ac0ae7877..a57c4178a73 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -94,7 +94,6 @@ import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.c import { ExpandableNavbarSectionComponent } from './app/navbar/expandable-navbar-section/expandable-navbar-section.component'; -import { ItemMetadataComponent } from './app/item-page/edit-item-page/item-metadata/item-metadata.component'; import { EditItemTemplatePageComponent } from './app/collection-page/edit-item-template-page/edit-item-template-page.component'; @@ -157,7 +156,6 @@ const DECLARATIONS = [ ComcolPageHandleComponent, AuthNavMenuComponent, ExpandableNavbarSectionComponent, - ItemMetadataComponent, EditItemTemplatePageComponent, LoadingComponent, SearchResultsComponent, From 1cf0f97121b96a0512cff3d9414b172c206190d7 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 3 Jan 2023 16:15:59 +0100 Subject: [PATCH 289/758] 98211: Added advanced workflow models --- src/app/core/core.module.ts | 6 +++++ ...ing-reviewer-action-advanced-info.model.ts | 27 +++++++++++++++++++ .../reviewer-action-advanced-info.model.ts | 16 +++++++++++ ...ewer-action-advanced-info.resource-type.ts | 25 +++++++++++++++++ ...ect-reviewer-action-advanced-info.model.ts | 18 +++++++++++++ .../models/workflow-action-object.model.ts | 20 ++++++++++++++ 6 files changed, 112 insertions(+) create mode 100644 src/app/core/tasks/models/rating-reviewer-action-advanced-info.model.ts create mode 100644 src/app/core/tasks/models/reviewer-action-advanced-info.model.ts create mode 100644 src/app/core/tasks/models/reviewer-action-advanced-info.resource-type.ts create mode 100644 src/app/core/tasks/models/select-reviewer-action-advanced-info.model.ts diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 8d8a614a899..df71f740da5 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -162,6 +162,9 @@ import { SearchConfig } from './shared/search/search-filters/search-config.model import { SequenceService } from './shared/sequence.service'; import { GroupDataService } from './eperson/group-data.service'; import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model'; +import { RatingReviewerActionAdvancedInfo } from './tasks/models/rating-reviewer-action-advanced-info.model'; +import { ReviewerActionAdvancedInfo } from './tasks/models/reviewer-action-advanced-info.model'; +import { SelectReviewerActionAdvancedInfo } from './tasks/models/select-reviewer-action-advanced-info.model'; /** * When not in production, endpoint responses can be mocked for testing purposes @@ -332,6 +335,9 @@ export const models = Version, VersionHistory, WorkflowAction, + ReviewerActionAdvancedInfo, + RatingReviewerActionAdvancedInfo, + SelectReviewerActionAdvancedInfo, TemplateItem, Feature, Authorization, diff --git a/src/app/core/tasks/models/rating-reviewer-action-advanced-info.model.ts b/src/app/core/tasks/models/rating-reviewer-action-advanced-info.model.ts new file mode 100644 index 00000000000..2759d3edf21 --- /dev/null +++ b/src/app/core/tasks/models/rating-reviewer-action-advanced-info.model.ts @@ -0,0 +1,27 @@ +import { typedObject } from '../../cache/builders/build-decorators'; +import { inheritSerialization, autoserialize } from 'cerialize'; +import { RATING_REVIEWER_ACTION_ADVANCED_INFO } from './reviewer-action-advanced-info.resource-type'; +import { ReviewerActionAdvancedInfo } from './reviewer-action-advanced-info.model'; + +/** + * A model class for a {@link RatingReviewerActionAdvancedInfo} + */ +@typedObject +@inheritSerialization(ReviewerActionAdvancedInfo) +export class RatingReviewerActionAdvancedInfo extends ReviewerActionAdvancedInfo { + + static type = RATING_REVIEWER_ACTION_ADVANCED_INFO; + + /** + * Whether the description is required. + */ + @autoserialize + descriptionRequired: boolean; + + /** + * The maximum value. + */ + @autoserialize + maxValue: number; + +} diff --git a/src/app/core/tasks/models/reviewer-action-advanced-info.model.ts b/src/app/core/tasks/models/reviewer-action-advanced-info.model.ts new file mode 100644 index 00000000000..dc423eec51c --- /dev/null +++ b/src/app/core/tasks/models/reviewer-action-advanced-info.model.ts @@ -0,0 +1,16 @@ +import { typedObject } from '../../cache/builders/build-decorators'; +import { autoserialize } from 'cerialize'; +import { REVIEWER_ACTION_ADVANCED_INFO } from './reviewer-action-advanced-info.resource-type'; + +/** + * A model class for a {@link ReviewerActionAdvancedInfo} + */ +@typedObject +export class ReviewerActionAdvancedInfo { + + static type = REVIEWER_ACTION_ADVANCED_INFO; + + @autoserialize + id: string; + +} diff --git a/src/app/core/tasks/models/reviewer-action-advanced-info.resource-type.ts b/src/app/core/tasks/models/reviewer-action-advanced-info.resource-type.ts new file mode 100644 index 00000000000..876f37495e2 --- /dev/null +++ b/src/app/core/tasks/models/reviewer-action-advanced-info.resource-type.ts @@ -0,0 +1,25 @@ +import { ResourceType } from '../../shared/resource-type'; + +/** + * The resource type for {@link ReviewerActionAdvancedInfo} + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const REVIEWER_ACTION_ADVANCED_INFO = new ResourceType('revieweraction'); + +/** + * The resource type for {@link RatingReviewerActionAdvancedInfo} + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const RATING_REVIEWER_ACTION_ADVANCED_INFO = new ResourceType('ratingrevieweraction'); + +/** + * The resource type for {@link SelectReviewerActionAdvancedInfo} + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const SELECT_REVIEWER_ACTION_ADVANCED_INFO = new ResourceType('selectrevieweraction'); diff --git a/src/app/core/tasks/models/select-reviewer-action-advanced-info.model.ts b/src/app/core/tasks/models/select-reviewer-action-advanced-info.model.ts new file mode 100644 index 00000000000..cd8812f6afd --- /dev/null +++ b/src/app/core/tasks/models/select-reviewer-action-advanced-info.model.ts @@ -0,0 +1,18 @@ +import { typedObject } from '../../cache/builders/build-decorators'; +import { inheritSerialization, autoserialize } from 'cerialize'; +import { SELECT_REVIEWER_ACTION_ADVANCED_INFO } from './reviewer-action-advanced-info.resource-type'; +import { ReviewerActionAdvancedInfo } from './reviewer-action-advanced-info.model'; + +/** + * A model class for a {@link SelectReviewerActionAdvancedInfo} + */ +@typedObject +@inheritSerialization(ReviewerActionAdvancedInfo) +export class SelectReviewerActionAdvancedInfo extends ReviewerActionAdvancedInfo { + + static type = SELECT_REVIEWER_ACTION_ADVANCED_INFO; + + @autoserialize + group: string; + +} diff --git a/src/app/core/tasks/models/workflow-action-object.model.ts b/src/app/core/tasks/models/workflow-action-object.model.ts index 720d8178598..6fa103bbeae 100644 --- a/src/app/core/tasks/models/workflow-action-object.model.ts +++ b/src/app/core/tasks/models/workflow-action-object.model.ts @@ -2,6 +2,7 @@ import { inheritSerialization, autoserialize } from 'cerialize'; import { typedObject } from '../../cache/builders/build-decorators'; import { DSpaceObject } from '../../shared/dspace-object.model'; import { WORKFLOW_ACTION } from './workflow-action-object.resource-type'; +import { ReviewerActionAdvancedInfo } from './reviewer-action-advanced-info.model'; /** * A model class for a WorkflowAction @@ -22,4 +23,23 @@ export class WorkflowAction extends DSpaceObject { */ @autoserialize options: string[]; + + /** + * Whether this action has advanced options + */ + @autoserialize + advanced: boolean; + + /** + * The advanced options that the user can select at this action + */ + @autoserialize + advancedOptions: string[]; + + /** + * The advanced info required by the advanced options + */ + @autoserialize + advancedInfo: ReviewerActionAdvancedInfo[]; + } From 0fb9970734f0d38acaaa5d10d48660775d4f15fb Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 3 Jan 2023 20:26:50 +0100 Subject: [PATCH 290/758] 98211: Added button to my workflow task page --- ...claimed-task-actions-abstract.component.ts | 16 ++++++ ...task-action-rating-reviewer.component.html | 4 ++ ...task-action-rating-reviewer.component.scss | 0 ...k-action-rating-reviewer.component.spec.ts | 27 +++++++++ ...d-task-action-rating-reviewer.component.ts | 55 ++++++++++++++++++ ...task-action-select-reviewer.component.html | 4 ++ ...task-action-select-reviewer.component.scss | 0 ...k-action-select-reviewer.component.spec.ts | 27 +++++++++ ...d-task-action-select-reviewer.component.ts | 57 +++++++++++++++++++ src/app/shared/shared.module.ts | 9 ++- .../workflowitems-edit-page-routing-paths.ts | 10 ++++ .../workflowitems-edit-page-routing.module.ts | 24 +++++++- src/assets/i18n/en.json5 | 15 +++++ 13 files changed, 245 insertions(+), 3 deletions(-) create mode 100644 src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts create mode 100644 src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html create mode 100644 src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.scss create mode 100644 src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts create mode 100644 src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts create mode 100644 src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html create mode 100644 src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.scss create mode 100644 src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts create mode 100644 src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts new file mode 100644 index 00000000000..a99639bd173 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; +import { ClaimedTaskActionsAbstractComponent } from './claimed-task-actions-abstract.component'; + +/** + * Abstract component for rendering an advanced claimed task's action + * To create a child-component for a new option: + * - Set the "option" of the component + * - Add a @rendersWorkflowTaskOption annotation to your component providing the same enum value + * - Optionally overwrite createBody if the request body requires more than just the option + */ +@Component({ + selector: 'ds-advanced-claimed-task-action-abstract', + template: '' +}) +export abstract class AdvancedClaimedTaskActionsAbstractComponent extends ClaimedTaskActionsAbstractComponent { +} diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html new file mode 100644 index 00000000000..8ed7b186403 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html @@ -0,0 +1,4 @@ + diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.scss b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts new file mode 100644 index 00000000000..f99c0558c6b --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts @@ -0,0 +1,27 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { + AdvancedClaimedTaskActionRatingReviewerComponent +} from './advanced-claimed-task-action-rating-reviewer.component'; + +describe('AdvancedClaimedTaskActionsRatingReviewerComponent', () => { + let component: AdvancedClaimedTaskActionRatingReviewerComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ + AdvancedClaimedTaskActionRatingReviewerComponent, + ], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AdvancedClaimedTaskActionRatingReviewerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts new file mode 100644 index 00000000000..0fb660b6e67 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts @@ -0,0 +1,55 @@ +import { Component, Injector } from '@angular/core'; +import { Router } from '@angular/router'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { RequestService } from '../../../../core/data/request.service'; +import { + getWorkflowRatingReviewerRoute +} from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; +import { + AdvancedClaimedTaskActionsAbstractComponent +} from '../abstract/advanced-claimed-task-actions-abstract.component'; + +export const WORKFLOW_ADVANCED_TASK_OPTION_RATING_REVIEWER = 'submit_rating_reviewer'; + +@Component({ + selector: 'ds-advanced-claimed-task-action-rating-reviewer', + templateUrl: './advanced-claimed-task-action-rating-reviewer.component.html', + styleUrls: ['./advanced-claimed-task-action-rating-reviewer.component.scss'] +}) +export class AdvancedClaimedTaskActionRatingReviewerComponent extends AdvancedClaimedTaskActionsAbstractComponent { + + /** + * This component represents the advanced select option + */ + option = WORKFLOW_ADVANCED_TASK_OPTION_RATING_REVIEWER; + + /** + * Route to the workflow's task page + */ + workflowTaskPageRoute: string; + + constructor( + protected injector: Injector, + protected router: Router, + protected notificationsService: NotificationsService, + protected translate: TranslateService, + protected searchService: SearchService, + protected requestService: RequestService, + ) { + super(injector, router, notificationsService, translate, searchService, requestService); + } + + ngOnInit(): void { + this.initPageRoute(); + } + + /** + * Initialise the route to the rating reviewer's page + */ + initPageRoute() { + this.workflowTaskPageRoute = getWorkflowRatingReviewerRoute(this.object.id); + } + +} diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html new file mode 100644 index 00000000000..8ed7b186403 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html @@ -0,0 +1,4 @@ + diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.scss b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts new file mode 100644 index 00000000000..24b8501f553 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts @@ -0,0 +1,27 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { + AdvancedClaimedTaskActionSelectReviewerComponent +} from './advanced-claimed-task-action-select-reviewer.component'; + +describe('AdvancedClaimedTaskActionsSelectReviewerComponent', () => { + let component: AdvancedClaimedTaskActionSelectReviewerComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ + AdvancedClaimedTaskActionSelectReviewerComponent, + ], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AdvancedClaimedTaskActionSelectReviewerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts new file mode 100644 index 00000000000..4ce3ec224a4 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts @@ -0,0 +1,57 @@ +import { Component, Injector } from '@angular/core'; +import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator'; +import { + AdvancedClaimedTaskActionsAbstractComponent +} from '../abstract/advanced-claimed-task-actions-abstract.component'; +import { Router } from '@angular/router'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { RequestService } from '../../../../core/data/request.service'; +import { + getWorkflowSelectReviewerRoute +} from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; + +export const WORKFLOW_ADVANCED_TASK_OPTION_SELECT_REVIEWER = 'submit_select_reviewer'; + +@rendersWorkflowTaskOption(WORKFLOW_ADVANCED_TASK_OPTION_SELECT_REVIEWER) +@Component({ + selector: 'ds-advanced-claimed-task-action-select-reviewer', + templateUrl: './advanced-claimed-task-action-select-reviewer.component.html', + styleUrls: ['./advanced-claimed-task-action-select-reviewer.component.scss'] +}) +export class AdvancedClaimedTaskActionSelectReviewerComponent extends AdvancedClaimedTaskActionsAbstractComponent { + + /** + * This component represents the advanced select option + */ + option = WORKFLOW_ADVANCED_TASK_OPTION_SELECT_REVIEWER; + + /** + * Route to the workflow's task page + */ + workflowTaskPageRoute: string; + + constructor( + protected injector: Injector, + protected router: Router, + protected notificationsService: NotificationsService, + protected translate: TranslateService, + protected searchService: SearchService, + protected requestService: RequestService, + ) { + super(injector, router, notificationsService, translate, searchService, requestService); + } + + ngOnInit(): void { + this.initPageRoute(); + } + + /** + * Initialise the route to the select reviewer's page + */ + initPageRoute() { + this.workflowTaskPageRoute = getWorkflowSelectReviewerRoute(this.object.id); + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 715ee66a99b..9a859dff9b8 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -177,6 +177,10 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/ import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component'; import { DsSelectComponent } from './ds-select/ds-select.component'; import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'; +import { AdvancedClaimedTaskActionSelectReviewerComponent } from './mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component'; +import { + AdvancedClaimedTaskActionRatingReviewerComponent +} from './mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -346,6 +350,8 @@ const COMPONENTS = [ CommunitySidebarSearchListElementComponent, SearchNavbarComponent, ScopeSelectorModalComponent, + AdvancedClaimedTaskActionSelectReviewerComponent, + AdvancedClaimedTaskActionRatingReviewerComponent, ]; const ENTRY_COMPONENTS = [ @@ -402,6 +408,8 @@ const ENTRY_COMPONENTS = [ OnClickMenuItemComponent, TextMenuItemComponent, ScopeSelectorModalComponent, + AdvancedClaimedTaskActionSelectReviewerComponent, + AdvancedClaimedTaskActionRatingReviewerComponent, ]; const SHARED_ITEM_PAGE_COMPONENTS = [ @@ -436,7 +444,6 @@ const DIRECTIVES = [ ClaimedTaskActionsDirective, FileValueAccessorDirective, FileValidator, - ClaimedTaskActionsDirective, NgForTrackByIdDirective, MetadataFieldValidator, HoverClassDirective diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts index e2d969a8722..c39bd1fc48a 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts @@ -1,5 +1,6 @@ import { URLCombiner } from '../core/url-combiner/url-combiner'; import { getWorkflowItemModuleRoute } from '../app-routing-paths'; +import { RATING_REVIEWER_ACTION_ADVANCED_INFO } from '../core/tasks/models/reviewer-action-advanced-info.resource-type'; export function getWorkflowItemPageRoute(wfiId: string) { return new URLCombiner(getWorkflowItemModuleRoute(), wfiId).toString(); @@ -20,7 +21,16 @@ export function getWorkflowItemSendBackRoute(wfiId: string) { return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_SEND_BACK_PATH).toString(); } +export function getWorkflowSelectReviewerRoute(wfiId: string) { + return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_SELECT_REVIEWER_PATH).toString(); +} +export function getWorkflowRatingReviewerRoute(wfiId: string) { + return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_RATING_REVIEWER_PATH).toString(); +} + export const WORKFLOW_ITEM_EDIT_PATH = 'edit'; export const WORKFLOW_ITEM_DELETE_PATH = 'delete'; export const WORKFLOW_ITEM_VIEW_PATH = 'view'; export const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback'; +export const WORKFLOW_SELECT_REVIEWER_PATH = 'selectreviewer'; +export const WORKFLOW_RATING_REVIEWER_PATH = 'ratingreviewer'; diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts index 9c24bacb98d..722e8b3768b 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts @@ -7,7 +7,9 @@ import { WORKFLOW_ITEM_DELETE_PATH, WORKFLOW_ITEM_EDIT_PATH, WORKFLOW_ITEM_SEND_BACK_PATH, - WORKFLOW_ITEM_VIEW_PATH + WORKFLOW_ITEM_VIEW_PATH, + WORKFLOW_SELECT_REVIEWER_PATH, + WORKFLOW_RATING_REVIEWER_PATH, } from './workflowitems-edit-page-routing-paths'; import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component'; import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component'; @@ -59,7 +61,25 @@ import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item- breadcrumb: I18nBreadcrumbResolver }, data: { title: 'workflow-item.send-back.title', breadcrumbKey: 'workflow-item.edit' } - } + }, + { + canActivate: [AuthenticatedGuard], + path: WORKFLOW_SELECT_REVIEWER_PATH, + component: ThemedWorkflowItemSendBackComponent, + resolve: { + breadcrumb: I18nBreadcrumbResolver + }, + data: { title: 'workflow-item.select-reviewer.title', breadcrumbKey: 'workflow-item.edit' } + }, + { + canActivate: [AuthenticatedGuard], + path: WORKFLOW_RATING_REVIEWER_PATH, + component: ThemedWorkflowItemSendBackComponent, + resolve: { + breadcrumb: I18nBreadcrumbResolver + }, + data: { title: 'workflow-item.rating-reviewer.title', breadcrumbKey: 'workflow-item.edit' } + }, ] }] ) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f742273edbe..f2b6a6459ae 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4003,6 +4003,15 @@ "submission.workflow.generic.view-help": "Select this option to view the item's metadata.", + "submission.workflow.generic.submit_select_reviewer": "Select Reviewer", + + "submission.workflow.generic.submit_select_reviewer-help": "", + + + "submission.workflow.generic.submit_rating_reviewer": "Rating Reviewer", + + "submission.workflow.generic.submit_rating_reviewer-help": "", + "submission.workflow.tasks.claimed.approve": "Approve", @@ -4156,6 +4165,12 @@ "workflow-item.view.breadcrumbs": "Workflow View", + "workflow-item.select-reviewer.title": "Select Reviewer", + + + "workflow-item.rating-reviewer.title": "Rating Reviewer", + + "idle-modal.header": "Session will expire soon", "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?", From 30eba0bdefd58ab8aea067b3ae839aee30904bb0 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Jan 2023 11:37:46 +0100 Subject: [PATCH 291/758] 97742: Themed DsoEditMetadataComponent --- .../edit-item-template-page.component.html | 2 +- .../themed-dso-edit-metadata.component.ts | 33 +++++++++++++++++++ src/app/dso-shared/dso-shared.module.ts | 7 ++++ .../edit-item-page.routing.module.ts | 3 +- .../dso-edit-metadata.component.html | 0 .../dso-edit-metadata.component.scss | 0 .../dso-edit-metadata.component.ts | 12 +++++++ src/themes/custom/lazy-theme.module.ts | 6 ++-- 8 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts create mode 100644 src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html create mode 100644 src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss create mode 100644 src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html index ba18fa69b96..4d630659e8c 100644 --- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html +++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html @@ -3,7 +3,7 @@

    {{ 'collection.edit.template.head' | translate:{ collection: collection?.name } }}

    - +     diff --git a/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts new file mode 100644 index 00000000000..ba21907c99e --- /dev/null +++ b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts @@ -0,0 +1,33 @@ +import { ThemedComponent } from '../../shared/theme-support/themed.component'; +import { DsoEditMetadataComponent } from './dso-edit-metadata.component'; +import { Component, Input } from '@angular/core'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { UpdateDataService } from '../../core/data/update-data.service'; + +@Component({ + selector: 'ds-themed-dso-edit-metadata', + styleUrls: [], + templateUrl: './../../shared/theme-support/themed.component.html', +}) +export class ThemedDsoEditMetadataComponent extends ThemedComponent { + + @Input() dso: DSpaceObject; + + @Input() updateDataService: UpdateDataService; + + protected inAndOutputNames: (keyof DsoEditMetadataComponent & keyof this)[] = ['dso', 'updateDataService']; + + protected getComponentName(): string { + return 'DsoEditMetadataComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../../themes/${themeName}/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component`); + } + + protected importUnthemedComponent(): Promise { + return import(`./dso-edit-metadata.component`); + } + + +} diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts index 0a9294105bb..e09cbac9151 100644 --- a/src/app/dso-shared/dso-shared.module.ts +++ b/src/app/dso-shared/dso-shared.module.ts @@ -5,6 +5,7 @@ import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-fie import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component'; import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component'; import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component'; +import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-edit-metadata.component'; @NgModule({ imports: [ @@ -12,6 +13,7 @@ import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-me ], declarations: [ DsoEditMetadataComponent, + ThemedDsoEditMetadataComponent, MetadataFieldSelectorComponent, DsoEditMetadataFieldValuesComponent, DsoEditMetadataValueComponent, @@ -19,6 +21,11 @@ import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-me ], exports: [ DsoEditMetadataComponent, + ThemedDsoEditMetadataComponent, + MetadataFieldSelectorComponent, + DsoEditMetadataFieldValuesComponent, + DsoEditMetadataValueComponent, + DsoEditMetadataHeadersComponent, ], }) export class DsoSharedModule { 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 7ccf1fec378..47bf41335fa 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 @@ -38,6 +38,7 @@ import { ItemPageRelationshipsGuard } from './item-page-relationships.guard'; import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard'; import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard'; import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component'; +import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component'; /** * Routing module that handles the routing for the Edit Item page administrator functionality @@ -75,7 +76,7 @@ import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso }, { path: 'metadata', - component: DsoEditMetadataComponent, + component: ThemedDsoEditMetadataComponent, data: { title: 'item.edit.tabs.metadata.title', showBreadcrumbs: true }, canActivate: [ItemPageMetadataGuard] }, diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts new file mode 100644 index 00000000000..b1cd6d2b394 --- /dev/null +++ b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -0,0 +1,12 @@ +import { DsoEditMetadataComponent as BaseComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component'; +import { Component } from '@angular/core'; + +@Component({ + selector: 'ds-dso-edit-metadata', + // styleUrls: ['./dso-edit-metadata.component.scss'], + styleUrls: ['../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss'], + // templateUrl: './dso-edit-metadata.component.html', + templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html', +}) +export class DsoEditMetadataComponent extends BaseComponent { +} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index a57c4178a73..3c618a5746a 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -113,6 +113,8 @@ import { ObjectListComponent } from './app/shared/object-list/object-list.compon import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component'; import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component'; import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component'; +import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component'; +import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module'; const DECLARATIONS = [ FileSectionComponent, @@ -166,8 +168,7 @@ const DECLARATIONS = [ BrowseByMetadataPageComponent, BrowseByDatePageComponent, BrowseByTitlePageComponent, - - + DsoEditMetadataComponent, ]; @NgModule({ @@ -218,6 +219,7 @@ const DECLARATIONS = [ FormsModule, ResourcePoliciesModule, ComcolModule, + DsoSharedModule, ], declarations: DECLARATIONS, exports: [ From 57f10fa9eb3d93fef491a67e66b355f24fe27255 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Jan 2023 11:47:53 +0100 Subject: [PATCH 292/758] v1.22.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52b089be371..0f41cec0c8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "7.5.0-next", + "version": "1.22.19", "scripts": { "ng": "ng", "config:watch": "nodemon", From 9f61109e8373edfb6b45b7d3511b211102faebdb Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Jan 2023 13:07:31 +0100 Subject: [PATCH 293/758] 97742: Lint fix --- .../dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index 2c584fb5340..8206ec91359 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -1,3 +1,4 @@ +/* eslint-disable max-classes-per-file */ import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models'; import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util'; import { MoveOperation, Operation } from 'fast-json-patch'; @@ -7,8 +8,6 @@ import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch- import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service'; import { MetadataPatchMoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model'; -/* tslint:disable:max-classes-per-file */ - /** * Enumeration for the type of change occurring on a metadata value */ @@ -452,4 +451,3 @@ export class DsoEditMetadataForm { return operations; } } -/* tslint:enable:max-classes-per-file */ From 8cbf3511bb902ff0737ece47fa03dd15a3539b05 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Jan 2023 13:13:40 +0100 Subject: [PATCH 294/758] 97742: Lint fixes --- .../metadata-field-selector.component.ts | 2 +- .../item-page/edit-item-page/edit-item-page.routing.module.ts | 1 - .../metadata-representation-list.component.spec.ts | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts index 066f6713017..5053a4b83dd 100644 --- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts @@ -12,7 +12,7 @@ import { import { switchMap, debounceTime, distinctUntilChanged, map, tap, take } from 'rxjs/operators'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { - getAllSucceededRemoteData, getFirstCompletedRemoteData, getFirstSucceededRemoteData, + getAllSucceededRemoteData, getFirstCompletedRemoteData, metadataFieldsToString } from '../../../core/shared/operators'; import { Observable } from 'rxjs/internal/Observable'; 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 47bf41335fa..e6fa53f3f31 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 @@ -37,7 +37,6 @@ import { ItemPageBitstreamsGuard } from './item-page-bitstreams.guard'; import { ItemPageRelationshipsGuard } from './item-page-relationships.guard'; import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard'; import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard'; -import { DsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/dso-edit-metadata.component'; import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component'; /** diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts index 7321e57b9f9..54420721b89 100644 --- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts +++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts @@ -4,8 +4,6 @@ import { By } from '@angular/platform-browser'; import { MetadataRepresentationListComponent } from './metadata-representation-list.component'; import { RelationshipDataService } from '../../../core/data/relationship-data.service'; import { Item } from '../../../core/shared/item.model'; -import { Relationship } from '../../../core/shared/item-relationships/relationship.model'; -import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { TranslateModule } from '@ngx-translate/core'; import { VarDirective } from '../../../shared/utils/var.directive'; import { of as observableOf } from 'rxjs'; From 594f8eaa779a06ac5ade960d4b7913fa78285e87 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 5 Jan 2023 13:18:36 +0100 Subject: [PATCH 295/758] Fix breadcrumb color css --- src/app/breadcrumbs/breadcrumbs.component.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss index 412dca87dbc..029609e6c0b 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.scss +++ b/src/app/breadcrumbs/breadcrumbs.component.scss @@ -23,9 +23,12 @@ li.breadcrumb-item { } } -li.breadcrumb-item > a { - color: var(--ds-breadcrumb-link-color) !important; +li.breadcrumb-item { + a { + color: var(--ds-breadcrumb-link-color) !important; + } } + li.breadcrumb-item.active { color: var(--ds-breadcrumb-link-active-color) !important; } From e5082ffa1f1be76e421589c3388c1ffc1b69309d Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 5 Jan 2023 13:30:28 +0100 Subject: [PATCH 296/758] Remove unneeded important --- src/app/breadcrumbs/breadcrumbs.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss index 029609e6c0b..a4d83b82ea7 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.scss +++ b/src/app/breadcrumbs/breadcrumbs.component.scss @@ -25,12 +25,12 @@ li.breadcrumb-item { li.breadcrumb-item { a { - color: var(--ds-breadcrumb-link-color) !important; + color: var(--ds-breadcrumb-link-color); } } li.breadcrumb-item.active { - color: var(--ds-breadcrumb-link-active-color) !important; + color: var(--ds-breadcrumb-link-active-color); } .breadcrumb-item+ .breadcrumb-item::before { From 5da65b3c791e573d4d43046080c5a23c49ac2530 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Thu, 5 Jan 2023 13:42:25 +0100 Subject: [PATCH 297/758] 97742: Revert accidental dspace-angular version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f41cec0c8b..52b089be371 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "1.22.19", + "version": "7.5.0-next", "scripts": { "ng": "ng", "config:watch": "nodemon", From 10bf18fe29c0dedb7bdaa52bdbb16ddef35e967e Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Mon, 2 Jan 2023 15:33:25 +0100 Subject: [PATCH 298/758] 97399 WIP: Tests for ContextHelpDirective --- .../page-internal-server-error.component.html | 2 +- .../context-help-wrapper.component.ts | 6 +- src/app/shared/context-help.directive.spec.ts | 65 +++++++++++++++++-- src/app/shared/context-help.directive.ts | 8 +-- 4 files changed, 69 insertions(+), 12 deletions(-) diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html index 4995afc80b0..595fd9961b0 100644 --- a/src/app/page-internal-server-error/page-internal-server-error.component.html +++ b/src/app/page-internal-server-error/page-internal-server-error.component.html @@ -1,6 +1,6 @@

    500

    -

    {{"500.page-internal-server-error" | translate}}

    +

    {{"500.page-internal-server-error" | translate}}


    {{"500.help" | translate}}


    diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts index 1792425798b..0ef535bf954 100644 --- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts @@ -53,7 +53,7 @@ export class ContextHelpWrapperComponent { * into link-free pieces of text and objects of the form * {href: string, text: string} (which represent links). * This function makes no effort to check whether the href is a - * correct URL. Currently this function does not support escape + * correct URL. Currently, this function does not support escape * characters: its behavior when given a string containing square * brackets that do not deliminate a link is undefined. * Regular parentheses outside of links do work, however. @@ -66,7 +66,7 @@ export class ContextHelpWrapperComponent { * " is a link, and ", * {href: "https://youtube.com", text: "so is this"} * ] - */ + */ private parseLinks(content: string): (string | {href: string, text: string})[] { // Implementation note: due to unavailability of `matchAll` method on strings, // separate "split" and "parse" steps are needed. @@ -93,4 +93,4 @@ export class ContextHelpWrapperComponent { } - + diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts index f00fb9d355b..35770b6038c 100644 --- a/src/app/shared/context-help.directive.spec.ts +++ b/src/app/shared/context-help.directive.spec.ts @@ -1,8 +1,65 @@ -import { ContextHelpDirective } from './context-help.directive'; +import { Component, DebugElement, Input } from '@angular/core'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { of as observableOf, Observable } from 'rxjs'; +import { ContextHelpDirective, ContextHelpDirectiveInput } from './context-help.directive'; +import { TranslateService } from '@ngx-translate/core'; +import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + template: `
    some text
    ` +}) +class TestComponent { + @Input() content = ''; + contextHelpParams(): ContextHelpDirectiveInput { + return { + content: this.content + }; + } +} + +// tslint:disable-next-line:max-classes-per-file +class MockTranslateService { + messages: {[index: string]: string} = { + lorem: 'lorem ipsum dolor sit amet', + linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)' + }; + + get(key: string): Observable { + return observableOf(this.messages[key]); + } +} describe('ContextHelpDirective', () => { - it('should create an instance', () => { - const directive = new ContextHelpDirective(); - expect(directive).toBeTruthy(); + let component: TestComponent; + let fixture: ComponentFixture; + // let el: DebugElement; + // let translateService: TranslateService; + + beforeEach(() => { + console.log('Anyone hear that?'); + fixture = TestBed.configureTestingModule({ + imports: [NgbTooltipModule], + providers: [ + { provide: TranslateService, useClass: MockTranslateService } + ], + declarations: [TestComponent, ContextHelpWrapperComponent, ContextHelpDirective] + }).createComponent(TestComponent); + component = fixture.componentInstance; + }); + + it('should add the tooltip icon', () => { + component.content = 'lorem'; + fixture.detectChanges(); + + expect(component).toBeDefined(); + const [wrapper] = fixture.nativeElement.children; + const [i, div] = wrapper.children; + expect(wrapper.tagName).toBe('DS-CONTEXT-HELP-WRAPPER'); + expect(i.tagName).toBe('I'); + expect(div.tagName).toBe('DIV'); + expect(div.innerHTML).toBe('some text'); + i.click(); // TODO: triggers a type error }); }); diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts index 4ffa4d24d6b..1d8bcccfa74 100644 --- a/src/app/shared/context-help.directive.ts +++ b/src/app/shared/context-help.directive.ts @@ -3,10 +3,10 @@ import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning'; import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component'; import { PlacementDir } from './context-help-wrapper/placement-dir.model'; -export type ContextHelpDirectiveInput = { - content: string, - tooltipPlacement?: PlacementArray, - iconPlacement?: PlacementDir +export interface ContextHelpDirectiveInput { + content: string; + tooltipPlacement?: PlacementArray; + iconPlacement?: PlacementDir; } /* From c156e1ca6f57c9c914a772e349ea8182ff54ad73 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Wed, 4 Jan 2023 11:43:15 +0100 Subject: [PATCH 299/758] 97732 Context help model, actions and reducer --- src/app/shared/context-help.actions.ts | 81 +++++++++++++++++++++ src/app/shared/context-help.model.ts | 4 + src/app/shared/context-help.reducer.ts | 47 ++++++++++++ src/app/shared/context-help.service.spec.ts | 16 ++++ src/app/shared/context-help.service.ts | 33 +++++++++ 5 files changed, 181 insertions(+) create mode 100644 src/app/shared/context-help.actions.ts create mode 100644 src/app/shared/context-help.model.ts create mode 100644 src/app/shared/context-help.reducer.ts create mode 100644 src/app/shared/context-help.service.spec.ts create mode 100644 src/app/shared/context-help.service.ts diff --git a/src/app/shared/context-help.actions.ts b/src/app/shared/context-help.actions.ts new file mode 100644 index 00000000000..2bd8b6a1635 --- /dev/null +++ b/src/app/shared/context-help.actions.ts @@ -0,0 +1,81 @@ +import { Action } from '@ngrx/store'; +import { type } from './ngrx/type'; +import { ContextHelpModel } from './context-help.model'; + +export const ContextHelpActionTypes = { + 'CONTEXT_HELP_TOGGLE_ICONS': type('dspace/context-help/CONTEXT_HELP_TOGGLE_ICONS'), + 'CONTEXT_HELP_ADD': type('dspace/context-help/CONTEXT_HELP_ADD'), + 'CONTEXT_HELP_REMOVE': type('dspace/context-help/CONTEXT_HELP_REMOVE'), + 'CONTEXT_HELP_TOGGLE_TOOLTIP': type('dspace/context-help/CONTEXT_HELP_TOGGLE_TOOLTIP'), + 'CONTEXT_HELP_SHOW_TOOLTIP': type('dspace/context-help/CONTEXT_HELP_SHOW_TOOLTIP'), + 'CONTEXT_HELP_HIDE_TOOLTIP' : type('dspace/context-help/CONTEXT_HELP_HIDE_TOOLTIP'), +}; + +/** + * Toggles the visibility of all context help icons. + */ +export class ContextHelpToggleIconsAction implements Action { + type = ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS; +} + +/** + * Registers a new context help icon to the store. + */ +export class ContextHelpAddAction implements Action { + type = ContextHelpActionTypes.CONTEXT_HELP_ADD; + model: ContextHelpModel; + + constructor (model: ContextHelpModel) { + this.model = model; + } +} + +/** + * Removes a context help icon from the store. + */ +export class ContextHelpRemoveAction implements Action { + type = ContextHelpActionTypes.CONTEXT_HELP_REMOVE; + id: string; + + constructor(id: string) { + this.id = id; + } +} + +export abstract class ContextHelpTooltipAction implements Action { + type; + id: string; + + constructor(id: string) { + this.id = id; + } +} + +/** + * Toggles the tooltip of a single context help icon. + */ +export class ContextHelpToggleTooltipAction extends ContextHelpTooltipAction { + type = ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_TOOLTIP; +} + +/** + * Shows the tooltip of a single context help icon. + */ +export class ContextHelpShowTooltipAction extends ContextHelpTooltipAction { + type = ContextHelpActionTypes.CONTEXT_HELP_SHOW_TOOLTIP; +} + +/** + * Hides the tooltip of a single context help icon. + */ +export class ContextHelpHideTooltipAction extends ContextHelpTooltipAction { + type = ContextHelpActionTypes.CONTEXT_HELP_HIDE_TOOLTIP; +} + +export type ContextHelpAction + = ContextHelpToggleIconsAction + | ContextHelpAddAction + | ContextHelpRemoveAction + | ContextHelpToggleTooltipAction + | ContextHelpShowTooltipAction + | ContextHelpHideTooltipAction; diff --git a/src/app/shared/context-help.model.ts b/src/app/shared/context-help.model.ts new file mode 100644 index 00000000000..4b2b344f602 --- /dev/null +++ b/src/app/shared/context-help.model.ts @@ -0,0 +1,4 @@ +export class ContextHelpModel { + id: string; + tooltipVisible?: boolean = false; +} diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts new file mode 100644 index 00000000000..b5f683956fa --- /dev/null +++ b/src/app/shared/context-help.reducer.ts @@ -0,0 +1,47 @@ +import { ContextHelpModel } from './context-help.model'; +import { ContextHelpAction, ContextHelpActionTypes } from './context-help.actions'; + +export type ContextHelpModels = { + [id: string]: ContextHelpModel; +}; + +export interface ContextHelpState { + allIconsVisible: boolean; + models: ContextHelpModels; +} + +export function contextHelpReducer(state: ContextHelpState, action: ContextHelpAction): ContextHelpState { + switch (action.type) { + case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: { + return {...state, allIconsVisible: true}; + } + case ContextHelpActionTypes.CONTEXT_HELP_ADD: { + const newModels = {...state.models, [action.model.id]: action.model}; + return {...state, models: newModels}; + } + case ContextHelpActionTypes.CONTEXT_HELP_REMOVE: { + const {[action.id]: _, ...remainingModels} = state.models; + return {...state, models: remainingModels}; + } + case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_TOOLTIP: { + return modifyTooltipVisibility(state, action.id, v => !v); + } + case ContextHelpActionTypes.CONTEXT_HELP_SHOW_TOOLTIP: { + return modifyTooltipVisibility(state, action.id, _ => true); + } + case ContextHelpActionTypes.CONTEXT_HELP_HIDE_TOOLTIP: { + return modifyTooltipVisibility(state, action.id, _ => false); + } + default: { + return state; + } + } +} + +function modifyTooltipVisibility(state: ContextHelpState, id: string, modify: (vis: boolean) => boolean) + : ContextHelpState { + const {[id]: matchingModel, ...otherModels} = state.models; + const modifiedModel = {...matchingModel, tooltipVisible: modify(matchingModel.tooltipVisible)}; + const newModels = {...otherModels, [id]: modifiedModel}; + return {...state, models: newModels}; +} diff --git a/src/app/shared/context-help.service.spec.ts b/src/app/shared/context-help.service.spec.ts new file mode 100644 index 00000000000..d2d29121b02 --- /dev/null +++ b/src/app/shared/context-help.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ContextHelpService } from './context-help.service'; + +describe('ContextHelpService', () => { + let service: ContextHelpService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ContextHelpService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts new file mode 100644 index 00000000000..071308c7139 --- /dev/null +++ b/src/app/shared/context-help.service.ts @@ -0,0 +1,33 @@ +import { Injectable } from '@angular/core'; +import { ContextHelpModel } from './context-help.model'; + +@Injectable({ + providedIn: 'root' +}) +export class ContextHelpService { + constructor() { } + + toggleIcons() { + + } + + add(contextHelp: ContextHelpModel) { + + } + + remove(id: string) { + + } + + showTooltip(id: string) { + + } + + hideTooltip(id: string) { + + } + + toggleTooltip(id: string) { + + } +} From 5ba45cb0fac564bfd701a92da6824b831ada0976 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Wed, 4 Jan 2023 15:54:09 +0100 Subject: [PATCH 300/758] 97732 Context help service, changes to directive and component --- src/app/app.reducer.ts | 5 +- .../page-internal-server-error.component.html | 2 +- .../context-help-wrapper.component.html | 8 +- .../context-help-wrapper.component.ts | 75 +++++++++++++--- src/app/shared/context-help.actions.ts | 6 +- src/app/shared/context-help.directive.ts | 48 +++++++--- src/app/shared/context-help.model.ts | 4 +- src/app/shared/context-help.reducer.ts | 11 ++- src/app/shared/context-help.service.ts | 87 ++++++++++++++++--- 9 files changed, 202 insertions(+), 44 deletions(-) diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index 5bd4f745d96..e842c0efd36 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -50,6 +50,7 @@ import { sidebarReducer, SidebarState } from './shared/sidebar/sidebar.reducer'; import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer'; import { ThemeState, themeReducer } from './shared/theme-support/theme.reducer'; import { correlationIdReducer } from './correlation-id/correlation-id.reducer'; +import { contextHelpReducer, ContextHelpState } from './shared/context-help.reducer'; export interface AppState { router: fromRouter.RouterReducerState; @@ -71,6 +72,7 @@ export interface AppState { epeopleRegistry: EPeopleRegistryState; groupRegistry: GroupRegistryState; correlationId: string; + contextHelp: ContextHelpState; } export const appReducers: ActionReducerMap = { @@ -92,7 +94,8 @@ export const appReducers: ActionReducerMap = { communityList: CommunityListReducer, epeopleRegistry: ePeopleRegistryReducer, groupRegistry: groupRegistryReducer, - correlationId: correlationIdReducer + correlationId: correlationIdReducer, + contextHelp: contextHelpReducer, }; export const routerStateSelector = (state: AppState) => state.router; diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html index 595fd9961b0..bb43cdc6788 100644 --- a/src/app/page-internal-server-error/page-internal-server-error.component.html +++ b/src/app/page-internal-server-error/page-internal-server-error.component.html @@ -1,6 +1,6 @@

    500

    -

    {{"500.page-internal-server-error" | translate}}

    +

    {{"500.page-internal-server-error" | translate}}


    {{"500.help" | translate}}


    diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html index 939ad8323ce..03fc46c1721 100644 --- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html @@ -10,12 +10,16 @@
    - + #tooltip="ngbTooltip" + (click)="onClick()"> diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts index 0ef535bf954..e4e22d7ebc8 100644 --- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts @@ -1,11 +1,16 @@ -import { Component, Input, OnInit, TemplateRef } from '@angular/core'; +import { Component, Input, OnInit, TemplateRef, OnDestroy, AfterViewInit, ViewChild } from '@angular/core'; import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning'; import { TranslateService } from '@ngx-translate/core'; -import { Observable, of as observableOf } from 'rxjs'; +import { Observable, of as observableOf, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; import { PlacementDir } from './placement-dir.model'; +import content from '*.scss'; +import { ContextHelpService } from '../context-help.service'; +import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; +import { hasValueOperator } from '../empty.util'; +import { ContextHelp } from '../context-help.model'; -/* +/** * This component renders an info icon next to the wrapped element which * produces a tooltip when clicked. */ @@ -14,28 +19,39 @@ import { PlacementDir } from './placement-dir.model'; templateUrl: './context-help-wrapper.component.html', styleUrls: ['./context-help-wrapper.component.scss'], }) -export class ContextHelpWrapperComponent { - /* +export class ContextHelpWrapperComponent implements OnInit, AfterViewInit, OnDestroy { + /** * Template reference for the wrapped element. */ @Input() templateRef: TemplateRef; - /* + /** + * Identifier for the context help tooltip. + */ + @Input() id: string; + + /** * Indicate where the tooltip should show up, relative to the info icon. */ @Input() tooltipPlacement?: PlacementArray; - /* + /** * Indicate whether the info icon should appear to the left or to * the right of the wrapped element. */ @Input() iconPlacement?: PlacementDir; - /* + /** * If true, don't process text to render links. */ @Input() dontParseLinks?: boolean; + @ViewChild('tooltip', { static: false }) tooltip: NgbTooltip; + + shouldShowIcon$: Observable; + + private subs: Subscription[] = []; + // TODO: dependent on evaluation order of input setters? parsedContent$: Observable<(string | {href: string, text: string})[]> = observableOf([]); @Input() set content(content : string) { @@ -46,9 +62,48 @@ export class ContextHelpWrapperComponent { ); } - constructor(private translateService: TranslateService) { } + constructor( + private translateService: TranslateService, + private contextHelpService: ContextHelpService + ) { } + + ngOnInit() { + this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$(); + } + + ngAfterViewInit() { + this.subs = [ + this.contextHelpService.getContextHelp$(this.id) + .pipe(hasValueOperator()) + .subscribe((ch: ContextHelp) => { + if (ch.isTooltipVisible && !this.tooltip.isOpen()) { + this.tooltip.open(); + } else if (!ch.isTooltipVisible && this.tooltip.isOpen()) { + this.tooltip.close() + } + }), + + this.tooltip.shown.subscribe(() => { + this.contextHelpService.showTooltip(this.id); + }), + + this.tooltip.hidden.subscribe(() => { + this.contextHelpService.hideTooltip(this.id); + }) + ]; + } + + ngOnDestroy() { + for (let sub of this.subs) { + sub.unsubscribe(); + } + } + + onClick() { + this.contextHelpService.toggleTooltip(this.id); + } - /* + /** * Parses Markdown-style links, splitting up a given text * into link-free pieces of text and objects of the form * {href: string, text: string} (which represent links). diff --git a/src/app/shared/context-help.actions.ts b/src/app/shared/context-help.actions.ts index 2bd8b6a1635..5f985c2f733 100644 --- a/src/app/shared/context-help.actions.ts +++ b/src/app/shared/context-help.actions.ts @@ -1,6 +1,6 @@ import { Action } from '@ngrx/store'; import { type } from './ngrx/type'; -import { ContextHelpModel } from './context-help.model'; +import { ContextHelp } from './context-help.model'; export const ContextHelpActionTypes = { 'CONTEXT_HELP_TOGGLE_ICONS': type('dspace/context-help/CONTEXT_HELP_TOGGLE_ICONS'), @@ -23,9 +23,9 @@ export class ContextHelpToggleIconsAction implements Action { */ export class ContextHelpAddAction implements Action { type = ContextHelpActionTypes.CONTEXT_HELP_ADD; - model: ContextHelpModel; + model: ContextHelp; - constructor (model: ContextHelpModel) { + constructor (model: ContextHelp) { this.model = model; } } diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts index 1d8bcccfa74..89e283715aa 100644 --- a/src/app/shared/context-help.directive.ts +++ b/src/app/shared/context-help.directive.ts @@ -1,15 +1,28 @@ -import { ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, OnChanges, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; +import { + ComponentFactoryResolver, + ComponentRef, + Directive, + ElementRef, + Input, + OnChanges, + OnInit, + TemplateRef, + ViewContainerRef, + OnDestroy +} from '@angular/core'; import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning'; import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component'; import { PlacementDir } from './context-help-wrapper/placement-dir.model'; +import { ContextHelpService } from './context-help.service'; export interface ContextHelpDirectiveInput { content: string; + id: string; tooltipPlacement?: PlacementArray; iconPlacement?: PlacementDir; } -/* +/** * Directive to add a clickable tooltip icon to an element. * The tooltip icon's position is configurable ('left' or 'right') * and so is the position of the tooltip itself (PlacementArray). @@ -17,14 +30,15 @@ export interface ContextHelpDirectiveInput { @Directive({ selector: '[dsContextHelp]', }) -export class ContextHelpDirective implements OnChanges { - /* +export class ContextHelpDirective implements OnChanges, OnDestroy { + /** * Expects an object with the following fields: * - content: a string referring to an entry in the i18n files * - tooltipPlacement: a PlacementArray describing where the tooltip should expand, relative to the tooltip icon * - iconPlacement: a string 'left' or 'right', describing where the tooltip icon should be placed, relative to the element */ - @Input() dsContextHelp: string | ContextHelpDirectiveInput; + @Input() dsContextHelp: ContextHelpDirectiveInput; + mostRecentId: string | undefined = undefined; protected wrapper: ComponentRef; @@ -32,19 +46,31 @@ export class ContextHelpDirective implements OnChanges { private templateRef: TemplateRef, private viewContainerRef: ViewContainerRef, private componentFactoryResolver: ComponentFactoryResolver, + private contextHelpService: ContextHelpService ){} ngOnChanges() { - const input: ContextHelpDirectiveInput = typeof(this.dsContextHelp) === 'string' - ? {content: this.dsContextHelp} - : this.dsContextHelp; + this.clearMostRecentId(); + this.mostRecentId = this.dsContextHelp.id; + this.contextHelpService.add({id: this.dsContextHelp.id}); // TODO: tooltipVisible field const factory = this.componentFactoryResolver.resolveComponentFactory(ContextHelpWrapperComponent); this.wrapper = this.viewContainerRef.createComponent(factory); this.wrapper.instance.templateRef = this.templateRef; - this.wrapper.instance.content = input.content; - this.wrapper.instance.tooltipPlacement = input.tooltipPlacement; - this.wrapper.instance.iconPlacement = input.iconPlacement; + this.wrapper.instance.content = this.dsContextHelp.content; + this.wrapper.instance.id = this.dsContextHelp.id; + this.wrapper.instance.tooltipPlacement = this.dsContextHelp.tooltipPlacement; + this.wrapper.instance.iconPlacement = this.dsContextHelp.iconPlacement; + } + + ngOnDestroy() { + this.clearMostRecentId(); + } + + private clearMostRecentId(): void { + if (this.mostRecentId !== undefined) { + this.contextHelpService.remove(this.mostRecentId); + } } } diff --git a/src/app/shared/context-help.model.ts b/src/app/shared/context-help.model.ts index 4b2b344f602..9c024dbf1f1 100644 --- a/src/app/shared/context-help.model.ts +++ b/src/app/shared/context-help.model.ts @@ -1,4 +1,4 @@ -export class ContextHelpModel { +export class ContextHelp { id: string; - tooltipVisible?: boolean = false; + isTooltipVisible?: boolean = false; } diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts index b5f683956fa..b705c797acb 100644 --- a/src/app/shared/context-help.reducer.ts +++ b/src/app/shared/context-help.reducer.ts @@ -1,8 +1,8 @@ -import { ContextHelpModel } from './context-help.model'; +import { ContextHelp } from './context-help.model'; import { ContextHelpAction, ContextHelpActionTypes } from './context-help.actions'; export type ContextHelpModels = { - [id: string]: ContextHelpModel; + [id: string]: ContextHelp; }; export interface ContextHelpState { @@ -10,7 +10,10 @@ export interface ContextHelpState { models: ContextHelpModels; } -export function contextHelpReducer(state: ContextHelpState, action: ContextHelpAction): ContextHelpState { +// TODO +const initialState: ContextHelpState = {allIconsVisible: true, models: {}}; + +export function contextHelpReducer(state: ContextHelpState = initialState, action: ContextHelpAction): ContextHelpState { switch (action.type) { case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: { return {...state, allIconsVisible: true}; @@ -41,7 +44,7 @@ export function contextHelpReducer(state: ContextHelpState, action: ContextHelpA function modifyTooltipVisibility(state: ContextHelpState, id: string, modify: (vis: boolean) => boolean) : ContextHelpState { const {[id]: matchingModel, ...otherModels} = state.models; - const modifiedModel = {...matchingModel, tooltipVisible: modify(matchingModel.tooltipVisible)}; + const modifiedModel = {...matchingModel, isTooltipVisible: modify(matchingModel.isTooltipVisible)}; const newModels = {...otherModels, [id]: modifiedModel}; return {...state, models: newModels}; } diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts index 071308c7139..7bbd1216e1d 100644 --- a/src/app/shared/context-help.service.ts +++ b/src/app/shared/context-help.service.ts @@ -1,33 +1,100 @@ import { Injectable } from '@angular/core'; -import { ContextHelpModel } from './context-help.model'; +import { ContextHelp } from './context-help.model'; +import { Store, createFeatureSelector, createSelector, select, MemoizedSelector } from '@ngrx/store'; +import { ContextHelpState } from './context-help.reducer'; +import { + ContextHelpToggleIconsAction, + ContextHelpAddAction, + ContextHelpRemoveAction, + ContextHelpShowTooltipAction, + ContextHelpHideTooltipAction, + ContextHelpToggleTooltipAction +} from './context-help.actions'; +import { Observable } from 'rxjs'; + +const contextHelpStateSelector = + createFeatureSelector('contextHelp'); +const allIconsVisibleSelector = createSelector( + contextHelpStateSelector, + (state: ContextHelpState): boolean => state.allIconsVisible +); +const contextHelpSelector = + (id: string): MemoizedSelector => createSelector( + contextHelpStateSelector, + (state: ContextHelpState) => state.models[id] + ); @Injectable({ providedIn: 'root' }) export class ContextHelpService { - constructor() { } + constructor(private store: Store) { } - toggleIcons() { + /** + * Observable keeping track of whether context help icons should be visible globally. + */ + shouldShowIcons$(): Observable { + return this.store.pipe(select(allIconsVisibleSelector)); + } + /** + * Observable that tracks the state for a specific context help icon. + * + * @param id: id of the context help icon. + */ + getContextHelp$(id: string): Observable { + return this.store.pipe(select(contextHelpSelector(id))); } - add(contextHelp: ContextHelpModel) { + /** + * Toggles the visibility of all context help icons. + */ + toggleIcons() { + this.store.dispatch(new ContextHelpToggleIconsAction()); + } + /** + * Registers a new context help icon to the store. + * + * @param contextHelp: the initial state of the new help icon. + */ + add(contextHelp: ContextHelp) { + this.store.dispatch(new ContextHelpAddAction(contextHelp)); } + /** + * Removes a context help icon from the store. + * + * @id: the id of the help icon to be removed. + */ remove(id: string) { + this.store.dispatch(new ContextHelpRemoveAction(id)); + } + /** + * Toggles the tooltip of a single context help icon. + * + * @id: the id of the help icon for which the visibility will be toggled. + */ + toggleTooltip(id: string) { + this.store.dispatch(new ContextHelpToggleTooltipAction(id)); } + /** + * Shows the tooltip of a single context help icon. + * + * @id: the id of the help icon that will be made visible. + */ showTooltip(id: string) { - + this.store.dispatch(new ContextHelpShowTooltipAction(id)); } + /** + * Hides the tooltip of a single context help icon. + * + * @id: the id of the help icon that will be made invisible. + */ hideTooltip(id: string) { - - } - - toggleTooltip(id: string) { - + this.store.dispatch(new ContextHelpHideTooltipAction(id)); } } From e16a3edf785ec23dd77ab3e4dde579239e3bbdfd Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Wed, 4 Jan 2023 17:02:39 +0100 Subject: [PATCH 301/758] 97732 ContextHelpToggleComponent added --- src/app/app.module.ts | 2 ++ .../context-help-toggle.component.html | 8 ++++++ .../context-help-toggle.component.scss | 8 ++++++ .../context-help-toggle.component.spec.ts | 25 +++++++++++++++++++ .../context-help-toggle.component.ts | 22 ++++++++++++++++ src/app/header/header.component.html | 1 + .../page-internal-server-error.component.html | 1 + .../context-help-wrapper.component.ts | 5 ++-- src/app/shared/context-help.reducer.ts | 2 +- 9 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.html create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.scss create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.spec.ts create mode 100644 src/app/header/context-help-toggle/context-help-toggle.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 67bccd9105e..189d2032563 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -58,6 +58,7 @@ import { ThemedPageInternalServerErrorComponent } from './page-internal-server-e import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component'; import { APP_CONFIG, AppConfig } from '../config/app-config.interface'; +import { ContextHelpToggleComponent } from './header/context-help-toggle/context-help-toggle.component'; export function getConfig() { return environment; @@ -167,6 +168,7 @@ const DECLARATIONS = [ RootComponent, ThemedRootComponent, HeaderComponent, + ContextHelpToggleComponent, ThemedHeaderComponent, HeaderNavbarWrapperComponent, ThemedHeaderNavbarWrapperComponent, diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html new file mode 100644 index 00000000000..caf1bf5daf7 --- /dev/null +++ b/src/app/header/context-help-toggle/context-help-toggle.component.html @@ -0,0 +1,8 @@ + diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss new file mode 100644 index 00000000000..ba34ba8b896 --- /dev/null +++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss @@ -0,0 +1,8 @@ +.ds-context-help-toggle { + color: var(--ds-header-icon-color); + background-color: var(--ds-header-bg); +} + +.ds-context-help-toggle:hover { + color: var(--ds-header-icon-color-hover); +} diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts new file mode 100644 index 00000000000..16d82f1a0a5 --- /dev/null +++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ContextHelpToggleComponent } from './context-help-toggle.component'; + +describe('ContextHelpToggleComponent', () => { + let component: ContextHelpToggleComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ContextHelpToggleComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ContextHelpToggleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts new file mode 100644 index 00000000000..cc5e779d6eb --- /dev/null +++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; +import { ContextHelpService } from '../../shared/context-help.service'; + +@Component({ + selector: 'ds-context-help-toggle', + templateUrl: './context-help-toggle.component.html', + styleUrls: ['./context-help-toggle.component.scss'] +}) +export class ContextHelpToggleComponent implements OnInit { + + constructor( + private contextHelpService: ContextHelpService + ) { } + + ngOnInit(): void { + } + + onClick() { + console.log('toggling icons'); + this.contextHelpService.toggleIcons(); + } +} diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index c7b979d266d..d04f0951565 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -8,6 +8,7 @@ \ No newline at end of file + From 5a1e57408fd546df71d500981c3fb2bd3274be22 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Thu, 5 Jan 2023 13:21:50 +0100 Subject: [PATCH 303/758] 97732 Fixed some display issues --- .../page-internal-server-error.component.html | 7 ++++++- .../context-help-wrapper.component.html | 2 +- .../context-help-wrapper.component.scss | 19 ++++++++++--------- src/styles/_custom_variables.scss | 1 + 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html index bb43cdc6788..a60624dbd5f 100644 --- a/src/app/page-internal-server-error/page-internal-server-error.component.html +++ b/src/app/page-internal-server-error/page-internal-server-error.component.html @@ -1,6 +1,11 @@

    500

    -

    {{"500.page-internal-server-error" | translate}}

    +

    + {{"500.page-internal-server-error" | translate}} +


    {{"500.help" | translate}}


    diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html index 03fc46c1721..b031d0f42d7 100644 --- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html @@ -18,7 +18,7 @@ [placement]="tooltipPlacement" autoClose="outside" triggers="manual" - container="'body'" + container="body" #tooltip="ngbTooltip" (click)="onClick()"> diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss index 3bf9c7bba8e..d28883cae39 100644 --- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss @@ -3,14 +3,14 @@ } .ds-context-help-icon { - position: absolute; - top: 0; - cursor: pointer; - color: var(--bs-info); - background-color: var(--bs-white); - font-size: 16px; // not relative, because we don't want the icon to resize based on the container - line-height: 1; - border-radius: 50%; + position: absolute; + top: 0; + cursor: pointer; + color: var(--bs-info); + background-color: var(--bs-white); + font-size: 16px; // not relative, because we don't want the icon to resize based on the container + line-height: 1; + border-radius: 50%; } .ds-context-help-icon-left { @@ -22,5 +22,6 @@ } ::ng-deep .tooltip-inner { - width: 300px; + width: var(--ds-context-help-tooltip-width); + max-width: var(--ds-context-help-tooltip-width); } diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 2013562dec0..4098bb64178 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -88,4 +88,5 @@ --ds-context-x-offset: -16px; --ds-context-help-icon-size: 16px; + --ds-context-help-tooltip-width: 300px; } From 84c053575f0a9c2eb019a9cab0332f861d94cec5 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Thu, 5 Jan 2023 14:50:25 +0100 Subject: [PATCH 304/758] 97732 Some example tooltips for the edit group page --- .../group-form/group-form.component.html | 11 ++++++++++- .../members-list/members-list.component.html | 12 ++++++++++-- .../subgroup-list/subgroups-list.component.html | 11 +++++++++-- src/app/footer/footer.component.html | 7 +------ .../top-level-community-list.component.html | 5 +---- .../page-internal-server-error.component.html | 5 +---- src/assets/i18n/en.json5 | 6 ++++-- 7 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html index 0fc5a574b7d..c0bcc854e79 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.html +++ b/src/app/access-control/group-registry/group-form/group-form.component.html @@ -9,7 +9,16 @@

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

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

    +

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

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

    - +
    + + + +
    +
    +
    + + + + +
    +
    +
    + +
    +
    + + + +
    + + + + + + + + + + + + + + + + + +
    {{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
    {{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 + '.headMembers' | translate}}

    + + + +
    + + + + + + + + + + + + + + + + + +
    {{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
    {{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 : '-' }} +     		+
    + + +
    +
    +
    + +     + + + + diff --git a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts b/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts new file mode 100644 index 00000000000..8077139026d --- /dev/null +++ b/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts @@ -0,0 +1,247 @@ +import { CommonModule } from '@angular/common'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, fakeAsync, flush, inject, TestBed, tick, waitForAsync } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { BrowserModule, By } from '@angular/platform-browser'; +import { Router } from '@angular/router'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; +import { Observable, of as observableOf } from 'rxjs'; +import { RestResponse } from '../../../../core/cache/response.models'; +import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { PageInfo } from '../../../../core/shared/page-info.model'; +import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock'; +import { EPersonListComponent } from './eperson-list.component'; +import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock'; +import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; +import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; +import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; +import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { RouterMock } from '../../../../shared/mocks/router.mock'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; +import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; + +describe('EPersonListComponent', () => { + let component: EPersonListComponent; + let fixture: ComponentFixture; + let translateService: TranslateService; + let builderService: FormBuilderService; + let ePersonDataServiceStub: any; + let groupsDataServiceStub: any; + let activeGroup; + let allEPersons; + let allGroups; + let epersonMembers; + let subgroupMembers; + let paginationService; + + beforeEach(waitForAsync(() => { + activeGroup = GroupMock; + epersonMembers = [EPersonMock2]; + subgroupMembers = [GroupMock2]; + allEPersons = [EPersonMock, EPersonMock2]; + allGroups = [GroupMock, GroupMock2]; + ePersonDataServiceStub = { + activeGroup: activeGroup, + epersonMembers: epersonMembers, + subgroupMembers: subgroupMembers, + findAllByHref(href: string): Observable>> { + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), groupsDataServiceStub.getEPersonMembers())); + }, + searchByScope(scope: string, query: string): Observable>> { + if (query === '') { + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons)); + } + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])); + }, + clearEPersonRequests() { + // empty + }, + clearLinkRequests() { + // empty + }, + getEPeoplePageRouterLink(): string { + return '/access-control/epeople'; + } + }; + groupsDataServiceStub = { + activeGroup: activeGroup, + epersonMembers: epersonMembers, + subgroupMembers: subgroupMembers, + allGroups: allGroups, + getActiveGroup(): Observable { + return observableOf(activeGroup); + }, + getEPersonMembers() { + return this.epersonMembers; + }, + searchGroups(query: string): Observable>> { + if (query === '') { + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups)); + } + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])); + }, + addMemberToGroup(parentGroup, eperson: EPerson): Observable { + this.epersonMembers = [...this.epersonMembers, eperson]; + return observableOf(new RestResponse(true, 200, 'Success')); + }, + clearGroupsRequests() { + // empty + }, + clearGroupLinkRequests() { + // empty + }, + getGroupEditPageRouterLink(group: Group): string { + return '/access-control/groups/' + group.id; + }, + deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable { + this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => { + if (eperson.id !== epersonToDelete.id) { + return eperson; + } + }); + if (this.epersonMembers === undefined) { + this.epersonMembers = []; + } + return observableOf(new RestResponse(true, 200, 'Success')); + } + }; + builderService = getMockFormBuilderService(); + translateService = getMockTranslateService(); + + paginationService = new PaginationServiceStub(); + TestBed.configureTestingModule({ + imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + declarations: [EPersonListComponent], + providers: [EPersonListComponent, + { provide: EPersonDataService, useValue: ePersonDataServiceStub }, + { provide: GroupDataService, useValue: groupsDataServiceStub }, + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: FormBuilderService, useValue: builderService }, + { provide: Router, useValue: new RouterMock() }, + { provide: PaginationService, useValue: paginationService }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EPersonListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + afterEach(fakeAsync(() => { + fixture.destroy(); + flush(); + component = null; + fixture.debugElement.nativeElement.remove(); + })); + + it('should create EpeopleListComponent', inject([EPersonListComponent], (comp: EPersonListComponent) => { + expect(comp).toBeDefined(); + })); + + it('should show list of eperson members of current active group', () => { + const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child')); + expect(epersonIdsFound.length).toEqual(1); + epersonMembers.map((eperson: EPerson) => { + expect(epersonIdsFound.find((foundEl) => { + return (foundEl.nativeElement.textContent.trim() === eperson.uuid); + })).toBeTruthy(); + }); + }); + + describe('search', () => { + describe('when searching without query', () => { + let epersonsFound; + beforeEach(fakeAsync(() => { + component.search({ scope: 'metadata', query: '' }); + tick(); + fixture.detectChanges(); + epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr')); + })); + + it('should display all epersons', () => { + expect(epersonsFound.length).toEqual(2); + }); + + describe('if eperson is already a eperson', () => { + it('should have delete button, else it should have add button', () => { + activeGroup.epersons.map((eperson: EPerson) => { + epersonsFound.map((foundEPersonRowElement) => { + if (foundEPersonRowElement.debugElement !== undefined) { + const epersonId = foundEPersonRowElement.debugElement.query(By.css('td:first-child')); + const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus')); + const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt')); + if (epersonId.nativeElement.textContent === eperson.id) { + expect(addButton).toBeUndefined(); + expect(deleteButton).toBeDefined(); + } else { + expect(deleteButton).toBeUndefined(); + expect(addButton).toBeDefined(); + } + } + }); + }); + }); + }); + + describe('if first add button is pressed', () => { + beforeEach(fakeAsync(() => { + const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-plus')); + addButton.nativeElement.click(); + tick(); + fixture.detectChanges(); + })); + it('all groups in search member of selected group', () => { + epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr')); + expect(epersonsFound.length).toEqual(2); + epersonsFound.map((foundEPersonRowElement) => { + if (foundEPersonRowElement.debugElement !== undefined) { + const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus')); + const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt')); + expect(addButton).toBeUndefined(); + expect(deleteButton).toBeDefined(); + } + }); + }); + }); + + describe('if first delete button is pressed', () => { + beforeEach(fakeAsync(() => { + const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-trash-alt')); + addButton.nativeElement.click(); + tick(); + fixture.detectChanges(); + })); + it('first eperson in search delete button, because now member', () => { + epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr')); + epersonsFound.map((foundEPersonRowElement) => { + if (foundEPersonRowElement.debugElement !== undefined) { + const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus')); + const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt')); + expect(deleteButton).toBeUndefined(); + expect(addButton).toBeDefined(); + } + }); + }); + }); + }); + }); + +}); diff --git a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts b/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts new file mode 100644 index 00000000000..9eafe10daaf --- /dev/null +++ b/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts @@ -0,0 +1,358 @@ +import { Component, OnDestroy, OnInit, Input } from '@angular/core'; +import { FormBuilder } from '@angular/forms'; +import { Router } from '@angular/router'; +import { TranslateService } from '@ngx-translate/core'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { + getAllCompletedRemoteData, + getFirstSucceededRemoteData, + getRemoteDataPayload, + getFirstCompletedRemoteData +} from '../../../../core/shared/operators'; +import { + BehaviorSubject, + Subscription, + combineLatest as observableCombineLatest, + Observable, + ObservedValueOf, + of as observableOf +} from 'rxjs'; +import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model'; +import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; +import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; +import { switchMap, map, take, mergeMap } from 'rxjs/operators'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; + +/** + * Keys to keep track of specific subscriptions + */ +enum SubKey { + ActiveGroup, + MembersDTO, + SearchResultsDTO, +} + +export interface EPersonActionConfig { + css?: string; + disabled: boolean; + icon: string; +} + +export interface EPersonListActionConfig { + add: EPersonActionConfig; + remove: EPersonActionConfig; +} + +@Component({ + selector: 'ds-eperson-list', + templateUrl: './eperson-list.component.html' +}) +export class EPersonListComponent implements OnInit, OnDestroy { + + @Input() + messagePrefix: string; + + @Input() + actionConfig: EPersonListActionConfig = { + add: { + css: 'btn-outline-primary', + disabled: false, + icon: 'fas fa-plus fa-fw', + }, + remove: { + css: 'btn-outline-danger', + disabled: false, + icon: 'fas fa-trash-alt fa-fw' + }, + }; + + /** + * EPeople being displayed in search result, initially all members, after search result of search + */ + ePeopleSearchDtos: BehaviorSubject> = new BehaviorSubject>(undefined); + /** + * List of EPeople members of currently active group being edited + */ + ePeopleMembersOfGroupDtos: BehaviorSubject> = new BehaviorSubject>(undefined); + + /** + * Pagination config used to display the list of EPeople that are result of EPeople search + */ + configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'sml', + pageSize: 5, + currentPage: 1 + }); + /** + * Pagination config used to display the list of EPerson Membes of active group being edited + */ + config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { + id: 'ml', + pageSize: 5, + currentPage: 1 + }); + + /** + * Map of active subscriptions + */ + subs: Map = new Map(); + + // The search form + searchForm; + + // Current search in edit group - epeople search form + currentSearchQuery: string; + currentSearchScope: string; + + // Whether or not user has done a EPeople search yet + searchDone: boolean; + + // current active group being edited + groupBeingEdited: Group; + + constructor( + protected groupDataService: GroupDataService, + public ePersonDataService: EPersonDataService, + protected translateService: TranslateService, + protected notificationsService: NotificationsService, + protected formBuilder: FormBuilder, + protected paginationService: PaginationService, + private router: Router + ) { + this.currentSearchQuery = ''; + this.currentSearchScope = 'metadata'; + } + + ngOnInit(): void { + this.searchForm = this.formBuilder.group(({ + scope: 'metadata', + query: '', + })); + this.subs.set(SubKey.ActiveGroup, this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => { + if (activeGroup != null) { + this.groupBeingEdited = activeGroup; + this.retrieveMembers(this.config.currentPage); + } + })); + } + + /** + * Retrieve the EPersons that are members of the group + * + * @param page the number of the page to retrieve + * @private + */ + retrieveMembers(page: number): void { + this.unsubFrom(SubKey.MembersDTO); + this.subs.set(SubKey.MembersDTO, + this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( + switchMap((currentPagination) => { + return this.ePersonDataService.findAllByHref(this.groupBeingEdited._links.epersons.href, { + currentPage: currentPagination.currentPage, + elementsPerPage: currentPagination.pageSize + } + ); + }), + getAllCompletedRemoteData(), + map((rd: RemoteData) => { + if (rd.hasFailed) { + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage })); + } else { + return rd; + } + }), + switchMap((epersonListRD: RemoteData>) => { + const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => { + const dto$: Observable = observableCombineLatest( + this.isMemberOfGroup(member), (isMember: ObservedValueOf>) => { + const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel(); + epersonDtoModel.eperson = member; + epersonDtoModel.memberOfGroup = isMember; + return epersonDtoModel; + }); + return dto$; + })); + return dtos$.pipe(map((dtos: EpersonDtoModel[]) => { + return buildPaginatedList(epersonListRD.payload.pageInfo, dtos); + })); + })) + .subscribe((paginatedListOfDTOs: PaginatedList) => { + this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs); + })); + } + + /** + * Whether the given ePerson is a member of the group currently being edited + * @param possibleMember EPerson that is a possible member (being tested) of the group currently being edited + */ + isMemberOfGroup(possibleMember: EPerson): Observable { + return this.groupDataService.getActiveGroup().pipe(take(1), + mergeMap((group: Group) => { + if (group != null) { + return this.ePersonDataService.findAllByHref(group._links.epersons.href, { + currentPage: 1, + elementsPerPage: 9999 + }, false) + .pipe( + getFirstSucceededRemoteData(), + getRemoteDataPayload(), + map((listEPeopleInGroup: PaginatedList) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)), + map((epeople: EPerson[]) => epeople.length > 0)); + } else { + return observableOf(false); + } + })); + } + + /** + * Unsubscribe from a subscription if it's still subscribed, and remove it from the map of + * active subscriptions + * + * @param key The key of the subscription to unsubscribe from + * @private + */ + protected unsubFrom(key: SubKey) { + if (this.subs.has(key)) { + this.subs.get(key).unsubscribe(); + this.subs.delete(key); + } + } + + /** + * Deletes a given EPerson from the members list of the group currently being edited + * @param ePerson EPerson we want to delete as member from group that is currently being edited + */ + deleteMemberFromGroup(ePerson: EpersonDtoModel) { + this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { + if (activeGroup != null) { + const response = this.groupDataService.deleteMemberFromGroup(activeGroup, ePerson.eperson); + this.showNotifications('deleteMember', response, ePerson.eperson.name, activeGroup); + this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery }); + } else { + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup')); + } + }); + } + + /** + * Adds a given EPerson to the members list of the group currently being edited + * @param ePerson EPerson we want to add as member to group that is currently being edited + */ + addMemberToGroup(ePerson: EpersonDtoModel) { + ePerson.memberOfGroup = true; + this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { + if (activeGroup != null) { + const response = this.groupDataService.addMemberToGroup(activeGroup, ePerson.eperson); + this.showNotifications('addMember', response, ePerson.eperson.name, activeGroup); + } else { + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup')); + } + }); + } + + /** + * Search in the EPeople by name, email or metadata + * @param data Contains scope and query param + */ + search(data: any) { + this.unsubFrom(SubKey.SearchResultsDTO); + this.subs.set(SubKey.SearchResultsDTO, + this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe( + switchMap((paginationOptions) => { + + const query: string = data.query; + const scope: string = data.scope; + if (query != null && this.currentSearchQuery !== query && this.groupBeingEdited) { + this.router.navigate([], { + queryParamsHandling: 'merge' + }); + this.currentSearchQuery = query; + this.paginationService.resetPage(this.configSearch.id); + } + if (scope != null && this.currentSearchScope !== scope && this.groupBeingEdited) { + this.router.navigate([], { + queryParamsHandling: 'merge' + }); + this.currentSearchScope = scope; + this.paginationService.resetPage(this.configSearch.id); + } + this.searchDone = true; + + return this.ePersonDataService.searchByScope(this.currentSearchScope, this.currentSearchQuery, { + currentPage: paginationOptions.currentPage, + elementsPerPage: paginationOptions.pageSize + }); + }), + getAllCompletedRemoteData(), + map((rd: RemoteData) => { + if (rd.hasFailed) { + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage })); + } else { + return rd; + } + }), + switchMap((epersonListRD: RemoteData>) => { + const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => { + const dto$: Observable = observableCombineLatest( + this.isMemberOfGroup(member), (isMember: ObservedValueOf>) => { + const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel(); + epersonDtoModel.eperson = member; + epersonDtoModel.memberOfGroup = isMember; + return epersonDtoModel; + }); + return dto$; + })); + return dtos$.pipe(map((dtos: EpersonDtoModel[]) => { + return buildPaginatedList(epersonListRD.payload.pageInfo, dtos); + })); + })) + .subscribe((paginatedListOfDTOs: PaginatedList) => { + this.ePeopleSearchDtos.next(paginatedListOfDTOs); + })); + } + + /** + * unsub all subscriptions + */ + ngOnDestroy(): void { + for (const key of this.subs.keys()) { + this.unsubFrom(key); + } + this.paginationService.clearPagination(this.config.id); + this.paginationService.clearPagination(this.configSearch.id); + } + + /** + * Shows a notification based on the success/failure of the request + * @param messageSuffix Suffix for message + * @param response RestResponse observable containing success/failure request + * @param nameObject Object request was about + * @param activeGroup Group currently being edited + */ + showNotifications(messageSuffix: string, response: Observable>, nameObject: string, activeGroup: Group) { + response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData) => { + if (rd.hasSucceeded) { + this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.success.' + messageSuffix, { name: nameObject })); + this.ePersonDataService.clearLinkRequests(activeGroup._links.epersons.href); + } else { + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.' + messageSuffix, { name: nameObject })); + } + }); + } + + /** + * Reset all input-fields to be empty and search all search + */ + clearFormAndResetResult() { + this.searchForm.patchValue({ + query: '', + }); + this.search({ query: '' }); + } + +} diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts index 0b19b17100e..0fa405a1c9d 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts @@ -149,6 +149,7 @@ describe('MembersListComponent', () => { fixture.destroy(); flush(); component = null; + fixture.debugElement.nativeElement.remove(); })); it('should create MembersListComponent', inject([MembersListComponent], (comp: MembersListComponent) => { diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts index 54d144da513..8bc540641e8 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts @@ -94,13 +94,15 @@ export class MembersListComponent implements OnInit, OnDestroy { paginationSub: Subscription; - constructor(private groupDataService: GroupDataService, - public ePersonDataService: EPersonDataService, - private translateService: TranslateService, - private notificationsService: NotificationsService, - private formBuilder: FormBuilder, - private paginationService: PaginationService, - private router: Router) { + constructor( + protected groupDataService: GroupDataService, + public ePersonDataService: EPersonDataService, + private translateService: TranslateService, + private notificationsService: NotificationsService, + protected formBuilder: FormBuilder, + private paginationService: PaginationService, + private router: Router + ) { this.currentSearchQuery = ''; this.currentSearchScope = 'metadata'; } @@ -124,7 +126,7 @@ export class MembersListComponent implements OnInit, OnDestroy { * @param page the number of the page to retrieve * @private */ - private retrieveMembers(page: number) { + protected retrieveMembers(page: number) { this.unsubFrom(SubKey.MembersDTO); this.subs.set(SubKey.MembersDTO, this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts index 7a07f6fe103..fb4edff76f4 100644 --- a/src/app/core/data/request.service.spec.ts +++ b/src/app/core/data/request.service.spec.ts @@ -592,6 +592,19 @@ describe('RequestService', () => { 'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123' ); }); + + it('should properly encode the body with an array', () => { + const body = { + 'property1': 'multiple\nlines\nto\nsend', + 'property2': 'sp&ci@l characters', + 'sp&ci@l-chars in prop': 'test123', + 'arrayParam': ['arrayValue1', 'arrayValue2'], + }; + const queryParams = service.uriEncodeBody(body); + expect(queryParams).toEqual( + 'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123&arrayParam=arrayValue1&arrayParam=arrayValue2' + ); + }); }); }); diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts index 14499b82149..f26b36da087 100644 --- a/src/app/core/data/request.service.ts +++ b/src/app/core/data/request.service.ts @@ -252,8 +252,8 @@ export class RequestService { /** * Convert request Payload to a URL-encoded string * - * e.g. uriEncodeBody({param: value, param1: value1}) - * returns: param=value¶m1=value1 + * e.g. uriEncodeBody({param: value, param1: value1, param2: [value3, value4]}) + * returns: param=value¶m1=value1¶m2=value3¶m2=value4 * * @param body * The request Payload to convert @@ -264,11 +264,19 @@ export class RequestService { let queryParams = ''; if (isNotEmpty(body) && typeof body === 'object') { Object.keys(body) - .forEach((param) => { + .forEach((param: string) => { const encodedParam = encodeURIComponent(param); - const encodedBody = encodeURIComponent(body[param]); - const paramValue = `${encodedParam}=${encodedBody}`; - queryParams = isEmpty(queryParams) ? queryParams.concat(paramValue) : queryParams.concat('&', paramValue); + if (Array.isArray(body[param])) { + for (const element of body[param]) { + const encodedBody = encodeURIComponent(element); + const paramValue = `${encodedParam}=${encodedBody}`; + queryParams = isEmpty(queryParams) ? queryParams.concat(paramValue) : queryParams.concat('&', paramValue); + } + } else { + const encodedBody = encodeURIComponent(body[param]); + const paramValue = `${encodedParam}=${encodedBody}`; + queryParams = isEmpty(queryParams) ? queryParams.concat(paramValue) : queryParams.concat('&', paramValue); + } }); } return queryParams; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html index 64e5638de65..3009cc07711 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html @@ -1,5 +1,15 @@
    - advancedInfo: {{ (workflowAction$ | async)?.advancedInfo | json }} +

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

    +

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

    + + diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.scss b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.scss index e69de29bb2d..65f38247c83 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.scss +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.scss @@ -0,0 +1,7 @@ +:host ::ng-deep { + .reviewersListWithGroup { + #search, #search + form, #search + form + ds-pagination { + display: none !important; + } + } +} diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts index df867d5595a..29949a0ae34 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts @@ -1,8 +1,17 @@ -import { Component } from '@angular/core'; +import { Component, OnInit, OnDestroy } from '@angular/core'; import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator'; import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component'; +import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; +import { + SelectReviewerActionAdvancedInfo +} from '../../../core/tasks/models/select-reviewer-action-advanced-info.model'; +import { + EPersonListActionConfig +} from '../../../access-control/group-registry/group-form/eperson-list/eperson-list.component'; +import { Subscription } from 'rxjs'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; export const WORKFLOW_ADVANCED_TASK_OPTION_SELECT_REVIEWER = 'submit_select_reviewer'; export const ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER = 'selectrevieweraction'; @@ -13,7 +22,63 @@ export const ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER = 'selectrevieweraction'; templateUrl: './advanced-workflow-action-select-reviewer.component.html', styleUrls: ['./advanced-workflow-action-select-reviewer.component.scss'], }) -export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkflowActionComponent { +export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkflowActionComponent implements OnInit, OnDestroy { + + multipleReviewers = true; + + selectedReviewers: EPerson[]; + + reviewersListActionConfig: EPersonListActionConfig; + + /** + * When the component is created the value is `undefined`, afterwards it will be set to either the group id or `null`. + * It needs to be subscribed in the **ngOnInit()** because otherwise some unnecessary request will be made. + */ + groupId?: string | null; + + subs: Subscription[] = []; + + ngOnDestroy(): void { + this.subs.forEach((subscription: Subscription) => subscription.unsubscribe()); + } + + ngOnInit(): void { + super.ngOnInit(); + if (this.multipleReviewers) { + this.reviewersListActionConfig = { + add: { + css: 'btn-outline-primary', + disabled: false, + icon: 'fas fa-plus', + }, + remove: { + css: 'btn-outline-danger', + disabled: false, + icon: 'fas fa-minus' + }, + }; + } else { + this.reviewersListActionConfig = { + add: { + css: 'btn-outline-primary', + disabled: false, + icon: 'fas fa-check', + }, + remove: { + css: 'btn-primary', + disabled: true, + icon: 'fas fa-check' + }, + }; + } + this.subs.push(this.workflowAction$.subscribe((workflowAction: WorkflowAction) => { + if (workflowAction) { + this.groupId = (workflowAction.advancedInfo as SelectReviewerActionAdvancedInfo[])[0].group; + } else { + this.groupId = null; + } + })); + } getType(): string { return ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER; @@ -22,6 +87,7 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf createBody(): any { return { [WORKFLOW_ADVANCED_TASK_OPTION_SELECT_REVIEWER]: true, + eperson: this.selectedReviewers.map((ePerson: EPerson) => ePerson.id), }; } diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts new file mode 100644 index 00000000000..bf27b1e79f1 --- /dev/null +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts @@ -0,0 +1,212 @@ +import { CommonModule } from '@angular/common'; +import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; +import { ComponentFixture, fakeAsync, flush, inject, TestBed, waitForAsync } from '@angular/core/testing'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { BrowserModule, By } from '@angular/platform-browser'; +import { Router } from '@angular/router'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; +import { Observable, of as observableOf } from 'rxjs'; +import { RestResponse } from '../../../../core/cache/response.models'; +import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { PageInfo } from '../../../../core/shared/page-info.model'; +import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock'; +import { ReviewersListComponent } from './reviewers-list.component'; +import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock'; +import { + createSuccessfulRemoteDataObject$, + createNoContentRemoteDataObject$ +} from '../../../../shared/remote-data.utils'; +import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; +import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; +import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; +import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; +import { RouterMock } from '../../../../shared/mocks/router.mock'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; +import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; + +describe('ReviewersListComponent', () => { + let component: ReviewersListComponent; + let fixture: ComponentFixture; + let translateService: TranslateService; + let builderService: FormBuilderService; + let ePersonDataServiceStub: any; + let groupsDataServiceStub: any; + let activeGroup; + let allEPersons; + let allGroups; + let epersonMembers; + let subgroupMembers; + let paginationService; + + beforeEach(waitForAsync(() => { + activeGroup = GroupMock; + epersonMembers = [EPersonMock2]; + subgroupMembers = [GroupMock2]; + allEPersons = [EPersonMock, EPersonMock2]; + allGroups = [GroupMock, GroupMock2]; + ePersonDataServiceStub = { + activeGroup: activeGroup, + epersonMembers: epersonMembers, + subgroupMembers: subgroupMembers, + findAllByHref(href: string): Observable>> { + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), groupsDataServiceStub.getEPersonMembers())); + }, + searchByScope(scope: string, query: string): Observable>> { + if (query === '') { + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons)); + } + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])); + }, + clearEPersonRequests() { + // empty + }, + clearLinkRequests() { + // empty + }, + getEPeoplePageRouterLink(): string { + return '/access-control/epeople'; + } + }; + groupsDataServiceStub = { + activeGroup: activeGroup, + epersonMembers: epersonMembers, + subgroupMembers: subgroupMembers, + allGroups: allGroups, + getActiveGroup(): Observable { + return observableOf(activeGroup); + }, + getEPersonMembers() { + return this.epersonMembers; + }, + searchGroups(query: string): Observable>> { + if (query === '') { + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups)); + } + return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])); + }, + addMemberToGroup(parentGroup, eperson: EPerson): Observable { + this.epersonMembers = [...this.epersonMembers, eperson]; + return observableOf(new RestResponse(true, 200, 'Success')); + }, + clearGroupsRequests() { + // empty + }, + clearGroupLinkRequests() { + // empty + }, + getGroupEditPageRouterLink(group: Group): string { + return '/access-control/groups/' + group.id; + }, + deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable { + this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => { + if (eperson.id !== epersonToDelete.id) { + return eperson; + } + }); + if (this.epersonMembers === undefined) { + this.epersonMembers = []; + } + return observableOf(new RestResponse(true, 200, 'Success')); + }, + findById(id: string) { + for (const group of allGroups) { + if (group.id === id) { + console.log('found', group); + return createSuccessfulRemoteDataObject$(group); + } + } + return createNoContentRemoteDataObject$(); + }, + editGroup() { + // empty + } + }; + builderService = getMockFormBuilderService(); + translateService = getMockTranslateService(); + + paginationService = new PaginationServiceStub(); + TestBed.configureTestingModule({ + imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + declarations: [ReviewersListComponent], + providers: [ReviewersListComponent, + { provide: EPersonDataService, useValue: ePersonDataServiceStub }, + { provide: GroupDataService, useValue: groupsDataServiceStub }, + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: FormBuilderService, useValue: builderService }, + { provide: Router, useValue: new RouterMock() }, + { provide: PaginationService, useValue: paginationService }, + ], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ReviewersListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + afterEach(fakeAsync(() => { + fixture.destroy(); + flush(); + component = null; + fixture.debugElement.nativeElement.remove(); + })); + + it('should create ReviewersListComponent', inject([ReviewersListComponent], (comp: ReviewersListComponent) => { + expect(comp).toBeDefined(); + })); + + describe('when no group is selected', () => { + beforeEach(() => { + component.ngOnChanges({ + groupId: new SimpleChange(undefined, null, true) + }); + fixture.detectChanges(); + }); + + it('should show no epersons because no group is selected', () => { + const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child')); + expect(epersonIdsFound.length).toEqual(0); + epersonMembers.map((eperson: EPerson) => { + expect(epersonIdsFound.find((foundEl) => { + return (foundEl.nativeElement.textContent.trim() === eperson.uuid); + })).not.toBeTruthy(); + }); + }); + }); + + describe('when group is selected', () => { + beforeEach(() => { + component.ngOnChanges({ + groupId: new SimpleChange(undefined, GroupMock.id, true) + }); + fixture.detectChanges(); + }); + + it('should show all eperson members of group', () => { + const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child')); + expect(epersonIdsFound.length).toEqual(1); + epersonMembers.map((eperson: EPerson) => { + expect(epersonIdsFound.find((foundEl) => { + return (foundEl.nativeElement.textContent.trim() === eperson.uuid); + })).toBeTruthy(); + }); + }); + }); + +}); diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts new file mode 100644 index 00000000000..14159450ff9 --- /dev/null +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts @@ -0,0 +1,124 @@ +import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges, EventEmitter, Output } from '@angular/core'; +import { FormBuilder } from '@angular/forms'; +import { Router } from '@angular/router'; +import { TranslateService } from '@ngx-translate/core'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { GroupDataService } from '../../../../core/eperson/group-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; +import { Group } from '../../../../core/eperson/models/group.model'; +import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; +import { + EPersonListComponent, + EPersonListActionConfig +} from '../../../../access-control/group-registry/group-form/eperson-list/eperson-list.component'; +import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { Observable, of as observableOf } from 'rxjs'; +import { hasValue } from '../../../../shared/empty.util'; +import { PaginatedList } from '../../../../core/data/paginated-list.model'; + +/** + * Keys to keep track of specific subscriptions + */ +enum SubKey { + ActiveGroup, + MembersDTO, + SearchResultsDTO, +} + +@Component({ + selector: 'ds-reviewers-list', + // templateUrl: './reviewers-list.component.html', + templateUrl: '../../../../access-control/group-registry/group-form/eperson-list/eperson-list.component.html', +}) +export class ReviewersListComponent extends EPersonListComponent implements OnInit, OnChanges, OnDestroy { + + @Input() + groupId: string | null; + + @Input() + actionConfig: EPersonListActionConfig; + + @Input() + multipleReviewers: boolean; + + @Output() + selectedReviewersUpdated: EventEmitter = new EventEmitter(); + + selectedReviewers: EpersonDtoModel[] = []; + + constructor(protected groupService: GroupDataService, + public ePersonDataService: EPersonDataService, + translateService: TranslateService, + notificationsService: NotificationsService, + formBuilder: FormBuilder, + paginationService: PaginationService, + router: Router) { + super(groupService, ePersonDataService, translateService, notificationsService, formBuilder, paginationService, router); + } + + ngOnInit() { + this.searchForm = this.formBuilder.group(({ + scope: 'metadata', + query: '', + })); + } + + ngOnChanges(changes: SimpleChanges): void { + this.groupId = changes.groupId.currentValue; + if (changes.groupId.currentValue !== changes.groupId.previousValue) { + if (this.groupId === null) { + this.retrieveMembers(this.config.currentPage); + } else { + this.subs.set(SubKey.ActiveGroup, this.groupService.findById(this.groupId).pipe( + getFirstSucceededRemoteDataPayload(), + ).subscribe((activeGroup: Group) => { + if (activeGroup != null) { + this.groupDataService.editGroup(activeGroup); + this.groupBeingEdited = activeGroup; + this.retrieveMembers(this.config.currentPage); + } + })); + } + } + } + + retrieveMembers(page: number): void { + this.config.currentPage = page; + if (this.groupId === null) { + this.unsubFrom(SubKey.MembersDTO); + const paginatedListOfDTOs: PaginatedList = new PaginatedList(); + paginatedListOfDTOs.page = this.selectedReviewers; + this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs); + } else { + super.retrieveMembers(page); + } + } + + isMemberOfGroup(possibleMember: EPerson): Observable { + return observableOf(hasValue(this.selectedReviewers.find((reviewer: EpersonDtoModel) => reviewer.eperson.id === possibleMember.id))); + } + + deleteMemberFromGroup(ePerson: EpersonDtoModel) { + ePerson.memberOfGroup = false; + const index = this.selectedReviewers.indexOf(ePerson); + if (index !== -1) { + this.selectedReviewers.splice(index, 1); + } + this.selectedReviewersUpdated.emit(this.selectedReviewers.map((epersonDtoModel: EpersonDtoModel) => epersonDtoModel.eperson)); + } + + addMemberToGroup(ePerson: EpersonDtoModel) { + ePerson.memberOfGroup = true; + if (!this.multipleReviewers) { + for (const selectedReviewer of this.selectedReviewers) { + selectedReviewer.memberOfGroup = false; + } + this.selectedReviewers = []; + } + this.selectedReviewers.push(ePerson); + this.selectedReviewersUpdated.emit(this.selectedReviewers.map((epersonDtoModel: EpersonDtoModel) => epersonDtoModel.eperson)); + } + +} diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts index b230ffe65cd..080ca964689 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts @@ -18,16 +18,21 @@ import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/ import { AdvancedClaimedTaskActionsDirective } from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-claimed-task-actions.directive'; +import { AccessControlModule } from '../access-control/access-control.module'; +import { + ReviewersListComponent +} from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component'; @NgModule({ - imports: [ - WorkflowItemsEditPageRoutingModule, - CommonModule, - SharedModule, - SubmissionModule, - StatisticsModule, - ItemPageModule - ], + imports: [ + WorkflowItemsEditPageRoutingModule, + CommonModule, + SharedModule, + SubmissionModule, + StatisticsModule, + ItemPageModule, + AccessControlModule + ], declarations: [ WorkflowItemDeleteComponent, ThemedWorkflowItemDeleteComponent, @@ -38,6 +43,7 @@ import { AdvancedWorkflowActionSelectReviewerComponent, AdvancedWorkflowActionPageComponent, AdvancedClaimedTaskActionsDirective, + ReviewersListComponent, ] }) /** diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index b410a26ac10..9d455fb422e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -539,6 +539,54 @@ "admin.metadata-import.page.error.addFile": "Select file first!", + "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting", + + "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting", + + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.", + + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search", "auth.errors.invalid-user": "Invalid email address or password.", From f4a303f80854f27cce069d437f37a30372a38854 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 9 Jan 2023 17:30:00 +0100 Subject: [PATCH 317/758] 98344: Added decline task simple workflow step --- ...d-task-actions-decline-task.component.html | 12 +++ ...d-task-actions-decline-task.component.scss | 0 ...ask-actions-decline-task.component.spec.ts | 90 +++++++++++++++++++ ...med-task-actions-decline-task.component.ts | 34 +++++++ src/app/shared/shared.module.ts | 3 + .../testing/claimed-task-data-service.stub.ts | 6 ++ src/assets/i18n/en.json5 | 4 + 7 files changed, 149 insertions(+) create mode 100644 src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html create mode 100644 src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.scss create mode 100644 src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts create mode 100644 src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html new file mode 100644 index 00000000000..38ed36c0f10 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html @@ -0,0 +1,12 @@ + diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.scss b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts new file mode 100644 index 00000000000..ef132ff5228 --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts @@ -0,0 +1,90 @@ +import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; +import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service'; +import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; +import { getMockSearchService } from '../../../mocks/search-service.mock'; +import { getMockRequestService } from '../../../mocks/request.service.mock'; +import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; +import { Router } from '@angular/router'; +import { RouterStub } from '../../../testing/router.stub'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { RequestService } from '../../../../core/data/request.service'; +import { ClaimedTaskActionsDeclineTaskComponent } from './claimed-task-actions-decline-task.component'; +import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub'; + +let component: ClaimedTaskActionsDeclineTaskComponent; +let fixture: ComponentFixture; + +const searchService = getMockSearchService(); + +const requestService = getMockRequestService(); + +let mockPoolTaskDataService: PoolTaskDataService; + +describe('ClaimedTaskActionsDeclineTaskComponent', () => { + const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' }); + + let claimedTaskService: ClaimedTaskDataServiceStub; + + beforeEach(waitForAsync(() => { + claimedTaskService = new ClaimedTaskDataServiceStub(); + + mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null); + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }) + ], + providers: [ + { provide: ClaimedTaskDataService, useValue: claimedTaskService }, + { provide: Injector, useValue: {} }, + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: Router, useValue: new RouterStub() }, + { provide: SearchService, useValue: searchService }, + { provide: RequestService, useValue: requestService }, + { provide: PoolTaskDataService, useValue: mockPoolTaskDataService }, + ], + declarations: [ClaimedTaskActionsDeclineTaskComponent], + schemas: [NO_ERRORS_SCHEMA] + }).overrideComponent(ClaimedTaskActionsDeclineTaskComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default } + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ClaimedTaskActionsDeclineTaskComponent); + component = fixture.componentInstance; + component.object = object; + spyOn(component, 'initReloadAnchor').and.returnValue(undefined); + fixture.detectChanges(); + }); + + afterEach(() => { + fixture.debugElement.nativeElement.remove(); + }); + + it('should display decline button', () => { + const btn = fixture.debugElement.query(By.css('.declineTaskAction')); + + expect(btn).not.toBeNull(); + }); + + it('should display spin icon when decline is pending', () => { + component.processing$.next(true); + fixture.detectChanges(); + + const span = fixture.debugElement.query(By.css('.declineTaskAction .fa-spin')); + + expect(span).not.toBeNull(); + }); + +}); diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts new file mode 100644 index 00000000000..ab867d62d6d --- /dev/null +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts @@ -0,0 +1,34 @@ +import { Component, Injector } from '@angular/core'; +import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component'; +import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator'; +import { Router } from '@angular/router'; +import { NotificationsService } from '../../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { SearchService } from '../../../../core/shared/search/search.service'; +import { RequestService } from '../../../../core/data/request.service'; + +export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task'; + +@rendersWorkflowTaskOption(WORKFLOW_TASK_OPTION_DECLINE_TASK) +@Component({ + selector: 'ds-claimed-task-actions-decline-task', + templateUrl: './claimed-task-actions-decline-task.component.html', + styleUrls: ['./claimed-task-actions-decline-task.component.scss'] +}) +/** + * Component for displaying and processing the decline task action on a workflow task item + */ +export class ClaimedTaskActionsDeclineTaskComponent extends ClaimedTaskActionsAbstractComponent { + + option = WORKFLOW_TASK_OPTION_DECLINE_TASK; + + constructor(protected injector: Injector, + protected router: Router, + protected notificationsService: NotificationsService, + protected translate: TranslateService, + protected searchService: SearchService, + protected requestService: RequestService) { + super(injector, router, notificationsService, translate, searchService, requestService); + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 9a859dff9b8..1cc0a86115a 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -181,6 +181,7 @@ import { AdvancedClaimedTaskActionSelectReviewerComponent } from './mydspace-act import { AdvancedClaimedTaskActionRatingReviewerComponent } from './mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component'; +import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component'; const MODULES = [ // Do NOT include UniversalModule, HttpModule, or JsonpModule here @@ -265,6 +266,7 @@ const COMPONENTS = [ ClaimedTaskActionsRejectComponent, ClaimedTaskActionsReturnToPoolComponent, ClaimedTaskActionsEditMetadataComponent, + ClaimedTaskActionsDeclineTaskComponent, ClaimedTaskActionsLoaderComponent, ItemActionsComponent, PoolTaskActionsComponent, @@ -389,6 +391,7 @@ const ENTRY_COMPONENTS = [ LogInOidcComponent, BundleListElementComponent, ClaimedTaskActionsApproveComponent, + ClaimedTaskActionsDeclineTaskComponent, ClaimedTaskActionsRejectComponent, ClaimedTaskActionsReturnToPoolComponent, ClaimedTaskActionsEditMetadataComponent, diff --git a/src/app/shared/testing/claimed-task-data-service.stub.ts b/src/app/shared/testing/claimed-task-data-service.stub.ts index ef04e3bf277..3a9f3d852d7 100644 --- a/src/app/shared/testing/claimed-task-data-service.stub.ts +++ b/src/app/shared/testing/claimed-task-data-service.stub.ts @@ -1,5 +1,7 @@ import { Observable, EMPTY } from 'rxjs'; import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response'; +import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model'; +import { RemoteData } from '../../core/data/remote-data'; export class ClaimedTaskDataServiceStub { @@ -7,4 +9,8 @@ export class ClaimedTaskDataServiceStub { return EMPTY; } + public findByItem(_uuid: string): Observable> { + return EMPTY; + } + } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 9d455fb422e..6addb5a81ba 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4069,6 +4069,10 @@ "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.", + "submission.workflow.tasks.claimed.decline": "Decline", + + "submission.workflow.tasks.claimed.decline_help": "", + "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.placeholder": "Describe the reason of reject", From b3510534895b15882c0bc5ef68a6102307a0bfcd Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 10 Jan 2023 14:10:44 +0100 Subject: [PATCH 318/758] 98344: Fixed workflow id passed to backend instead of claimed task id --- ...claimed-task-actions-abstract.component.ts | 24 +++++++++++++++++-- ...k-action-rating-reviewer.component.spec.ts | 14 +++++++++-- ...d-task-action-rating-reviewer.component.ts | 17 ------------- ...k-action-select-reviewer.component.spec.ts | 14 +++++++++-- ...d-task-action-select-reviewer.component.ts | 12 ---------- ...rkflow-action-select-reviewer.component.ts | 2 +- .../advanced-workflow-action.component.ts | 18 ++++++++++++++ 7 files changed, 65 insertions(+), 36 deletions(-) diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts index 8738f7745b6..3774b60f1a6 100644 --- a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts @@ -1,5 +1,8 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ClaimedTaskActionsAbstractComponent } from './claimed-task-actions-abstract.component'; +import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; +import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; +import { getAdvancedWorkflowRoute } from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; /** * Abstract component for rendering an advanced claimed task's action @@ -12,7 +15,7 @@ import { ClaimedTaskActionsAbstractComponent } from './claimed-task-actions-abst selector: 'ds-advanced-claimed-task-action-abstract', template: '' }) -export abstract class AdvancedClaimedTaskActionsAbstractComponent extends ClaimedTaskActionsAbstractComponent { +export abstract class AdvancedClaimedTaskActionsAbstractComponent extends ClaimedTaskActionsAbstractComponent implements OnInit { workflowType: string; @@ -21,10 +24,27 @@ export abstract class AdvancedClaimedTaskActionsAbstractComponent extends Claime */ workflowTaskPageRoute: string; + ngOnInit(): void { + super.ngOnInit(); + this.initPageRoute(); + } + + /** + * Initialise the route to the advanced workflow page + */ + initPageRoute() { + this.subs.push(this.object.workflowitem.pipe( + getFirstSucceededRemoteDataPayload() + ).subscribe((workflowItem: WorkflowItem) => { + this.workflowTaskPageRoute = getAdvancedWorkflowRoute(workflowItem.id); + })); + } + openAdvancedClaimedTaskTab(): void { void this.router.navigate([this.workflowTaskPageRoute], { queryParams: { workflow: this.workflowType, + claimedTask: this.object.id, }, }); } diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts index ed2fc423107..563af2810e2 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts @@ -19,11 +19,19 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component'; +import { of as observableOf } from 'rxjs'; +import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; const taskId = 'claimed-task-1'; +const workflowId = 'workflow-1'; describe('AdvancedClaimedTaskActionRatingReviewerComponent', () => { - const object = Object.assign(new ClaimedTask(), { id: taskId }); + const object = Object.assign(new ClaimedTask(), { + id: taskId, + workflowitem: observableOf(Object.assign(new WorkflowItem(), { + id: workflowId, + })), + }); let component: AdvancedClaimedTaskActionRatingReviewerComponent; let fixture: ComponentFixture; @@ -75,11 +83,13 @@ describe('AdvancedClaimedTaskActionRatingReviewerComponent', () => { }); it('should navigate to the advanced workflow page when clicked', () => { + component.workflowTaskPageRoute = `/workflowitems/${workflowId}/advanced`; fixture.debugElement.query(By.css('.ratingReviewerAction')).nativeElement.click(); - expect(router.navigate).toHaveBeenCalledWith([`/workflowitems/${taskId}/advanced`], { + expect(router.navigate).toHaveBeenCalledWith([`/workflowitems/${workflowId}/advanced`], { queryParams: { workflow: ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER, + claimedTask: taskId, }, }); }); diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts index bfa676b30eb..20fe58c80ec 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts @@ -4,7 +4,6 @@ import { NotificationsService } from '../../../notifications/notifications.servi import { TranslateService } from '@ngx-translate/core'; import { SearchService } from '../../../../core/shared/search/search.service'; import { RequestService } from '../../../../core/data/request.service'; -import { getAdvancedWorkflowRoute } from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component'; @@ -28,11 +27,6 @@ export class AdvancedClaimedTaskActionRatingReviewerComponent extends AdvancedCl workflowType = ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER; - /** - * Route to the workflow's task page - */ - workflowTaskPageRoute: string; - constructor( protected injector: Injector, protected router: Router, @@ -44,15 +38,4 @@ export class AdvancedClaimedTaskActionRatingReviewerComponent extends AdvancedCl super(injector, router, notificationsService, translate, searchService, requestService); } - ngOnInit(): void { - this.initPageRoute(); - } - - /** - * Initialise the route to the rating reviewer's page - */ - initPageRoute(): void { - this.workflowTaskPageRoute = getAdvancedWorkflowRoute(this.object.id); - } - } diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts index 0c91898a97b..db670e3cdcb 100644 --- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts @@ -20,11 +20,19 @@ import { Location } from '@angular/common'; import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; +import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; +import { of as observableOf } from 'rxjs'; const taskId = 'claimed-task-1'; +const workflowId = 'workflow-1'; describe('AdvancedClaimedTaskActionSelectReviewerComponent', () => { - const object = Object.assign(new ClaimedTask(), { id: taskId }); + const object = Object.assign(new ClaimedTask(), { + id: taskId, + workflowitem: observableOf(Object.assign(new WorkflowItem(), { + id: workflowId, + })), + }); let component: AdvancedClaimedTaskActionSelectReviewerComponent; let fixture: ComponentFixture; @@ -77,11 +85,13 @@ describe('AdvancedClaimedTaskActionSelectReviewerComponent', () => { }); it('should navigate to the advanced workflow page when clicked', () => { + component.workflowTaskPageRoute = `/workflowitems/${workflowId}/advanced`; fixture.debugElement.query(By.css('.selectReviewerAction')).nativeElement.click(); - expect(router.navigate).toHaveBeenCalledWith([`/workflowitems/${taskId}/advanced`], { + expect(router.navigate).toHaveBeenCalledWith([`/workflowitems/${workflowId}/advanced`], { queryParams: { workflow: ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER, + claimedTask: taskId, }, }); }); diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts index 7b2aa015af5..c7a2a2e5459 100644 --- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts @@ -8,7 +8,6 @@ import { NotificationsService } from '../../../notifications/notifications.servi import { TranslateService } from '@ngx-translate/core'; import { SearchService } from '../../../../core/shared/search/search.service'; import { RequestService } from '../../../../core/data/request.service'; -import { getAdvancedWorkflowRoute } from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER, WORKFLOW_ADVANCED_TASK_OPTION_SELECT_REVIEWER @@ -40,15 +39,4 @@ export class AdvancedClaimedTaskActionSelectReviewerComponent extends AdvancedCl super(injector, router, notificationsService, translate, searchService, requestService); } - ngOnInit(): void { - this.initPageRoute(); - } - - /** - * Initialise the route to the select reviewer's page - */ - initPageRoute() { - this.workflowTaskPageRoute = getAdvancedWorkflowRoute(this.object.id); - } - } diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts index 29949a0ae34..d7a885f067c 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts @@ -26,7 +26,7 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf multipleReviewers = true; - selectedReviewers: EPerson[]; + selectedReviewers: EPerson[] = []; reviewersListActionConfig: EPersonListActionConfig; diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts index bef619ce454..f40cde6fa68 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts @@ -41,6 +41,24 @@ export abstract class AdvancedWorkflowActionComponent extends WorkflowItemAction ); } + /** + * Performs the action and shows a notification based on the outcome of the action + */ + performAction() { + this.sendRequest(this.route.snapshot.queryParams.claimedTask).subscribe((successful: boolean) => { + if (successful) { + const title = this.translationService.get('workflow-item.' + this.type + '.notification.success.title'); + const content = this.translationService.get('workflow-item.' + this.type + '.notification.success.content'); + this.notificationsService.success(title, content); + this.previousPage(); + } else { + const title = this.translationService.get('workflow-item.' + this.type + '.notification.error.title'); + const content = this.translationService.get('workflow-item.' + this.type + '.notification.error.content'); + this.notificationsService.error(title, content); + } + }); + } + /** * Submits the task with the given {@link createBody}. * From f9f3ad32c78040521b950752eccfbd9dc9840305 Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Tue, 10 Jan 2023 19:37:06 +0530 Subject: [PATCH 319/758] [CST-7604] added hithighlight for person and orgunit --- src/app/core/breadcrumbs/dso-name.service.ts | 42 +++++++++++++++++++ src/app/shared/mocks/dso-name.service.mock.ts | 11 +++++ ...em-search-result-grid-element.component.ts | 3 +- .../item-list-preview.component.ts | 2 +- ...arch-result-list-element.component.spec.ts | 5 ++- .../search-result-list-element.component.ts | 2 +- 6 files changed, 60 insertions(+), 5 deletions(-) diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts index d56f4a00eb0..64f37baa653 100644 --- a/src/app/core/breadcrumbs/dso-name.service.ts +++ b/src/app/core/breadcrumbs/dso-name.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { hasValue, isEmpty } from '../../shared/empty.util'; import { DSpaceObject } from '../shared/dspace-object.model'; import { TranslateService } from '@ngx-translate/core'; +import { Metadata } from '../shared/metadata.utils'; /** * Returns a name for a {@link DSpaceObject} based @@ -67,4 +68,45 @@ export class DSONameService { return name; } + /** + * Gets the Hit highlight + * + * @param object + * @param dso + * + * @returns {string} html embedded hit highlight. + */ + getHitHighlights(object: any, dso: DSpaceObject): string { + const types = dso.getRenderTypes(); + const entityType = types + .filter((type) => typeof type === 'string') + .find((type: string) => (['Person', 'OrgUnit']).includes(type)) as string; + if (entityType === 'Person') { + const familyName = this.firstMetadataValue(object, dso, 'person.familyName'); + const givenName = this.firstMetadataValue(object, dso, 'person.givenName'); + if (isEmpty(familyName) && isEmpty(givenName)) { + return this.firstMetadataValue(object, dso, 'dc.title') || dso.name; + } else if (isEmpty(familyName) || isEmpty(givenName)) { + return familyName || givenName; + } + return `${familyName}, ${givenName}`; + } else if (entityType === 'OrgUnit') { + return this.firstMetadataValue(object, dso, 'organization.legalName'); + } + return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled'); + } + + /** + * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights. + * + * @param object + * @param dso + * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]]. + * + * @returns {string} the first matching string value, or `undefined`. + */ + firstMetadataValue(object: any, dso: DSpaceObject, keyOrKeys: string | string[]): string { + return Metadata.firstValue([object.hitHighlights, dso.metadata], keyOrKeys); + } + } diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts index f4947cc860a..1e3280ce8df 100644 --- a/src/app/shared/mocks/dso-name.service.mock.ts +++ b/src/app/shared/mocks/dso-name.service.mock.ts @@ -6,4 +6,15 @@ export class DSONameServiceMock { public getName(dso: DSpaceObject) { return UNDEFINED_NAME; } + + public getHitHighlights(object: any, dso: DSpaceObject) { + if (object.hitHighlights && object.hitHighlights['dc.title']) { + return object.hitHighlights['dc.title'][0]; + } else if (object.hitHighlights && object.hitHighlights['organization.legalName']) { + return object.hitHighlights['organization.legalName'][0]; + } else if (object.hitHighlights && (object.hitHighlights['person.familyName'] || object.hitHighlights['person.givenName'])) { + return `${object.hitHighlights['person.familyName'][0] || ''}, ${object.hitHighlights['person.givenName'][0] || ''}`; + } + return UNDEFINED_NAME; + } } diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts index fc24d5450b8..303e4681a28 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts @@ -42,7 +42,6 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen ngOnInit(): void { super.ngOnInit(); this.itemPageRoute = getItemPageRoute(this.dso); - this.dsoTitle = this.firstMetadataValue('dc.title') ?? - (this.dso ? this.dsoNameService.getName(this.dso) : undefined); + this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso); } } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts index 04f1e24d7b8..6b40678dedc 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -55,7 +55,7 @@ export class ItemListPreviewComponent implements OnInit { ngOnInit(): void { this.showThumbnails = this.appConfig.browseBy.showThumbnails; - this.dsoTitle = this.dsoNameService.getName(this.item); + this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.item); } diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index 660377746ab..0d7c2cbc587 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -15,6 +15,9 @@ let publicationListElementComponent: ItemSearchResultListElementComponent; let fixture: ComponentFixture; const dcTitle = 'This is just another title'; const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), { + hitHighlights: { + 'dc.title': [dcTitle], + }, indexableObject: Object.assign(new Item(), { bundles: observableOf({}), @@ -22,7 +25,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul 'dc.title': [ { language: 'en_US', - value: dcTitle + value: 'This is just another title' } ], 'dc.contributor.author': [ diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts index c69044e907d..e56b7e970a9 100644 --- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts @@ -33,7 +33,7 @@ export class SearchResultListElementComponent, K exten ngOnInit(): void { if (hasValue(this.object)) { this.dso = this.object.indexableObject; - this.dsoTitle = this.firstMetadataValue('dc.title') ?? this.dsoNameService.getName(this.dso); + this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso); } } From b7b2803f6ebb6e86f2c38cceb5168a80ceeefe0c Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Tue, 10 Jan 2023 19:37:06 +0530 Subject: [PATCH 320/758] [CST-7604] added hithighlight for person and orgunit --- src/app/core/breadcrumbs/dso-name.service.ts | 42 +++++++++++++++++++ src/app/shared/mocks/dso-name.service.mock.ts | 11 +++++ ...arch-result-grid-element.component.spec.ts | 3 ++ ...em-search-result-grid-element.component.ts | 3 +- .../item-list-preview.component.ts | 2 +- ...arch-result-list-element.component.spec.ts | 5 ++- .../search-result-list-element.component.ts | 2 +- 7 files changed, 63 insertions(+), 5 deletions(-) diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts index d56f4a00eb0..64f37baa653 100644 --- a/src/app/core/breadcrumbs/dso-name.service.ts +++ b/src/app/core/breadcrumbs/dso-name.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { hasValue, isEmpty } from '../../shared/empty.util'; import { DSpaceObject } from '../shared/dspace-object.model'; import { TranslateService } from '@ngx-translate/core'; +import { Metadata } from '../shared/metadata.utils'; /** * Returns a name for a {@link DSpaceObject} based @@ -67,4 +68,45 @@ export class DSONameService { return name; } + /** + * Gets the Hit highlight + * + * @param object + * @param dso + * + * @returns {string} html embedded hit highlight. + */ + getHitHighlights(object: any, dso: DSpaceObject): string { + const types = dso.getRenderTypes(); + const entityType = types + .filter((type) => typeof type === 'string') + .find((type: string) => (['Person', 'OrgUnit']).includes(type)) as string; + if (entityType === 'Person') { + const familyName = this.firstMetadataValue(object, dso, 'person.familyName'); + const givenName = this.firstMetadataValue(object, dso, 'person.givenName'); + if (isEmpty(familyName) && isEmpty(givenName)) { + return this.firstMetadataValue(object, dso, 'dc.title') || dso.name; + } else if (isEmpty(familyName) || isEmpty(givenName)) { + return familyName || givenName; + } + return `${familyName}, ${givenName}`; + } else if (entityType === 'OrgUnit') { + return this.firstMetadataValue(object, dso, 'organization.legalName'); + } + return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled'); + } + + /** + * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights. + * + * @param object + * @param dso + * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]]. + * + * @returns {string} the first matching string value, or `undefined`. + */ + firstMetadataValue(object: any, dso: DSpaceObject, keyOrKeys: string | string[]): string { + return Metadata.firstValue([object.hitHighlights, dso.metadata], keyOrKeys); + } + } diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts index f4947cc860a..1e3280ce8df 100644 --- a/src/app/shared/mocks/dso-name.service.mock.ts +++ b/src/app/shared/mocks/dso-name.service.mock.ts @@ -6,4 +6,15 @@ export class DSONameServiceMock { public getName(dso: DSpaceObject) { return UNDEFINED_NAME; } + + public getHitHighlights(object: any, dso: DSpaceObject) { + if (object.hitHighlights && object.hitHighlights['dc.title']) { + return object.hitHighlights['dc.title'][0]; + } else if (object.hitHighlights && object.hitHighlights['organization.legalName']) { + return object.hitHighlights['organization.legalName'][0]; + } else if (object.hitHighlights && (object.hitHighlights['person.familyName'] || object.hitHighlights['person.givenName'])) { + return `${object.hitHighlights['person.familyName'][0] || ''}, ${object.hitHighlights['person.givenName'][0] || ''}`; + } + return UNDEFINED_NAME; + } } diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts index 97dda155c57..f25937df342 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts @@ -30,6 +30,9 @@ const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult(); mockItemWithMetadata.hitHighlights = {}; const dcTitle = 'This is just another title'; mockItemWithMetadata.indexableObject = Object.assign(new Item(), { + hitHighlights: { + 'dc.title': [dcTitle], + }, bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), metadata: { 'dc.title': [ diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts index fc24d5450b8..303e4681a28 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts @@ -42,7 +42,6 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen ngOnInit(): void { super.ngOnInit(); this.itemPageRoute = getItemPageRoute(this.dso); - this.dsoTitle = this.firstMetadataValue('dc.title') ?? - (this.dso ? this.dsoNameService.getName(this.dso) : undefined); + this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso); } } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts index 04f1e24d7b8..6b40678dedc 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -55,7 +55,7 @@ export class ItemListPreviewComponent implements OnInit { ngOnInit(): void { this.showThumbnails = this.appConfig.browseBy.showThumbnails; - this.dsoTitle = this.dsoNameService.getName(this.item); + this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.item); } diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index 660377746ab..0d7c2cbc587 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -15,6 +15,9 @@ let publicationListElementComponent: ItemSearchResultListElementComponent; let fixture: ComponentFixture; const dcTitle = 'This is just another title'; const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), { + hitHighlights: { + 'dc.title': [dcTitle], + }, indexableObject: Object.assign(new Item(), { bundles: observableOf({}), @@ -22,7 +25,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul 'dc.title': [ { language: 'en_US', - value: dcTitle + value: 'This is just another title' } ], 'dc.contributor.author': [ diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts index c69044e907d..e56b7e970a9 100644 --- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts @@ -33,7 +33,7 @@ export class SearchResultListElementComponent, K exten ngOnInit(): void { if (hasValue(this.object)) { this.dso = this.object.indexableObject; - this.dsoTitle = this.firstMetadataValue('dc.title') ?? this.dsoNameService.getName(this.dso); + this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso); } } From 36891ef3bfe685669e924add39ee184c07a612db Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Fri, 30 Dec 2022 10:11:57 +0100 Subject: [PATCH 321/758] 98204: Edit collection assign roles tab breaks when no workflow groups --- .../collection-roles/collection-roles.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts index a6c37cbc452..68bdf7b5614 100644 --- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts @@ -62,7 +62,7 @@ export class CollectionRolesComponent implements OnInit { name: 'bitstream_read', href: collection._links.bitstreamReadGroup.href, }, - ...collection._links.workflowGroups, + ...(collection._links.workflowGroups ? collection._links.workflowGroups : []), ]), ); } From ef9373baec155a16cef6df7a6b04f7fc8570b288 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 10 Jan 2023 17:56:32 +0100 Subject: [PATCH 322/758] 98376: Fixed collection-roles page for collections with single workflowGroup --- .../collection-roles.component.ts | 45 +++++++++++-------- src/assets/i18n/en.json5 | 5 +++ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts index 68bdf7b5614..0177cc3a386 100644 --- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts +++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts @@ -6,6 +6,7 @@ import { RemoteData } from '../../../core/data/remote-data'; import { Collection } from '../../../core/shared/collection.model'; import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { HALLink } from '../../../core/shared/hal-link.model'; +import { hasValue } from '../../../shared/empty.util'; /** * Component for managing a collection's roles @@ -45,25 +46,31 @@ export class CollectionRolesComponent implements OnInit { ); this.comcolRoles$ = this.collection$.pipe( - map((collection) => [ - { - name: 'collection-admin', - href: collection._links.adminGroup.href, - }, - { - name: 'submitters', - href: collection._links.submittersGroup.href, - }, - { - name: 'item_read', - href: collection._links.itemReadGroup.href, - }, - { - name: 'bitstream_read', - href: collection._links.bitstreamReadGroup.href, - }, - ...(collection._links.workflowGroups ? collection._links.workflowGroups : []), - ]), + map((collection) => { + let workflowGroups: HALLink[] | HALLink = hasValue(collection._links.workflowGroups) ? collection._links.workflowGroups : []; + if (!Array.isArray(workflowGroups)) { + workflowGroups = [workflowGroups]; + } + return [ + { + name: 'collection-admin', + href: collection._links.adminGroup.href, + }, + { + name: 'submitters', + href: collection._links.submittersGroup.href, + }, + { + name: 'item_read', + href: collection._links.itemReadGroup.href, + }, + { + name: 'bitstream_read', + href: collection._links.bitstreamReadGroup.href, + }, + ...workflowGroups, + ]; + }), ); } } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6addb5a81ba..97af59d1594 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1179,6 +1179,11 @@ "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.scorereviewers.name": "Score Reviewers", + + "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.", + + "community.form.abstract": "Short Description", From 5660e7dc701a575cb0f4df5c732d6ce1ee92bb06 Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Wed, 11 Jan 2023 02:46:20 +0530 Subject: [PATCH 323/758] [CST-7604] test cases update --- src/app/shared/mocks/dso-name.service.mock.ts | 14 +- ...arch-result-grid-element.component.spec.ts | 136 ++++++++++++++++- ...arch-result-list-element.component.spec.ts | 139 +++++++++++++++++- 3 files changed, 282 insertions(+), 7 deletions(-) diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts index 1e3280ce8df..cf3cf5466b2 100644 --- a/src/app/shared/mocks/dso-name.service.mock.ts +++ b/src/app/shared/mocks/dso-name.service.mock.ts @@ -9,11 +9,19 @@ export class DSONameServiceMock { public getHitHighlights(object: any, dso: DSpaceObject) { if (object.hitHighlights && object.hitHighlights['dc.title']) { - return object.hitHighlights['dc.title'][0]; + return object.hitHighlights['dc.title'][0].value; } else if (object.hitHighlights && object.hitHighlights['organization.legalName']) { - return object.hitHighlights['organization.legalName'][0]; + return object.hitHighlights['organization.legalName'][0].value; } else if (object.hitHighlights && (object.hitHighlights['person.familyName'] || object.hitHighlights['person.givenName'])) { - return `${object.hitHighlights['person.familyName'][0] || ''}, ${object.hitHighlights['person.givenName'][0] || ''}`; + if (object.hitHighlights['person.familyName'] && object.hitHighlights['person.givenName']) { + return `${object.hitHighlights['person.familyName'][0].value}, ${object.hitHighlights['person.givenName'][0].value}`; + } + if (object.hitHighlights['person.familyName']) { + return `${object.hitHighlights['person.familyName'][0].value}`; + } + if (object.hitHighlights['person.givenName']) { + return `${object.hitHighlights['person.givenName'][0].value}`; + } } return UNDEFINED_NAME; } diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts index f25937df342..dc42b033d84 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts @@ -31,7 +31,9 @@ mockItemWithMetadata.hitHighlights = {}; const dcTitle = 'This is just another title'; mockItemWithMetadata.indexableObject = Object.assign(new Item(), { hitHighlights: { - 'dc.title': [dcTitle], + 'dc.title': [{ + value: dcTitle + }], }, bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), metadata: { @@ -61,6 +63,114 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), { ] } }); +const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), { + hitHighlights: { + 'person.familyName': [{ + value: 'Michel' + }], + }, + indexableObject: + Object.assign(new Item(), { + bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), + entityType: 'Person', + metadata: { + 'dc.title': [ + { + language: 'en_US', + value: 'This is just another title' + } + ], + 'dc.contributor.author': [ + { + language: 'en_US', + value: 'Smith, Donald' + } + ], + 'dc.publisher': [ + { + language: 'en_US', + value: 'a publisher' + } + ], + 'dc.date.issued': [ + { + language: 'en_US', + value: '2015-06-26' + } + ], + 'dc.description.abstract': [ + { + language: 'en_US', + value: 'This is the abstract' + } + ], + 'dspace.entity.type': [ + { + value: 'Person' + } + ], + 'person.familyName': [ + { + value: 'Michel' + } + ] + } + }) +}); +const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), { + hitHighlights: { + 'organization.legalName': [{ + value: 'Science' + }], + }, + indexableObject: + Object.assign(new Item(), { + bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])), + entityType: 'OrgUnit', + metadata: { + 'dc.title': [ + { + language: 'en_US', + value: 'This is just another title' + } + ], + 'dc.contributor.author': [ + { + language: 'en_US', + value: 'Smith, Donald' + } + ], + 'dc.publisher': [ + { + language: 'en_US', + value: 'a publisher' + } + ], + 'dc.date.issued': [ + { + language: 'en_US', + value: '2015-06-26' + } + ], + 'dc.description.abstract': [ + { + language: 'en_US', + value: 'This is the abstract' + } + ], + 'organization.legalName': [ + { + value: 'Science' + } + ], + 'dspace.entity.type': [ + { + value: 'OrgUnit' + } + ] + } + }) +}); const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult(); mockItemWithoutMetadata.hitHighlights = {}; @@ -169,6 +279,30 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet expect(titleField.nativeNode.innerHTML).toEqual(dcTitle); }); }); + + describe('When the item is Person and has title', () => { + beforeEach(() => { + comp.object = mockPerson; + fixture.detectChanges(); + }); + + it('should show highlighted title', () => { + const titleField = fixture.debugElement.query(By.css('.card-title')); + expect(titleField.nativeNode.innerHTML).toEqual('Michel'); + }); + }); + + describe('When the item is orgUnit and has title', () => { + beforeEach(() => { + comp.object = mockOrgUnit; + fixture.detectChanges(); + }); + + it('should show highlighted title', () => { + const titleField = fixture.debugElement.query(By.css('.card-title')); + expect(titleField.nativeNode.innerHTML).toEqual('Science'); + }); + }); }); }; } diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index 0d7c2cbc587..7665b7d64e3 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -16,7 +16,9 @@ let fixture: ComponentFixture; const dcTitle = 'This is just another title'; const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), { hitHighlights: { - 'dc.title': [dcTitle], + 'dc.title': [{ + value: dcTitle + }], }, indexableObject: Object.assign(new Item(), { @@ -25,7 +27,7 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul 'dc.title': [ { language: 'en_US', - value: 'This is just another title' + value: dcTitle } ], 'dc.contributor.author': [ @@ -62,7 +64,114 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(new ItemSearchRe metadata: {} }) }); - +const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), { + hitHighlights: { + 'person.familyName': [{ + value: 'Michel' + }], + }, + indexableObject: + Object.assign(new Item(), { + bundles: observableOf({}), + entityType: 'Person', + metadata: { + 'dc.title': [ + { + language: 'en_US', + value: 'This is just another title' + } + ], + 'dc.contributor.author': [ + { + language: 'en_US', + value: 'Smith, Donald' + } + ], + 'dc.publisher': [ + { + language: 'en_US', + value: 'a publisher' + } + ], + 'dc.date.issued': [ + { + language: 'en_US', + value: '2015-06-26' + } + ], + 'dc.description.abstract': [ + { + language: 'en_US', + value: 'This is the abstract' + } + ], + 'person.familyName': [ + { + value: 'Michel' + } + ], + 'dspace.entity.type': [ + { + value: 'Person' + } + ] + } + }) +}); +const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), { + hitHighlights: { + 'organization.legalName': [{ + value: 'Science' + }], + }, + indexableObject: + Object.assign(new Item(), { + bundles: observableOf({}), + entityType: 'OrgUnit', + metadata: { + 'dc.title': [ + { + language: 'en_US', + value: 'This is just another title' + } + ], + 'dc.contributor.author': [ + { + language: 'en_US', + value: 'Smith, Donald' + } + ], + 'dc.publisher': [ + { + language: 'en_US', + value: 'a publisher' + } + ], + 'dc.date.issued': [ + { + language: 'en_US', + value: '2015-06-26' + } + ], + 'dc.description.abstract': [ + { + language: 'en_US', + value: 'This is the abstract' + } + ], + 'organization.legalName': [ + { + value: 'Science' + } + ], + 'dspace.entity.type': [ + { + value: 'OrgUnit' + } + ] + } + }) +}); const environmentUseThumbs = { browseBy: { showThumbnails: true @@ -220,6 +329,30 @@ describe('ItemSearchResultListElementComponent', () => { }); }); + describe('When the item is Person and has title', () => { + beforeEach(() => { + publicationListElementComponent.object = mockPerson; + fixture.detectChanges(); + }); + + it('should show highlighted title', () => { + const titleField = fixture.debugElement.query(By.css('.item-list-title')); + expect(titleField.nativeNode.innerHTML).toEqual('Michel'); + }); + }); + + describe('When the item is orgUnit and has title', () => { + beforeEach(() => { + publicationListElementComponent.object = mockOrgUnit; + fixture.detectChanges(); + }); + + it('should show highlighted title', () => { + const titleField = fixture.debugElement.query(By.css('.item-list-title')); + expect(titleField.nativeNode.innerHTML).toEqual('Science'); + }); + }); + describe('When the item has no title', () => { beforeEach(() => { publicationListElementComponent.object = mockItemWithoutMetadata; From 7cee2aac6f277989c5ed0ce8425b27665d07a7e0 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Tue, 10 Jan 2023 18:59:06 +0100 Subject: [PATCH 324/758] 98376: Added rating button to ratingreviewaction claimed task and created page --- package.json | 1 + ...claimed-task-action-rating.component.html} | 2 +- ...claimed-task-action-rating.component.scss} | 0 ...imed-task-action-rating.component.spec.ts} | 20 +++--- ...d-claimed-task-action-rating.component.ts} | 19 +++--- src/app/shared/shared.module.ts | 8 +-- ...flow-action-rating-reviewer.component.html | 1 - ...rkflow-action-rating-reviewer.component.ts | 15 ----- ...nced-workflow-action-rating.component.html | 44 +++++++++++++ ...ced-workflow-action-rating.component.scss} | 0 ...-workflow-action-rating.component.spec.ts} | 31 +++++++-- ...vanced-workflow-action-rating.component.ts | 66 +++++++++++++++++++ .../advanced-workflow-action.component.ts | 2 +- .../workflowitems-edit-page.module.ts | 40 +++++++---- src/assets/i18n/en.json5 | 30 ++++++++- yarn.lock | 7 ++ 16 files changed, 220 insertions(+), 66 deletions(-) rename src/app/shared/mydspace-actions/claimed-task/{rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html => rating/advanced-claimed-task-action-rating.component.html} (66%) rename src/app/shared/mydspace-actions/claimed-task/{rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.scss => rating/advanced-claimed-task-action-rating.component.scss} (100%) rename src/app/shared/mydspace-actions/claimed-task/{rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts => rating/advanced-claimed-task-action-rating.component.spec.ts} (83%) rename src/app/shared/mydspace-actions/claimed-task/{rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts => rating/advanced-claimed-task-action-rating.component.ts} (62%) delete mode 100644 src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.html delete mode 100644 src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.ts create mode 100644 src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html rename src/app/workflowitems-edit-page/advanced-workflow-action/{advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.scss => advanced-workflow-action-rating/advanced-workflow-action-rating.component.scss} (100%) rename src/app/workflowitems-edit-page/advanced-workflow-action/{advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.spec.ts => advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts} (72%) create mode 100644 src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts diff --git a/package.json b/package.json index 278afdf6c38..71b744fe77b 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "ng-mocks": "11.11.2", "ng2-file-upload": "1.4.0", "ng2-nouislider": "^1.8.3", + "ngx-bootstrap": "7.1.2", "ngx-infinite-scroll": "^10.0.1", "ngx-moment": "^5.0.0", "ngx-pagination": "5.0.0", diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html similarity index 66% rename from src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html rename to src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html index 856b585fb32..5b63aa381e7 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.html +++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html @@ -1,4 +1,4 @@ diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.scss b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.scss similarity index 100% rename from src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.scss rename to src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.scss diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts similarity index 83% rename from src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts rename to src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts index 563af2810e2..c192a68aa78 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.spec.ts +++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts @@ -1,7 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { - AdvancedClaimedTaskActionRatingReviewerComponent -} from './advanced-claimed-task-action-rating-reviewer.component'; +import { AdvancedClaimedTaskActionRatingComponent } from './advanced-claimed-task-action-rating.component'; import { By } from '@angular/platform-browser'; import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub'; @@ -17,23 +15,23 @@ import { Location } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { - ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER -} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component'; + ADVANCED_WORKFLOW_ACTION_RATING +} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component'; import { of as observableOf } from 'rxjs'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; const taskId = 'claimed-task-1'; const workflowId = 'workflow-1'; -describe('AdvancedClaimedTaskActionRatingReviewerComponent', () => { +describe('AdvancedClaimedTaskActionRatingComponent', () => { const object = Object.assign(new ClaimedTask(), { id: taskId, workflowitem: observableOf(Object.assign(new WorkflowItem(), { id: workflowId, })), }); - let component: AdvancedClaimedTaskActionRatingReviewerComponent; - let fixture: ComponentFixture; + let component: AdvancedClaimedTaskActionRatingComponent; + let fixture: ComponentFixture; let claimedTaskDataService: ClaimedTaskDataServiceStub; let notificationService: NotificationsServiceStub; @@ -51,7 +49,7 @@ describe('AdvancedClaimedTaskActionRatingReviewerComponent', () => { TranslateModule.forRoot(), ], declarations: [ - AdvancedClaimedTaskActionRatingReviewerComponent, + AdvancedClaimedTaskActionRatingComponent, ], providers: [ { provide: ClaimedTaskDataService, useValue: claimedTaskDataService }, @@ -66,7 +64,7 @@ describe('AdvancedClaimedTaskActionRatingReviewerComponent', () => { }); beforeEach(() => { - fixture = TestBed.createComponent(AdvancedClaimedTaskActionRatingReviewerComponent); + fixture = TestBed.createComponent(AdvancedClaimedTaskActionRatingComponent); component = fixture.componentInstance; component.object = object; fixture.detectChanges(); @@ -88,7 +86,7 @@ describe('AdvancedClaimedTaskActionRatingReviewerComponent', () => { expect(router.navigate).toHaveBeenCalledWith([`/workflowitems/${workflowId}/advanced`], { queryParams: { - workflow: ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER, + workflow: ADVANCED_WORKFLOW_ACTION_RATING, claimedTask: taskId, }, }); diff --git a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts similarity index 62% rename from src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts rename to src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts index 20fe58c80ec..2c2983c25c6 100644 --- a/src/app/shared/mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts @@ -8,24 +8,25 @@ import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component'; import { - ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER -} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component'; - -export const WORKFLOW_ADVANCED_TASK_OPTION_RATING_REVIEWER = 'submit_rating_reviewer'; + ADVANCED_WORKFLOW_ACTION_RATING, + WORKFLOW_ADVANCED_TASK_OPTION_RATING, +} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component'; +import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator'; +@rendersWorkflowTaskOption(WORKFLOW_ADVANCED_TASK_OPTION_RATING) @Component({ selector: 'ds-advanced-claimed-task-action-rating-reviewer', - templateUrl: './advanced-claimed-task-action-rating-reviewer.component.html', - styleUrls: ['./advanced-claimed-task-action-rating-reviewer.component.scss'] + templateUrl: './advanced-claimed-task-action-rating.component.html', + styleUrls: ['./advanced-claimed-task-action-rating.component.scss'] }) -export class AdvancedClaimedTaskActionRatingReviewerComponent extends AdvancedClaimedTaskActionsAbstractComponent { +export class AdvancedClaimedTaskActionRatingComponent extends AdvancedClaimedTaskActionsAbstractComponent { /** * This component represents the advanced select option */ - option = WORKFLOW_ADVANCED_TASK_OPTION_RATING_REVIEWER; + option = WORKFLOW_ADVANCED_TASK_OPTION_RATING; - workflowType = ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER; + workflowType = ADVANCED_WORKFLOW_ACTION_RATING; constructor( protected injector: Injector, diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 1cc0a86115a..d5bb76c2952 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -179,8 +179,8 @@ import { DsSelectComponent } from './ds-select/ds-select.component'; import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component'; import { AdvancedClaimedTaskActionSelectReviewerComponent } from './mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component'; import { - AdvancedClaimedTaskActionRatingReviewerComponent -} from './mydspace-actions/claimed-task/rating-reviewer/advanced-claimed-task-action-rating-reviewer.component'; + AdvancedClaimedTaskActionRatingComponent +} from './mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component'; import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component'; const MODULES = [ @@ -353,7 +353,7 @@ const COMPONENTS = [ SearchNavbarComponent, ScopeSelectorModalComponent, AdvancedClaimedTaskActionSelectReviewerComponent, - AdvancedClaimedTaskActionRatingReviewerComponent, + AdvancedClaimedTaskActionRatingComponent, ]; const ENTRY_COMPONENTS = [ @@ -412,7 +412,7 @@ const ENTRY_COMPONENTS = [ TextMenuItemComponent, ScopeSelectorModalComponent, AdvancedClaimedTaskActionSelectReviewerComponent, - AdvancedClaimedTaskActionRatingReviewerComponent, + AdvancedClaimedTaskActionRatingComponent, ]; const SHARED_ITEM_PAGE_COMPONENTS = [ diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.html deleted file mode 100644 index 1b26ba35996..00000000000 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.html +++ /dev/null @@ -1 +0,0 @@ -

    advanced-workflow-action-rating-reviewer works!

    diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.ts deleted file mode 100644 index 4e0185401df..00000000000 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; -import { - rendersAdvancedWorkflowTaskOption -} from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator'; - -export const ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER = 'ratingrevieweraction'; - -@rendersAdvancedWorkflowTaskOption(ADVANCED_WORKFLOW_ACTION_RATING_REVIEWER) -@Component({ - selector: 'ds-advanced-workflow-action-rating-reviewer', - templateUrl: './advanced-workflow-action-rating-reviewer.component.html', - styleUrls: ['./advanced-workflow-action-rating-reviewer.component.scss'] -}) -export class AdvancedWorkflowActionRatingReviewerComponent { -} diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html new file mode 100644 index 00000000000..c74006550c8 --- /dev/null +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html @@ -0,0 +1,44 @@ +
    +

    + {{ 'advanced-workflow-action.rating.description-requiredDescription' | translate }} +

    +

    + {{ 'advanced-workflow-action.rating.description' | translate }} +

    + +
    +
    + + + + {{ 'advanced-workflow-action.rating.form.review.error' | translate }} + +
    + +
    + + + +
    +
    + + + + +
    + + +
    +
    diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.scss b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.scss similarity index 100% rename from src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.scss rename to src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.scss diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts similarity index 72% rename from src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.spec.ts rename to src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts index 244e397303d..a75d4e30a26 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AdvancedWorkflowActionRatingReviewerComponent } from './advanced-workflow-action-rating-reviewer.component'; -import { ActivatedRoute, convertToParamMap } from '@angular/router'; +import { AdvancedWorkflowActionRatingComponent } from './advanced-workflow-action-rating.component'; +import { ActivatedRoute, convertToParamMap, Router } from '@angular/router'; import { of as observableOf } from 'rxjs'; import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; @@ -12,12 +12,17 @@ import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub'; import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub'; +import { RouterStub } from '../../../shared/testing/router.stub'; +import { TranslateModule } from '@ngx-translate/core'; +import { VarDirective } from '../../../shared/utils/var.directive'; +import { RatingModule } from 'ngx-bootstrap/rating'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; const workflowId = '1'; -describe('AdvancedWorkflowActionRatingReviewerComponent', () => { - let component: AdvancedWorkflowActionRatingReviewerComponent; - let fixture: ComponentFixture; +describe('AdvancedWorkflowActionRatingComponent', () => { + let component: AdvancedWorkflowActionRatingComponent; + let fixture: ComponentFixture; let claimedTaskDataService: ClaimedTaskDataServiceStub; let notificationService: NotificationsServiceStub; @@ -31,8 +36,15 @@ describe('AdvancedWorkflowActionRatingReviewerComponent', () => { workflowItemDataService = new WorkflowItemDataServiceStub(); await TestBed.configureTestingModule({ + imports: [ + FormsModule, + RatingModule, + ReactiveFormsModule, + TranslateModule.forRoot(), + ], declarations: [ - AdvancedWorkflowActionRatingReviewerComponent, + AdvancedWorkflowActionRatingComponent, + VarDirective, ], providers: [ { @@ -51,6 +63,7 @@ describe('AdvancedWorkflowActionRatingReviewerComponent', () => { { provide: ClaimedTaskDataService, useValue: claimedTaskDataService }, { provide: NotificationsService, useValue: notificationService }, { provide: RouteService, useValue: routeServiceStub }, + { provide: Router, useValue: new RouterStub() }, { provide: WorkflowActionDataService, useValue: workflowActionDataService }, { provide: WorkflowItemDataService, useValue: workflowItemDataService }, ], @@ -58,11 +71,15 @@ describe('AdvancedWorkflowActionRatingReviewerComponent', () => { }); beforeEach(() => { - fixture = TestBed.createComponent(AdvancedWorkflowActionRatingReviewerComponent); + fixture = TestBed.createComponent(AdvancedWorkflowActionRatingComponent); component = fixture.componentInstance; fixture.detectChanges(); }); + afterEach(() => { + fixture.debugElement.nativeElement.remove(); + }); + it('should create', () => { expect(component).toBeTruthy(); }); diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts new file mode 100644 index 00000000000..c669cfcfe9e --- /dev/null +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts @@ -0,0 +1,66 @@ +import { Component, OnInit } from '@angular/core'; +import { + rendersAdvancedWorkflowTaskOption +} from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator'; +import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component'; +import { FormGroup, FormControl } from '@angular/forms'; +import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model'; +import { + RatingReviewerActionAdvancedInfo +} from '../../../core/tasks/models/rating-reviewer-action-advanced-info.model'; + +export const WORKFLOW_ADVANCED_TASK_OPTION_RATING = 'rating'; +export const ADVANCED_WORKFLOW_ACTION_RATING = 'ratingreviewaction'; + +@rendersAdvancedWorkflowTaskOption(ADVANCED_WORKFLOW_ACTION_RATING) +@Component({ + selector: 'ds-advanced-workflow-action-rating-reviewer', + templateUrl: './advanced-workflow-action-rating.component.html', + styleUrls: ['./advanced-workflow-action-rating.component.scss'], + preserveWhitespaces: false, +}) +export class AdvancedWorkflowActionRatingComponent extends AdvancedWorkflowActionComponent implements OnInit { + + ratingForm: FormGroup; + + ngOnInit() { + super.ngOnInit(); + this.ratingForm = new FormGroup({ + review: new FormControl(''), + rating: new FormControl(0), + }); + } + + /** + * Only run **performAction()** when the form has been correctly filled in + */ + performAction(): void { + this.ratingForm.updateValueAndValidity(); + if (this.ratingForm.valid) { + super.performAction(); + } else { + this.ratingForm.markAllAsTouched(); + } + } + + createBody(): any { + const body = { + [WORKFLOW_ADVANCED_TASK_OPTION_RATING]: true, + score: this.ratingForm.get('rating').value, + }; + if (this.ratingForm.get('review').value !== '') { + const description: string = this.ratingForm.get('review').value; + Object.assign(body, { description }); + } + return body; + } + + getType(): string { + return ADVANCED_WORKFLOW_ACTION_RATING; + } + + getAdvancedInfo(workflowAction: WorkflowAction | null): RatingReviewerActionAdvancedInfo | null { + return workflowAction ? (workflowAction.advancedInfo[0] as RatingReviewerActionAdvancedInfo) : null; + } + +} diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts index f40cde6fa68..256a4d89151 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts @@ -44,7 +44,7 @@ export abstract class AdvancedWorkflowActionComponent extends WorkflowItemAction /** * Performs the action and shows a notification based on the outcome of the action */ - performAction() { + performAction(): void { this.sendRequest(this.route.snapshot.queryParams.claimedTask).subscribe((successful: boolean) => { if (successful) { const title = this.translationService.get('workflow-item.' + this.type + '.notification.success.title'); diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts index 080ca964689..dc60bd7d2b8 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts @@ -6,15 +6,23 @@ import { SubmissionModule } from '../submission/submission.module'; import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-item-delete.component'; import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component'; import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component'; -import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component'; +import { + ThemedWorkflowItemSendBackComponent +} from './workflow-item-send-back/themed-workflow-item-send-back.component'; import { StatisticsModule } from '../statistics/statistics.module'; import { ItemPageModule } from '../item-page/item-page.module'; import { AdvancedWorkflowActionsLoaderComponent } from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component'; -import { AdvancedWorkflowActionRatingReviewerComponent } from './advanced-workflow-action/advanced-workflow-action-rating-reviewer/advanced-workflow-action-rating-reviewer.component'; -import { AdvancedWorkflowActionSelectReviewerComponent } from './advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; -import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component'; +import { + AdvancedWorkflowActionRatingComponent +} from './advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component'; +import { + AdvancedWorkflowActionSelectReviewerComponent +} from './advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component'; +import { + AdvancedWorkflowActionPageComponent +} from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component'; import { AdvancedClaimedTaskActionsDirective } from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-claimed-task-actions.directive'; @@ -22,24 +30,28 @@ import { AccessControlModule } from '../access-control/access-control.module'; import { ReviewersListComponent } from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component'; +import { FormModule } from '../shared/form/form.module'; +import { RatingModule } from 'ngx-bootstrap/rating'; @NgModule({ - imports: [ - WorkflowItemsEditPageRoutingModule, - CommonModule, - SharedModule, - SubmissionModule, - StatisticsModule, - ItemPageModule, - AccessControlModule - ], + imports: [ + WorkflowItemsEditPageRoutingModule, + CommonModule, + SharedModule, + SubmissionModule, + StatisticsModule, + ItemPageModule, + AccessControlModule, + FormModule, + RatingModule, + ], declarations: [ WorkflowItemDeleteComponent, ThemedWorkflowItemDeleteComponent, WorkflowItemSendBackComponent, ThemedWorkflowItemSendBackComponent, AdvancedWorkflowActionsLoaderComponent, - AdvancedWorkflowActionRatingReviewerComponent, + AdvancedWorkflowActionRatingComponent, AdvancedWorkflowActionSelectReviewerComponent, AdvancedWorkflowActionPageComponent, AdvancedClaimedTaskActionsDirective, diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 97af59d1594..57f93ee9061 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -539,6 +539,17 @@ "admin.metadata-import.page.error.addFile": "Select file first!", + "advanced-workflow-action.rating.form.rating.label": "Rating", + + "advanced-workflow-action.rating.form.review.label": "Review", + + "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating", + + "advanced-workflow-action.rating.description": "Please select a rating below", + + "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review", + + "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting", "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting", @@ -4061,9 +4072,9 @@ "submission.workflow.generic.submit_select_reviewer-help": "", - "submission.workflow.generic.submit_rating_reviewer": "Rating Reviewer", + "submission.workflow.generic.rating": "Rate", - "submission.workflow.generic.submit_rating_reviewer-help": "", + "submission.workflow.generic.rating-help": "", "submission.workflow.tasks.claimed.approve": "Approve", @@ -4241,8 +4252,21 @@ "workflow-item.selectrevieweraction.button.confirm": "Confirm", - "workflow-item.ratingrevieweraction.header": "Rating Reviewer", + "workflow-item.ratingreviewaction.notification.success.title": "Rating review", + + "workflow-item.ratingreviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", + + "workflow-item.ratingreviewaction.notification.error.title": "Something went wrong", + + "workflow-item.ratingreviewaction.notification.error.content": "Couldn't rate this item", + + "workflow-item.ratingreviewaction.title": "Rate this item", + + "workflow-item.ratingreviewaction.header": "Rate this item", + + "workflow-item.ratingreviewaction.button.cancel": "Cancel", + "workflow-item.ratingreviewaction.button.confirm": "Confirm", "idle-modal.header": "Session will expire soon", diff --git a/yarn.lock b/yarn.lock index 0f8ef0a6e60..555bce24ff4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9357,6 +9357,13 @@ ng2-nouislider@^1.8.3: resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.8.3.tgz#c9c1ec77b6b5a909f87368ba799914208baa13a6" integrity sha512-Vl8tHCcJ/ioJLAs2t6FBC35sZq1P/O5ZdqdFwYxOCOMVbILGWNg+2gWZIjFstvv9pqb/mVvVUYe6qGG/mA/RBQ== +ngx-bootstrap@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-7.1.2.tgz#cf06a05cc22a74b882b45882a1f64f72ddece23d" + integrity sha512-VsZwlGVM+qYOAdvEzzH3wqCjvj3yHec4n82Tho0ve6mhN1GTRu9WPrPmvxp3cFjIu8VQbREUeKPfK0ooO8U5eg== + dependencies: + tslib "^2.0.0" + ngx-infinite-scroll@^10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-10.0.1.tgz#6f51f2f8775a7c50d1dd8bad125d4e748abbe880" From 6396e6a585b964d3c8ce0f111c9a7be3512be797 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Wed, 11 Jan 2023 12:33:26 -0600 Subject: [PATCH 325/758] Add DataCite to i18n list of sources --- 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 d043d61ae5d..d2bd425df04 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3836,6 +3836,8 @@ "submission.import-external.source.crossref": "CrossRef", + "submission.import-external.source.datacite": "DataCite", + "submission.import-external.source.scielo": "SciELO", "submission.import-external.source.scopus": "Scopus", From 11b6ec9a9e86f2b39a1fd6b588681b483f879e5a Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 11 Jan 2023 20:28:54 +0100 Subject: [PATCH 326/758] 98376: Replaced EPersonListComponent with MembersListComponent & display error for empty reviewers list --- .../access-control/access-control.module.ts | 4 +- .../eperson-list/eperson-list.component.html | 146 ------- .../eperson-list.component.spec.ts | 247 ------------ .../eperson-list/eperson-list.component.ts | 358 ------------------ .../members-list/members-list.component.html | 29 +- .../members-list/members-list.component.ts | 131 ++++--- .../modify-item-overview.component.html | 2 +- ...flow-action-select-reviewer.component.html | 5 +- ...rkflow-action-select-reviewer.component.ts | 13 +- .../reviewers-list.component.ts | 11 +- src/assets/i18n/en.json5 | 2 + 11 files changed, 123 insertions(+), 825 deletions(-) delete mode 100644 src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.html delete mode 100644 src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts delete mode 100644 src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts index 2c9932d3870..99aaaaf133d 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'; import { FormModule } from '../shared/form/form.module'; -import { EPersonListComponent } from './group-registry/group-form/eperson-list/eperson-list.component'; @NgModule({ imports: [ @@ -21,7 +20,7 @@ import { EPersonListComponent } from './group-registry/group-form/eperson-list/e FormModule, ], exports: [ - EPersonListComponent, + MembersListComponent, ], declarations: [ EPeopleRegistryComponent, @@ -30,7 +29,6 @@ import { EPersonListComponent } from './group-registry/group-form/eperson-list/e GroupFormComponent, SubgroupsListComponent, MembersListComponent, - EPersonListComponent, ], }) /** diff --git a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.html b/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.html deleted file mode 100644 index e4a507ae19c..00000000000 --- a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.html +++ /dev/null @@ -1,146 +0,0 @@ - -

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

    - - -
    -
    - -
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - -
    - - - - - - - - - - - - - - - - - -
    {{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
    {{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 + '.headMembers' | translate}}

    - - - -
    - - - - - - - - - - - - - - - - - -
    {{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
    {{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 : '-' }} -     		-
    - - -
    -
    -
    - -     - - - -     diff --git a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts b/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts deleted file mode 100644 index 8077139026d..00000000000 --- a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts +++ /dev/null @@ -1,247 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ComponentFixture, fakeAsync, flush, inject, TestBed, tick, waitForAsync } from '@angular/core/testing'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { BrowserModule, By } from '@angular/platform-browser'; -import { Router } from '@angular/router'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; -import { Observable, of as observableOf } from 'rxjs'; -import { RestResponse } from '../../../../core/cache/response.models'; -import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { PageInfo } from '../../../../core/shared/page-info.model'; -import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock'; -import { EPersonListComponent } from './eperson-list.component'; -import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock'; -import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; -import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; -import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock'; -import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock'; -import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub'; -import { RouterMock } from '../../../../shared/mocks/router.mock'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; - -describe('EPersonListComponent', () => { - let component: EPersonListComponent; - let fixture: ComponentFixture; - let translateService: TranslateService; - let builderService: FormBuilderService; - let ePersonDataServiceStub: any; - let groupsDataServiceStub: any; - let activeGroup; - let allEPersons; - let allGroups; - let epersonMembers; - let subgroupMembers; - let paginationService; - - beforeEach(waitForAsync(() => { - activeGroup = GroupMock; - epersonMembers = [EPersonMock2]; - subgroupMembers = [GroupMock2]; - allEPersons = [EPersonMock, EPersonMock2]; - allGroups = [GroupMock, GroupMock2]; - ePersonDataServiceStub = { - activeGroup: activeGroup, - epersonMembers: epersonMembers, - subgroupMembers: subgroupMembers, - findAllByHref(href: string): Observable>> { - return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), groupsDataServiceStub.getEPersonMembers())); - }, - searchByScope(scope: string, query: string): Observable>> { - if (query === '') { - return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), allEPersons)); - } - return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])); - }, - clearEPersonRequests() { - // empty - }, - clearLinkRequests() { - // empty - }, - getEPeoplePageRouterLink(): string { - return '/access-control/epeople'; - } - }; - groupsDataServiceStub = { - activeGroup: activeGroup, - epersonMembers: epersonMembers, - subgroupMembers: subgroupMembers, - allGroups: allGroups, - getActiveGroup(): Observable { - return observableOf(activeGroup); - }, - getEPersonMembers() { - return this.epersonMembers; - }, - searchGroups(query: string): Observable>> { - if (query === '') { - return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), this.allGroups)); - } - return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])); - }, - addMemberToGroup(parentGroup, eperson: EPerson): Observable { - this.epersonMembers = [...this.epersonMembers, eperson]; - return observableOf(new RestResponse(true, 200, 'Success')); - }, - clearGroupsRequests() { - // empty - }, - clearGroupLinkRequests() { - // empty - }, - getGroupEditPageRouterLink(group: Group): string { - return '/access-control/groups/' + group.id; - }, - deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable { - this.epersonMembers = this.epersonMembers.find((eperson: EPerson) => { - if (eperson.id !== epersonToDelete.id) { - return eperson; - } - }); - if (this.epersonMembers === undefined) { - this.epersonMembers = []; - } - return observableOf(new RestResponse(true, 200, 'Success')); - } - }; - builderService = getMockFormBuilderService(); - translateService = getMockTranslateService(); - - paginationService = new PaginationServiceStub(); - TestBed.configureTestingModule({ - imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [EPersonListComponent], - providers: [EPersonListComponent, - { provide: EPersonDataService, useValue: ePersonDataServiceStub }, - { provide: GroupDataService, useValue: groupsDataServiceStub }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() }, - { provide: FormBuilderService, useValue: builderService }, - { provide: Router, useValue: new RouterMock() }, - { provide: PaginationService, useValue: paginationService }, - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EPersonListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - afterEach(fakeAsync(() => { - fixture.destroy(); - flush(); - component = null; - fixture.debugElement.nativeElement.remove(); - })); - - it('should create EpeopleListComponent', inject([EPersonListComponent], (comp: EPersonListComponent) => { - expect(comp).toBeDefined(); - })); - - it('should show list of eperson members of current active group', () => { - const epersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child')); - expect(epersonIdsFound.length).toEqual(1); - epersonMembers.map((eperson: EPerson) => { - expect(epersonIdsFound.find((foundEl) => { - return (foundEl.nativeElement.textContent.trim() === eperson.uuid); - })).toBeTruthy(); - }); - }); - - describe('search', () => { - describe('when searching without query', () => { - let epersonsFound; - beforeEach(fakeAsync(() => { - component.search({ scope: 'metadata', query: '' }); - tick(); - fixture.detectChanges(); - epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr')); - })); - - it('should display all epersons', () => { - expect(epersonsFound.length).toEqual(2); - }); - - describe('if eperson is already a eperson', () => { - it('should have delete button, else it should have add button', () => { - activeGroup.epersons.map((eperson: EPerson) => { - epersonsFound.map((foundEPersonRowElement) => { - if (foundEPersonRowElement.debugElement !== undefined) { - const epersonId = foundEPersonRowElement.debugElement.query(By.css('td:first-child')); - const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus')); - const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt')); - if (epersonId.nativeElement.textContent === eperson.id) { - expect(addButton).toBeUndefined(); - expect(deleteButton).toBeDefined(); - } else { - expect(deleteButton).toBeUndefined(); - expect(addButton).toBeDefined(); - } - } - }); - }); - }); - }); - - describe('if first add button is pressed', () => { - beforeEach(fakeAsync(() => { - const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-plus')); - addButton.nativeElement.click(); - tick(); - fixture.detectChanges(); - })); - it('all groups in search member of selected group', () => { - epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr')); - expect(epersonsFound.length).toEqual(2); - epersonsFound.map((foundEPersonRowElement) => { - if (foundEPersonRowElement.debugElement !== undefined) { - const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus')); - const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt')); - expect(addButton).toBeUndefined(); - expect(deleteButton).toBeDefined(); - } - }); - }); - }); - - describe('if first delete button is pressed', () => { - beforeEach(fakeAsync(() => { - const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-trash-alt')); - addButton.nativeElement.click(); - tick(); - fixture.detectChanges(); - })); - it('first eperson in search delete button, because now member', () => { - epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr')); - epersonsFound.map((foundEPersonRowElement) => { - if (foundEPersonRowElement.debugElement !== undefined) { - const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus')); - const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt')); - expect(deleteButton).toBeUndefined(); - expect(addButton).toBeDefined(); - } - }); - }); - }); - }); - }); - -}); diff --git a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts b/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts deleted file mode 100644 index 9eafe10daaf..00000000000 --- a/src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts +++ /dev/null @@ -1,358 +0,0 @@ -import { Component, OnDestroy, OnInit, Input } from '@angular/core'; -import { FormBuilder } from '@angular/forms'; -import { Router } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; -import { Group } from '../../../../core/eperson/models/group.model'; -import { - getAllCompletedRemoteData, - getFirstSucceededRemoteData, - getRemoteDataPayload, - getFirstCompletedRemoteData -} from '../../../../core/shared/operators'; -import { - BehaviorSubject, - Subscription, - combineLatest as observableCombineLatest, - Observable, - ObservedValueOf, - of as observableOf -} from 'rxjs'; -import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model'; -import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; -import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; -import { switchMap, map, take, mergeMap } from 'rxjs/operators'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; - -/** - * Keys to keep track of specific subscriptions - */ -enum SubKey { - ActiveGroup, - MembersDTO, - SearchResultsDTO, -} - -export interface EPersonActionConfig { - css?: string; - disabled: boolean; - icon: string; -} - -export interface EPersonListActionConfig { - add: EPersonActionConfig; - remove: EPersonActionConfig; -} - -@Component({ - selector: 'ds-eperson-list', - templateUrl: './eperson-list.component.html' -}) -export class EPersonListComponent implements OnInit, OnDestroy { - - @Input() - messagePrefix: string; - - @Input() - actionConfig: EPersonListActionConfig = { - add: { - css: 'btn-outline-primary', - disabled: false, - icon: 'fas fa-plus fa-fw', - }, - remove: { - css: 'btn-outline-danger', - disabled: false, - icon: 'fas fa-trash-alt fa-fw' - }, - }; - - /** - * EPeople being displayed in search result, initially all members, after search result of search - */ - ePeopleSearchDtos: BehaviorSubject> = new BehaviorSubject>(undefined); - /** - * List of EPeople members of currently active group being edited - */ - ePeopleMembersOfGroupDtos: BehaviorSubject> = new BehaviorSubject>(undefined); - - /** - * Pagination config used to display the list of EPeople that are result of EPeople search - */ - configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'sml', - pageSize: 5, - currentPage: 1 - }); - /** - * Pagination config used to display the list of EPerson Membes of active group being edited - */ - config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'ml', - pageSize: 5, - currentPage: 1 - }); - - /** - * Map of active subscriptions - */ - subs: Map = new Map(); - - // The search form - searchForm; - - // Current search in edit group - epeople search form - currentSearchQuery: string; - currentSearchScope: string; - - // Whether or not user has done a EPeople search yet - searchDone: boolean; - - // current active group being edited - groupBeingEdited: Group; - - constructor( - protected groupDataService: GroupDataService, - public ePersonDataService: EPersonDataService, - protected translateService: TranslateService, - protected notificationsService: NotificationsService, - protected formBuilder: FormBuilder, - protected paginationService: PaginationService, - private router: Router - ) { - this.currentSearchQuery = ''; - this.currentSearchScope = 'metadata'; - } - - ngOnInit(): void { - this.searchForm = this.formBuilder.group(({ - scope: 'metadata', - query: '', - })); - this.subs.set(SubKey.ActiveGroup, this.groupDataService.getActiveGroup().subscribe((activeGroup: Group) => { - if (activeGroup != null) { - this.groupBeingEdited = activeGroup; - this.retrieveMembers(this.config.currentPage); - } - })); - } - - /** - * Retrieve the EPersons that are members of the group - * - * @param page the number of the page to retrieve - * @private - */ - retrieveMembers(page: number): void { - this.unsubFrom(SubKey.MembersDTO); - this.subs.set(SubKey.MembersDTO, - this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( - switchMap((currentPagination) => { - return this.ePersonDataService.findAllByHref(this.groupBeingEdited._links.epersons.href, { - currentPage: currentPagination.currentPage, - elementsPerPage: currentPagination.pageSize - } - ); - }), - getAllCompletedRemoteData(), - map((rd: RemoteData) => { - if (rd.hasFailed) { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage })); - } else { - return rd; - } - }), - switchMap((epersonListRD: RemoteData>) => { - const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => { - const dto$: Observable = observableCombineLatest( - this.isMemberOfGroup(member), (isMember: ObservedValueOf>) => { - const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel(); - epersonDtoModel.eperson = member; - epersonDtoModel.memberOfGroup = isMember; - return epersonDtoModel; - }); - return dto$; - })); - return dtos$.pipe(map((dtos: EpersonDtoModel[]) => { - return buildPaginatedList(epersonListRD.payload.pageInfo, dtos); - })); - })) - .subscribe((paginatedListOfDTOs: PaginatedList) => { - this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs); - })); - } - - /** - * Whether the given ePerson is a member of the group currently being edited - * @param possibleMember EPerson that is a possible member (being tested) of the group currently being edited - */ - isMemberOfGroup(possibleMember: EPerson): Observable { - return this.groupDataService.getActiveGroup().pipe(take(1), - mergeMap((group: Group) => { - if (group != null) { - return this.ePersonDataService.findAllByHref(group._links.epersons.href, { - currentPage: 1, - elementsPerPage: 9999 - }, false) - .pipe( - getFirstSucceededRemoteData(), - getRemoteDataPayload(), - map((listEPeopleInGroup: PaginatedList) => listEPeopleInGroup.page.filter((ePersonInList: EPerson) => ePersonInList.id === possibleMember.id)), - map((epeople: EPerson[]) => epeople.length > 0)); - } else { - return observableOf(false); - } - })); - } - - /** - * Unsubscribe from a subscription if it's still subscribed, and remove it from the map of - * active subscriptions - * - * @param key The key of the subscription to unsubscribe from - * @private - */ - protected unsubFrom(key: SubKey) { - if (this.subs.has(key)) { - this.subs.get(key).unsubscribe(); - this.subs.delete(key); - } - } - - /** - * Deletes a given EPerson from the members list of the group currently being edited - * @param ePerson EPerson we want to delete as member from group that is currently being edited - */ - deleteMemberFromGroup(ePerson: EpersonDtoModel) { - this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { - if (activeGroup != null) { - const response = this.groupDataService.deleteMemberFromGroup(activeGroup, ePerson.eperson); - this.showNotifications('deleteMember', response, ePerson.eperson.name, activeGroup); - this.search({ scope: this.currentSearchScope, query: this.currentSearchQuery }); - } else { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup')); - } - }); - } - - /** - * Adds a given EPerson to the members list of the group currently being edited - * @param ePerson EPerson we want to add as member to group that is currently being edited - */ - addMemberToGroup(ePerson: EpersonDtoModel) { - ePerson.memberOfGroup = true; - this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => { - if (activeGroup != null) { - const response = this.groupDataService.addMemberToGroup(activeGroup, ePerson.eperson); - this.showNotifications('addMember', response, ePerson.eperson.name, activeGroup); - } else { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.noActiveGroup')); - } - }); - } - - /** - * Search in the EPeople by name, email or metadata - * @param data Contains scope and query param - */ - search(data: any) { - this.unsubFrom(SubKey.SearchResultsDTO); - this.subs.set(SubKey.SearchResultsDTO, - this.paginationService.getCurrentPagination(this.configSearch.id, this.configSearch).pipe( - switchMap((paginationOptions) => { - - const query: string = data.query; - const scope: string = data.scope; - if (query != null && this.currentSearchQuery !== query && this.groupBeingEdited) { - this.router.navigate([], { - queryParamsHandling: 'merge' - }); - this.currentSearchQuery = query; - this.paginationService.resetPage(this.configSearch.id); - } - if (scope != null && this.currentSearchScope !== scope && this.groupBeingEdited) { - this.router.navigate([], { - queryParamsHandling: 'merge' - }); - this.currentSearchScope = scope; - this.paginationService.resetPage(this.configSearch.id); - } - this.searchDone = true; - - return this.ePersonDataService.searchByScope(this.currentSearchScope, this.currentSearchQuery, { - currentPage: paginationOptions.currentPage, - elementsPerPage: paginationOptions.pageSize - }); - }), - getAllCompletedRemoteData(), - map((rd: RemoteData) => { - if (rd.hasFailed) { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage })); - } else { - return rd; - } - }), - switchMap((epersonListRD: RemoteData>) => { - const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => { - const dto$: Observable = observableCombineLatest( - this.isMemberOfGroup(member), (isMember: ObservedValueOf>) => { - const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel(); - epersonDtoModel.eperson = member; - epersonDtoModel.memberOfGroup = isMember; - return epersonDtoModel; - }); - return dto$; - })); - return dtos$.pipe(map((dtos: EpersonDtoModel[]) => { - return buildPaginatedList(epersonListRD.payload.pageInfo, dtos); - })); - })) - .subscribe((paginatedListOfDTOs: PaginatedList) => { - this.ePeopleSearchDtos.next(paginatedListOfDTOs); - })); - } - - /** - * unsub all subscriptions - */ - ngOnDestroy(): void { - for (const key of this.subs.keys()) { - this.unsubFrom(key); - } - this.paginationService.clearPagination(this.config.id); - this.paginationService.clearPagination(this.configSearch.id); - } - - /** - * Shows a notification based on the success/failure of the request - * @param messageSuffix Suffix for message - * @param response RestResponse observable containing success/failure request - * @param nameObject Object request was about - * @param activeGroup Group currently being edited - */ - showNotifications(messageSuffix: string, response: Observable>, nameObject: string, activeGroup: Group) { - response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData) => { - if (rd.hasSucceeded) { - this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.success.' + messageSuffix, { name: nameObject })); - this.ePersonDataService.clearLinkRequests(activeGroup._links.epersons.href); - } else { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure.' + messageSuffix, { name: nameObject })); - } - }); - } - - /** - * Reset all input-fields to be empty and search all search - */ - clearFormAndResetResult() { - this.searchForm.patchValue({ - query: '', - }); - this.search({ query: '' }); - } - -} 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 e5932edf059..e4a507ae19c 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 @@ -55,18 +55,20 @@

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

    - +
    diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts index 8bc540641e8..bdeb49decd5 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts @@ -1,30 +1,32 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit, Input } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { - Observable, - of as observableOf, - Subscription, - BehaviorSubject, - combineLatest as observableCombineLatest, - ObservedValueOf, -} from 'rxjs'; -import { map, mergeMap, switchMap, take } from 'rxjs/operators'; -import {buildPaginatedList, PaginatedList} from '../../../../core/data/paginated-list.model'; -import { RemoteData } from '../../../../core/data/remote-data'; import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; import { GroupDataService } from '../../../../core/eperson/group-data.service'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { PaginationService } from '../../../../core/pagination/pagination.service'; import { Group } from '../../../../core/eperson/models/group.model'; import { + getAllCompletedRemoteData, getFirstSucceededRemoteData, - getFirstCompletedRemoteData, getAllCompletedRemoteData, getRemoteDataPayload + getRemoteDataPayload, + getFirstCompletedRemoteData } from '../../../../core/shared/operators'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { + BehaviorSubject, + Subscription, + combineLatest as observableCombineLatest, + Observable, + ObservedValueOf, + of as observableOf +} from 'rxjs'; +import { PaginatedList, buildPaginatedList } from '../../../../core/data/paginated-list.model'; +import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; -import {EpersonDtoModel} from '../../../../core/eperson/models/eperson-dto.model'; -import { PaginationService } from '../../../../core/pagination/pagination.service'; +import { switchMap, map, take, mergeMap } from 'rxjs/operators'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; /** * Keys to keep track of specific subscriptions @@ -35,6 +37,17 @@ enum SubKey { SearchResultsDTO, } +export interface EPersonActionConfig { + css?: string; + disabled: boolean; + icon: string; +} + +export interface EPersonListActionConfig { + add: EPersonActionConfig; + remove: EPersonActionConfig; +} + @Component({ selector: 'ds-members-list', templateUrl: './members-list.component.html' @@ -47,6 +60,20 @@ export class MembersListComponent implements OnInit, OnDestroy { @Input() messagePrefix: string; + @Input() + actionConfig: EPersonListActionConfig = { + add: { + css: 'btn-outline-primary', + disabled: false, + icon: 'fas fa-plus fa-fw', + }, + remove: { + css: 'btn-outline-danger', + disabled: false, + icon: 'fas fa-trash-alt fa-fw' + }, + }; + /** * EPeople being displayed in search result, initially all members, after search result of search */ @@ -91,23 +118,20 @@ export class MembersListComponent implements OnInit, OnDestroy { // current active group being edited groupBeingEdited: Group; - paginationSub: Subscription; - - constructor( protected groupDataService: GroupDataService, public ePersonDataService: EPersonDataService, - private translateService: TranslateService, - private notificationsService: NotificationsService, + protected translateService: TranslateService, + protected notificationsService: NotificationsService, protected formBuilder: FormBuilder, - private paginationService: PaginationService, + protected paginationService: PaginationService, private router: Router ) { this.currentSearchQuery = ''; this.currentSearchScope = 'metadata'; } - ngOnInit() { + ngOnInit(): void { this.searchForm = this.formBuilder.group(({ scope: 'metadata', query: '', @@ -126,7 +150,7 @@ export class MembersListComponent implements OnInit, OnDestroy { * @param page the number of the page to retrieve * @private */ - protected retrieveMembers(page: number) { + retrieveMembers(page: number): void { this.unsubFrom(SubKey.MembersDTO); this.subs.set(SubKey.MembersDTO, this.paginationService.getCurrentPagination(this.config.id, this.config).pipe( @@ -137,36 +161,36 @@ export class MembersListComponent implements OnInit, OnDestroy { } ); }), - getAllCompletedRemoteData(), - map((rd: RemoteData) => { - if (rd.hasFailed) { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', {cause: rd.errorMessage})); - } else { - return rd; - } - }), - switchMap((epersonListRD: RemoteData>) => { - const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => { - const dto$: Observable = observableCombineLatest( - this.isMemberOfGroup(member), (isMember: ObservedValueOf>) => { - const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel(); - epersonDtoModel.eperson = member; - epersonDtoModel.memberOfGroup = isMember; - return epersonDtoModel; - }); - return dto$; - })); - return dtos$.pipe(map((dtos: EpersonDtoModel[]) => { - return buildPaginatedList(epersonListRD.payload.pageInfo, dtos); + getAllCompletedRemoteData(), + map((rd: RemoteData) => { + if (rd.hasFailed) { + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage })); + } else { + return rd; + } + }), + switchMap((epersonListRD: RemoteData>) => { + const dtos$ = observableCombineLatest(...epersonListRD.payload.page.map((member: EPerson) => { + const dto$: Observable = observableCombineLatest( + this.isMemberOfGroup(member), (isMember: ObservedValueOf>) => { + const epersonDtoModel: EpersonDtoModel = new EpersonDtoModel(); + epersonDtoModel.eperson = member; + epersonDtoModel.memberOfGroup = isMember; + return epersonDtoModel; + }); + return dto$; + })); + return dtos$.pipe(map((dtos: EpersonDtoModel[]) => { + return buildPaginatedList(epersonListRD.payload.pageInfo, dtos); + })); + })) + .subscribe((paginatedListOfDTOs: PaginatedList) => { + this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs); })); - })) - .subscribe((paginatedListOfDTOs: PaginatedList) => { - this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs); - })); } /** - * Whether or not the given ePerson is a member of the group currently being edited + * Whether the given ePerson is a member of the group currently being edited * @param possibleMember EPerson that is a possible member (being tested) of the group currently being edited */ isMemberOfGroup(possibleMember: EPerson): Observable { @@ -195,7 +219,7 @@ export class MembersListComponent implements OnInit, OnDestroy { * @param key The key of the subscription to unsubscribe from * @private */ - private unsubFrom(key: SubKey) { + protected unsubFrom(key: SubKey) { if (this.subs.has(key)) { this.subs.get(key).unsubscribe(); this.subs.delete(key); @@ -270,7 +294,7 @@ export class MembersListComponent implements OnInit, OnDestroy { getAllCompletedRemoteData(), map((rd: RemoteData) => { if (rd.hasFailed) { - this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', {cause: rd.errorMessage})); + this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage })); } else { return rd; } @@ -333,4 +357,5 @@ export class MembersListComponent implements OnInit, OnDestroy { }); this.search({ query: '' }); } + } diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html index ce6e01df3df..dbef279d8c7 100644 --- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html +++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html @@ -1,4 +1,4 @@ - +
    diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html index 3009cc07711..d4ac6208116 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html @@ -7,9 +7,12 @@ [groupId]="groupId" [ngClass]="groupId ? 'reviewersListWithGroup' : ''" [multipleReviewers]="multipleReviewers" - (selectedReviewersUpdated)="selectedReviewers = $event" + (selectedReviewersUpdated)="selectedReviewers = $event; displayError = false" messagePrefix="advanced-workflow-action-select-reviewer.groups.form.reviewers-list" > + + {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }} + diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts index d7a885f067c..f766c97f395 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts @@ -9,7 +9,7 @@ import { } from '../../../core/tasks/models/select-reviewer-action-advanced-info.model'; import { EPersonListActionConfig -} from '../../../access-control/group-registry/group-form/eperson-list/eperson-list.component'; +} from '../../../access-control/group-registry/group-form/members-list/members-list.component'; import { Subscription } from 'rxjs'; import { EPerson } from '../../../core/eperson/models/eperson.model'; @@ -38,6 +38,8 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf subs: Subscription[] = []; + displayError = false; + ngOnDestroy(): void { this.subs.forEach((subscription: Subscription) => subscription.unsubscribe()); } @@ -84,6 +86,15 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf return ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER; } + performAction(): void { + if (this.selectedReviewers.length > 0) { + super.performAction(); + } else { + this.displayError = true; + } + console.log(this.displayError); + } + createBody(): any { return { [WORKFLOW_ADVANCED_TASK_OPTION_SELECT_REVIEWER]: true, diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts index 14159450ff9..0cd485e638a 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts @@ -8,15 +8,14 @@ import { NotificationsService } from '../../../../shared/notifications/notificat import { PaginationService } from '../../../../core/pagination/pagination.service'; import { Group } from '../../../../core/eperson/models/group.model'; import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators'; -import { - EPersonListComponent, - EPersonListActionConfig -} from '../../../../access-control/group-registry/group-form/eperson-list/eperson-list.component'; import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; import { EPerson } from '../../../../core/eperson/models/eperson.model'; import { Observable, of as observableOf } from 'rxjs'; import { hasValue } from '../../../../shared/empty.util'; import { PaginatedList } from '../../../../core/data/paginated-list.model'; +import { + MembersListComponent, EPersonListActionConfig +} from '../../../../access-control/group-registry/group-form/members-list/members-list.component'; /** * Keys to keep track of specific subscriptions @@ -30,9 +29,9 @@ enum SubKey { @Component({ selector: 'ds-reviewers-list', // templateUrl: './reviewers-list.component.html', - templateUrl: '../../../../access-control/group-registry/group-form/eperson-list/eperson-list.component.html', + templateUrl: '../../../../access-control/group-registry/group-form/members-list/members-list.component.html', }) -export class ReviewersListComponent extends EPersonListComponent implements OnInit, OnChanges, OnDestroy { +export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy { @Input() groupId: string | null; diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 57f93ee9061..aa2f59e7ee2 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -599,6 +599,8 @@ "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search", + "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.", + "auth.errors.invalid-user": "Invalid email address or password.", From bd2135bcd29d3a459a5f2d25295db7fcb62b0dc5 Mon Sep 17 00:00:00 2001 From: Marie Verdonck Date: Wed, 11 Jan 2023 20:45:04 +0100 Subject: [PATCH 327/758] 98376: scoreReview workflow - slight refactor REST changes --- ...vanced-workflow-action-rating.component.ts | 8 ++++---- src/assets/i18n/en.json5 | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts index c669cfcfe9e..eb06e492431 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts @@ -9,8 +9,8 @@ import { RatingReviewerActionAdvancedInfo } from '../../../core/tasks/models/rating-reviewer-action-advanced-info.model'; -export const WORKFLOW_ADVANCED_TASK_OPTION_RATING = 'rating'; -export const ADVANCED_WORKFLOW_ACTION_RATING = 'ratingreviewaction'; +export const WORKFLOW_ADVANCED_TASK_OPTION_RATING = 'submit_score'; +export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction'; @rendersAdvancedWorkflowTaskOption(ADVANCED_WORKFLOW_ACTION_RATING) @Component({ @@ -49,8 +49,8 @@ export class AdvancedWorkflowActionRatingComponent extends AdvancedWorkflowActio score: this.ratingForm.get('rating').value, }; if (this.ratingForm.get('review').value !== '') { - const description: string = this.ratingForm.get('review').value; - Object.assign(body, { description }); + const review: string = this.ratingForm.get('review').value; + Object.assign(body, { review: review }); } return body; } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index aa2f59e7ee2..6b5b317c6e1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4074,9 +4074,9 @@ "submission.workflow.generic.submit_select_reviewer-help": "", - "submission.workflow.generic.rating": "Rate", + "submission.workflow.generic.submit_score": "Rate", - "submission.workflow.generic.rating-help": "", + "submission.workflow.generic.submit_score-help": "", "submission.workflow.tasks.claimed.approve": "Approve", @@ -4254,21 +4254,21 @@ "workflow-item.selectrevieweraction.button.confirm": "Confirm", - "workflow-item.ratingreviewaction.notification.success.title": "Rating review", + "workflow-item.scorereviewaction.notification.success.title": "Rating review", - "workflow-item.ratingreviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", + "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", - "workflow-item.ratingreviewaction.notification.error.title": "Something went wrong", + "workflow-item.scorereviewaction.notification.error.title": "Something went wrong", - "workflow-item.ratingreviewaction.notification.error.content": "Couldn't rate this item", + "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item", - "workflow-item.ratingreviewaction.title": "Rate this item", + "workflow-item.scorereviewaction.title": "Rate this item", - "workflow-item.ratingreviewaction.header": "Rate this item", + "workflow-item.scorereviewaction.header": "Rate this item", - "workflow-item.ratingreviewaction.button.cancel": "Cancel", + "workflow-item.scorereviewaction.button.cancel": "Cancel", - "workflow-item.ratingreviewaction.button.confirm": "Confirm", + "workflow-item.scorereviewaction.button.confirm": "Confirm", "idle-modal.header": "Session will expire soon", From 357525e68ac830b33062c70a73db28fc1478ab42 Mon Sep 17 00:00:00 2001 From: Michael Spalti Date: Mon, 9 Jan 2023 10:32:49 -0800 Subject: [PATCH 328/758] Ignore IP authentication method in login component. lint fix using enum Simplified assignment. --- src/app/shared/log-in/log-in.component.html | 2 +- src/app/shared/log-in/log-in.component.ts | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 6e4685a07bd..36f7034f4d7 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -1,6 +1,6 @@ From 0f8d2d7b16afbe503141e5747814f17711b2e752 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 3 Feb 2023 23:45:59 +0100 Subject: [PATCH 424/758] [CST-7757] D-W-M fixed --- .../subscription-modal/subscription-modal.component.ts | 2 +- src/assets/i18n/en.json5 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index fa7aec92733..fc7e021b86e 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -64,7 +64,7 @@ export class SubscriptionModalComponent implements OnInit { /** * Frequencies to be shown as checkboxes */ - private frequencyDefaultValues = ['D', 'M', 'W']; + private frequencyDefaultValues = ['D', 'W', 'M']; /** * True if form status has changed and at least one frequency is checked diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 49e06578777..e3fee7198c0 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2313,11 +2313,11 @@ "item.page.subscriptions.modal.new-subscription-form.type.content": "Content", - "item.page.subscriptions.modal.new-subscription-form.frequency.D": "daily", + "item.page.subscriptions.modal.new-subscription-form.frequency.D": "Daily", - "item.page.subscriptions.modal.new-subscription-form.frequency.M": "monthly", + "item.page.subscriptions.modal.new-subscription-form.frequency.W": "Weekly", - "item.page.subscriptions.modal.new-subscription-form.frequency.W": "weekly", + "item.page.subscriptions.modal.new-subscription-form.frequency.M": "Monthly", "item.page.subscriptions.modal.new-subscription-form.submit": "Submit", From 0dfb37d15403acd954278e799f1a72a42b9dcfdd Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 6 Feb 2023 10:22:12 +0100 Subject: [PATCH 425/758] [CST-7757] Show object name --- .../subscription-modal/subscription-modal.component.html | 1 + src/assets/i18n/en.json5 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index 156b8717f9d..debc6edf502 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -6,6 +6,7 @@

    {{'item.page.subscriptions.modal.title' | translate}}
    +

    {{dso.name}} {{dso.type}}

    diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index e3fee7198c0..d58e6544b7c 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2309,6 +2309,8 @@ "item.page.subscriptions.modal.title": "Subscriptions", + "item.page.subscriptions.modal.type-frequency": "Type and frequency", + "item.page.subscriptions.modal.close": "Close", "item.page.subscriptions.modal.new-subscription-form.type.content": "Content", From da1a20096b4dbce2661bd2c6d5b4736c4a9f0f2f Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 6 Feb 2023 10:15:24 +0100 Subject: [PATCH 426/758] 98855: Remove temp themed ng-content container This is problematic when ng-content is provided but it's not used --- src/app/shared/theme-support/themed.component.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts index 973a3a26f61..d75568e0ba2 100644 --- a/src/app/shared/theme-support/themed.component.ts +++ b/src/app/shared/theme-support/themed.component.ts @@ -91,11 +91,10 @@ export abstract class ThemedComponent implements OnInit, OnDestroy, OnChanges ).subscribe((constructor: GenericConstructor) => { const factory = this.resolver.resolveComponentFactory(constructor); - const contentNodes = [[...this.themedElementContent.nativeElement.children].map(node => node)] || undefined; - - this.compRef = this.vcr.createComponent(factory, undefined, undefined, contentNodes); + this.compRef = this.vcr.createComponent(factory, undefined, undefined, [this.themedElementContent.nativeElement.children]); this.connectInputsAndOutputs(); this.cdr.markForCheck(); + this.themedElementContent.nativeElement.remove(); }); } From 3bf5b9fd0b80ad316ce70ad438a781f8997f2731 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 6 Feb 2023 10:37:16 +0100 Subject: [PATCH 427/758] [CST-7221] Opaque search bar --- src/app/search-navbar/search-navbar.component.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss index 40433fc619c..d5f3d8d6158 100644 --- a/src/app/search-navbar/search-navbar.component.scss +++ b/src/app/search-navbar/search-navbar.component.scss @@ -1,9 +1,6 @@ input[type="text"] { margin-top: calc(-0.5 * var(--bs-font-size-base)); - - &:focus { - background-color: rgba(255, 255, 255, 0.5) !important; - } + background-color: #fff !important; &.collapsed { opacity: 0; From eae7b0d768025c583ca9b572c6d1913805944036 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 6 Feb 2023 11:16:35 +0100 Subject: [PATCH 428/758] [CST-7757] Minor fixes --- .../dso-page-subscription-button.component.html | 2 ++ .../dso-page-subscription-button.component.ts | 3 +++ .../shared/subscriptions/models/subscription.resource-type.ts | 2 +- .../subscription-modal/subscription-modal.component.ts | 3 +++ .../subscription-view/subscription-view.component.html | 2 +- .../subscription-view/subscription-view.component.spec.ts | 2 +- .../subscription-view/subscription-view.component.ts | 3 +++ src/app/subscriptions-page/subscriptions-page.component.ts | 3 +++ 8 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html index 1932c370005..8601dcdda94 100644 --- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html +++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html @@ -1,6 +1,8 @@ diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts index f97439c1a11..54cd9e6bb0d 100644 --- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts +++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts @@ -13,6 +13,9 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; templateUrl: './dso-page-subscription-button.component.html', styleUrls: ['./dso-page-subscription-button.component.scss'] }) +/** + * Display a button that opens the modal to manage subscriptions + */ export class DsoPageSubscriptionButtonComponent implements OnInit { /** diff --git a/src/app/shared/subscriptions/models/subscription.resource-type.ts b/src/app/shared/subscriptions/models/subscription.resource-type.ts index 50098e53c57..a1dad5cba0e 100644 --- a/src/app/shared/subscriptions/models/subscription.resource-type.ts +++ b/src/app/shared/subscriptions/models/subscription.resource-type.ts @@ -1,7 +1,7 @@ import { ResourceType } from '../../../core/shared/resource-type'; /** - * The resource type for Group + * The resource type for Subscription * * Needs to be in a separate file to prevent circular * dependencies in webpack. diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index fc7e021b86e..3d40c6f7e04 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -23,6 +23,9 @@ import { isNotEmpty } from '../../empty.util'; templateUrl: './subscription-modal.component.html', styleUrls: ['./subscription-modal.component.scss'] }) +/** + * Modal that allows to manage the subscriptions for the selected item + */ export class SubscriptionModalComponent implements OnInit { /** diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html index d9a47e44296..dfd2e2b1b1b 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html @@ -5,7 +5,7 @@

    - - + diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index ba0200a892f..27f461e7eae 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4621,6 +4621,14 @@ "subscriptions.table.action": "Action", + "subscriptions.table.edit": "Edit", + + "subscriptions.table.delete": "Delete", + + "subscriptions.table.not-available": "Not available", + + "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it", + "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.", From 1e20551d2a375a5b2abf602b9ba31edb263a310f Mon Sep 17 00:00:00 2001 From: Yury Bondarenko Date: Fri, 13 Jan 2023 17:54:39 +0100 Subject: [PATCH 499/758] Keep SSL sessions alive between xhr2 requests --- src/app/core/services/server-xhr.service.ts | 51 +++++++++++++++++++++ src/modules/app/server-app.module.ts | 6 +++ 2 files changed, 57 insertions(+) create mode 100644 src/app/core/services/server-xhr.service.ts diff --git a/src/app/core/services/server-xhr.service.ts b/src/app/core/services/server-xhr.service.ts new file mode 100644 index 00000000000..17e5162d43e --- /dev/null +++ b/src/app/core/services/server-xhr.service.ts @@ -0,0 +1,51 @@ +/** + * The contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree and available online at + * + * http://www.dspace.org/license/ + */ + +import { XhrFactory } from '@angular/common'; +import { Injectable } from '@angular/core'; +import { Agent as HttpAgent, AgentOptions as HttpAgentOptions } from 'http'; +import { Agent as HttpsAgent } from 'https'; +import { XMLHttpRequest } from 'xhr2'; + +/** + * Allow HTTP sessions to be kept alive. + * Without this configuration, Angular re-connects to REST multiple times per SSR cycle. + * https://nodejs.org/api/http.html#new-agentoptions + */ +const agentOptions: HttpAgentOptions = { + keepAlive: true, + keepAliveMsecs: 60 * 1000, +}; + +// Agents need to be reused between requests, otherwise keep-alive doesn't help. +const httpAgent = new HttpAgent(agentOptions); +const httpsAgent = new HttpsAgent(agentOptions); + +/** + * Contructs the XMLHttpRequest instances used for all HttpClient requests. + * Emulated by https://github.com/pwnall/node-xhr2 on the server. + * This class overrides the built-in Angular implementation to set additional configuration. + * + * Note that this must be provided in ServerAppModule; + * it doesn't work when added as a Universal engine provider. + */ +@Injectable() +export class ServerXhrService implements XhrFactory { + build(): XMLHttpRequest { + const xhr = new XMLHttpRequest(); + + // This call is specific to xhr2 and will probably break if we use another library. + // https://github.com/pwnall/node-xhr2#features + (xhr as any).nodejsSet({ + httpAgent, + httpsAgent, + }); + + return xhr; + } +} diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts index 01a55489483..6bb344a1cd9 100644 --- a/src/modules/app/server-app.module.ts +++ b/src/modules/app/server-app.module.ts @@ -34,6 +34,8 @@ import { AuthRequestService } from '../../app/core/auth/auth-request.service'; import { ServerAuthRequestService } from '../../app/core/auth/server-auth-request.service'; import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service'; import { AppConfig, APP_CONFIG_STATE } from '../../config/app-config.interface'; +import { XhrFactory } from '@angular/common'; +import { ServerXhrService } from '../../app/core/services/server-xhr.service'; import { environment } from '../../environments/environment'; @@ -121,6 +123,10 @@ export function createTranslateLoader() { provide: HardRedirectService, useClass: ServerHardRedirectService, }, + { + provide: XhrFactory, + useClass: ServerXhrService, + }, ] }) export class ServerAppModule { From 800d3a90019a51f45e7d1b6f6b899231bf7fbd86 Mon Sep 17 00:00:00 2001 From: corrado lombardi Date: Thu, 9 Feb 2023 15:31:03 +0100 Subject: [PATCH 500/758] [CST-7755] added cancel button to modal and updated message returned when a supervision order already exists --- .../supervision-group-selector.component.html | 17 +++++++++++------ .../supervision-group-selector.component.ts | 6 +++--- ...item-search-result-list-element.component.ts | 2 +- src/assets/i18n/en.json5 | 4 ++++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html index f6a5c339cec..c6d45c87431 100644 --- a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html +++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.html @@ -30,11 +30,16 @@ (select)="updateGroupObjectSelected($event)"> -
    - + +
    + +
    - \ No newline at end of file + diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts index 1ae2d496d2f..88ffb130702 100644 --- a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts @@ -79,13 +79,13 @@ export class SupervisionGroupSelectorComponent { if (rd.state === 'Success') { this.supervisionOrderDataService.searchByItem(this.itemUUID, null, null, followLink('group')); this.notificationsService.success(this.translateService.get('supervision-group-selector.notification.create.success.title', { name: this.selectedGroup.name })); + this.close(); } else { this.notificationsService.error( - this.translateService.get('supervision-group-selector.notification.create.failure.title'), - rd.errorMessage); + this.translateService.get('supervision-group-selector.notification.create.failure.title'), + rd.statusCode == 422 ? this.translateService.get('supervision-group-selector.notification.create.already-existing') : rd.errorMessage); } }); - this.close(); } } diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index 41afab0ab82..2fa72d2ac09 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -100,7 +100,7 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen ).pipe( getAllSucceededRemoteData(), ).subscribe((result) => { - this.supervisionOrder$ = this.supervisionOrderDataService.searchByItem(this.dso.uuid, null, null, followLink('group')).pipe( + this.supervisionOrder$ = this.supervisionOrderDataService.searchByItem(this.dso.uuid, false, true, followLink('group')).pipe( getAllSucceededRemoteListPayload(), switchMap((supervisionOrders: SupervisionOrder[]) => { const supervisionOrdersArray = supervisionOrders.map((supervisionOrder: SupervisionOrder) => { diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 0251f171b77..47fbbaf5188 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1443,6 +1443,8 @@ "supervision-group-selector.select.group.label": "Select a Group", + "supervision-group-selector.button.cancel": "Cancel", + "supervision-group-selector.button.save": "Save", "supervision-group-selector.select.type-of-order.error": "Please select a type of order", @@ -1453,6 +1455,8 @@ "supervision-group-selector.notification.create.failure.title": "Error", + "supervision-group-selector.notification.create.already-existing" : "A supervision order already exists on this item for selected group", + "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}", From 52cd98a7d3a41891b407971dba6fe529f9dc22b3 Mon Sep 17 00:00:00 2001 From: corrado lombardi Date: Thu, 9 Feb 2023 15:39:13 +0100 Subject: [PATCH 501/758] [CST-7755] lint fix --- .../supervision-group-selector.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts index 88ffb130702..da22fe0d441 100644 --- a/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component.ts @@ -83,7 +83,7 @@ export class SupervisionGroupSelectorComponent { } else { this.notificationsService.error( this.translateService.get('supervision-group-selector.notification.create.failure.title'), - rd.statusCode == 422 ? this.translateService.get('supervision-group-selector.notification.create.already-existing') : rd.errorMessage); + rd.statusCode === 422 ? this.translateService.get('supervision-group-selector.notification.create.already-existing') : rd.errorMessage); } }); } From 9e11d69a8ade6fae07676d49f6a2cb4697705107 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 9 Feb 2023 08:48:50 -0600 Subject: [PATCH 502/758] Fix bug where allowStale couldn't be disabled --- server.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.ts b/server.ts index 478a4c0ec19..ba0c8fd7b26 100644 --- a/server.ts +++ b/server.ts @@ -324,7 +324,7 @@ function initCache() { botCache = new LRU( { max: environment.cache.serverSide.botCache.max, ttl: environment.cache.serverSide.botCache.timeToLive || 24 * 60 * 60 * 1000, // 1 day - allowStale: environment.cache.serverSide.botCache.allowStale || true // if object is stale, return stale value before deleting + allowStale: environment.cache.serverSide.botCache.allowStale ?? true // if object is stale, return stale value before deleting }); } @@ -335,7 +335,7 @@ function initCache() { anonymousCache = new LRU( { max: environment.cache.serverSide.anonymousCache.max, ttl: environment.cache.serverSide.anonymousCache.timeToLive || 10 * 1000, // 10 seconds - allowStale: environment.cache.serverSide.anonymousCache.allowStale || true // if object is stale, return stale value before deleting + allowStale: environment.cache.serverSide.anonymousCache.allowStale ?? true // if object is stale, return stale value before deleting }); } } From ac06f30950ee2f9cdb05a08a53019c48abaf5a2e Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Thu, 9 Feb 2023 17:19:07 +0100 Subject: [PATCH 503/758] 99053: Removed ngx-bootstrap dependency --- package.json | 1 - ...nced-workflow-action-rating.component.html | 10 +- ...d-workflow-action-rating.component.spec.ts | 4 +- .../workflowitems-edit-page.module.ts | 4 +- yarn.lock | 30393 ++++++++-------- 5 files changed, 15203 insertions(+), 15209 deletions(-) diff --git a/package.json b/package.json index 71b744fe77b..278afdf6c38 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,6 @@ "ng-mocks": "11.11.2", "ng2-file-upload": "1.4.0", "ng2-nouislider": "^1.8.3", - "ngx-bootstrap": "7.1.2", "ngx-infinite-scroll": "^10.0.1", "ngx-moment": "^5.0.0", "ngx-pagination": "5.0.0", diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html index ac0cdac1cc2..aca9b4da73b 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html @@ -21,12 +21,14 @@
    -
    +
    + +
    + diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts index ee6cb16bbe2..c57d918126e 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts @@ -1,21 +1,46 @@ import { Component, Inject, OnInit } from '@angular/core'; + +import { BehaviorSubject, Observable } from 'rxjs'; +import { map, mergeMap, take, tap } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; + import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { + listableObjectComponent +} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { Context } from '../../../../../core/shared/context.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { Observable } from 'rxjs'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { followLink } from '../../../../../shared/utils/follow-link-config.model'; import { RemoteData } from '../../../../../core/data/remote-data'; -import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators'; +import { + getAllSucceededRemoteData, + getFirstCompletedRemoteData, + getRemoteDataPayload +} from '../../../../../core/shared/operators'; import { Item } from '../../../../../core/shared/item.model'; -import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; +import { + SearchResultListElementComponent +} from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; -import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; +import { + WorkflowItemSearchResult +} from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface'; -import { WorkspaceItemSearchResult } from '../../../../../shared/object-collection/shared/workspace-item-search-result.model'; +import { + WorkspaceItemSearchResult +} from '../../../../../shared/object-collection/shared/workspace-item-search-result.model'; import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model'; +import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; +import { PaginatedList } from '../../../../../core/data/paginated-list.model'; +import { ConfirmationModalComponent } from '../../../../../shared/confirmation-modal/confirmation-modal.component'; +import { hasValue } from '../../../../../shared/empty.util'; +import { + SupervisionOrderListEntry +} from '../../../../../shared/object-list/supervision-order-status/supervision-order-status.component'; +import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch) @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch) @@ -25,7 +50,7 @@ import { SupervisionOrder } from '../../../../../core/supervision-order/models/s templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html' }) /** - * The component for displaying a list element for an workflow item on the admin workflow search page + * The component for displaying a list element for a workflow item on the admin workflow search page */ export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends SearchResultListElementComponent implements OnInit { @@ -34,14 +59,25 @@ export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends S */ public item$: Observable; + /** + * The id of the item linked to the workflow item + */ + public itemId: string; + /** * The supervision orders linked to the workflow item */ - public supervisionOrder$: Observable; + public supervisionOrder$: BehaviorSubject = new BehaviorSubject([]); + + private messagePrefix = 'workflow-item.search.result'; constructor(private linkService: LinkService, - protected truncatableService: TruncatableService, protected dsoNameService: DSONameService, + protected modalService: NgbModal, + protected notificationsService: NotificationsService, + protected supervisionOrderDataService: SupervisionOrderDataService, + protected translateService: TranslateService, + protected truncatableService: TruncatableService, @Inject(APP_CONFIG) protected appConfig: AppConfig ) { super(truncatableService, dsoNameService, appConfig); @@ -53,7 +89,78 @@ export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends S ngOnInit(): void { super.ngOnInit(); this.dso = this.linkService.resolveLink(this.dso, followLink('item')); - this.supervisionOrder$ = (this.dso.supervisionOrders as Observable>)?.pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); this.item$ = (this.dso.item as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); + + this.item$.pipe( + take(1), + tap((item: Item) => this.itemId = item.id), + mergeMap((item: Item) => this.retrieveSupervisorOrders(item.id)) + ).subscribe((supervisionOrderList: SupervisionOrder[]) => { + this.supervisionOrder$.next(supervisionOrderList); + }) + } + + /** + * Deletes the Group from the Repository. The Group 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. + */ + deleteSupervisionOrder(supervisionOrderEntry: SupervisionOrderListEntry) { + const modalRef = this.modalService.open(ConfirmationModalComponent); + modalRef.componentInstance.dso = supervisionOrderEntry.group; + modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-supervision.modal.header'; + modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-supervision.modal.info'; + modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-supervision.modal.cancel'; + modalRef.componentInstance.confirmLabel = this.messagePrefix + '.delete-supervision.modal.confirm'; + modalRef.componentInstance.brandColor = 'danger'; + modalRef.componentInstance.confirmIcon = 'fas fa-trash'; + modalRef.componentInstance.response.pipe( + take(1), + mergeMap((confirm: boolean) => { + if (confirm && hasValue(supervisionOrderEntry.supervisionOrder.id)) { + return this.supervisionOrderDataService.delete(supervisionOrderEntry.supervisionOrder.id).pipe( + take(1), + tap((result: boolean) => { + if (result) { + this.notificationsService.success( + null, + this.translateService.get( + this.messagePrefix + '.notification.deleted.success', + { name: this.dsoNameService.getName(supervisionOrderEntry.group) } + ) + ); + } else { + this.notificationsService.error( + null, + this.translateService.get( + this.messagePrefix + '.notification.deleted.failure', + { name: this.dsoNameService.getName(supervisionOrderEntry.group) } + ) + ); + } + }), + mergeMap((result: boolean) => result ? this.retrieveSupervisorOrders(this.itemId) : this.supervisionOrder$.asObservable()) + ) + } else { + return this.supervisionOrder$.asObservable() + } + }) + ).subscribe((supervisionOrderList: SupervisionOrder[]) => { + this.supervisionOrder$.next(supervisionOrderList) + }) + } + + /** + * Retrieve the list of SupervisionOrder object related to the given item + * + * @param itemId + * @private + */ + private retrieveSupervisorOrders(itemId): Observable { + return this.supervisionOrderDataService.searchByItem( + itemId, false, true, followLink('group') + ).pipe( + getFirstCompletedRemoteData(), + map((soRD: RemoteData>) => soRD.hasSucceeded && !soRD.hasNoContent ? soRD.payload.page : []) + ); } } diff --git a/src/app/core/submission/models/submission-object.model.ts b/src/app/core/submission/models/submission-object.model.ts index 3d373d25229..e2d1a4396bb 100644 --- a/src/app/core/submission/models/submission-object.model.ts +++ b/src/app/core/submission/models/submission-object.model.ts @@ -15,6 +15,8 @@ import { excludeFromEquals } from '../../utilities/equals.decorators'; import { WorkspaceitemSectionsObject } from './workspaceitem-sections.model'; import { CacheableObject } from '../../cache/cacheable-object.model'; import { SUPERVISION_ORDER } from '../../supervision-order/models/supervision-order.resource-type'; +import { PaginatedList } from '../../data/paginated-list.model'; +import { SupervisionOrder } from '../../supervision-order/models/supervision-order.model'; export interface SubmissionObjectError { message: string; @@ -101,6 +103,6 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable */ @link(SUPERVISION_ORDER) /* This was changed from 'Observable> | WorkspaceItem' to 'any' to prevent issues in templates with async */ - supervisionOrders?: any; + supervisionOrders?: Observable>>; } 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 9779ecd830b..59ce71ff6cd 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 @@ -13,7 +13,7 @@ import { ViewChild } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; +import { Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; import { ListableObject } from '../listable-object.model'; @@ -41,11 +41,6 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges */ @Input() object: ListableObject; - /** - * The supervision order to determine supervision orders - */ - @Input() supervisionOrders: Observable; - /** * The index of the object in the list */ @@ -76,6 +71,11 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges */ @Input() showLabel = true; + /** + * Whether to show the supervision orders badges or not + */ + @Input() showSupervisionOrderBadges = false; + /** * The value to display for this element */ @@ -128,7 +128,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges */ protected inAndOutputNames: string[] = [ 'object', - 'supervisionOrders', + 'showSupervisionOrderBadges', 'index', 'linkType', 'listID', diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts index dde9cf61dce..f292ac5b76f 100644 --- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts +++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts @@ -46,6 +46,11 @@ export class AbstractListableElementComponent { */ @Input() showLabel = true; + /** + * Whether to show the supervision orders badges or not + */ + @Input() showSupervisionOrderBadges = false; + /** * The context we matched on to get this component */ diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html index f244da97bd1..4bf45e7f3b6 100644 --- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html +++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html @@ -1 +1 @@ - + diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html index 863d328a693..a0ef3e1cb9f 100644 --- a/src/app/shared/object-list/object-list.component.html +++ b/src/app/shared/object-list/object-list.component.html @@ -25,8 +25,13 @@ - diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts index 65e2b508daa..9d064115e63 100644 --- a/src/app/shared/object-list/object-list.component.ts +++ b/src/app/shared/object-list/object-list.component.ts @@ -81,6 +81,11 @@ export class ObjectListComponent { */ @Input() showPaginator = true; + /** + * Whether to show the supervision orders badges or not + */ + @Input() showSupervisionOrderBadges = false; + /** * Emit when one of the listed object has changed. */ diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html index 64108681f62..bf1d51bfc26 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html @@ -23,37 +23,24 @@ - - - ( - ) - - - - - ; + + + ( + ) + + + + + ; + - - - + +
    - -
    -
    - {{'item.search.result.list.element.supervised-by' | translate}} -
    -
    - - {{supervisionOrder.group._name}} - X - -
    -
    -     diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index 2fa72d2ac09..7ed96fdc68f 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -1,5 +1,7 @@ import { Component, Inject } from '@angular/core'; -import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator'; +import { + listableObjectComponent +} from '../../../../../object-collection/shared/listable-object/listable-object.decorator'; import { ViewMode } from '../../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model'; import { SearchResultListElementComponent } from '../../../search-result-list-element.component'; @@ -8,7 +10,7 @@ import { getItemPageRoute } from '../../../../../../item-page/item-page-routing- import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service'; import { TruncatableService } from '../../../../../../shared/truncatable/truncatable.service'; import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; -import { AppConfig, APP_CONFIG } from '../../../../../../../config/app-config.interface'; +import { APP_CONFIG, AppConfig } from '../../../../../../../config/app-config.interface'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { combineLatest, filter, map, Observable, switchMap, take } from 'rxjs'; import { ConfirmationModalComponent } from '../../../../../../shared/confirmation-modal/confirmation-modal.component'; @@ -16,11 +18,15 @@ import { hasValue } from '../../../../../../shared/empty.util'; import { NotificationsService } from '../../../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { followLink } from '../../../../../../shared/utils/follow-link-config.model'; -import { getAllSucceededRemoteListPayload, getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators'; +import { + getAllSucceededRemoteData, + getAllSucceededRemoteListPayload, + getFirstSucceededRemoteDataPayload, + getRemoteDataPayload +} from '../../../../../../core/shared/operators'; import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model'; import { Group } from '../../../../../../core/eperson/models/group.model'; import { ResourcePolicyDataService } from '../../../../../../core/resource-policy/resource-policy-data.service'; -import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../../core/shared/operators'; import { AuthService } from '../../../../../../core/auth/auth.service'; import { EPerson } from '../../../../../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../../../../../core/eperson/eperson-data.service'; diff --git a/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.html b/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.html new file mode 100644 index 00000000000..2e4f8d39cd9 --- /dev/null +++ b/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.html @@ -0,0 +1,13 @@ + +
    +
    + {{'workflow-item.search.result.list.element.supervised-by' | translate}} +
    +
    + + {{supervisionOrder.group.name}} + X + +
    +
    +     diff --git a/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.scss b/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.spec.ts b/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.spec.ts new file mode 100644 index 00000000000..9a5516b8e95 --- /dev/null +++ b/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SupervisionOrderStatusComponent } from './supervision-order-status.component'; + +describe('SupervisionOrderStatusComponent', () => { + let component: SupervisionOrderStatusComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SupervisionOrderStatusComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SupervisionOrderStatusComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.ts b/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.ts new file mode 100644 index 00000000000..92cbf178857 --- /dev/null +++ b/src/app/shared/object-list/supervision-order-status/supervision-order-status.component.ts @@ -0,0 +1,88 @@ +import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; + +import { BehaviorSubject, from, Observable } from 'rxjs'; +import { map, mergeMap, reduce } from 'rxjs/operators'; + +import { SupervisionOrder } from '../../../core/supervision-order/models/supervision-order.model'; +import { Group } from '../../../core/eperson/models/group.model'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { isNotEmpty } from '../../empty.util'; +import { RemoteData } from '../../../core/data/remote-data'; + +export interface SupervisionOrderListEntry { + supervisionOrder: SupervisionOrder; + group: Group +} + +@Component({ + selector: 'ds-supervision-order-status', + templateUrl: './supervision-order-status.component.html', + styleUrls: ['./supervision-order-status.component.scss'] +}) +export class SupervisionOrderStatusComponent implements OnChanges { + + /** + * The list of supervision order object to show + */ + @Input() supervisionOrderList: SupervisionOrder[] = []; + + /** + * The groups the user belongs to + */ + groups: Group[]; + + /** + * List of the supervision orders combined with the group + */ + supervisionOrderEntries$: BehaviorSubject = new BehaviorSubject([]); + + @Output() delete: EventEmitter = new EventEmitter(); + + ngOnChanges(changes: SimpleChanges): void { + if (changes && changes.supervisionOrderList) { + this.getSupervisionOrderEntries(changes.supervisionOrderList.currentValue) + .subscribe((supervisionOrderEntries: SupervisionOrderListEntry[]) => { + this.supervisionOrderEntries$.next(supervisionOrderEntries) + }) + } + console.log('ngOnChanges', changes); + } + + /** + * Create a list of SupervisionOrderListEntry by the given SupervisionOrder list + * + * @param supervisionOrderList + */ + private getSupervisionOrderEntries(supervisionOrderList: SupervisionOrder[]): Observable { + return from(supervisionOrderList).pipe( + mergeMap((so: SupervisionOrder) => so.group.pipe( + getFirstCompletedRemoteData(), + map((sogRD: RemoteData) => { + if (sogRD.hasSucceeded) { + const entry: SupervisionOrderListEntry = { + supervisionOrder: so, + group: sogRD.payload + }; + return entry; + } else { + return null; + } + }) + )), + reduce((acc: SupervisionOrderListEntry[], value: any) => { + if (isNotEmpty(value)) { + return [...acc, value] + } else { + return acc; + } + }, []), + ) + } + + /** + * Emit a delete event with the given SupervisionOrderListEntry. + */ + deleteSupervisionOrder(supervisionOrder: SupervisionOrderListEntry) { + this.delete.emit(supervisionOrder); + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 3c985d46b96..624d519ad1f 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -100,19 +100,19 @@ import { CreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component'; import { - ThemedCreateCommunityParentSelectorComponent + ThemedCreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component'; import { CreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component'; import { - ThemedCreateItemParentSelectorComponent + ThemedCreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component'; import { CreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component'; import { - ThemedCreateCollectionParentSelectorComponent + ThemedCreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component'; import { CommunitySearchResultListElementComponent @@ -124,19 +124,19 @@ import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component'; import { - ThemedEditItemSelectorComponent + ThemedEditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component'; import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component'; import { - ThemedEditCommunitySelectorComponent + ThemedEditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component'; import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component'; import { - ThemedEditCollectionSelectorComponent + ThemedEditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component'; import { RoleDirective } from './roles/role.directive'; import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component'; @@ -242,14 +242,20 @@ import { MenuModule } from './menu/menu.module'; import { ListableNotificationObjectComponent } from './object-list/listable-notification-object/listable-notification-object.component'; -import { SupervisionGroupSelectorComponent } from './dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component'; +import { + SupervisionGroupSelectorComponent +} from './dso-selector/modal-wrappers/supervision-group-selector/supervision-group-selector.component'; import { EpersonGroupListComponent } from './form/eperson-group-list/eperson-group-list.component'; import { EpersonSearchBoxComponent } from './form/eperson-group-list/eperson-search-box/eperson-search-box.component'; import { GroupSearchBoxComponent } from './form/eperson-group-list/group-search-box/group-search-box.component'; import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component'; import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component'; -import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component'; - +import { + LogInExternalProviderComponent +} from './log-in/methods/log-in-external-provider/log-in-external-provider.component'; +import { + SupervisionOrderStatusComponent +} from './object-list/supervision-order-status/supervision-order-status.component'; const MODULES = [ @@ -452,18 +458,20 @@ const DIRECTIVES = [ ...COMPONENTS, ...ENTRY_COMPONENTS, ...DIRECTIVES, + SupervisionOrderStatusComponent, ], providers: [ ...PROVIDERS ], - exports: [ - ...MODULES, - ...PIPES, - ...COMPONENTS, - ...ENTRY_COMPONENTS, - ...DIRECTIVES, - TranslateModule, - ] + exports: [ + ...MODULES, + ...PIPES, + ...COMPONENTS, + ...ENTRY_COMPONENTS, + ...DIRECTIVES, + TranslateModule, + SupervisionOrderStatusComponent, + ] }) /** diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 47fbbaf5188..892f686fb86 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2271,21 +2271,21 @@ "item.truncatable-part.show-less": "Collapse", - "item.search.result.delete-supervision.modal.header": "Delete Supervision Order", + "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", - "item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", + "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", - "item.search.result.delete-supervision.modal.cancel": "Cancel", + "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel", - "item.search.result.delete-supervision.modal.confirm": "Delete", + "workflow-item.search.result.delete-supervision.modal.confirm": "Delete", - "item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"", + "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"", - "item.search.result.notification.deleted.failure.title": "Failed to delete supervision order \"{{name}}\"", + "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"", - "item.search.result.notification.deleted.failure.content": "Failed to delete supervision order", + "workflow-item.search.result.list.element.supervised-by": "Supervised by:", - "item.search.result.list.element.supervised-by": "Supervised by:", + "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group", From 851fe7869ed5c47089e0430e82542c4d08a89477 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Sat, 11 Feb 2023 03:29:17 +0100 Subject: [PATCH 511/758] [CST-7757] 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 bf32aebe47c..fa6f2694fa1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4748,6 +4748,8 @@ "subscriptions.modal.new-subscription-form.submit": "Submit", + "subscriptions.modal.new-subscription-form.processing": "Processing...", + "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.", "subscriptions.modal.delete.success": "Subscription deleted successfully", From c74ef49797cb0fe9e816cb9648a7503b7094304f Mon Sep 17 00:00:00 2001 From: cris Date: Sat, 11 Feb 2023 17:13:52 +0000 Subject: [PATCH 512/758] fixed issue in browser console --- .../mydspace-item-collection/item-collection.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts index 8f857540d4c..2f2a20ede36 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts @@ -40,7 +40,9 @@ export class ItemCollectionComponent implements OnInit { */ ngOnInit() { - this.linkService.resolveLinks(this.object, followLink('workflowitem', {}, + this.linkService.resolveLinks(this.object, followLink('workflowitem', { + isOptional: true + }, followLink('collection',{}) )); this.collection$ = (this.object.workflowitem as Observable>).pipe( From 363136027ec0e05d01e2a9d5c1ba6cbbc9dbba45 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 13 Feb 2023 10:36:13 +0100 Subject: [PATCH 513/758] [CST-7755] WIP revert changes on list components --- ...arch-result-list-element.component.spec.ts | 103 +------------ ...arch-result-list-element.component.spec.ts | 101 +------------ ...arch-result-list-element.component.spec.ts | 101 +------------ ...arch-result-list-element.component.spec.ts | 99 +------------ ...arch-result-list-element.component.spec.ts | 98 +------------ ...on-search-result-list-element.component.ts | 20 +-- ...arch-result-list-element.component.spec.ts | 103 +------------ ...table-object-component-loader.component.ts | 6 - .../abstract-listable-element.component.ts | 10 -- .../item/item-list-element.component.html | 2 +- .../object-list/object-list.component.html | 1 - .../object-list/object-list.component.ts | 5 - ...arch-result-list-element.component.spec.ts | 102 +------------ ...em-search-result-list-element.component.ts | 136 +----------------- 14 files changed, 16 insertions(+), 871 deletions(-) diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts index 3a0e73e46c2..178ed86c40c 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts @@ -1,7 +1,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component'; import { Item } from '../../../../../core/shared/item.model'; @@ -10,43 +10,9 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { GroupMock } from '../../../../../shared/testing/group-mock'; -import { hot } from 'jasmine-marbles'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; -import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent; let fixture: ComponentFixture; -let authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) -}); - -const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { - getAuthenticatedUserFromStore: () => { - return of(EPersonMock); - } -}); - -const user = Object.assign(new EPerson(), { - id: 'userId', - groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), - _links: { self: { href: 'test.com/uuid/1234567654321' } } -}); -const epersonService = jasmine.createSpyObj('epersonService', { - findById: createSuccessfulRemoteDataObject$(user), -}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -104,65 +70,12 @@ const enviromentNoThumbs = { } }; -const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { - searchByItem: jasmine.createSpy('searchByItem'), -}); - -const supervisionOrder: any = { - id: '1', - type: 'supervisionOrder', - uuid: 'supervision-order-1', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; -const anothersupervisionOrder: any = { - id: '2', - type: 'supervisionOrder', - uuid: 'supervision-order-2', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; - -const pageInfo = new PageInfo(); -const array = [supervisionOrder, anothersupervisionOrder]; -const paginatedList = buildPaginatedList(pageInfo, array); -const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - describe('JournalIssueSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - { provide: NotificationsService, useValue: {}}, - { provide: TranslateService, useValue: {}}, - { provide: ResourcePolicyDataService, useValue: {}}, - { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: epersonService}, - { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -174,9 +87,6 @@ describe('JournalIssueSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(JournalIssueSearchResultListElementComponent); journalIssueListElementComponent = fixture.componentInstance; @@ -254,13 +164,6 @@ describe('JournalIssueSearchResultListElementComponent', () => { declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, - {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - {provide: NotificationsService, useValue: {}}, - {provide: TranslateService, useValue: {}}, - {provide: ResourcePolicyDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: epersonService}, - {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -278,9 +181,7 @@ describe('JournalIssueSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); + journalIssueListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts index 67665403d1d..71fa83a3b1e 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts @@ -1,7 +1,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { Item } from '../../../../../core/shared/item.model'; import { JournalVolumeSearchResultListElementComponent } from './journal-volume-search-result-list-element.component'; @@ -10,43 +10,10 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { GroupMock } from '../../../../../shared/testing/group-mock'; -import { hot } from 'jasmine-marbles'; -import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; -import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent; let fixture: ComponentFixture; -let authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) -}); - -const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { - getAuthenticatedUserFromStore: () => { - return of(EPersonMock); - } -}); -const user = Object.assign(new EPerson(), { - id: 'userId', - groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), - _links: { self: { href: 'test.com/uuid/1234567654321' } } -}); -const epersonService = jasmine.createSpyObj('epersonService', { - findById: createSuccessfulRemoteDataObject$(user), -}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), { @@ -102,65 +69,12 @@ const enviromentNoThumbs = { } }; -const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { - searchByItem: jasmine.createSpy('searchByItem'), -}); - -const supervisionOrder: any = { - id: '1', - type: 'supervisionOrder', - uuid: 'supervision-order-1', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; -const anothersupervisionOrder: any = { - id: '2', - type: 'supervisionOrder', - uuid: 'supervision-order-2', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; - -const pageInfo = new PageInfo(); -const array = [supervisionOrder, anothersupervisionOrder]; -const paginatedList = buildPaginatedList(pageInfo, array); -const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - describe('JournalVolumeSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - { provide: NotificationsService, useValue: {}}, - { provide: TranslateService, useValue: {}}, - { provide: ResourcePolicyDataService, useValue: {}}, - { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: epersonService}, - { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -172,9 +86,6 @@ describe('JournalVolumeSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent); journalVolumeListElementComponent = fixture.componentInstance; @@ -251,13 +162,6 @@ describe('JournalVolumeSearchResultListElementComponent', () => { declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, - {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - {provide: NotificationsService, useValue: {}}, - {provide: TranslateService, useValue: {}}, - {provide: ResourcePolicyDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: epersonService}, - {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -269,9 +173,6 @@ describe('JournalVolumeSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(JournalVolumeSearchResultListElementComponent); journalVolumeListElementComponent = fixture.componentInstance; })); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts index 63e8abda28e..07970d71282 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts @@ -1,7 +1,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { JournalSearchResultListElementComponent } from './journal-search-result-list-element.component'; import { Item } from '../../../../../core/shared/item.model'; import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe'; @@ -10,42 +10,9 @@ import { ItemSearchResult } from '../../../../../shared/object-collection/shared import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { GroupMock } from '../../../../../shared/testing/group-mock'; -import { hot } from 'jasmine-marbles'; -import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; -import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let journalListElementComponent: JournalSearchResultListElementComponent; let fixture: ComponentFixture; -let authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) -}); - -const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { - getAuthenticatedUserFromStore: () => { - return of(EPersonMock); - } -}); -const user = Object.assign(new EPerson(), { - id: 'userId', - groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), - _links: { self: { href: 'test.com/uuid/1234567654321' } } -}); -const epersonService = jasmine.createSpyObj('epersonService', { - findById: createSuccessfulRemoteDataObject$(user), -}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -98,65 +65,12 @@ const enviromentNoThumbs = { } }; -const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { - searchByItem: jasmine.createSpy('searchByItem'), -}); - -const supervisionOrder: any = { - id: '1', - type: 'supervisionOrder', - uuid: 'supervision-order-1', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; -const anothersupervisionOrder: any = { - id: '2', - type: 'supervisionOrder', - uuid: 'supervision-order-2', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; - -const pageInfo = new PageInfo(); -const array = [supervisionOrder, anothersupervisionOrder]; -const paginatedList = buildPaginatedList(pageInfo, array); -const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - describe('JournalSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [JournalSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - { provide: NotificationsService, useValue: {}}, - { provide: TranslateService, useValue: {}}, - { provide: ResourcePolicyDataService, useValue: {}}, - { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: epersonService}, - { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -168,9 +82,6 @@ describe('JournalSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(JournalSearchResultListElementComponent); journalListElementComponent = fixture.componentInstance; @@ -223,13 +134,6 @@ describe('JournalSearchResultListElementComponent', () => { declarations: [JournalSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, - {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - {provide: NotificationsService, useValue: {}}, - {provide: TranslateService, useValue: {}}, - {provide: ResourcePolicyDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: epersonService}, - {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -241,9 +145,6 @@ describe('JournalSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(JournalSearchResultListElementComponent); journalListElementComponent = fixture.componentInstance; })); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts index 102393ed8f5..9609a9582aa 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts @@ -1,7 +1,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { OrgUnitSearchResultListElementComponent } from './org-unit-search-result-list-element.component'; import { Item } from '../../../../../core/shared/item.model'; import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe'; @@ -12,41 +12,9 @@ import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { GroupMock } from '../../../../../shared/testing/group-mock'; -import { hot } from 'jasmine-marbles'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; -import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent; let fixture: ComponentFixture; -let authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) -}); - -const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { - getAuthenticatedUserFromStore: () => { - return of(EPersonMock); - } -}); -const user = Object.assign(new EPerson(), { - id: 'userId', - groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), - _links: { self: { href: 'test.com/uuid/1234567654321' } } -}); -const epersonService = jasmine.createSpyObj('epersonService', { - findById: createSuccessfulRemoteDataObject$(user), -}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -97,52 +65,6 @@ const enviromentNoThumbs = { } }; -const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { - searchByItem: jasmine.createSpy('searchByItem'), -}); - -const supervisionOrder: any = { - id: '1', - type: 'supervisionOrder', - uuid: 'supervision-order-1', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; -const anothersupervisionOrder: any = { - id: '2', - type: 'supervisionOrder', - uuid: 'supervision-order-2', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; - -const pageInfo = new PageInfo(); -const array = [supervisionOrder, anothersupervisionOrder]; -const paginatedList = buildPaginatedList(pageInfo, array); -const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - describe('OrgUnitSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ @@ -156,12 +78,6 @@ describe('OrgUnitSearchResultListElementComponent', () => { declarations: [ OrgUnitSearchResultListElementComponent , TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - { provide: NotificationsService, useValue: {}}, - { provide: ResourcePolicyDataService, useValue: {}}, - { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: epersonService}, - { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -173,9 +89,6 @@ describe('OrgUnitSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(OrgUnitSearchResultListElementComponent); orgUnitListElementComponent = fixture.componentInstance; @@ -235,12 +148,6 @@ describe('OrgUnitSearchResultListElementComponent', () => { declarations: [OrgUnitSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, - {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - {provide: NotificationsService, useValue: {}}, - {provide: ResourcePolicyDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: epersonService}, - {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -258,9 +165,7 @@ describe('OrgUnitSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); + orgUnitListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts index 25b3a37c832..31018520f62 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts @@ -1,7 +1,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { PersonSearchResultListElementComponent } from './person-search-result-list-element.component'; import { Item } from '../../../../../core/shared/item.model'; @@ -12,44 +12,9 @@ import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; -import { hot } from 'jasmine-marbles'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { GroupMock } from '../../../../../shared/testing/group-mock'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; -import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; -import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let personListElementComponent: PersonSearchResultListElementComponent; let fixture: ComponentFixture; -const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { - searchByItem: jasmine.createSpy('searchByItem'), -}); -let authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) -}); - -const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { - getAuthenticatedUserFromStore: () => { - return of(EPersonMock); - } -}); -const user = Object.assign(new EPerson(), { - id: 'userId', - groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), - _links: { self: { href: 'test.com/uuid/1234567654321' } } -}); -const epersonService = jasmine.createSpyObj('epersonService', { - findById: createSuccessfulRemoteDataObject$(user), -}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -100,48 +65,6 @@ const enviromentNoThumbs = { } }; -const supervisionOrder: any = { - id: '1', - type: 'supervisionOrder', - uuid: 'supervision-order-1', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; -const anothersupervisionOrder: any = { - id: '2', - type: 'supervisionOrder', - uuid: 'supervision-order-2', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; - -const pageInfo = new PageInfo(); -const array = [supervisionOrder, anothersupervisionOrder]; -const paginatedList = buildPaginatedList(pageInfo, array); -const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - describe('PersonSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ @@ -155,12 +78,6 @@ describe('PersonSearchResultListElementComponent', () => { declarations: [PersonSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - { provide: NotificationsService, useValue: {} }, - { provide: ResourcePolicyDataService, useValue: {}}, - { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: epersonService}, - { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -172,9 +89,6 @@ describe('PersonSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(PersonSearchResultListElementComponent); personListElementComponent = fixture.componentInstance; @@ -234,12 +148,6 @@ describe('PersonSearchResultListElementComponent', () => { declarations: [PersonSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, - {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService}, - {provide: NotificationsService, useValue: {}}, - {provide: ResourcePolicyDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: epersonService}, - {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -257,9 +165,7 @@ describe('PersonSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); + personListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts index 09142fc02e8..217d7baef95 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts @@ -9,14 +9,6 @@ import { import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; @listableObjectComponent('PersonSearchResult', ViewMode.ListElement) @Component({ @@ -32,17 +24,9 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList public constructor( protected truncatableService: TruncatableService, protected dsoNameService: DSONameService, - @Inject(APP_CONFIG) protected appConfig: AppConfig, - protected supervisionOrderDataService: SupervisionOrderDataService, - protected modalService: NgbModal, - protected notificationsService: NotificationsService, - protected translateService: TranslateService, - protected resourcePolicyService: ResourcePolicyDataService, - protected authService: AuthService, - protected epersonService: EPersonDataService, - protected authorizationService: AuthorizationDataService + @Inject(APP_CONFIG) protected appConfig: AppConfig ) { - super(truncatableService, dsoNameService, appConfig, supervisionOrderDataService, modalService, notificationsService, translateService, resourcePolicyService, authService, epersonService, authorizationService); + super(truncatableService, dsoNameService, appConfig); } /** diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts index 60487af8c80..0cb3e63e870 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts @@ -1,6 +1,6 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { ProjectSearchResultListElementComponent } from './project-search-result-list-element.component'; import { Item } from '../../../../../core/shared/item.model'; @@ -10,43 +10,9 @@ import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { By } from '@angular/platform-browser'; import { APP_CONFIG } from '../../../../../../config/app-config.interface'; -import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service'; -import { NotificationsService } from '../../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils'; -import { PageInfo } from '../../../../../core/shared/page-info.model'; -import { buildPaginatedList } from '../../../../../core/data/paginated-list.model'; -import { GroupMock } from '../../../../../shared/testing/group-mock'; -import { hot } from 'jasmine-marbles'; -import { AuthService } from '../../../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service'; -import { EPersonDataService } from '../../../../../core/eperson/eperson-data.service'; -import { ResourcePolicyDataService } from '../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub'; -import { EPersonMock } from '../../../../../shared/testing/eperson.mock'; -import { EPerson } from '../../../../../core/eperson/models/eperson.model'; -import { createPaginatedList } from '../../../../../shared/testing/utils.test'; let projectListElementComponent: ProjectSearchResultListElementComponent; let fixture: ComponentFixture; -let authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) -}); - -const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { - getAuthenticatedUserFromStore: () => { - return of(EPersonMock); - } -}); - -const user = Object.assign(new EPerson(), { - id: 'userId', - groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), - _links: { self: { href: 'test.com/uuid/1234567654321' } } -}); -const epersonService = jasmine.createSpyObj('epersonService', { - findById: createSuccessfulRemoteDataObject$(user), -}); const mockItemWithMetadata: ItemSearchResult = Object.assign( new ItemSearchResult(), @@ -98,65 +64,12 @@ const enviromentNoThumbs = { } }; -const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { - searchByItem: jasmine.createSpy('searchByItem'), -}); - -const supervisionOrder: any = { - id: '1', - type: 'supervisionOrder', - uuid: 'supervision-order-1', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; -const anothersupervisionOrder: any = { - id: '2', - type: 'supervisionOrder', - uuid: 'supervision-order-2', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; - -const pageInfo = new PageInfo(); -const array = [supervisionOrder, anothersupervisionOrder]; -const paginatedList = buildPaginatedList(pageInfo, array); -const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - describe('ProjectSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ProjectSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - { provide: NotificationsService, useValue: {}}, - { provide: TranslateService, useValue: {}}, - { provide: ResourcePolicyDataService, useValue: {}}, - { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: epersonService}, - { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -168,9 +81,6 @@ describe('ProjectSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(ProjectSearchResultListElementComponent); projectListElementComponent = fixture.componentInstance; @@ -223,13 +133,6 @@ describe('ProjectSearchResultListElementComponent', () => { declarations: [ProjectSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, - {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - {provide: NotificationsService, useValue: {}}, - {provide: TranslateService, useValue: {}}, - {provide: ResourcePolicyDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: epersonService}, - {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } @@ -248,9 +151,7 @@ describe('ProjectSearchResultListElementComponent', () => { describe('with environment.browseBy.showThumbnails set to false', () => { beforeEach(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); + projectListElementComponent.object = mockItemWithMetadata; fixture.detectChanges(); }); 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 59ce71ff6cd..6b75c591816 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 @@ -71,11 +71,6 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges */ @Input() showLabel = true; - /** - * Whether to show the supervision orders badges or not - */ - @Input() showSupervisionOrderBadges = false; - /** * The value to display for this element */ @@ -128,7 +123,6 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges */ protected inAndOutputNames: string[] = [ 'object', - 'showSupervisionOrderBadges', 'index', 'linkType', 'listID', diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts index f292ac5b76f..7d4e107b2b3 100644 --- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts +++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts @@ -16,11 +16,6 @@ export class AbstractListableElementComponent { */ @Input() object: T; - /** - * The supervision orders to render in this list element - */ - @Input() supervisionOrders: T; - /** * The link type to determine the type of link rendered in this element */ @@ -46,11 +41,6 @@ export class AbstractListableElementComponent { */ @Input() showLabel = true; - /** - * Whether to show the supervision orders badges or not - */ - @Input() showSupervisionOrderBadges = false; - /** * The context we matched on to get this component */ diff --git a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html index 4bf45e7f3b6..3877e2f335b 100644 --- a/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html +++ b/src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.html @@ -1 +1 @@ - + diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html index a0ef3e1cb9f..b8712b85c57 100644 --- a/src/app/shared/object-list/object-list.component.html +++ b/src/app/shared/object-list/object-list.component.html @@ -31,7 +31,6 @@ [context]="context" [linkType]="linkType" [listID]="selectionConfig?.listId" - [showSupervisionOrderBadges]="showSupervisionOrderBadges" (contentChange)="contentChange.emit($event)"> diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts index 9d064115e63..65e2b508daa 100644 --- a/src/app/shared/object-list/object-list.component.ts +++ b/src/app/shared/object-list/object-list.component.ts @@ -81,11 +81,6 @@ export class ObjectListComponent { */ @Input() showPaginator = true; - /** - * Whether to show the supervision orders badges or not - */ - @Input() showSupervisionOrderBadges = false; - /** * Emit when one of the listed object has changed. */ diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts index d4ca14c1057..7665b7d64e3 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { of as observableOf, of } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component'; import { Item } from '../../../../../../core/shared/item.model'; import { TruncatePipe } from '../../../../../utils/truncate.pipe'; @@ -10,44 +10,10 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-name.service.mock'; import { APP_CONFIG } from '../../../../../../../config/app-config.interface'; -import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service'; -import { NotificationsService } from '../../../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../../../../shared/remote-data.utils'; -import { PageInfo } from '../../../../../../core/shared/page-info.model'; -import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model'; -import { GroupMock } from '../../../../../../shared/testing/group-mock'; -import { hot } from 'jasmine-marbles'; -import { AuthService } from '../../../../../../core/auth/auth.service'; -import { AuthorizationDataService } from '../../../../../../core/data/feature-authorization/authorization-data.service'; -import { EPersonDataService } from '../../../../../../core/eperson/eperson-data.service'; -import { ResourcePolicyDataService } from '../../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthServiceStub } from '../../../../../../shared/testing/auth-service.stub'; -import { EPersonMock } from '../../../../../../shared/testing/eperson.mock'; -import { EPerson } from 'src/app/core/eperson/models/eperson.model'; -import { createPaginatedList } from 'src/app/shared/testing/utils.test'; let publicationListElementComponent: ItemSearchResultListElementComponent; let fixture: ComponentFixture; const dcTitle = 'This is just another title'; -let authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true) -}); - -const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), { - getAuthenticatedUserFromStore: () => { - return of(EPersonMock); - } -}); -const user = Object.assign(new EPerson(), { - id: 'userId', - groups: createSuccessfulRemoteDataObject$(createPaginatedList([])), - _links: { self: { href: 'test.com/uuid/1234567654321' } } -}); -const epersonService = jasmine.createSpyObj('epersonService', { - findById: createSuccessfulRemoteDataObject$(user), -}); - const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), { hitHighlights: { 'dc.title': [{ @@ -218,65 +184,12 @@ const enviromentNoThumbs = { } }; -const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', { - searchByItem: jasmine.createSpy('searchByItem'), -}); - -const supervisionOrder: any = { - id: '1', - type: 'supervisionOrder', - uuid: 'supervision-order-1', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; -const anothersupervisionOrder: any = { - id: '2', - type: 'supervisionOrder', - uuid: 'supervision-order-2', - _links: { - item: { - href: 'https://rest.api/rest/api/eperson' - }, - group: { - href: 'https://rest.api/rest/api/group' - }, - self: { - href: 'https://rest.api/rest/api/supervisionorders/1' - }, - }, - item: observableOf(createSuccessfulRemoteDataObject({})), - group: observableOf(createSuccessfulRemoteDataObject(GroupMock)) -}; - -const pageInfo = new PageInfo(); -const array = [supervisionOrder, anothersupervisionOrder]; -const paginatedList = buildPaginatedList(pageInfo, array); -const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); - describe('ItemSearchResultListElementComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ItemSearchResultListElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, - { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - { provide: NotificationsService, useValue: {}}, - { provide: TranslateService, useValue: {}}, - { provide: ResourcePolicyDataService, useValue: {}}, - { provide: AuthService, useValue: authService}, - { provide: EPersonDataService, useValue: epersonService}, - { provide: AuthorizationDataService, useValue: authorizationService}, { provide: DSONameService, useClass: DSONameServiceMock }, { provide: APP_CONFIG, useValue: environmentUseThumbs } ], @@ -288,9 +201,6 @@ describe('ItemSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(ItemSearchResultListElementComponent); publicationListElementComponent = fixture.componentInstance; @@ -463,13 +373,6 @@ describe('ItemSearchResultListElementComponent', () => { declarations: [ItemSearchResultListElementComponent, TruncatePipe], providers: [ {provide: TruncatableService, useValue: {}}, - {provide: SupervisionOrderDataService, useValue: supervisionOrderDataService }, - {provide: NotificationsService, useValue: {}}, - {provide: TranslateService, useValue: {}}, - {provide: ResourcePolicyDataService, useValue: {}}, - {provide: AuthService, useValue: authService}, - {provide: EPersonDataService, useValue: epersonService}, - {provide: AuthorizationDataService, useValue: authorizationService}, {provide: DSONameService, useClass: DSONameServiceMock}, { provide: APP_CONFIG, useValue: enviromentNoThumbs } ], @@ -481,9 +384,6 @@ describe('ItemSearchResultListElementComponent', () => { })); beforeEach(waitForAsync(() => { - supervisionOrderDataService.searchByItem.and.returnValue(hot('a|', { - a: paginatedListRD - })); fixture = TestBed.createComponent(ItemSearchResultListElementComponent); publicationListElementComponent = fixture.componentInstance; })); diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index 7ed96fdc68f..f84ae642ad2 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -1,37 +1,10 @@ -import { Component, Inject } from '@angular/core'; -import { - listableObjectComponent -} from '../../../../../object-collection/shared/listable-object/listable-object.decorator'; +import { Component } from '@angular/core'; +import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator'; import { ViewMode } from '../../../../../../core/shared/view-mode.model'; import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model'; import { SearchResultListElementComponent } from '../../../search-result-list-element.component'; import { Item } from '../../../../../../core/shared/item.model'; import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths'; -import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service'; -import { TruncatableService } from '../../../../../../shared/truncatable/truncatable.service'; -import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service'; -import { APP_CONFIG, AppConfig } from '../../../../../../../config/app-config.interface'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { combineLatest, filter, map, Observable, switchMap, take } from 'rxjs'; -import { ConfirmationModalComponent } from '../../../../../../shared/confirmation-modal/confirmation-modal.component'; -import { hasValue } from '../../../../../../shared/empty.util'; -import { NotificationsService } from '../../../../../../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { followLink } from '../../../../../../shared/utils/follow-link-config.model'; -import { - getAllSucceededRemoteData, - getAllSucceededRemoteListPayload, - getFirstSucceededRemoteDataPayload, - getRemoteDataPayload -} from '../../../../../../core/shared/operators'; -import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model'; -import { Group } from '../../../../../../core/eperson/models/group.model'; -import { ResourcePolicyDataService } from '../../../../../../core/resource-policy/resource-policy-data.service'; -import { AuthService } from '../../../../../../core/auth/auth.service'; -import { EPerson } from '../../../../../../core/eperson/models/eperson.model'; -import { EPersonDataService } from '../../../../../../core/eperson/eperson-data.service'; -import { AuthorizationDataService } from '../../../../../../core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from '../../../../../../core/data/feature-authorization/feature-id'; @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement) @listableObjectComponent(ItemSearchResult, ViewMode.ListElement) @@ -44,8 +17,6 @@ import { FeatureID } from '../../../../../../core/data/feature-authorization/fea * The component for displaying a list element for an item search result of the type Publication */ export class ItemSearchResultListElementComponent extends SearchResultListElementComponent { - messagePrefix = 'item.search.result'; - /** * Route to the item's page */ @@ -56,112 +27,9 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen */ showThumbnails: boolean; - /** - * List of the supervision orders combined with the group - */ - supervisionOrder$: Observable<{ supervisionOrder: SupervisionOrder; group: Group; }[]>; - - /** - * The groups the user belongs to - */ - groups: Group[]; - - constructor( - protected truncatableService: TruncatableService, - protected dsoNameService: DSONameService, - @Inject(APP_CONFIG) protected appConfig: AppConfig, - protected supervisionOrderDataService: SupervisionOrderDataService, - protected modalService: NgbModal, - protected notificationsService: NotificationsService, - protected translateService: TranslateService, - protected resourcePolicyService: ResourcePolicyDataService, - protected authService: AuthService, - protected epersonService: EPersonDataService, - protected authorizationService: AuthorizationDataService - ) { super(truncatableService, dsoNameService, appConfig); } - ngOnInit(): void { super.ngOnInit(); this.showThumbnails = this.appConfig.browseBy.showThumbnails; - let isAdmin = false; - this.authorizationService.isAuthorized(FeatureID.AdministratorOf).subscribe(isadmin => { - isAdmin = isadmin; - }); - - this.authService.getAuthenticatedUserFromStore().pipe( - filter((user: EPerson) => hasValue(user.id)), - switchMap((user: EPerson) => this.epersonService.findById(user.id, true, true, followLink('groups'))), - getAllSucceededRemoteData(), - getRemoteDataPayload(), - switchMap((user: EPerson) => user.groups), - ).subscribe(groups => { - this.groups = groups?.payload?.page; - }); - this.itemPageRoute = getItemPageRoute(this.dso); - if (this.supervisionOrders) { - this.resourcePolicyService.searchByResource( - this.dso.uuid, null, false, true, - followLink('eperson'), followLink('group') - ).pipe( - getAllSucceededRemoteData(), - ).subscribe((result) => { - this.supervisionOrder$ = this.supervisionOrderDataService.searchByItem(this.dso.uuid, false, true, followLink('group')).pipe( - getAllSucceededRemoteListPayload(), - switchMap((supervisionOrders: SupervisionOrder[]) => { - const supervisionOrdersArray = supervisionOrders.map((supervisionOrder: SupervisionOrder) => { - return supervisionOrder.group.pipe( - getFirstSucceededRemoteDataPayload(), - map((group: Group) => { - let isAuthorized = false; - result.payload.page.forEach(resourcePolicy => { - resourcePolicy.group.subscribe(res => { - if (isAdmin || (res.payload && res.payload.uuid === group.uuid && this.groups.find(groups => groups.uuid === group.uuid))) { - isAuthorized = true; - } - }); - }); - return isAuthorized ? ({ supervisionOrder, group }) : null; - }), - ); - }); - return combineLatest(supervisionOrdersArray).pipe( - map(array => array.filter(hasValue)) - ); - })); - }); - } - } - - /** - * Deletes the Group from the Repository. The Group 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. - */ - deleteSupervisionOrder(supervisionOrder) { - const modalRef = this.modalService.open(ConfirmationModalComponent); - modalRef.componentInstance.dso = supervisionOrder.group; - modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-supervision.modal.header'; - modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-supervision.modal.info'; - modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-supervision.modal.cancel'; - modalRef.componentInstance.confirmLabel = this.messagePrefix + '.delete-supervision.modal.confirm'; - modalRef.componentInstance.brandColor = 'danger'; - modalRef.componentInstance.confirmIcon = 'fas fa-trash'; - modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => { - if (confirm) { - if (hasValue(supervisionOrder.supervisionOrder.id)) { - this.supervisionOrderDataService.delete(supervisionOrder.supervisionOrder.id) - .subscribe((rd: boolean) => { - if (rd) { - this.supervisionOrderDataService.searchByItem(this.dso.uuid, null, null, followLink('group')); - this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.deleted.success', { name: supervisionOrder.group._name })); - } else { - this.notificationsService.error( - this.translateService.get(this.messagePrefix + '.notification.deleted.failure.title', { name: supervisionOrder.group._name }), - this.translateService.get(this.messagePrefix + '.notification.deleted.failure.content')); - } - }); - } - } - }); } } From 078bdd287fbeca3912cc894f2356241925172081 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 13 Feb 2023 15:45:56 +0100 Subject: [PATCH 514/758] [CST-7757] Fix delete message --- .../subscription-modal.component.html | 2 +- .../subscription-modal.component.ts | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index 0e723a8140f..a71498f0021 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -27,7 +27,7 @@

    {{'subscriptions.modal.title' | translate}}

    -

    {{'subscriptions.modal.delete-info' | translate}}

    +

    {{'subscriptions.modal.delete-info' | translate}}

    diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts index c094e37ef23..b8426bc635c 100644 --- a/src/app/shared/search/search.component.ts +++ b/src/app/shared/search/search.component.ts @@ -117,6 +117,11 @@ export class SearchComponent implements OnInit { */ @Input() selectionConfig: SelectionConfig; + /** + * A boolean representing if show csv export button + */ + @Input() showCsvExport = false; + /** * A boolean representing if show search sidebar button */ diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts index 64a2befeb2d..bdeb7247792 100644 --- a/src/app/shared/search/themed-search.component.ts +++ b/src/app/shared/search/themed-search.component.ts @@ -19,7 +19,7 @@ import { ListableObject } from '../object-collection/shared/listable-object.mode templateUrl: '../theme-support/themed.component.html', }) export class ThemedSearchComponent extends ThemedComponent { - protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showSidebar', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics']; + protected inAndOutputNames: (keyof SearchComponent & keyof this)[] = ['configurationList', 'context', 'configuration', 'fixedFilterQuery', 'useCachedVersionIfAvailable', 'inPlaceSearch', 'linkType', 'paginationId', 'searchEnabled', 'sideBarWidth', 'searchFormPlaceholder', 'selectable', 'selectionConfig', 'showCsvExport', 'showSidebar', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics']; @Input() configurationList: SearchConfigurationOption[] = []; @@ -47,6 +47,8 @@ export class ThemedSearchComponent extends ThemedComponent { @Input() selectionConfig: SelectionConfig; + @Input() showCsvExport = false; + @Input() showSidebar = true; @Input() showViewModes = true; From d810cbcc8fea2aea627223f46cd25c8a964c9390 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Wed, 15 Feb 2023 11:36:56 +0300 Subject: [PATCH 518/758] src/assets/i18n: Improve English strings for file upload Simple improvement to the wording in the file upload section of the item submission form. Also add a period at the end of the string. Fixes: #2096 --- src/assets/i18n/ar.json5 | 4 ++-- src/assets/i18n/bn.json5 | 2 +- src/assets/i18n/ca.json5 | 2 +- src/assets/i18n/cs.json5 | 4 ++-- src/assets/i18n/de.json5 | 2 +- src/assets/i18n/en.json5 | 2 +- src/assets/i18n/es.json5 | 2 +- src/assets/i18n/fi.json5 | 2 +- src/assets/i18n/fr.json5 | 2 +- src/assets/i18n/gd.json5 | 2 +- src/assets/i18n/hu.json5 | 2 +- src/assets/i18n/ja.json5 | 4 ++-- src/assets/i18n/kk.json5 | 2 +- src/assets/i18n/lv.json5 | 2 +- src/assets/i18n/nl.json5 | 2 +- src/assets/i18n/pt-BR.json5 | 2 +- src/assets/i18n/pt-PT.json5 | 2 +- src/assets/i18n/sv.json5 | 2 +- src/assets/i18n/sw.json5 | 4 ++-- src/assets/i18n/tr.json5 | 2 +- src/assets/i18n/uk.json5 | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5 index 24e6e146034..1edbdf7981c 100644 --- a/src/assets/i18n/ar.json5 +++ b/src/assets/i18n/ar.json5 @@ -6459,9 +6459,9 @@ // TODO New key - Add a translation "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.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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // TODO New key - Add a translation - "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // "submission.sections.upload.no-entry": "No", // TODO New key - Add a translation diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5 index 55ec1820dd3..8b903c4a65d 100644 --- a/src/assets/i18n/bn.json5 +++ b/src/assets/i18n/bn.json5 @@ -5803,7 +5803,7 @@ // "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": "অনুগ্রহ করে মনে রাখবেন যে {{collectionName}} সংগ্রহে আপলোড করা ফাইলগুলি অ্যাক্সেসযোগ্য হবে, একক ফাইলের জন্য স্পষ্টভাবে যা নির্ধারণ করা হয়েছে তা ছাড়াও, নিম্নলিখিত গ্রুপ(গুলি) সহ:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "এখানে আপনি বর্তমানে আইটেমটিতে সমস্ত ফাইল পাবেন। আপনি ফাইল মেটাডেটা এবং অ্যাক্সেস শর্তাদি আপডেট করতে পারেন অথবা অতিরিক্ত ফাইল আপলোড করুন - পৃষ্ঠাটিতে সর্বত্র ড্র্যাগ করুন এবং ড্রপ করুন ", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5 index 24698baac0d..246a92061cc 100644 --- a/src/assets/i18n/ca.json5 +++ b/src/assets/i18n/ca.json5 @@ -6353,7 +6353,7 @@ // "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": "Tingueu en compte que els fitxers carregats a la col·lecció {{ collectionName }} seran accessibles, a més del que es decideixi explícitament per al fitxer, per als grups següents:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Aquí trobareu tots els fitxers que es troben actualment a l'ítem. Podeu actualitzar les metadades del fitxer i les condicions d'accés o incloure fitxers addicionals simplement arrossegant i deixant anar a qualsevol lloc de la pàgina", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5 index a04e89b2c3c..5ed1474384a 100644 --- a/src/assets/i18n/cs.json5 +++ b/src/assets/i18n/cs.json5 @@ -6327,9 +6327,9 @@ // TODO New key - Add a translation "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.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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // TODO New key - Add a translation - "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // "submission.sections.upload.no-entry": "No", // TODO New key - Add a translation diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index c1979be6b6a..82d422621c3 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -5203,7 +5203,7 @@ // "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": "Bitte beachten Sie, dass in diese Sammlung {{collectionName}} hochgeladene Dateien zugüglich zu dem, was für einzelne Dateien entschieden wurde, für folgende Gruppe(n) zugänglich sein:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Hier finden Sie alle Dateien, die aktuell zum Item gehören. Sie können ihre Metadaten und Zugriffsrechte bearbeiten oder weitere Dateien per Drag & Drop hinzufügen.", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8fcac7d0409..fc4c6aa74d1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4581,7 +4581,7 @@ "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.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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index ae41bfdcb5c..3184e4f22bf 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -6353,7 +6353,7 @@ // "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 fichero, para 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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Aquí encontrará todos los archivos que se encuentran actualmente en el ítem. Puede actualizar los metadatos del fichero y las condiciones de acceso e incluir ficheros adicionales simplemente arrastrando-y-soltando en cualquier lugar de la página", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5 index 2a077006cc3..05ae06d46b5 100644 --- a/src/assets/i18n/fi.json5 +++ b/src/assets/i18n/fi.json5 @@ -4914,7 +4914,7 @@ // "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": "Yksittäisten tiedostojen pääsyrajoitusten lisäksi {{collectionName}}-kokoelmaan ladatut tiedostot ovat seuraavien ryhmien saatavilla:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Tietueen kaikki tiedostot on lueteltu tässä. Voit päivittää tiedoston metadataa ja pääsyehtoja tai ladata lisää tiedostoja raahaamalla ne mihin hyvänsä sivun kohtaan", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index 381e13a743f..1e042c81fda 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -5670,7 +5670,7 @@ // "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": "Veuillez noter que, en complément des accès spécifiquement accordés pour le fichier, les fichiers téléchargés dans la collection {{collectionName}} seront accessibles par défaut au(x) groupe(s) suivant(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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Vous trouverez ici tous les fichiers actuellement associés à l'Item. Vous pouvez éditer les métadonnés et les niveaux d'accès de ce(s) fichier(s) ou télécharger des fichiers complémentaires simplement en les glissant n'importe où sur cette page", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5 index 083de54781e..45841454525 100644 --- a/src/assets/i18n/gd.json5 +++ b/src/assets/i18n/gd.json5 @@ -5801,7 +5801,7 @@ // TODO New key - Add a translation "submission.sections.upload.header.policy.default.withlist": "Thoir fa-near gum bi cothrom air faidhlichean a chaidh a luchdachadh gu cruinneachadh {{collectionName}}, cho math ris na chaidh a cho-dhùnadh airson an fhaidhle air leth, aig a' bhuidheann/na buidhnean a leanas:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "An seo gheibh thu na faidhlichean gu lèir san nì an-dràsta. Is urrainn dhut metadata an fhaidhle ùrachadh agus cothrom fhaighinn air cumhachan no faidhlichean eile a luchdachadh suas le bhith gan slaodadh agus gan leigeil às air feadh na duilleig", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index 0e73e9dbae2..bfa4a53ccf5 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -4924,7 +4924,7 @@ // "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": "Kérjük, vegye figyelembe, hogy a {{collectionName}} gyűjteménybe feltöltött állományok elérhetők lesznek, azon kívül amit az egyedi állományokról kifejezetten eldöntött, a következő csoport(ok)ban:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Itt megtalálja a tárgyban lévő valamennyi állományt. Frissítheti az állomány metaadatait és hozzáférési feltételeit vagy feltölthet további állományokat azzal, hogy behúzza azokat bárhova az oldalra", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5 index 71b32cf70bf..83a755c9239 100644 --- a/src/assets/i18n/ja.json5 +++ b/src/assets/i18n/ja.json5 @@ -6459,9 +6459,9 @@ // TODO New key - Add a translation "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.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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // TODO New key - Add a translation - "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // "submission.sections.upload.no-entry": "No", // TODO New key - Add a translation diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index b661ce21d35..0fd092df02c 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -6283,7 +6283,7 @@ // "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": "{{collectionName}} жинағына жүктелген файлдар жеке файл үшін нақты анықталғаннан басқа, келесі топпен (топтармен) қол жетімді болатындығын ескеріңіз:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Мұнда сіз осы элементтегі барлық файлдарды таба аласыз. Файл метадеректерін және кіру шарттарын жаңартуға немесе қосымша файлдарды олардыбетінде сүйреп апару арқылы жүктеуге болады.", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5 index e00ad3517b2..79ff8ce8555 100644 --- a/src/assets/i18n/lv.json5 +++ b/src/assets/i18n/lv.json5 @@ -5379,7 +5379,7 @@ // "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": "Lūdzu, ņemiet vērā, ka augšupielādētie faili kolekcijā {{collectionName}} būs pieejami papildus tam, kas ir skaidri noteikts par atsevišķu failu, ar šādām grupām:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Šeit atradīsit visus failus, kas pašlaik atrodas materiālā. Varat atjaunināt failu metadatus un piekļuves nosacījumus vai augšupielādēt papildu failus, vienkārši ievelkot un atstājot tos visur lapā", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5 index b02e3a5276e..1ebdeaa5667 100644 --- a/src/assets/i18n/nl.json5 +++ b/src/assets/i18n/nl.json5 @@ -5752,7 +5752,7 @@ // "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": "Let op: bestanden in de collectie {{collectionName}} zullen niet alleen toegankelijk zijn volgens de expliciet toegekende rechten per bestand, maar ook volgens de volgende groep(en):", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Hier vindt u alle bestanden van het item. U kunt de metadata en toegangsrechten bewerken of meer bestanden toevoegen door ze naar deze pagina te slepen.", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index f68436d00bc..7dca26aa4e0 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -6066,7 +6066,7 @@ // "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": "Por favor note que arquivos enviados a coleção {{collectionName}} serão acessíveis, de acordo com o que está explicitamente definido no arquivo, no(s) seguinte(s) 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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Aqui vocẽ encontra todos os arquivos que estão atualmente no item. Você pode atualizar os metadados do arquivo e condições de acesso ou enviar arquivos adicionais apenas arrastando os arquivos em qualquer lugar da página", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5 index b277e866c08..62e7c53e36c 100644 --- a/src/assets/i18n/pt-PT.json5 +++ b/src/assets/i18n/pt-PT.json5 @@ -5117,7 +5117,7 @@ // "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": "Por favor note que os ficheiros enviados à coleção {{collectionName}} serão acessíveis, de acordo com o que está explicitamente definido no ficheiro, no(s) seguinte(s) 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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Aqui encontra todos os ficheiros que estão atualmente no item. Pode atualizar os metadados do ficheiro e condições de acesso ou carregar ficheiros adicionais arrastando os ficheiros em qualquer lugar desta página", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5 index d04b95e1444..4c9db83b167 100644 --- a/src/assets/i18n/sv.json5 +++ b/src/assets/i18n/sv.json5 @@ -5954,7 +5954,7 @@ // "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": "Notera att uppladdade filer i samlingen {{collectionName}} också kommer att vara åtkompliga för följande grupp(er):", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Här visas samtliga filer som ingår i posten. Du kan uppdatera filernas metadata och villkor för åtkomst, samt ladda upp nya filer genom att dra och släppa dem här", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5 index 5e00b545999..4f686550190 100644 --- a/src/assets/i18n/sw.json5 +++ b/src/assets/i18n/sw.json5 @@ -6459,9 +6459,9 @@ // TODO New key - Add a translation "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.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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // TODO New key - Add a translation - "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", // "submission.sections.upload.no-entry": "No", // TODO New key - Add a translation diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5 index fff02c59672..92e0c5b6e29 100644 --- a/src/assets/i18n/tr.json5 +++ b/src/assets/i18n/tr.json5 @@ -4905,7 +4905,7 @@ // "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": "{{collectionName}} koleksiyonuna yüklenen dosyalara, tek dosya için açıkça karar verilenlere ek olarak aşağıdaki gruplarla erişilebilir olacağını lütfen unutmayın:", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Burada, o anda öğede bulunan tüm dosyaları bulacaksınız. Dosya metadatalarını güncelleyebilir ve koşullara erişebilir veya sayfanın her yerine sürükleyip bırakarak ek dosyalar yükleyebilirsiniz", // "submission.sections.upload.no-entry": "No", diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5 index 0ba5b0109ad..6ee2bd9f1c6 100644 --- a/src/assets/i18n/uk.json5 +++ b/src/assets/i18n/uk.json5 @@ -5225,7 +5225,7 @@ // "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": "Зверніть увагу, що завантажені файли в {{collectionName}} зібрання будуть доступні, для користувачів, що входять у групу(и):", - // "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": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or upload additional files by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Тут ви знайдете всі файли, які зараз містяться в документі. Ви можете оновити метадані файлу та умови доступу або завантажити додаткові файли, просто перетягнувши їх сюди на сторінці", // "submission.sections.upload.no-entry": "No", From b676c1ab7967234392381d4362ac0137f2b3bb4c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 15 Feb 2023 18:43:49 +0100 Subject: [PATCH 519/758] [CST-8935] Fix issue with missing matcher providers --- src/app/app.module.ts | 4 ++++ src/app/shared/form/form.module.ts | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 750d63beda1..89e361821ba 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -9,6 +9,8 @@ import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; +import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core'; + import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { appEffects } from './app.effects'; @@ -101,6 +103,8 @@ const PROVIDERS = [ useClass: LogInterceptor, multi: true }, + // register the dynamic matcher used by form. MUST be provided by the app module + ...DYNAMIC_MATCHER_PROVIDERS, ]; const DECLARATIONS = [ diff --git a/src/app/shared/form/form.module.ts b/src/app/shared/form/form.module.ts index 61fc7e3c390..51ebaee1b8a 100644 --- a/src/app/shared/form/form.module.ts +++ b/src/app/shared/form/form.module.ts @@ -21,7 +21,7 @@ import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds- import { SharedModule } from '../shared.module'; import { TranslateModule } from '@ngx-translate/core'; import { SearchModule } from '../search/search.module'; -import { DYNAMIC_FORM_CONTROL_MAP_FN, DYNAMIC_MATCHER_PROVIDERS, DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core'; +import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core'; import { ExistingMetadataListElementComponent } from './builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component'; import { ExistingRelationListElementComponent } from './builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component'; import { ExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; @@ -101,7 +101,6 @@ const DIRECTIVES = [ provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn }, - ...DYNAMIC_MATCHER_PROVIDERS, VocabularyTreeviewService, DynamicFormLayoutService, DynamicFormService, From 028d4192bb7e4f0f69f60b02b7912d5982b49de7 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 15 Feb 2023 11:37:37 +0100 Subject: [PATCH 520/758] translation fixes in security form --- src/assets/i18n/de.json5 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index 82d422621c3..6c8eb4bc8f6 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -3838,17 +3838,17 @@ // "profile.security.form.error.matching-passwords": "The passwords do not match.", "profile.security.form.error.matching-passwords": "Die Passwörter stimmen nicht überein.", - // "profile.security.form.error.password-length": "The password should be at least 6 characters long.", - "profile.security.form.error.password-length": "Das Passwort sollte mindestens 6 Zeichen lang sein.", - // "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": "Optional können Sie ein neues Passwort in das Feld darunter eingeben und es durch erneute Eingabe in das zweite Feld bestätigen. Es sollte mindestens sechs Zeichen lang sein.", + "profile.security.form.info": "Im nachfolgenden Feld können Sie bei Bedarf ein neues Passwort eingeben und es durch erneute Eingabe in das zweite Feld bestätigen. Es sollte mindestens sechs Zeichen lang sein.", // "profile.security.form.label.password": "Password", "profile.security.form.label.password": "Passwort", // "profile.security.form.label.passwordrepeat": "Retype to confirm", - "profile.security.form.label.passwordrepeat": "Zum Bestätigen erneut eingeben", + "profile.security.form.label.passwordrepeat": "Zum Bestätigen das Passwort erneut eingeben", + + // "profile.security.form.label.current-password": "Current password" + "profile.security.form.label.current-password": "Ihr aktuelles Passwort" // "profile.security.form.notifications.success.content": "Your changes to the password were saved.", "profile.security.form.notifications.success.content": "Ihr geändertes Passwort wurde gespeichert.", @@ -3862,8 +3862,14 @@ // "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": "Das Passwort sollte mindestens 6 Zeichen lang sein.", + // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.", + "profile.security.form.notifications.error.change-failed": "Es ist ein Fehler beim Ändern des Passworts aufgetreten. Bitte überprüfen Sie, ob Ihr aktuelles Passwort korrekt eingegeben wurde.", + // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.", "profile.security.form.notifications.error.not-same": "Die angegebenen Passwörter sind nicht identisch.", + + // "profile.security.form.notifications.error.general": "Please fill required fields of security form.", + "profile.security.form.notifications.error.general": "Bitte füllen Sie alle Pflichtfelder im Formular aus.", // "profile.title": "Update Profile", "profile.title": "Profil aktualisieren", From 3ed9ae2d3ea343767c362e223c4579cbc7bda419 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 15 Feb 2023 12:14:42 +0100 Subject: [PATCH 521/758] remove minimum passwort length value from translated messages --- src/assets/i18n/de.json5 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index 6c8eb4bc8f6..e5d074d7f58 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -1982,8 +1982,8 @@ // "forgot-password.form.head": "Forgot Password", "forgot-password.form.head": "Passwort vergessen", - // "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": "Bitte geben Sie ein neues Passwort (mindestens sechs Zeichen) ein und bestätigen Sie es erneut.", + // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.", + "forgot-password.form.info": "Bitte geben Sie ein neues Passwort ein und bestätigen Sie es erneut.", // "forgot-password.form.card.security": "Security", "forgot-password.form.card.security": "Sicherheit", @@ -3838,8 +3838,8 @@ // "profile.security.form.error.matching-passwords": "The passwords do not match.", "profile.security.form.error.matching-passwords": "Die Passwörter stimmen nicht überein.", - // "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": "Im nachfolgenden Feld können Sie bei Bedarf ein neues Passwort eingeben und es durch erneute Eingabe in das zweite Feld bestätigen. Es sollte mindestens sechs Zeichen lang sein.", + // "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.", + "profile.security.form.info": "Im nachfolgenden Feld können Sie bei Bedarf ein neues Passwort eingeben und es durch erneute Eingabe in das zweite Feld bestätigen.", // "profile.security.form.label.password": "Password", "profile.security.form.label.password": "Passwort", @@ -3975,8 +3975,8 @@ // "register-page.create-profile.security.header": "Security", "register-page.create-profile.security.header": "Sicherheit", - // "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": "Bitte geben Sie ein Passwort in das unten stehende Feld ein und bestätigen Sie es, indem Sie es in das zweite Feld erneut eingeben. Es sollte mindestens sechs Zeichen lang sein.", + // "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.", + "register-page.create-profile.security.info": "Bitte geben Sie ein Passwort in das unten stehende Feld ein und bestätigen Sie es, indem Sie es in das zweite Feld erneut eingeben.", // "register-page.create-profile.security.label.password": "Password *", "register-page.create-profile.security.label.password": "Passwort *", From 26705a5cf75b4301991f1edbfa4994b4c55e3800 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 15 Feb 2023 18:32:54 +0100 Subject: [PATCH 522/758] fixed missing comma --- src/assets/i18n/de.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index e5d074d7f58..9dbd7032554 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -3848,7 +3848,7 @@ "profile.security.form.label.passwordrepeat": "Zum Bestätigen das Passwort erneut eingeben", // "profile.security.form.label.current-password": "Current password" - "profile.security.form.label.current-password": "Ihr aktuelles Passwort" + "profile.security.form.label.current-password": "Ihr aktuelles Passwort", // "profile.security.form.notifications.success.content": "Your changes to the password were saved.", "profile.security.form.notifications.success.content": "Ihr geändertes Passwort wurde gespeichert.", From e5e6639d214adc7d5e52003577618a2cbf0d40c0 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 15 Feb 2023 18:34:02 +0100 Subject: [PATCH 523/758] added comma to default translation --- src/assets/i18n/de.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index 9dbd7032554..df4c2cb4ee5 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -3847,7 +3847,7 @@ // "profile.security.form.label.passwordrepeat": "Retype to confirm", "profile.security.form.label.passwordrepeat": "Zum Bestätigen das Passwort erneut eingeben", - // "profile.security.form.label.current-password": "Current password" + // "profile.security.form.label.current-password": "Current password", "profile.security.form.label.current-password": "Ihr aktuelles Passwort", // "profile.security.form.notifications.success.content": "Your changes to the password were saved.", From bf22eb5582e7ff76483a9d6d95b1061af1b2a41a Mon Sep 17 00:00:00 2001 From: cris Date: Wed, 15 Feb 2023 22:14:31 +0000 Subject: [PATCH 524/758] suggestionOption.name displayed --- .../dso-input-suggestions/dso-input-suggestions.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html index 7515b830b94..64c88bbd786 100644 --- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html +++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html @@ -14,6 +14,7 @@
    From 0733e2766d3010a1b979a828f6230653300ded3a Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 16 Feb 2023 17:53:47 +0100 Subject: [PATCH 525/758] [CST-8952] Fix issue with admin reset password functionality --- .../eperson-form/eperson-form.component.spec.ts | 2 +- .../epeople-registry/eperson-form/eperson-form.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 a96c238f93a..a476d07502d 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 @@ -537,7 +537,7 @@ describe('EPersonFormComponent', () => { }); it('should call epersonRegistrationService.registerEmail', () => { - expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail); + expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail, null, 'register'); }); }); }); 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 7d607647e32..4fbc192124f 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 @@ -36,6 +36,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model'; import { ValidateEmailNotTaken } from './validators/email-taken.validator'; import { Registration } from '../../../core/shared/registration.model'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; +import { TYPE_REQUEST_REGISTER } from '../../../register-email-form/register-email-form.component'; @Component({ selector: 'ds-eperson-form', @@ -491,7 +492,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { */ resetPassword() { if (hasValue(this.epersonInitial.email)) { - this.epersonRegistrationService.registerEmail(this.epersonInitial.email).pipe(getFirstCompletedRemoteData()) + this.epersonRegistrationService.registerEmail(this.epersonInitial.email, null, TYPE_REQUEST_REGISTER).pipe(getFirstCompletedRemoteData()) .subscribe((response: RemoteData) => { if (response.hasSucceeded) { this.notificationsService.success(this.translateService.get('admin.access-control.epeople.actions.reset'), From 3a2225679a52c58d479d7045e917407b6287a0e0 Mon Sep 17 00:00:00 2001 From: cris Date: Thu, 16 Feb 2023 17:11:17 +0000 Subject: [PATCH 526/758] avoiding console.log errors --- .../dso-input-suggestions.component.html | 1 - src/app/shared/shared.module.ts | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html index 64c88bbd786..7515b830b94 100644 --- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html +++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html @@ -14,7 +14,6 @@
    diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 32d11f8d36a..817232e39c0 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -216,6 +216,9 @@ import { import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component'; +import { + BundleListElementComponent +} from './object-list/bundle-list-element/bundle-list-element.component'; import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component'; @@ -373,6 +376,7 @@ const COMPONENTS = [ const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator + BundleListElementComponent, CollectionListElementComponent, CommunityListElementComponent, SearchResultListElementComponent, From 92f21961358bbe0c09e7d033dfd53f0bd47b4424 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 16 Feb 2023 14:09:35 -0600 Subject: [PATCH 527/758] Fix param to send user the forgot password email --- .../eperson-form/eperson-form.component.spec.ts | 2 +- .../epeople-registry/eperson-form/eperson-form.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 a476d07502d..bf03e1defbc 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 @@ -537,7 +537,7 @@ describe('EPersonFormComponent', () => { }); it('should call epersonRegistrationService.registerEmail', () => { - expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail, null, 'register'); + expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail, null, 'forgot'); }); }); }); 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 4fbc192124f..c5c9f8f9544 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 @@ -36,7 +36,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model'; import { ValidateEmailNotTaken } from './validators/email-taken.validator'; import { Registration } from '../../../core/shared/registration.model'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { TYPE_REQUEST_REGISTER } from '../../../register-email-form/register-email-form.component'; +import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component'; @Component({ selector: 'ds-eperson-form', @@ -492,7 +492,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { */ resetPassword() { if (hasValue(this.epersonInitial.email)) { - this.epersonRegistrationService.registerEmail(this.epersonInitial.email, null, TYPE_REQUEST_REGISTER).pipe(getFirstCompletedRemoteData()) + this.epersonRegistrationService.registerEmail(this.epersonInitial.email, null, TYPE_REQUEST_FORGOT).pipe(getFirstCompletedRemoteData()) .subscribe((response: RemoteData) => { if (response.hasSucceeded) { this.notificationsService.success(this.translateService.get('admin.access-control.epeople.actions.reset'), From d1ec9897b154af06df41674504169ba45d24d06c Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Fri, 17 Feb 2023 10:35:32 -0600 Subject: [PATCH 528/758] Update version tag for release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 184f1a56471..56ad493a2b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "7.5.0-next", + "version": "7.5.0", "scripts": { "ng": "ng", "config:watch": "nodemon", From 47e65861e1033695c7c34247560ba9bcaccf6d53 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 2 Mar 2023 12:06:41 +0100 Subject: [PATCH 529/758] [DSC-966] Show metric donuts in column --- .../object-list/metric-donuts/metric-donuts.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/object-list/metric-donuts/metric-donuts.component.html b/src/app/shared/object-list/metric-donuts/metric-donuts.component.html index 539c0839236..eb74c7aaedd 100644 --- a/src/app/shared/object-list/metric-donuts/metric-donuts.component.html +++ b/src/app/shared/object-list/metric-donuts/metric-donuts.component.html @@ -1,7 +1,7 @@ -
    +
    Date: Wed, 5 Apr 2023 15:26:25 +0200 Subject: [PATCH 530/758] [CST-8654] added link to potential duplicate --- .../duplicate-match/duplicate-match.component.html | 11 +++++++++-- .../duplicate-match/duplicate-match.component.ts | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.html b/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.html index 465d79f2357..5659813f852 100644 --- a/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.html +++ b/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.html @@ -21,7 +21,7 @@
    + + {{"submission.workflow.generic.view" | translate}} + +
    diff --git a/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.ts b/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.ts index eaa21688a1a..6f29a06f0c8 100644 --- a/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.ts +++ b/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.ts @@ -20,6 +20,7 @@ import { SectionsService } from '../../sections.service'; import { DuplicateMatchMetadataDetailConfig } from '../models/duplicate-detail-metadata.model'; import { DetectDuplicateMatch } from '../../../../core/submission/models/workspaceitem-section-deduplication.model'; import { environment } from '../../../../../environments/environment'; +import {getEntityPageRoute, getItemPageRoute} from "../../../../item-page/item-page-routing-paths"; /** * This component shows a single possible duplication within the duplications section. @@ -303,4 +304,9 @@ export class DuplicateMatchComponent implements OnInit { this.modalRef = this.modalService.open(modal); } + getItemPage(item: Item) { + return getItemPageRoute(item); + } + + protected readonly getItemPageRoute = getItemPageRoute; } From efbc3456ef9f2da631d442d048a9f929781e043b Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 13 Apr 2023 09:08:52 +0200 Subject: [PATCH 531/758] [DSC-629] use advanced attachment layout by default --- src/app/core/data/bitstream-data.service.ts | 51 +++++++- .../advanced-attachment.component.html | 76 +---------- .../advanced-attachment.component.scss | 10 -- .../advanced-attachment.component.ts | 25 +++- .../attachment-render.component.html | 1 + .../attachment-render.component.scss | 0 .../attachment-render.component.spec.ts | 25 ++++ .../attachment-render.component.ts | 121 ++++++++++++++++++ .../attachment-type.decorator.ts | 30 +++++ .../bitstream-attachment.component.html | 54 ++++++++ .../bitstream-attachment.component.scss | 31 +++++ .../bitstream-attachment.component.spec.ts | 25 ++++ .../bitstream-attachment.component.ts | 52 ++++++++ .../attachment/attachment.component.ts | 2 +- .../bitstream-rendering-model.ts | 11 +- .../rendering-types/metadata-box.decorator.ts | 1 + src/app/cris-layout/cris-layout.module.ts | 119 +++++++++++++---- src/app/item-page/item-shared.module.ts | 15 ++- .../file-download-button.component.html | 24 ++-- .../file-download-button.component.ts | 14 +- 20 files changed, 548 insertions(+), 139 deletions(-) create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.html create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.scss create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-type.decorator.ts create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.scss create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.spec.ts create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts index bff1a2c2701..2464bd62801 100644 --- a/src/app/core/data/bitstream-data.service.ts +++ b/src/app/core/data/bitstream-data.service.ts @@ -352,7 +352,56 @@ export class BitstreamDataService extends IdentifiableDataService imp uuid: string, bundlename: string, metadataFilters: MetadataFilter[], - options?: FindListOptions, + options: FindListOptions = {}, + useCachedVersionIfAvailable = true, + reRequestOnStale = true, + ...linksToFollow: FollowLinkConfig[] + ): Observable>> { + const searchParams = []; + searchParams.push(new RequestParam('uuid', uuid)); + searchParams.push(new RequestParam('name', bundlename)); + + metadataFilters.forEach((entry: MetadataFilter) => { + searchParams.push(new RequestParam('filterMetadata', entry.metadataName)); + searchParams.push(new RequestParam('filterMetadataValue', entry.metadataValue)); + }); + + const hrefObs = this.getSearchByHref( + 'showableByItem', + { searchParams }, + ...linksToFollow + ); + + return this.findListByHref( + hrefObs, + options, + useCachedVersionIfAvailable, + reRequestOnStale, + ...linksToFollow + ); + } + + /** + * Returns an observable of {@link RemoteData} of a {@link Bitstream} that is not marked + * hidden (that hasn't got the metadata `bitstream.hide` or its value is not true/yes). + * resolve {@link HALLink}s of the object + * + * @param uuid The item UUID to retrieve bitstreams from + * @param bundlename Bundle type of the bitstreams + * @param metadataFilters Array of object we want to filter by + * @param options The {@link FindListOptions} for the request + * @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 linksToFollow List of {@link FollowLinkConfig} that indicate which + * {@link HALLink}s should be automatically resolved + */ + showableByItem( + uuid: string, + bundlename: string, + metadataFilters: MetadataFilter[], + options: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[] diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html index bf1b2e06aca..9806cf22ce8 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html @@ -1,78 +1,6 @@
    - - - -
    -
    - -
    -
    - - - -
    - - {{ 'cris-layout.advanced-attachment.'+attachmentConf.name | translate }} - - - - -

    - {{attachment.firstMetadataValue(attachmentConf.name)}} -

    - - - - {{attachment.firstMetadataValue(attachmentConf.name)}} - - - -     - - - - - {{ 'cris-layout.advanced-attachment.'+attachmentConf.name | translate }} - -

    {{getFormat(attachment) | async}}

    -     - - - - {{ 'cris-layout.advanced-attachment.'+attachmentConf.name | translate }} - -

    {{getSize(attachment) | dsFileSize}}

    -     - - - - - {{ 'cris-layout.advanced-attachment.'+ attachmentConf.name | translate }} - ({{checksum.checkSumAlgorithm}}) - -

    {{checksum.value}}

    -     -     -     - -
    -     - -
    -
    - - -
    -
    -
    +
    - - diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.scss b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.scss index 719519c49e1..2cece24b0f7 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.scss +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.scss @@ -1,14 +1,4 @@ -.img-file { - max-height: var(--ds-advanced-attachment-image-max-height); - object-fit: var(--ds-advanced-attachment-image-object-fit); - object-position: var(--ds-advanced-attachment-image-object-position); -} -.thumbnail-placeholder { - border: var(--ds-thumbnail-placeholder-border); - color: var(--ds-thumbnail-placeholder-color); - font-weight: var(--ds-advanced-attachment-thumbnail-placeholder-font-weight); -} .hint { cursor: pointer; diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts index bfc40b3e994..da17a21ba59 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts @@ -6,8 +6,15 @@ import { BitstreamDataService } from '../../../../../../../core/data/bitstream-d import { Item } from '../../../../../../../core/shared/item.model'; import { LayoutField } from '../../../../../../../core/layout/models/box.model'; import { AttachmentComponent } from '../attachment/attachment.component'; -import { AdvancedAttachmentElementType } from '../../../../../../../../config/advanced-attachment-rendering.config'; import { environment } from '../../../../../../../../environments/environment'; +import { FindListOptions } from '../../../../../../../core/data/find-list-options.model'; +import { Observable } from 'rxjs'; +import { buildPaginatedList, PaginatedList } from '../../../../../../../core/data/paginated-list.model'; +import { Bitstream } from '../../../../../../../core/shared/bitstream.model'; +import { followLink } from '../../../../../../../shared/utils/follow-link-config.model'; +import { getFirstCompletedRemoteData } from '../../../../../../../core/shared/operators'; +import { map } from 'rxjs/operators'; +import { RemoteData } from '../../../../../../../core/data/remote-data'; @Component({ selector: 'ds-advanced-attachment', @@ -17,6 +24,7 @@ import { environment } from '../../../../../../../../environments/environment'; /** * This component renders the attachment with an advanced layout. */ +@MetadataBoxFieldRendering(FieldRenderingType.ATTACHMENT, true) @MetadataBoxFieldRendering(FieldRenderingType.ADVANCEDATTACHMENT, true) export class AdvancedAttachmentComponent extends AttachmentComponent implements OnInit { @@ -30,11 +38,6 @@ export class AdvancedAttachmentComponent extends AttachmentComponent implements */ envPagination = environment.advancedAttachmentRendering.pagination; - /** - * Configuration type enum - */ - AdvancedAttachmentElementType = AdvancedAttachmentElementType; - constructor( @Inject('fieldProvider') public fieldProvider: LayoutField, @Inject('itemProvider') public itemProvider: Item, @@ -45,4 +48,14 @@ export class AdvancedAttachmentComponent extends AttachmentComponent implements super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService); } + getBitstreamsByItem(options?: FindListOptions): Observable> { + return this.bitstreamDataService + .showableByItem(this.item.uuid, this.field.bitstream.bundle, this.getMetadataFilters(), options, false, false, followLink('thumbnail')) + .pipe( + getFirstCompletedRemoteData(), + map((response: RemoteData>) => { + return response.hasSucceeded ? response.payload : buildPaginatedList(null, []); + }) + ); + } } diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.html new file mode 100644 index 00000000000..9d58487ddcf --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.html @@ -0,0 +1 @@ + diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.scss b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts new file mode 100644 index 00000000000..b6c6ecc0ede --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AttachmentRenderComponent } from './attachment-render.component'; + +describe('AttachmentRenderComponent', () => { + let component: AttachmentRenderComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AttachmentRenderComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(AttachmentRenderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts new file mode 100644 index 00000000000..9ebd142e3a8 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts @@ -0,0 +1,121 @@ +import { + Component, + ComponentFactory, + ComponentFactoryResolver, + ComponentRef, + Injector, + Input, + OnInit, + ViewChild, + ViewContainerRef +} from '@angular/core'; +import { + AttachmentRenderingType, + AttachmentTypeFieldRenderOptions, + getAttachmentTypeRendering +} from '../attachment-type.decorator'; +import { Item } from '../../../../../../../../../core/shared/item.model'; +import { GenericConstructor } from '../../../../../../../../../core/shared/generic-constructor'; +import { isEmpty } from '../../../../../../../../../shared/empty.util'; +import { Bitstream } from '../../../../../../../../../core/shared/bitstream.model'; + +@Component({ + selector: 'ds-attachment-render', + templateUrl: './attachment-render.component.html', + styleUrls: ['./attachment-render.component.scss'] +}) +export class AttachmentRenderComponent implements OnInit { + + /** + * Current DSpace Item + */ + @Input() item: Item; + /** + * The bitstream + */ + @Input() bitstream: Bitstream; + /** + * The bitstream + */ + @Input() renderingType: AttachmentRenderingType | string; + + /** + * Directive hook used to place the dynamic render component + */ + @ViewChild('attachmentValue', { + static: true, + read: ViewContainerRef + }) attachmentValueViewRef: ViewContainerRef; + + constructor( + protected componentFactoryResolver: ComponentFactoryResolver, + private injector: Injector + ) { + + } + + ngOnInit(): void { + this.attachmentValueViewRef.clear(); + this.generateComponentRef(); + } + + /** + * Generate ComponentFactory for metadata rendering + */ + computeComponentFactory(): ComponentFactory { + const rendering = this.computeRendering(); + const metadataFieldRenderOptions = this.getMetadataBoxFieldRenderOptions(rendering); + const constructor: GenericConstructor = metadataFieldRenderOptions?.componentRef; + return constructor ? this.componentFactoryResolver.resolveComponentFactory(constructor) : null; + } + + /** + * Generate ComponentRef for metadata rendering + */ + generateComponentRef(): ComponentRef { + let metadataRef: ComponentRef; + const factory: ComponentFactory = this.computeComponentFactory(); + metadataRef = this.attachmentValueViewRef.createComponent(factory, 0, this.getComponentInjector()); + (metadataRef.instance as any).item = this.item; + (metadataRef.instance as any).bitstream = this.bitstream; + return metadataRef; + } + + /** + * Generate Component Injector object + */ + getComponentInjector() { + const providers = [ + {provide: 'itemProvider', useValue: this.item, deps: []}, + {provide: 'bitstreamProvider', useValue: this.bitstream, deps: []} + ]; + + return Injector.create({ + providers: providers, + parent: this.injector + }); + } + + /** + * Return the rendering type of the field to render + * + * @return the rendering type + */ + computeRendering(): string | AttachmentRenderingType { + return this.renderingType || AttachmentRenderingType.DOWNLOAD; + } + + /** + * Return the rendering option related to the given rendering type + * @param fieldRenderingType + */ + getMetadataBoxFieldRenderOptions(fieldRenderingType: string): AttachmentTypeFieldRenderOptions { + let renderOptions = getAttachmentTypeRendering(fieldRenderingType); + // If the rendering type not exists will use DOWNLOAD type rendering + if (isEmpty(renderOptions)) { + renderOptions = getAttachmentTypeRendering(AttachmentRenderingType.DOWNLOAD); + } + return renderOptions; + } + +} diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-type.decorator.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-type.decorator.ts new file mode 100644 index 00000000000..9783432a103 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-type.decorator.ts @@ -0,0 +1,30 @@ +import { GenericConstructor } from '../../../../../../../../core/shared/generic-constructor'; +import { Component } from '@angular/core'; + +export enum AttachmentRenderingType { + DOWNLOAD = 'DOWNLOAD', + IIIF = 'IIIF', + PDF = 'PDF' +} + +const fieldType = new Map(); + +export interface AttachmentTypeFieldRenderOptions { + componentRef: GenericConstructor; + structured: boolean; +} + +export function AttachmentTypeRendering(objectType: AttachmentRenderingType, structured = false) { + return function decorator(component: any) { + if (objectType) { + fieldType.set(objectType, { + componentRef: component, + structured: structured + } as AttachmentTypeFieldRenderOptions); + } + }; +} + +export function getAttachmentTypeRendering(objectType: string): AttachmentTypeFieldRenderOptions { + return fieldType.get(objectType.toUpperCase()); +} diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html new file mode 100644 index 00000000000..b6ea021c414 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html @@ -0,0 +1,54 @@ + +
    +
    + +
    +
    + + + +
    + {{ 'cris-layout.advanced-attachment.'+attachmentConf.name | translate }} + + + +

    + {{attachment.firstMetadataValue(attachmentConf.name)}} +

    + + + + {{attachment.firstMetadataValue(attachmentConf.name)}} + + + +     + + + +

    {{getFormat(attachment) | async}}

    +     + + +

    {{getSize(attachment) | dsFileSize}}

    +     +     + +
    +     + +
    +
    + +
    + +
    +     + +
    + +
    +
    +
    +     diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.scss b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.scss new file mode 100644 index 00000000000..12fd88cd7ee --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.scss @@ -0,0 +1,31 @@ +.img-file { + max-height: var(--ds-advanced-attachment-image-max-height); + object-fit: var(--ds-advanced-attachment-image-object-fit); + object-position: var(--ds-advanced-attachment-image-object-position); +} + +.thumbnail-placeholder { + border: var(--ds-thumbnail-placeholder-border); + color: var(--ds-thumbnail-placeholder-color); + font-weight: var(--ds-advanced-attachment-thumbnail-placeholder-font-weight); +} + +.divider { + border-left: 1px solid var(--bs-gray-200); +} + +.card-container { + background-color: var(--bs-gray-100); + background-clip: border-box; + border-radius: 0.25rem; + padding: 1rem; +} + +i.custom-icon { + display: inline-block; + width: 20px; + height: 20px; + background-size: contain; + text-align: center; + vertical-align: middle; +} diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.spec.ts new file mode 100644 index 00000000000..0b25895afb7 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BitstreamAttachmentComponent } from './bitstream-attachment.component'; + +describe('BitstreamAttachmentComponent', () => { + let component: BitstreamAttachmentComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ BitstreamAttachmentComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(BitstreamAttachmentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts new file mode 100644 index 00000000000..6c37039bf41 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts @@ -0,0 +1,52 @@ +import { Component, Inject, Input, OnInit } from '@angular/core'; +import { Bitstream } from '../../../../../../../../core/shared/bitstream.model'; +import { environment } from '../../../../../../../../../environments/environment'; +import { AdvancedAttachmentElementType } from '../../../../../../../../../config/advanced-attachment-rendering.config'; +import { BitstreamRenderingModelComponent } from '../../bitstream-rendering-model'; +import { LayoutField } from '../../../../../../../../core/layout/models/box.model'; +import { Item } from '../../../../../../../../core/shared/item.model'; +import { BitstreamDataService } from '../../../../../../../../core/data/bitstream-data.service'; +import { TranslateService } from '@ngx-translate/core'; +import { ActivatedRoute, Router } from '@angular/router'; + +@Component({ + selector: 'ds-bitstream-attachment', + templateUrl: './bitstream-attachment.component.html', + styleUrls: ['./bitstream-attachment.component.scss'] +}) +export class BitstreamAttachmentComponent extends BitstreamRenderingModelComponent implements OnInit { + + /** + * Environment variables configuring the fields to be viewed + */ + envMetadata = environment.advancedAttachmentRendering.metadata; + + /** + * Configuration type enum + */ + AdvancedAttachmentElementType = AdvancedAttachmentElementType; + + /** + * All item providers to show buttons of + */ + allItemProviders: string[] = []; + + @Input() + attachment: Bitstream; + + constructor( + @Inject('fieldProvider') public fieldProvider: LayoutField, + @Inject('itemProvider') public itemProvider: Item, + @Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string, + protected readonly bitstreamDataService: BitstreamDataService, + protected readonly translateService: TranslateService, + protected readonly router: Router, + protected readonly route: ActivatedRoute, + ) { + super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService); + } + + ngOnInit() { + this.allItemProviders = this.item.allMetadataValues('bitstream.viewer.provider'); + } +} diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts index 74e068c0126..ae9d02b1fa6 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts @@ -19,7 +19,7 @@ import { BitstreamAttachmentRenderingModelComponent } from './bitstream-attachme templateUrl: './attachment.component.html', styleUrls: ['./attachment.component.scss'] }) -@MetadataBoxFieldRendering(FieldRenderingType.ATTACHMENT, true) +@MetadataBoxFieldRendering(FieldRenderingType.SIMPLEATTACHMENT, true) /** * The component for displaying a thumbnail rendered metadata box */ diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/bitstream-rendering-model.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/bitstream-rendering-model.ts index 58df8a6f374..aee32ecf7b7 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/bitstream-rendering-model.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/bitstream-rendering-model.ts @@ -125,7 +125,15 @@ export abstract class BitstreamRenderingModelComponent extends RenderingTypeStru */ getBitstreamsByItem(options?: FindListOptions): Observable> { return this.bitstreamDataService - .findByItem(this.item.uuid, this.field.bitstream.bundle, this.getMetadataFilters(), options, false, false, followLink('thumbnail')) + .findByItem( + this.item.uuid, + this.field.bitstream.bundle, + this.getMetadataFilters(), + options, + false, + false, + followLink('thumbnail') + ) .pipe( getFirstCompletedRemoteData(), map((response: RemoteData>) => { @@ -151,5 +159,4 @@ export abstract class BitstreamRenderingModelComponent extends RenderingTypeStru return filters; } - } diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box.decorator.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box.decorator.ts index ea0a4a4fd11..39e4d69dd66 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box.decorator.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box.decorator.ts @@ -17,6 +17,7 @@ export enum FieldRenderingType { TAG = 'TAG', VALUEPAIR = 'VALUEPAIR', ADVANCEDATTACHMENT = 'ADVANCEDATTACHMENT', + SIMPLEATTACHMENT = 'SIMPLEATTACHMENT', } const fieldType = new Map(); diff --git a/src/app/cris-layout/cris-layout.module.ts b/src/app/cris-layout/cris-layout.module.ts index e8e71040025..b51f3a3cdd1 100644 --- a/src/app/cris-layout/cris-layout.module.ts +++ b/src/app/cris-layout/cris-layout.module.ts @@ -12,41 +12,101 @@ import { CrisLayoutLeadingComponent } from './cris-layout-leading/cris-layout-le import { CrisLayoutLoaderComponent } from './cris-layout-loader/cris-layout-loader.component'; import { CrisLayoutMatrixComponent } from './cris-layout-matrix/cris-layout-matrix.component'; import { CrisLayoutVerticalComponent } from './cris-layout-loader/cris-layout-vertical/cris-layout-vertical.component'; -import { CrisLayoutSidebarComponent } from './cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component'; -import { CrisLayoutHorizontalComponent } from './cris-layout-loader/cris-layout-horizontal/cris-layout-horizontal.component'; -import { CrisLayoutNavbarComponent } from './cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component'; -import { CrisLayoutSidebarItemComponent } from './cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component'; -import { CrisLayoutBoxContainerComponent } from './cris-layout-matrix/cris-layout-box-container/cris-layout-box-container.component'; +import { + CrisLayoutSidebarComponent +} from './cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component'; +import { + CrisLayoutHorizontalComponent +} from './cris-layout-loader/cris-layout-horizontal/cris-layout-horizontal.component'; +import { + CrisLayoutNavbarComponent +} from './cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component'; +import { + CrisLayoutSidebarItemComponent +} from './cris-layout-loader/shared/sidebar-item/cris-layout-sidebar-item.component'; +import { + CrisLayoutBoxContainerComponent +} from './cris-layout-matrix/cris-layout-box-container/cris-layout-box-container.component'; import { RowComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/row.component'; -import { CrisLayoutMetadataBoxComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component'; -import { TextComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/text/text.component'; -import { HeadingComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/heading/heading.component'; -import { CrisLayoutRelationBoxComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/relation/cris-layout-relation-box.component'; +import { + CrisLayoutMetadataBoxComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component'; +import { + TextComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/text/text.component'; +import { + HeadingComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/heading/heading.component'; +import { + CrisLayoutRelationBoxComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/relation/cris-layout-relation-box.component'; import { MyDSpacePageModule } from '../my-dspace-page/my-dspace-page.module'; -import { LongtextComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longtext/longtext.component'; -import { DateComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/date/date.component'; +import { + LongtextComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longtext/longtext.component'; +import { + DateComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/date/date.component'; import { DsDatePipe } from './pipes/ds-date.pipe'; -import { LinkComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/link/link.component'; -import { IdentifierComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/identifier/identifier.component'; -import { CrisrefComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/crisref/crisref.component'; -import { ThumbnailComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.component'; -import { AttachmentComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component'; -import { CrisLayoutMetricsBoxComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component'; -import { CrisLayoutIIIFViewerBoxComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/iiif-viewer/cris-layout-iiif-viewer-box.component'; -import { MetricRowComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component'; +import { + LinkComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/link/link.component'; +import { + IdentifierComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/identifier/identifier.component'; +import { + CrisrefComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/crisref/crisref.component'; +import { + ThumbnailComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.component'; +import { + AttachmentComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component'; +import { + CrisLayoutMetricsBoxComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component'; +import { + CrisLayoutIIIFViewerBoxComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/iiif-viewer/cris-layout-iiif-viewer-box.component'; +import { + MetricRowComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component'; import { ContextMenuModule } from '../shared/context-menu/context-menu.module'; -import { TableComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component'; -import { InlineComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/inline/inline.component'; -import { OrcidComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/orcid/orcid.component'; -import { ValuepairComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/valuepair/valuepair.component'; -import { TagComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/tag/tag.component'; -import { MetadataContainerComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component'; -import { MetadataRenderComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-render/metadata-render.component'; +import { + TableComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/table/table.component'; +import { + InlineComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadataGroup/inline/inline.component'; +import { + OrcidComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/orcid/orcid.component'; +import { + ValuepairComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/valuepair/valuepair.component'; +import { + TagComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/tag/tag.component'; +import { + MetadataContainerComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component'; +import { + MetadataRenderComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-render/metadata-render.component'; import { MiradorViewerModule } from '../item-page/mirador-viewer/mirador-viewer.module'; import { ComcolModule } from '../shared/comcol/comcol.module'; import { SearchModule } from '../shared/search/search.module'; -import { AdvancedAttachmentComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component'; +import { + AdvancedAttachmentComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component'; import { FileDownloadButtonComponent } from '../shared/file-download-button/file-download-button.component'; +import { + BitstreamAttachmentComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component'; +import { + AttachmentRenderComponent +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator @@ -70,8 +130,9 @@ const ENTRY_COMPONENTS = [ OrcidComponent, ValuepairComponent, TagComponent, - AdvancedAttachmentComponent, + AdvancedAttachmentComponent ]; + @NgModule({ declarations: [ ...ENTRY_COMPONENTS, @@ -95,6 +156,8 @@ const ENTRY_COMPONENTS = [ MetadataContainerComponent, MetadataRenderComponent, FileDownloadButtonComponent, + BitstreamAttachmentComponent, + AttachmentRenderComponent, ], imports: [ CommonModule, diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts index b191b6c4b33..61c6934284a 100644 --- a/src/app/item-page/item-shared.module.ts +++ b/src/app/item-page/item-shared.module.ts @@ -1,12 +1,18 @@ -import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component'; +import { + RelatedEntitiesSearchComponent +} from './simple/related-entities/related-entities-search/related-entities-search.component'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SearchModule } from '../shared/search/search.module'; import { SharedModule } from '../shared/shared.module'; import { TranslateModule } from '@ngx-translate/core'; import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; -import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component'; -import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; +import { + dsDynamicFormControlMapFn +} from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component'; +import { + TabbedRelatedEntitiesSearchComponent +} from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; const COMPONENTS = [ RelatedEntitiesSearchComponent, @@ -33,4 +39,5 @@ const COMPONENTS = [ } ] }) -export class ItemSharedModule { } +export class ItemSharedModule { +} diff --git a/src/app/shared/file-download-button/file-download-button.component.html b/src/app/shared/file-download-button/file-download-button.component.html index 25e2180ec94..06a245983c0 100644 --- a/src/app/shared/file-download-button/file-download-button.component.html +++ b/src/app/shared/file-download-button/file-download-button.component.html @@ -1,15 +1,17 @@ - + + - - - {{ 'cris-layout.advanced-attachment.download' | translate }} + + + {{ 'cris-layout.advanced-attachment.download' | translate }} - - + + - {{ 'cris-layout.advanced-attachment.requestACopy' | - translate }} + {{ 'cris-layout.advanced-attachment.requestACopy' | + translate }} - \ No newline at end of file + + diff --git a/src/app/shared/file-download-button/file-download-button.component.ts b/src/app/shared/file-download-button/file-download-button.component.ts index 45c2357f792..0d5ed7fef2d 100644 --- a/src/app/shared/file-download-button/file-download-button.component.ts +++ b/src/app/shared/file-download-button/file-download-button.component.ts @@ -1,5 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { FileDownloadLinkComponent } from '../file-download-link/file-download-link.component'; +import { + AttachmentRenderingType, + AttachmentTypeRendering +} from '../../cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-type.decorator'; @Component({ selector: 'ds-file-download-button', @@ -7,8 +11,16 @@ import { FileDownloadLinkComponent } from '../file-download-link/file-download-l styleUrls: ['./file-download-button.component.scss'] }) /** - * Component displaying a download button or the request a coppy button depending on authorization + * Component displaying a download button or the request a copy button depending on authorization */ +@AttachmentTypeRendering(AttachmentRenderingType.DOWNLOAD, true) export class FileDownloadButtonComponent extends FileDownloadLinkComponent implements OnInit { + hasNoDownload = true; + + ngOnInit() { + super.ngOnInit(); + this.hasNoDownload = this.item.allMetadataValues('bitstream.viewer.provider').includes('nodownload'); + } + } From aafc6c8d720b4b1128637d91b5e7b54c64310a8c Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 13 Apr 2023 09:22:36 +0200 Subject: [PATCH 532/758] [DSC-629] avoid rendering unknown attachment types fix wording --- .../attachment-render.component.ts | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts index 9ebd142e3a8..c22adbc4dfd 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts @@ -60,25 +60,27 @@ export class AttachmentRenderComponent implements OnInit { } /** - * Generate ComponentFactory for metadata rendering + * Generate ComponentFactory for attachment rendering */ computeComponentFactory(): ComponentFactory { const rendering = this.computeRendering(); - const metadataFieldRenderOptions = this.getMetadataBoxFieldRenderOptions(rendering); - const constructor: GenericConstructor = metadataFieldRenderOptions?.componentRef; + const attachmentTypeRenderOptions = getAttachmentTypeRendering(rendering); + const constructor: GenericConstructor = attachmentTypeRenderOptions?.componentRef; return constructor ? this.componentFactoryResolver.resolveComponentFactory(constructor) : null; } /** - * Generate ComponentRef for metadata rendering + * Generate ComponentRef for attachment rendering */ generateComponentRef(): ComponentRef { - let metadataRef: ComponentRef; + let attachentComponentRef: ComponentRef; const factory: ComponentFactory = this.computeComponentFactory(); - metadataRef = this.attachmentValueViewRef.createComponent(factory, 0, this.getComponentInjector()); - (metadataRef.instance as any).item = this.item; - (metadataRef.instance as any).bitstream = this.bitstream; - return metadataRef; + if (factory) { + attachentComponentRef = this.attachmentValueViewRef.createComponent(factory, 0, this.getComponentInjector()); + (attachentComponentRef.instance as any).item = this.item; + (attachentComponentRef.instance as any).bitstream = this.bitstream; + } + return attachentComponentRef; } /** @@ -105,17 +107,4 @@ export class AttachmentRenderComponent implements OnInit { return this.renderingType || AttachmentRenderingType.DOWNLOAD; } - /** - * Return the rendering option related to the given rendering type - * @param fieldRenderingType - */ - getMetadataBoxFieldRenderOptions(fieldRenderingType: string): AttachmentTypeFieldRenderOptions { - let renderOptions = getAttachmentTypeRendering(fieldRenderingType); - // If the rendering type not exists will use DOWNLOAD type rendering - if (isEmpty(renderOptions)) { - renderOptions = getAttachmentTypeRendering(AttachmentRenderingType.DOWNLOAD); - } - return renderOptions; - } - } From 3fa4664175bbe2124ec31f4513ba9d81a77b11fa Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 13 Apr 2023 09:50:20 +0200 Subject: [PATCH 533/758] [DSC-629] enhance style --- .../file-download-button/file-download-button.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/file-download-button/file-download-button.component.html b/src/app/shared/file-download-button/file-download-button.component.html index 06a245983c0..a04507c87cb 100644 --- a/src/app/shared/file-download-button/file-download-button.component.html +++ b/src/app/shared/file-download-button/file-download-button.component.html @@ -1,7 +1,7 @@ - {{ 'cris-layout.advanced-attachment.download' | translate }} @@ -10,7 +10,7 @@ {{ 'cris-layout.advanced-attachment.requestACopy' | + class="btn btn-outline-primary" data-test="requestACopy">{{ 'cris-layout.advanced-attachment.requestACopy' | translate }} From bfc2fc54260465189c81f2cb052f1bbb84d6af3f Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 13 Apr 2023 10:03:52 +0200 Subject: [PATCH 534/758] [DSC-629] rollback attachment and advanced-attachment application --- .../advanced-attachment/advanced-attachment.component.ts | 1 - .../metadata/rendering-types/attachment/attachment.component.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts index da17a21ba59..023ff4ba079 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.ts @@ -24,7 +24,6 @@ import { RemoteData } from '../../../../../../../core/data/remote-data'; /** * This component renders the attachment with an advanced layout. */ -@MetadataBoxFieldRendering(FieldRenderingType.ATTACHMENT, true) @MetadataBoxFieldRendering(FieldRenderingType.ADVANCEDATTACHMENT, true) export class AdvancedAttachmentComponent extends AttachmentComponent implements OnInit { diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts index ae9d02b1fa6..74e068c0126 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.ts @@ -19,7 +19,7 @@ import { BitstreamAttachmentRenderingModelComponent } from './bitstream-attachme templateUrl: './attachment.component.html', styleUrls: ['./attachment.component.scss'] }) -@MetadataBoxFieldRendering(FieldRenderingType.SIMPLEATTACHMENT, true) +@MetadataBoxFieldRendering(FieldRenderingType.ATTACHMENT, true) /** * The component for displaying a thumbnail rendered metadata box */ From 7cdc20063391f78b910a36ad798627eb8020d752 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 13 Apr 2023 15:14:30 +0200 Subject: [PATCH 535/758] [DSC-629] check for bitstream viewer providers --- .../bitstream-attachment/bitstream-attachment.component.html | 2 +- .../bitstream-attachment/bitstream-attachment.component.ts | 4 ++-- .../file-download-button/file-download-button.component.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html index b6ea021c414..fa7b0eecfbb 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html @@ -40,7 +40,7 @@
    - +
    diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts index 6c37039bf41..a01f45d75e7 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.ts @@ -29,7 +29,7 @@ export class BitstreamAttachmentComponent extends BitstreamRenderingModelCompone /** * All item providers to show buttons of */ - allItemProviders: string[] = []; + allAttachmentProviders: string[] = []; @Input() attachment: Bitstream; @@ -47,6 +47,6 @@ export class BitstreamAttachmentComponent extends BitstreamRenderingModelCompone } ngOnInit() { - this.allItemProviders = this.item.allMetadataValues('bitstream.viewer.provider'); + this.allAttachmentProviders = this.attachment.allMetadataValues('bitstream.viewer.provider'); } } diff --git a/src/app/shared/file-download-button/file-download-button.component.ts b/src/app/shared/file-download-button/file-download-button.component.ts index 0d5ed7fef2d..d12b2532a2c 100644 --- a/src/app/shared/file-download-button/file-download-button.component.ts +++ b/src/app/shared/file-download-button/file-download-button.component.ts @@ -20,7 +20,7 @@ export class FileDownloadButtonComponent extends FileDownloadLinkComponent imple ngOnInit() { super.ngOnInit(); - this.hasNoDownload = this.item.allMetadataValues('bitstream.viewer.provider').includes('nodownload'); + this.hasNoDownload = this.bitstream.allMetadataValues('bitstream.viewer.provider').includes('nodownload'); } } From 297dfd695a256dd8e72ceae8b97193436314c2e0 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 13 Apr 2023 13:13:54 +0200 Subject: [PATCH 536/758] [DSC-629] fix download button not working in ssr --- src/app/cris-layout/cris-layout.module.ts | 2 -- src/app/item-page/item-shared.module.ts | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/cris-layout/cris-layout.module.ts b/src/app/cris-layout/cris-layout.module.ts index b51f3a3cdd1..f24d9e3c1f6 100644 --- a/src/app/cris-layout/cris-layout.module.ts +++ b/src/app/cris-layout/cris-layout.module.ts @@ -100,7 +100,6 @@ import { SearchModule } from '../shared/search/search.module'; import { AdvancedAttachmentComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component'; -import { FileDownloadButtonComponent } from '../shared/file-download-button/file-download-button.component'; import { BitstreamAttachmentComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component'; @@ -155,7 +154,6 @@ const ENTRY_COMPONENTS = [ RowComponent, MetadataContainerComponent, MetadataRenderComponent, - FileDownloadButtonComponent, BitstreamAttachmentComponent, AttachmentRenderComponent, ], diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts index 61c6934284a..a57c4cdeb18 100644 --- a/src/app/item-page/item-shared.module.ts +++ b/src/app/item-page/item-shared.module.ts @@ -13,10 +13,12 @@ import { import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; +import { FileDownloadButtonComponent } from '../shared/file-download-button/file-download-button.component'; const COMPONENTS = [ RelatedEntitiesSearchComponent, - TabbedRelatedEntitiesSearchComponent + TabbedRelatedEntitiesSearchComponent, + FileDownloadButtonComponent ]; @NgModule({ From 7c37373c4895541bcc9262e560c8f58e54676e7d Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 17 Apr 2023 17:08:27 +0200 Subject: [PATCH 537/758] [DSC-1036] added label for not repeatable fields during submission --- 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 69e6c1ee6eb..430decb91d7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1925,6 +1925,8 @@ "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "At least one investigator or one lead organization is required", + "error.validation.notRepeatable": "This field is not repeatable, enter only one value!", + "event.listelement.badge" : "Event", "explore.browse-section.title" : "Browse", From d28e87b799e0b90f11e2e9bf09010c96d7330d6d Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Tue, 18 Apr 2023 14:18:44 +0200 Subject: [PATCH 538/758] [DSC-629] create attachment-rendering.module --- .../attachment-rendering.module.ts | 25 +++++++++++++++++++ src/app/cris-layout/cris-layout.module.ts | 6 ++++- src/app/item-page/item-shared.module.ts | 2 -- src/themes/custom/eager-theme.module.ts | 4 +++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts new file mode 100644 index 00000000000..1c8bdc4c502 --- /dev/null +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { + FileDownloadButtonComponent +} from '../../../../../../../../../shared/file-download-button/file-download-button.component'; +import { SearchModule } from '../../../../../../../../../shared/search/search.module'; +import { SharedModule } from '../../../../../../../../../shared/shared.module'; +import { TranslateModule } from '@ngx-translate/core'; + +const COMPONENTS = [ + FileDownloadButtonComponent +]; + +@NgModule({ + declarations: [...COMPONENTS], + imports: [ + CommonModule, + SearchModule, + SharedModule, + TranslateModule + ], + exports: [...COMPONENTS] +}) +export class AttachmentRenderingModule { +} diff --git a/src/app/cris-layout/cris-layout.module.ts b/src/app/cris-layout/cris-layout.module.ts index f24d9e3c1f6..165d8a018ab 100644 --- a/src/app/cris-layout/cris-layout.module.ts +++ b/src/app/cris-layout/cris-layout.module.ts @@ -106,6 +106,9 @@ import { import { AttachmentRenderComponent } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component'; +import { + AttachmentRenderingModule +} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator @@ -166,7 +169,8 @@ const ENTRY_COMPONENTS = [ NgbAccordionModule, ComcolModule, MiradorViewerModule, - MetricsModule + MetricsModule, + AttachmentRenderingModule ], exports: [ CrisLayoutComponent, diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts index a57c4cdeb18..fe4233589d5 100644 --- a/src/app/item-page/item-shared.module.ts +++ b/src/app/item-page/item-shared.module.ts @@ -13,12 +13,10 @@ import { import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; -import { FileDownloadButtonComponent } from '../shared/file-download-button/file-download-button.component'; const COMPONENTS = [ RelatedEntitiesSearchComponent, TabbedRelatedEntitiesSearchComponent, - FileDownloadButtonComponent ]; @NgModule({ diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts index 5da03c3e274..ad62151e172 100644 --- a/src/themes/custom/eager-theme.module.ts +++ b/src/themes/custom/eager-theme.module.ts @@ -48,6 +48,9 @@ import { FooterModule } from '../../app/footer/footer.module'; import { ExploreModule } from '../../app/shared/explore/explore.module'; import { ContextMenuModule } from '../../app/shared/context-menu/context-menu.module'; import { MiradorViewerModule } from '../../app/item-page/mirador-viewer/mirador-viewer.module'; +import { + AttachmentRenderingModule +} from '../../app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module'; /** * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS. @@ -90,6 +93,7 @@ const DECLARATIONS = [ NavbarModule, ItemPageModule, ItemSharedModule, + AttachmentRenderingModule, ContextMenuModule, FooterModule, ExploreModule, From 1dc4ce4c9e49fb38c463a5591dbd9ca13970076c Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Mon, 17 Apr 2023 17:08:27 +0200 Subject: [PATCH 539/758] [DSC-1047] added label for not repeatable fields during submission --- 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 69e6c1ee6eb..430decb91d7 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1925,6 +1925,8 @@ "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "At least one investigator or one lead organization is required", + "error.validation.notRepeatable": "This field is not repeatable, enter only one value!", + "event.listelement.badge" : "Event", "explore.browse-section.title" : "Browse", From 6165efe499cb2923e788028dec6021ba683ee325 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 18 Apr 2023 15:54:43 +0200 Subject: [PATCH 540/758] [DSC-1047] Disable drag and drop for not-repeatable fields --- .../models/array-group/dynamic-form-array.component.scss | 4 ++-- .../models/array-group/dynamic-form-array.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss index acfb33b7ea6..a8c13c977c1 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss @@ -25,7 +25,7 @@ text-indent: calc(0.5 * var(--bs-spacer)) } - &:hover, &:focus { + &:hover:not(.cdk-drag-disabled), &:focus:not(.cdk-drag-disabled) { cursor: grab; .drag-icon { visibility: visible; @@ -36,7 +36,7 @@ .drag-handle { &:hover { - cursor: move; + cursor: grab; } &:focus { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts index 62bd7dcc237..9802724dc99 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts @@ -77,6 +77,6 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent { * If the drag feature is disabled for this DynamicRowArrayModel. */ get dragDisabled(): boolean { - return this.model.groups.length === 1 || !this.model.isDraggable; + return this.model.groups.length === 1 || !this.model.isDraggable || this.model.notRepeatable; } } From 74855e947bf3d7b078e994d8020304d5580a750c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 18 Apr 2023 15:56:21 +0200 Subject: [PATCH 541/758] [DSC-1047] Fix error visualizations for not-repeatable fields --- .../ds-dynamic-form-control-container.component.html | 12 +++++++----- .../models/ds-dynamic-input.model.ts | 7 ++++++- src/app/shared/form/builder/parsers/field-parser.ts | 12 ++++++++++++ src/assets/i18n/en.json5 | 2 +- 4 files changed, 26 insertions(+), 7 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 ed1a54c4a67..74c047bc57d 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 @@ -8,21 +8,23 @@ [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"> - +
    - - -
    +
    -
    +
    {{ message | translate: model.validators }}
    diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts index 39e3d62b554..3fdf35de36b 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts @@ -6,7 +6,7 @@ import { DynamicInputModelConfig, serializable } from '@ng-dynamic-forms/core'; -import {Subject} from 'rxjs'; +import { Subject } from 'rxjs'; import { LanguageCode } from '../../models/form-field-language-value.model'; import { VocabularyOptions } from '../../../../../core/submission/vocabularies/models/vocabulary-options.model'; @@ -32,6 +32,7 @@ export interface DsDynamicInputModelConfig extends DynamicInputModelConfig { securityLevel?: number; securityConfigLevel?: number[]; toggleSecurityVisibility?: boolean; + isModelOfNotRepeatableGroup?: boolean; } export class DsDynamicInputModel extends DynamicInputModel { @@ -54,6 +55,7 @@ export class DsDynamicInputModel extends DynamicInputModel { @serializable() securityLevel?: number; @serializable() securityConfigLevel?: number[]; @serializable() toggleSecurityVisibility = true; + @serializable() isModelOfNotRepeatableGroup = false; constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) { @@ -74,6 +76,9 @@ export class DsDynamicInputModel extends DynamicInputModel { if (isNotUndefined(config.toggleSecurityVisibility)) { this.toggleSecurityVisibility = config.toggleSecurityVisibility; } + if (isNotUndefined(config.isModelOfNotRepeatableGroup)) { + this.isModelOfNotRepeatableGroup = config.isModelOfNotRepeatableGroup; + } this.isModelOfInnerForm = (hasValue(config.isModelOfInnerForm) ? config.isModelOfInnerForm : false); this.hideErrorMessages = config.hideErrorMessages; diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts index aaf45d2ba3f..4ff1a94a000 100644 --- a/src/app/shared/form/builder/parsers/field-parser.ts +++ b/src/app/shared/form/builder/parsers/field-parser.ts @@ -102,6 +102,9 @@ export abstract class FieldParser { } } model = this.modelFactory(fieldValue, false); + if (!this.configData.repeatable) { + this.markAsNotRepeatable(model); + } } setLayout(model, 'element', 'host', 'col'); if (model.hasLanguages || isNotEmpty(model.relationship) || model.hasSecurityToggle) { @@ -409,6 +412,15 @@ export abstract class FieldParser { { required: this.configData.mandatoryMessage }); } + protected markAsNotRepeatable(controlModel) { + controlModel.isModelOfNotRepeatableGroup = true; + + controlModel.errorMessages = Object.assign( + {}, + controlModel.errorMessages, + { notRepeatable: 'error.validation.notRepeatable' }); + } + protected setLabel(controlModel, label = true, labelEmpty = false) { if (label) { controlModel.label = (labelEmpty) ? ' ' : this.configData.label; diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 430decb91d7..368790d98ae 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1925,7 +1925,7 @@ "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "At least one investigator or one lead organization is required", - "error.validation.notRepeatable": "This field is not repeatable, enter only one value!", + "error.validation.notRepeatable": "This field is not repeatable, please choose only one value and discard the others.", "event.listelement.badge" : "Event", From c1920839cfb71496b332cdef37e33cfa281bd1df Mon Sep 17 00:00:00 2001 From: Stefano Maffei Date: Wed, 19 Apr 2023 15:33:21 +0200 Subject: [PATCH 542/758] [DSC-1015] fix cypress tests --- cypress/integration/homepage.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/homepage.spec.ts b/cypress/integration/homepage.spec.ts index 7a147ff7e03..39097dc5186 100644 --- a/cypress/integration/homepage.spec.ts +++ b/cypress/integration/homepage.spec.ts @@ -7,8 +7,8 @@ describe('Homepage', () => { cy.visit('/'); }); - it('should display translated title "DSpace Cris Angular :: Home"', () => { - cy.title().should('eq', 'DSpace Cris Angular :: Home'); + it('should display translated title "DSpace at My University :: Home"', () => { + cy.title().should('eq', 'DSpace at My University :: Home'); }); it('should contain a news section', () => { From 333577475c4c13c04d30df5e65036675313678d6 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 20 Apr 2023 11:07:29 +0200 Subject: [PATCH 543/758] [DSC-1053] Show donut metrics only on CSR --- .../metric-donuts.component.html | 2 +- .../metric-donuts/metric-donuts.component.ts | 57 ++++++++++++++----- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/src/app/shared/object-list/metric-donuts/metric-donuts.component.html b/src/app/shared/object-list/metric-donuts/metric-donuts.component.html index 539c0839236..f6621ab77b6 100644 --- a/src/app/shared/object-list/metric-donuts/metric-donuts.component.html +++ b/src/app/shared/object-list/metric-donuts/metric-donuts.component.html @@ -1,5 +1,5 @@
    - + = new BehaviorSubject([]); + + constructor(private linkService: LinkService, @Inject(PLATFORM_ID) protected platformId: Object) { } ngOnInit() { this.linkService.resolveLink(this.item, followLink('metrics')); + if (isPlatformBrowser(this.platformId)) { + this.retrieveMetrics().subscribe((metrics: Metric[]) => { + this.metrics$.next(metrics); + }) + } } /** - * Filter metrics with a positive metricCount value. + * Retrieve metrics from item object. */ - donuts(): Observable { - if (!hasValue(this.item.metrics)) { + private retrieveMetrics(): Observable { + if (isEmpty(this.item.metrics)) { return of([]); + } else { + return this.item.metrics.pipe( + getFirstCompletedRemoteData(), + map((metricsRD: RemoteData>) => { + if (metricsRD.hasSucceeded) { + return metricsRD.payload.page.filter(metric => allowedDonuts.includes(metric.metricType)); + } else { + return []; + } + })); } - return this.item.metrics.pipe( - getFirstSucceededRemoteListPayload(), - map((metrics: Metric[]) => { - return metrics.filter(metric => allowedDonuts.includes(metric.metricType)); - })); } identify(index, item) { From 1d8bd70b7f6827941dfd9f730f0f28ff0002661f Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 20 Apr 2023 11:07:46 +0200 Subject: [PATCH 544/758] [DSC-1053] Show metrics box only on CSR --- .../cris-layout-metrics-box.component.ts | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.ts index 20d28855e79..4356141256d 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core'; import { BehaviorSubject, Subscription } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; @@ -13,6 +13,7 @@ import { ItemDataService } from '../../../../../core/data/item-data.service'; import { CrisLayoutBox, MetricsBoxConfiguration, } from '../../../../../core/layout/models/box.model'; import { Item } from '../../../../../core/shared/item.model'; import { CrisLayoutMetricRow } from '../../../../../core/layout/models/tab.model'; +import { isPlatformBrowser } from '@angular/common'; /** * This component renders the metadata boxes of items @@ -54,7 +55,8 @@ export class CrisLayoutMetricsBoxComponent extends CrisLayoutBoxModelComponent i protected itemService: ItemDataService, protected translateService: TranslateService, @Inject('boxProvider') public boxProvider: CrisLayoutBox, - @Inject('itemProvider') public itemProvider: Item + @Inject('itemProvider') public itemProvider: Item, + @Inject(PLATFORM_ID) protected platformId: Object ) { super(translateService, boxProvider, itemProvider); } @@ -62,17 +64,19 @@ export class CrisLayoutMetricsBoxComponent extends CrisLayoutBoxModelComponent i ngOnInit() { super.ngOnInit(); - this.metricsBoxConfiguration = this.box.configuration as MetricsBoxConfiguration; - this.subs.push( - this.itemService.getMetrics(this.item.uuid).pipe(getFirstSucceededRemoteDataPayload()) - .subscribe((result) => { - const matchingMetrics = this.metricsComponentService.getMatchingMetrics( - result.page, - this.metricsBoxConfiguration.maxColumns, - this.metricsBoxConfiguration.metrics - ); - this.metricRows.next(matchingMetrics); - })); + if (isPlatformBrowser(this.platformId)) { + this.metricsBoxConfiguration = this.box.configuration as MetricsBoxConfiguration; + this.subs.push( + this.itemService.getMetrics(this.item.uuid).pipe(getFirstSucceededRemoteDataPayload()) + .subscribe((result) => { + const matchingMetrics = this.metricsComponentService.getMatchingMetrics( + result.page, + this.metricsBoxConfiguration.maxColumns, + this.metricsBoxConfiguration.metrics + ); + this.metricRows.next(matchingMetrics); + })); + } } /** From 8d8dac4cc01c228bb2a74b696b02eb16ca64aae9 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 20 Apr 2023 11:08:43 +0200 Subject: [PATCH 545/758] [DSC-1053] Show AddThis plugin box only on CSR --- src/app/social/social.component.ts | 27 +++++++++++++-------------- src/app/social/social.service.ts | 29 +++++++++++------------------ 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/app/social/social.component.ts b/src/app/social/social.component.ts index d058e6458d1..1c128b69001 100644 --- a/src/app/social/social.component.ts +++ b/src/app/social/social.component.ts @@ -1,9 +1,5 @@ -import { - Component, - Inject, OnDestroy, - OnInit, -} from '@angular/core'; -import { DOCUMENT } from '@angular/common'; +import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID, } from '@angular/core'; +import { DOCUMENT, isPlatformBrowser } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { SocialService } from './social.service'; @@ -13,7 +9,7 @@ import { SocialService } from './social.service'; styleUrls: ['./social.component.scss'] }) /** - * Component to render dinamically the social2 buttons using addThis plugin + * Component to render dynamically the social2 buttons using addThis plugin */ export class SocialComponent implements OnInit, OnDestroy { @@ -25,19 +21,22 @@ export class SocialComponent implements OnInit, OnDestroy { subscription; constructor(@Inject(DOCUMENT) private _document: Document, + @Inject(PLATFORM_ID) protected platformId: Object, private socialService: SocialService, private activatedRoute: ActivatedRoute, ) { } ngOnInit() { - this.subscription = this.socialService.showSocialButtons(this.activatedRoute).subscribe((show) => { - if (show) { - this.showSocialButtons(); - } else { - this.hideSocialButtons(); - } - }); + if (isPlatformBrowser(this.platformId)) { + this.subscription = this.socialService.showSocialButtons(this.activatedRoute).subscribe((show) => { + if (show) { + this.showSocialButtons(); + } else { + this.hideSocialButtons(); + } + }); + } } showSocialButtons() { diff --git a/src/app/social/social.service.ts b/src/app/social/social.service.ts index 7757685d78b..0e6b52e3bab 100644 --- a/src/app/social/social.service.ts +++ b/src/app/social/social.service.ts @@ -1,10 +1,12 @@ import { Injectable } from '@angular/core'; +import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; + +import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs'; +import { distinctUntilChanged, filter, map, mergeMap, switchMap, take } from 'rxjs/operators'; + import { environment } from '../../environments/environment'; import { CookieService } from '../core/services/cookie.service'; -import { distinctUntilChanged, filter, map, mergeMap, switchMap, take } from 'rxjs/operators'; -import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { AuthService } from '../core/auth/auth.service'; -import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs'; export const APP_THIS_ID_SELECTOR = '#at4-share'; @@ -29,7 +31,7 @@ export class SocialService { } initializeAddThisScript(_document: Document): any { - // console.log('Initializing the addThisCookie script'); + // Initializing the addThisCookie script const script = _document.createElement('script'); script.type = 'text/javascript'; script.src = environment.addThisPlugin.scriptUrl + environment.addThisPlugin.siteId; @@ -37,22 +39,21 @@ export class SocialService { } hide(_document: Document) { - // console.log('Hiding social buttons'); + // Hiding social buttons const socialButtons: HTMLElement = _document.querySelector(APP_THIS_ID_SELECTOR); if (socialButtons) { - // console.log('HTML Element found, setting display to none'); + // HTML Element found, setting display to none socialButtons.style.display = 'none'; } } show(_document: Document) { - // console.log('Showing social buttons'); + // Showing social buttons const socialButtons: HTMLElement = _document.querySelector(APP_THIS_ID_SELECTOR); if (socialButtons) { - // console.log('HTML Element found, setting display to block'); + // HTML Element found, setting display to block socialButtons.style.display = 'block'; } - // console.error('No HTML Elements to show'); } protected initialize(activatedRoute: ActivatedRoute) { @@ -89,7 +90,6 @@ export class SocialService { // Listen to every cookies / user state changes and evaluate sharing state combineLatest([cookies$, userUUId$]).subscribe(([cookieMap, userUUID]) => { - // console.log('COOKIE/USER change detected. Evaluating.', cookieMap, userUUID); this.evaluateShowHide(cookieMap, userUUID); }); @@ -119,17 +119,10 @@ export class SocialService { } protected isAddThisCookieEnabled(cookieMap, userUUID) { - // console.log(cookieMap, userUUID); - // if (userUUID) { - // console.log('The user is authenticated, checking klaro-' + userUUID); - // } else { - // console.log('The user is not authenticated, checking klaro-anonymous'); - // } const cookie = userUUID ? this.cookie.get('klaro-' + userUUID) : this.cookie.get('klaro-anonymous'); const addThisCookie = cookie ? cookie['add-this'] : false; - // console.log('AddThisCookie is ' + addThisCookie); + return addThisCookie; } - } From ceedfbedac233a933a65525a709f83c6e575d40f Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 20 Apr 2023 11:20:12 +0200 Subject: [PATCH 546/758] [DSC-1053] Show search chart only on CSR --- .../search-charts.component.html | 2 +- .../search-charts/search-charts.component.ts | 54 ++++++++++++------- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/app/shared/search/search-charts/search-charts.component.html b/src/app/shared/search/search-charts/search-charts.component.html index 6dfdf360751..86df679aad4 100644 --- a/src/app/shared/search/search-charts/search-charts.component.html +++ b/src/app/shared/search/search-charts/search-charts.component.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/app/shared/search/search-charts/search-charts.component.ts b/src/app/shared/search/search-charts/search-charts.component.ts index 79041aa4d09..cd549726bc7 100644 --- a/src/app/shared/search/search-charts/search-charts.component.ts +++ b/src/app/shared/search/search-charts/search-charts.component.ts @@ -1,15 +1,17 @@ -import { getRemoteDataPayload } from './../../../core/shared/operators'; -import { SEARCH_CONFIG_SERVICE } from './../../../my-dspace-page/my-dspace-page.component'; -import { SearchConfigurationService } from './../../../core/shared/search/search-configuration.service'; -import { SearchService } from './../../../core/shared/search/search.service'; -import { Component, Inject, Input, OnInit } from '@angular/core'; +import { isPlatformBrowser } from '@angular/common'; +import { ChangeDetectorRef, Component, Inject, Input, OnInit, PLATFORM_ID } from '@angular/core'; import { BehaviorSubject, Observable, of } from 'rxjs'; -import { filter, map, switchMap, take, tap, mergeMap } from 'rxjs/operators'; +import { filter, map, mergeMap, switchMap, take, tap } from 'rxjs/operators'; + import { RemoteData } from '../../../core/data/remote-data'; import { SearchFilterConfig } from '../models/search-filter-config.model'; import { shrinkInOut } from '../../animations/shrink'; import { hasValue, isNotEmpty } from '../../empty.util'; +import { getRemoteDataPayload } from '../../../core/shared/operators'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; +import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; +import { SearchService } from '../../../core/shared/search/search.service'; @Component({ selector: 'ds-search-charts', @@ -57,25 +59,37 @@ export class SearchChartsComponent implements OnInit { */ selectedFilter: SearchFilterConfig; + /** + * Whether a platform id represents a browser platform. + */ + isPlatformBrowser: boolean; - constructor(private searchService: SearchService, + constructor( + private cdr: ChangeDetectorRef, + private searchService: SearchService, + @Inject(PLATFORM_ID) protected platformId: Object, @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) { } ngOnInit(): void { - this.filters.pipe( - filter((rd: RemoteData) => isNotEmpty(rd)), - take(1), - mergeMap((rd: RemoteData) => { - return this.hasFacetValues(rd.payload[0]).pipe( - tap((hasValues) => { - this.selectedFilter = this.selectedFilter - ? this.selectedFilter - : rd.hasSucceeded && hasValues ? rd.payload[0] : null; - }) - ); - }), - ).subscribe(); + this.isPlatformBrowser = isPlatformBrowser(this.platformId); + + if (isPlatformBrowser(this.platformId)) { + this.filters.pipe( + filter((rd: RemoteData) => isNotEmpty(rd)), + take(1), + mergeMap((rd: RemoteData) => { + return this.hasFacetValues(rd.payload[0]).pipe( + tap((hasValues) => { + this.selectedFilter = this.selectedFilter + ? this.selectedFilter + : rd.hasSucceeded && hasValues ? rd.payload[0] : null; + this.cdr.detectChanges(); + }) + ); + }), + ).subscribe(); + } } /** From 87952664b21a4de2ad0ee19047b86e3b8e9335f4 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 20 Apr 2023 15:18:31 +0200 Subject: [PATCH 547/758] [DSC-1053] Fix issue with metadata box change detection --- .../boxes/metadata/cris-layout-metadata-box.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.ts index 109458c4e24..f0d3166dad0 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/cris-layout-metadata-box.component.ts @@ -36,7 +36,7 @@ export class CrisLayoutMetadataBoxComponent extends CrisLayoutBoxModelComponent subs: Subscription[] = []; constructor( - public cd: ChangeDetectorRef, + public cdr: ChangeDetectorRef, protected translateService: TranslateService, @Inject('boxProvider') public boxProvider: CrisLayoutBox, @Inject('itemProvider') public itemProvider: Item @@ -55,6 +55,7 @@ export class CrisLayoutMetadataBoxComponent extends CrisLayoutBoxModelComponent */ setMetadataComponents(metadatacomponents: MetadataBoxConfiguration) { this.metadataBoxConfiguration = metadatacomponents; + this.cdr.detectChanges(); } /** From d063d18daebe74f73ec114cf2b48012551cf4543 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 20 Apr 2023 15:39:21 +0200 Subject: [PATCH 548/758] [DSC-629] fix tests --- .../advanced-attachment.component.html | 2 +- .../advanced-attachment.component.spec.ts | 71 ------------------- .../attachment-render.component.spec.ts | 11 ++- .../bitstream-attachment.component.html | 2 +- .../bitstream-attachment.component.spec.ts | 15 +++- .../bitstream-attachment.component.ts | 2 +- .../file-download-button.component.ts | 2 +- 7 files changed, 28 insertions(+), 77 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html index 9806cf22ce8..d472be4e313 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html @@ -1,6 +1,6 @@
    - +
    From 8060e0ec7275a096056b1c6517d43520d16827b5 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 10 May 2023 14:18:32 +0200 Subject: [PATCH 555/758] [DSC-1058] show filter labels on filter select --- src/app/shared/search/search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html index 0e7a0dcd21e..be0d7b56914 100644 --- a/src/app/shared/search/search.component.html +++ b/src/app/shared/search/search.component.html @@ -117,7 +117,7 @@
    - +
    From d5f70eeaaff343f1803d0651fbff26029ca518c3 Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Thu, 1 Dec 2022 01:42:38 +0530 Subject: [PATCH 556/758] [DSC-854] implemented nested menu for menu response --- src/app/core/layout/models/section.model.ts | 2 + src/app/menu.resolver.spec.ts | 100 ++++++++++++++++++++ src/app/menu.resolver.ts | 43 +++++++-- src/assets/i18n/en.json5 | 10 +- 4 files changed, 144 insertions(+), 11 deletions(-) diff --git a/src/app/core/layout/models/section.model.ts b/src/app/core/layout/models/section.model.ts index 0e783ce679c..6bd6bd85bec 100644 --- a/src/app/core/layout/models/section.model.ts +++ b/src/app/core/layout/models/section.model.ts @@ -29,6 +29,8 @@ export class Section extends CacheableObject { @autoserialize componentRows: SectionComponent[][]; + nestedSections: Section[]; + /** * The {@link HALLink}s for this section */ diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts index 7c2226e5b00..6c715e9073e 100644 --- a/src/app/menu.resolver.spec.ts +++ b/src/app/menu.resolver.spec.ts @@ -25,10 +25,41 @@ const MENU_STATE = { id: 'some menu' }; const EXPLORE_SECTIONS_DEFINITIONS = [ + { id: 'definition1' }, + { + id: 'definition2', + nestedSections: [ + { id: 'nested_definition1' }, + { id: 'nested_definition2' } + ] + }, + { id: 'definition3' }, +]; + +const ALL_FLAT_MENUS = [ { id: 'definition1' }, { id: 'definition2' }, { id: 'definition3' }, ]; +const ALL_NESTED_MENUS = [ + { + id: 'definition1', + nestedSections: [ + { id: 'nested_definition1' }, + ] + },{ + id: 'definition2', + nestedSections: [ + { id: 'nested_definition2' }, + ] + },{ + id: 'definition3', + nestedSections: [ + { id: 'nested_definition3' }, + ] + } +]; +const NO_MENUS = []; describe('MenuResolver', () => { let resolver: MenuResolver; @@ -130,11 +161,80 @@ describe('MenuResolver', () => { expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ id: 'explore_definition2', visible: true, })); + expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ + id: 'explore_nested_definition2', + parentID: 'explore_definition2', + active: false, + visible: true + })); expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ id: 'explore_definition3', visible: true, })); }); }); + + describe('handle menus', () => { + it('should show all flat menus', () => { + sectionsService.findVisibleSections.and.returnValue( + createSuccessfulRemoteDataObject$(createPaginatedList(ALL_FLAT_MENUS)) + ); + resolver.createPublicMenu$().subscribe(); + expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ + id: 'explore_definition1', visible: true, + })); + expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ + id: 'explore_definition2', visible: true, + })); + expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ + id: 'explore_definition3', visible: true, + })); + }); + + it('should show all nested menus', () => { + sectionsService.findVisibleSections.and.returnValue( + createSuccessfulRemoteDataObject$(createPaginatedList(ALL_NESTED_MENUS)) + ); + resolver.createPublicMenu$().subscribe(); + expect(menuService.addSection).toHaveBeenCalledWith( + MenuID.PUBLIC, + jasmine.objectContaining({ + id: 'explore_nested_definition1', + parentID: 'explore_definition1', + active: false, + visible: true + }) + ); + expect(menuService.addSection).toHaveBeenCalledWith( + MenuID.PUBLIC, + jasmine.objectContaining({ + id: 'explore_nested_definition2', + parentID: 'explore_definition2', + active: false, + visible: true + }) + ); + expect(menuService.addSection).toHaveBeenCalledWith( + MenuID.PUBLIC, + jasmine.objectContaining({ + id: 'explore_nested_definition3', + parentID: 'explore_definition3', + active: false, + visible: true + }) + ); + }); + + it('should show no menus', () => { + sectionsService.findVisibleSections.and.returnValue( + createSuccessfulRemoteDataObject$(createPaginatedList(NO_MENUS)) + ); + resolver.createPublicMenu$().subscribe(); + expect(menuService.addSection).toHaveBeenCalledWith( + MenuID.PUBLIC, + jasmine.objectContaining({}) + ); + }); + }); }); describe('createAdminMenu$', () => { diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index 43702b58fd7..9d9deb15c90 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -123,17 +123,44 @@ export class MenuResolver implements Resolve { ).subscribe( (sectionDefListRD: RemoteData>) => { if (sectionDefListRD.hasSucceeded) { sectionDefListRD.payload.page.forEach((section) => { - menuList.push({ + let parentMenu: any = { id: `explore_${section.id}`, active: false, visible: true, - model: { - type: MenuItemType.LINK, - text: `menu.section.explore_${section.id}`, - link: `/explore/${section.id}` - } as LinkMenuItemModel - }); - + }; + if (section.nestedSections) { + section.nestedSections.forEach((nested) => { + menuList.push({ + id: `explore_${nested.id}`, + parentID: `explore_${section.id}`, + active: false, + visible: true, + model: { + type: MenuItemType.LINK, + text: `menu.section.explore_${nested.id}`, + link: `/explore/${nested.id}` + } as LinkMenuItemModel + }); + }); + parentMenu = { + ...parentMenu, + index: 1, + model: { + type: MenuItemType.TEXT, + text: `menu.section.explore_${section.id}` + } as TextMenuItemModel, + }; + } else { + parentMenu = { + ...parentMenu, + model: { + type: MenuItemType.LINK, + text: `menu.section.explore_${section.id}`, + link: `/explore/${section.id}` + } as LinkMenuItemModel + }; + } + menuList.push(parentMenu); }); } menuList.forEach((menuSection) => this.menuService.addSection(MenuID.PUBLIC, Object.assign(menuSection, { diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d60fb2973fb..c0cda3fa181 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2078,7 +2078,9 @@ "explore.infrastructure.breadcrumbs": "Infrastructure", - "explore.fundings.breadcrumbs": "Projects", + "explore.fundings.breadcrumbs": "Fundings", + + "explore.projects.breadcrumbs": "Projects", "explore.fundings_and_projects.breadcrumbs": "Projects", @@ -3476,9 +3478,11 @@ "menu.section.explore_orgunits": "Organizations", - "menu.section.explore_fundings": "Projects", + "menu.section.explore_fundings": "Fundings", + + "menu.section.explore_projects": "Projects", - "menu.section.explore_fundings_and_projects": "Projects", + "menu.section.explore_fundings_and_projects": "Fundings & Projects", "menu.section.communities_and_collections": "Communities & Collections", From edad816591e9ba27b7868e48e93c2a86bdc8f151 Mon Sep 17 00:00:00 2001 From: Nikunj Sharma Date: Fri, 23 Dec 2022 14:45:30 +0530 Subject: [PATCH 557/758] [DSC-854] fixed nested sections with BE connections --- src/app/core/layout/models/section.model.ts | 1 + src/app/menu.resolver.spec.ts | 10 +++++----- src/app/menu.resolver.ts | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/core/layout/models/section.model.ts b/src/app/core/layout/models/section.model.ts index 6bd6bd85bec..83455b0f89c 100644 --- a/src/app/core/layout/models/section.model.ts +++ b/src/app/core/layout/models/section.model.ts @@ -29,6 +29,7 @@ export class Section extends CacheableObject { @autoserialize componentRows: SectionComponent[][]; + @autoserialize nestedSections: Section[]; /** diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts index 6c715e9073e..a4352be5e52 100644 --- a/src/app/menu.resolver.spec.ts +++ b/src/app/menu.resolver.spec.ts @@ -29,8 +29,8 @@ const EXPLORE_SECTIONS_DEFINITIONS = [ { id: 'definition2', nestedSections: [ - { id: 'nested_definition1' }, - { id: 'nested_definition2' } + { id: 'definition1' }, + { id: 'definition2' } ] }, { id: 'definition3' }, @@ -45,17 +45,17 @@ const ALL_NESTED_MENUS = [ { id: 'definition1', nestedSections: [ - { id: 'nested_definition1' }, + { id: 'definition1' }, ] },{ id: 'definition2', nestedSections: [ - { id: 'nested_definition2' }, + { id: 'definition2' }, ] },{ id: 'definition3', nestedSections: [ - { id: 'nested_definition3' }, + { id: 'definition3' }, ] } ]; diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index 9d9deb15c90..2a1f6bec91c 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -128,10 +128,10 @@ export class MenuResolver implements Resolve { active: false, visible: true, }; - if (section.nestedSections) { + if (section.nestedSections && section.nestedSections.length) { section.nestedSections.forEach((nested) => { menuList.push({ - id: `explore_${nested.id}`, + id: `explore_nested_${nested.id}`, parentID: `explore_${section.id}`, active: false, visible: true, From 4068236054becadaedf66299c5310acb3908623e Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 10:43:18 +0200 Subject: [PATCH 558/758] [DSC-1070] WIP add security badge to edit item metadata page --- .../dso-edit-metadata-headers.component.html | 1 + .../dso-edit-metadata-value.component.html | 9 +++++++++ .../dso-edit-metadata-value.component.ts | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html index ecaf2aa7443..232a1a6fcac 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html @@ -4,6 +4,7 @@
    {{ dsoType + '.edit.metadata.headers.value' | translate }}
    {{ dsoType + '.edit.metadata.headers.language' | translate }}
    +
    {{'item.edit.metadata.headers.security'| translate}}
    {{ dsoType + '.edit.metadata.headers.edit' | translate }}
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index f54dde4971c..4c54f82282f 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -15,6 +15,15 @@
    +
    +
    + +
    +
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index 3fdcd381abc..a3c618fdfe3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -12,6 +12,7 @@ import { map } from 'rxjs/operators'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { EMPTY } from 'rxjs/internal/observable/empty'; +import { MetadataSecurityConfiguration } from 'src/app/core/submission/models/metadata-security-configuration'; @Component({ selector: 'ds-dso-edit-metadata-value', @@ -33,6 +34,11 @@ export class DsoEditMetadataValueComponent implements OnInit { */ @Input() mdValue: DsoEditMetadataValue; + /** + * The metadata security configuration for the entity. + */ + @Input() metadataSecurityConfiguration: MetadataSecurityConfiguration = null; + /** * Type of DSO we're displaying values for * Determines i18n messages From e686fcd1121a79cfdb4ce6d31eb1fd7d250c1b65 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 15:44:46 +0200 Subject: [PATCH 559/758] [DSC-1070] Remove old subscription implementation --- .../subscription-edit-modal.component.html | 44 --- .../subscription-edit-modal.component.scss | 4 - .../subscription-edit-modal.component.spec.ts | 123 ------ .../subscription-edit-modal.component.ts | 190 ---------- .../subscription-modal.component.html | 99 ----- .../subscription-modal.component.scss | 12 - .../subscription-modal.component.spec.ts | 221 ----------- .../subscription-modal.component.ts | 355 ------------------ .../subscription-view.component.html | 29 -- .../subscription-view.component.scss | 0 .../subscription-view.component.spec.ts | 130 ------- .../subscription-view.component.ts | 102 ----- .../subscriptions/subscription.service.ts | 171 --------- 13 files changed, 1480 deletions(-) delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.html delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html delete mode 100644 src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss delete mode 100644 src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-view/subscription-view.component.html delete mode 100644 src/app/shared/subscriptions/components/subscription-view/subscription-view.component.scss delete mode 100644 src/app/shared/subscriptions/components/subscription-view/subscription-view.component.spec.ts delete mode 100644 src/app/shared/subscriptions/components/subscription-view/subscription-view.component.ts delete mode 100644 src/app/shared/subscriptions/subscription.service.ts diff --git a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.html b/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.html deleted file mode 100644 index a67b321ab74..00000000000 --- a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.html +++ /dev/null @@ -1,44 +0,0 @@ -
    -

    {{'context-menu.actions.subscription.title' | translate}}

    - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    -
    - {{ 'context-menu.actions.subscription.frequency.required' | translate }} -
    -
    -
    -
    -
    -
    - -
    -
    - - - - - -
    \ No newline at end of file diff --git a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss b/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss deleted file mode 100644 index fb9db5b0ff1..00000000000 --- a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.scss +++ /dev/null @@ -1,4 +0,0 @@ -.alert{ - font-weight: bold; - color:red; -} diff --git a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts b/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts deleted file mode 100644 index c3bef0b8d16..00000000000 --- a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.spec.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing'; -import { ComponentFixtureAutoDetect } from '@angular/core/testing'; -import { cold, getTestScheduler, hot } from 'jasmine-marbles'; - -// Import modules -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { BrowserModule, By } from '@angular/platform-browser'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; -import { SharedModule } from '../../../shared.module'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; -import { DebugElement,ChangeDetectionStrategy } from '@angular/core'; - -import { SubscriptionEditModalComponent } from './subscription-edit-modal.component'; - -// Import mocks -import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; -import { subscription } from '../../../testing/subscriptions-data.mock'; -import { MockActivatedRoute } from '../../../mocks/active-router.mock'; -import { ItemInfo } from '../../../testing/relationships-mocks'; - -// Import utils -import { NotificationsService } from '../../../notifications/notifications.service'; -import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; -import { SubscriptionService } from '../../subscription.service'; -import { Subscription } from '../../models/subscription.model'; - - -describe('SubscriptionEditModalComponent', () => { - let component: SubscriptionEditModalComponent; - let fixture: ComponentFixture; - let de: DebugElement; - - const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - updateSubscription: jasmine.createSpy('updateSubscription'), - }); - - - beforeEach(waitForAsync (() => { - TestBed.configureTestingModule({ - imports: [ - CommonModule, - ReactiveFormsModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [ SubscriptionEditModalComponent ], - providers: [ - { provide: ComponentFixtureAutoDetect, useValue: true }, - { provide: NotificationsService, useValue: NotificationsServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SubscriptionEditModalComponent); - component = fixture.componentInstance; - component.eperson = 'testid123'; - component.dso = ItemInfo.payload; - - de = fixture.debugElement; - - subscriptionServiceStub.updateSubscription.and.returnValue(cold('a|', { - a: {} - })); - - - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - describe('No Subscription inserted', () => { - it('should not show form', () => { - expect(de.query(By.css('form'))).toBeNull(); - }); - }); - - - describe('Subscription inserted', () => { - - beforeEach(fakeAsync(() => { - component.subscription = Object.assign(new Subscription(), subscription); - component.ngOnInit(); - fixture.detectChanges(); - })); - - it('when insert subscription show form', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should have right checkboxes checked', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(true); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(true); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - it('on checkbox clicked should change form values', () => { - const checkbox = de.query(By.css('#checkbox-2')).nativeElement; - checkbox.click(); - - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(true); - expect(component.subscriptionParameterList?.value?.length).toEqual(3); - }); - - it('on submit clicked update should have been called', () => { - const button = de.query(By.css('.btn-success')).nativeElement; - button.click(); - expect(subscriptionServiceStub.updateSubscription).toHaveBeenCalled(); - }); - }); -}); diff --git a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts b/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts deleted file mode 100644 index 46c895dc18e..00000000000 --- a/src/app/shared/subscriptions/components/subscription-edit-modal/subscription-edit-modal.component.ts +++ /dev/null @@ -1,190 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; - -import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; - -import { Subscription } from '../../models/subscription.model'; - -import { BehaviorSubject } from 'rxjs'; - -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; - -import { SubscriptionService } from '../../subscription.service'; -import { NotificationsService } from '../../../notifications/notifications.service'; - -import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; - -@Component({ - selector: 'ds-subscription-edit-modal', - templateUrl: './subscription-edit-modal.component.html', - styleUrls: ['./subscription-edit-modal.component.scss'] -}) -export class SubscriptionEditModalComponent implements OnInit { - - - /** - * DSpaceObject of the subscription - */ - @Input() dso: DSpaceObject; - - /** - * EPerson of the subscription - */ - @Input() eperson: string; - - /** - * List of subscription for the dso object and eperson relation - */ - @Input() subscription!: Subscription; - - /** - * Close event emit to close modal - */ - @Output() close: EventEmitter = new EventEmitter(); - - /** - * Reload event emit to refresh informations - */ - @Output() reload: EventEmitter = new EventEmitter(); - - /** - * A boolean representing if a request operation is pending - * @type {BehaviorSubject} - */ - public processing$ = new BehaviorSubject(false); - - /** - * Reactive form group that will be used to add subscriptions - */ - subscriptionForm: FormGroup; - - /** - * Used to show validation errors when user submits - */ - submitted = false; - - /** - * Reference to NgbModal - */ - public modalRef: NgbModalRef; - - - /** - * Frequencies to be shown as checkboxes - */ - frequencies = [ - {name: 'daily' ,value: 'D'}, - {name: 'monthly' ,value: 'M'}, - {name: 'weekly' ,value: 'W'}, - ]; - - constructor(private formGroup: FormBuilder, - private notificationsService: NotificationsService, - private subscriptionService: SubscriptionService - ) {} - - /** - * When component starts initialize starting functionality - */ - ngOnInit(): void { - this.initSubscription(); - } - - /** - * If the subscription is passed start the form with the information of subscription - */ - initSubscription(): void { - if (!!this.subscription) { - this.buildFormBuilder(this.subscription); - } - } - - /** - * Function to get subscriptionParameterList form array cleaner - */ - get subscriptionParameterList(): FormArray { - return this.subscriptionForm.get('subscriptionParameterList') as FormArray; - } - - /** - * When frequency checkboxes are being changed we add/remove frequencies from subscriptionParameterList - */ - selectCheckbox(event,frequency): void { - if (event.target.checked) { - this.addFrequency(frequency); - } else { - this.removeFrequency(frequency); - } - } - - /** - * Start the form with preinserted informations - */ - buildFormBuilder(subscription): void { - - this.subscriptionForm = this.formGroup.group({ - id: subscription.id, - type: subscription.subscriptionType, - subscriptionParameterList: this.formGroup.array([], Validators.required) - }); - - subscription.subscriptionParameterList.forEach( (parameter) => { - this.addFrequency(parameter.value); - }); - } - - /** - * Add a new frequency to the subscriptionParameterList form array - */ - addFrequency(frequency): void { - this.subscriptionParameterList.push( - this.formGroup.group({ - name: 'frequency', - value: frequency - }) - ); - } - - /** - * Remove frequency from subscriptionParameterList form array - */ - removeFrequency(frequency): void { - const index = this.subscriptionParameterList.controls.findIndex(el => el.value.value === frequency); - this.subscriptionParameterList.removeAt(index); - } - - /** - * When user saves it will check if form is valid and send request to update subscription - */ - submit(): void { - this.submitted = true; - if (this.subscriptionForm.valid) { - if (this.subscriptionForm.value.id) { - this.updateForm(this.subscriptionForm.value); - } - } - } - - /** - * Sends request to update a new subscription, refreshes the table of subscriptions and notifies about summary page - */ - updateForm(body): void { - this.subscriptionService.updateSubscription(body,this.eperson,this.dso.uuid).subscribe( (res) => { - this.reload.emit(); - this.close.emit(); - }); - } - - /** - * When close button is pressed emit function to close modal - */ - c(text): void { - this.close.emit(text); - } - - /** - * Returns if a specific frequency exists in the subscriptionParameterList - */ - getIsChecked(frequency): boolean { - return !!this.subscriptionForm.get('subscriptionParameterList').value.find(el => el.value === frequency.value); - } -} diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html deleted file mode 100644 index 0bc415bfd8b..00000000000 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.html +++ /dev/null @@ -1,99 +0,0 @@ -
    -

    {{'context-menu.actions.subscription.title' | translate}}

    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    {{'item.edit.modify.overview.field'| translate}}
    {{subscription.subscriptionType}} + {{ 'subscriptions.frequency.'+ parameterList.value | translate}}, diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts index a0caba97ee8..00f0b8d22ce 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts @@ -103,7 +103,7 @@ describe('SubscriptionViewComponent', () => { }); it('should have subscription paramenter info', () => { - expect(de.query(By.css('.subscription-parmenters > span'))).toBeTruthy(); + expect(de.query(By.css('.subscription-parameters > span'))).toBeTruthy(); }); it('should have subscription action info', () => { diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts index 9f7fca7caf6..4c6c5c6d21f 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts @@ -19,6 +19,9 @@ import { SubscriptionModalComponent } from '../subscription-modal/subscription-m templateUrl: './subscription-view.component.html', styleUrls: ['./subscription-view.component.scss'] }) +/** + * Table row representing a subscription that displays all information and action buttons to manage it + */ export class SubscriptionViewComponent { /** diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 7307218d0a4..05c587ba12c 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -20,6 +20,9 @@ import { hasValue } from '../shared/empty.util'; templateUrl: './subscriptions-page.component.html', styleUrls: ['./subscriptions-page.component.scss'] }) +/** + * List and allow to manage all the active subscription for the current user + */ export class SubscriptionsPageComponent implements OnInit, OnDestroy { /** From 7a46e6d93cff1b44961c05f8b2832188604cdec5 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 6 Feb 2023 11:21:12 +0100 Subject: [PATCH 429/758] [CST-7757] Labels renamed --- ...so-page-subscription-button.component.html | 6 ++-- .../subscription-modal.component.html | 12 +++---- src/assets/i18n/en.json5 | 34 +++++++++---------- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html index 8601dcdda94..15135009fcd 100644 --- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html +++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.html @@ -1,8 +1,8 @@ diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index debc6edf502..e095e094dc6 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -1,6 +1,6 @@
    -

    {{'item.page.subscriptions.modal.title' | translate}}

    +

    {{'subscriptions.modal.title' | translate}}

    @@ -10,14 +10,14 @@

    {{'item.page.subscriptions.modal.title' | translate}}
    - {{ 'item.page.subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}: + {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
    + [for]="'checkbox-' + frequency.key">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency.key | translate }}
    @@ -29,14 +29,14 @@

    {{'item.page.subscriptions.modal.title' | translate}}

    diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 6e861cd61a8..be9ffc99ed6 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2322,24 +2322,6 @@ "item.page.claim.tooltip": "Claim this item as profile", - "item.page.subscriptions.tooltip": "Subscribe", - - "item.page.subscriptions.modal.title": "Subscriptions", - - "item.page.subscriptions.modal.type-frequency": "Type and frequency", - - "item.page.subscriptions.modal.close": "Close", - - "item.page.subscriptions.modal.new-subscription-form.type.content": "Content", - - "item.page.subscriptions.modal.new-subscription-form.frequency.D": "Daily", - - "item.page.subscriptions.modal.new-subscription-form.frequency.W": "Weekly", - - "item.page.subscriptions.modal.new-subscription-form.frequency.M": "Monthly", - - "item.page.subscriptions.modal.new-subscription-form.submit": "Submit", - "item.preview.dc.identifier.uri": "Identifier:", "item.preview.dc.contributor.author": "Authors:", @@ -4599,7 +4581,23 @@ "subscriptions.frequency.W": "Weekly", + "subscriptions.tooltip": "Subscribe", + + "subscriptions.modal.title": "Subscriptions", + + "subscriptions.modal.type-frequency": "Type and frequency", + + "subscriptions.modal.close": "Close", + + "subscriptions.modal.new-subscription-form.type.content": "Content", + + "subscriptions.modal.new-subscription-form.frequency.D": "Daily", + + "subscriptions.modal.new-subscription-form.frequency.W": "Weekly", + + "subscriptions.modal.new-subscription-form.frequency.M": "Monthly", + "subscriptions.modal.new-subscription-form.submit": "Submit", "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.", From 67d401cc77e52135043087a848dbb6ebd40e9d15 Mon Sep 17 00:00:00 2001 From: corrado lombardi Date: Mon, 6 Feb 2023 16:53:37 +0100 Subject: [PATCH 430/758] [CST-7755] updated PR to latest REST changes --- src/app/core/shared/context.model.ts | 2 +- src/app/my-dspace-page/my-dspace-configuration-value-type.ts | 2 +- src/assets/i18n/en.json5 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts index 0f1130ebdad..dbe5a64552a 100644 --- a/src/app/core/shared/context.model.ts +++ b/src/app/core/shared/context.model.ts @@ -8,7 +8,7 @@ export enum Context { Search = 'search', Workflow = 'workflow', Workspace = 'workspace', - SupervisedItems = 'otherworkspace', + SupervisedItems = 'supervisedWorkspace', AdminMenu = 'adminMenu', EntitySearchModalWithNameVariants = 'EntitySearchModalWithNameVariants', EntitySearchModal = 'EntitySearchModal', diff --git a/src/app/my-dspace-page/my-dspace-configuration-value-type.ts b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts index 52e6b01c113..c8484d97a06 100644 --- a/src/app/my-dspace-page/my-dspace-configuration-value-type.ts +++ b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts @@ -1,5 +1,5 @@ export enum MyDSpaceConfigurationValueType { Workspace = 'workspace', - SupervisedItems = 'otherworkspace', + SupervisedItems = 'supervisedWorkspace', Workflow = 'workflow' } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 4e068152ab4..0251f171b77 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2968,7 +2968,7 @@ "mydspace.show.workspace": "Your Submissions", - "mydspace.show.otherworkspace": "Supervised items", + "mydspace.show.supervisedWorkspace": "Supervised items", "mydspace.status.archived": "Archived", @@ -4665,7 +4665,7 @@ - "otherworkspace.search.results.head": "Supervised Items", + "supervisedWorkspace.search.results.head": "Supervised Items", "workspace.search.results.head": "Your submissions", From 6864ffb385b30e15eb82c940ebfc2098e77e4e76 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 6 Feb 2023 16:56:45 +0100 Subject: [PATCH 431/758] 97298: Added form validator tests for restricted domains --- .../register-email-form.component.spec.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts index 8a527135bc9..4fea169e35e 100644 --- a/src/app/register-email-form/register-email-form.component.spec.ts +++ b/src/app/register-email-form/register-email-form.component.spec.ts @@ -96,6 +96,30 @@ describe('RegisterEmailFormComponent', () => { comp.form.patchValue({email: 'valid@email.org'}); expect(comp.form.invalid).toBeFalse(); }); + it('should not accept email with other domain names', () => { + spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'authentication-password.domain.valid', + values: ['marvel.com'], + }))); + comp.typeRequest = TYPE_REQUEST_REGISTER; + + comp.ngOnInit(); + + comp.form.patchValue({ email: 'valid@email.org' }); + expect(comp.form.invalid).toBeTrue(); + }); + it('should accept email with the given domain name', () => { + spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'authentication-password.domain.valid', + values: ['marvel.com'], + }))); + comp.typeRequest = TYPE_REQUEST_REGISTER; + + comp.ngOnInit(); + + comp.form.patchValue({ email: 'thor.odinson@marvel.com' }); + expect(comp.form.invalid).toBeFalse(); + }); }); describe('register', () => { it('should send a registration to the service and on success display a message and return to home', () => { From 34e970827e362d6eb0cbb4e07ad55e45742169c9 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 6 Feb 2023 18:20:39 +0100 Subject: [PATCH 432/758] 99053: Invalidate cache by default when performing the WorkflowItemActionPageComponent action --- src/app/shared/testing/request-service.stub.ts | 12 ++++++++++++ ...advanced-workflow-action-rating.component.spec.ts | 3 +++ ...workflow-action-select-reviewer.component.spec.ts | 3 +++ ...nced-workflow-action-select-reviewer.component.ts | 4 +++- .../advanced-workflow-action.component.spec.ts | 3 +++ .../advanced-workflow-action.component.ts | 4 +++- .../workflow-item-action-page.component.spec.ts | 9 +++++++-- .../workflow-item-action-page.component.ts | 11 +++++++---- .../workflow-item-delete.component.ts | 3 +-- .../workflow-item-send-back.component.ts | 3 +-- 10 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 src/app/shared/testing/request-service.stub.ts diff --git a/src/app/shared/testing/request-service.stub.ts b/src/app/shared/testing/request-service.stub.ts new file mode 100644 index 00000000000..9add8898dfc --- /dev/null +++ b/src/app/shared/testing/request-service.stub.ts @@ -0,0 +1,12 @@ +import { Observable, of as observableOf } from 'rxjs'; + +/** + * Stub service for {@link RequestService}. + */ +export class RequestServiceStub { + + removeByHrefSubstring(_href: string): Observable { + return observableOf(true); + } + +} diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts index 4abbe1a0c12..c6a7dc2c078 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts @@ -26,6 +26,8 @@ import { Item } from '../../../core/shared/item.model'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model'; +import { RequestService } from '../../../core/data/request.service'; +import { RequestServiceStub } from '../../../shared/testing/request-service.stub'; const claimedTaskId = '2'; const workflowId = '1'; @@ -80,6 +82,7 @@ describe('AdvancedWorkflowActionRatingComponent', () => { { provide: Router, useValue: new RouterStub() }, { provide: WorkflowActionDataService, useValue: workflowActionDataService }, { provide: WorkflowItemDataService, useValue: workflowItemDataService }, + { provide: RequestService, useClass: RequestServiceStub }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts index 855bde79a75..2884dbcc8e4 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts @@ -23,6 +23,8 @@ import { Item } from '../../../core/shared/item.model'; import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock'; import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { RequestService } from '../../../core/data/request.service'; +import { RequestServiceStub } from '../../../shared/testing/request-service.stub'; const claimedTaskId = '2'; const workflowId = '1'; @@ -73,6 +75,7 @@ describe('AdvancedWorkflowActionSelectReviewerComponent', () => { { provide: RouteService, useValue: routeServiceStub }, { provide: WorkflowActionDataService, useValue: workflowActionDataService }, { provide: WorkflowItemDataService, useValue: workflowItemDataService }, + { provide: RequestService, useClass: RequestServiceStub }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts index e1eada0c48e..b9f90e1736a 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts @@ -20,6 +20,7 @@ import { TranslateService } from '@ngx-translate/core'; import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service'; import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; import { ReviewersListComponent } from './reviewers-list/reviewers-list.component'; +import { RequestService } from 'src/app/core/data/request.service'; export const ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER = 'submit_select_reviewer'; export const ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER = 'selectrevieweraction'; @@ -60,8 +61,9 @@ export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkf protected translationService: TranslateService, protected workflowActionService: WorkflowActionDataService, protected claimedTaskDataService: ClaimedTaskDataService, + protected requestService: RequestService, ) { - super(route, workflowItemService, router, routeService, notificationsService, translationService, workflowActionService, claimedTaskDataService); + super(route, workflowItemService, router, routeService, notificationsService, translationService, workflowActionService, claimedTaskDataService, requestService); } ngOnDestroy(): void { diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts index f0c68826172..f57adcb05ff 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts @@ -18,6 +18,8 @@ import { TranslateModule } from '@ngx-translate/core'; import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub'; import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub'; +import { RequestService } from '../../../core/data/request.service'; +import { RequestServiceStub } from '../../../shared/testing/request-service.stub'; const workflowId = '1'; @@ -65,6 +67,7 @@ describe('AdvancedWorkflowActionComponent', () => { { provide: RouteService, useValue: routeServiceStub }, { provide: WorkflowActionDataService, useValue: workflowActionDataService }, { provide: WorkflowItemDataService, useValue: workflowItemDataService }, + { provide: RequestService, useClass: RequestServiceStub }, ], }).compileComponents(); }); diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts index 982e5f8eacb..61bc60cdbdd 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts @@ -12,6 +12,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operato import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service'; import { map } from 'rxjs/operators'; import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response'; +import { RequestService } from '../../../core/data/request.service'; /** * Abstract component for rendering an advanced claimed task's workflow page @@ -36,8 +37,9 @@ export abstract class AdvancedWorkflowActionComponent extends WorkflowItemAction protected translationService: TranslateService, protected workflowActionService: WorkflowActionDataService, protected claimedTaskDataService: ClaimedTaskDataService, + protected requestService: RequestService, ) { - super(route, workflowItemService, router, routeService, notificationsService, translationService); + super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService); } ngOnInit(): void { diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts index c7b9858836c..11f88788dc8 100644 --- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts +++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts @@ -16,6 +16,8 @@ import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { ActivatedRouteStub } from '../shared/testing/active-router.stub'; import { RouterStub } from '../shared/testing/router.stub'; import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub'; +import { RequestService } from '../core/data/request.service'; +import { RequestServiceStub } from '../shared/testing/request-service.stub'; const type = 'testType'; describe('WorkflowItemActionPageComponent', () => { @@ -52,6 +54,7 @@ describe('WorkflowItemActionPageComponent', () => { { provide: RouteService, useValue: {} }, { provide: NotificationsService, useClass: NotificationsServiceStub }, { provide: WorkflowItemDataService, useValue: wfiService }, + { provide: RequestService, useClass: RequestServiceStub }, ], schemas: [NO_ERRORS_SCHEMA] }) @@ -110,8 +113,10 @@ class TestComponent extends WorkflowItemActionPageComponent { protected router: Router, protected routeService: RouteService, protected notificationsService: NotificationsService, - protected translationService: TranslateService) { - super(route, workflowItemService, router, routeService, notificationsService, translationService); + protected translationService: TranslateService, + protected requestService: RequestService, + ) { + super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService); } getType(): string { diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts index f1740c27a42..0f6a222d85a 100644 --- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Observable, forkJoin } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; import { WorkflowItem } from '../core/submission/models/workflowitem.model'; @@ -11,6 +11,7 @@ import { NotificationsService } from '../shared/notifications/notifications.serv import { RemoteData } from '../core/data/remote-data'; import { getAllSucceededRemoteData, getRemoteDataPayload } from '../core/shared/operators'; import { isEmpty } from '../shared/empty.util'; +import { RequestService } from '../core/data/request.service'; /** * Abstract component representing a page to perform an action on a workflow item @@ -29,7 +30,9 @@ export abstract class WorkflowItemActionPageComponent implements OnInit { protected router: Router, protected routeService: RouteService, protected notificationsService: NotificationsService, - protected translationService: TranslateService) { + protected translationService: TranslateService, + protected requestService: RequestService, + ) { } /** @@ -45,9 +48,9 @@ export abstract class WorkflowItemActionPageComponent implements OnInit { * Performs the action and shows a notification based on the outcome of the action */ performAction() { - this.wfi$.pipe( + forkJoin([this.wfi$, this.requestService.removeByHrefSubstring('/discover')]).pipe( take(1), - switchMap((wfi: WorkflowItem) => this.sendRequest(wfi.id)) + switchMap(([wfi]) => this.sendRequest(wfi.id)) ).subscribe((successful: boolean) => { if (successful) { const title = this.translationService.get('workflow-item.' + this.type + '.notification.success.title'); diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts index 451469b5e44..faa2bf543a8 100644 --- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts @@ -27,7 +27,7 @@ export class WorkflowItemDeleteComponent extends WorkflowItemActionPageComponent protected notificationsService: NotificationsService, protected translationService: TranslateService, protected requestService: RequestService) { - super(route, workflowItemService, router, routeService, notificationsService, translationService); + super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService); } /** @@ -42,7 +42,6 @@ export class WorkflowItemDeleteComponent extends WorkflowItemActionPageComponent * @param id The id of the WorkflowItem */ sendRequest(id: string): Observable { - this.requestService.removeByHrefSubstring('/discover'); return this.workflowItemService.delete(id).pipe( getFirstCompletedRemoteData(), map((response: RemoteData) => response.hasSucceeded) diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts index 002e5dcc9a6..432b417f432 100644 --- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts @@ -23,7 +23,7 @@ export class WorkflowItemSendBackComponent extends WorkflowItemActionPageCompone protected notificationsService: NotificationsService, protected translationService: TranslateService, protected requestService: RequestService) { - super(route, workflowItemService, router, routeService, notificationsService, translationService); + super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService); } /** @@ -38,7 +38,6 @@ export class WorkflowItemSendBackComponent extends WorkflowItemActionPageCompone * @param id The id of the WorkflowItem */ sendRequest(id: string): Observable { - this.requestService.removeByHrefSubstring('/discover'); return this.workflowItemService.sendBack(id); } } From 615c74288efa93b37335045809646a075dd2ecc7 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Mon, 6 Feb 2023 19:01:45 +0100 Subject: [PATCH 433/758] 99053: Added DeclinedTask search result banner --- .../my-dspace-page/my-dspace-search.module.ts | 2 + ...med-task-actions-decline-task.component.ts | 16 +++ ...aimed-declined-task-search-result.model.ts | 2 +- ...-declined-task-task-search-result.model.ts | 8 ++ .../my-dspace-item-status-type.ts | 1 + ...-search-result-list-element.component.html | 2 +- ...arch-result-list-element.component.spec.ts | 6 +- ...-search-result-list-element.component.html | 2 +- ...rch-result-list-element.component.spec.ts} | 6 +- ...-search-result-list-element.component.html | 10 ++ ...arch-result-list-element.component.spec.ts | 106 ++++++++++++++++++ ...sk-search-result-list-element.component.ts | 66 +++++++++++ src/assets/i18n/en.json5 | 6 + 13 files changed, 228 insertions(+), 5 deletions(-) create mode 100644 src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts rename src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/{claimed-declided-search-result-list-element.component.spec.ts => claimed-declined-search-result-list-element.component.spec.ts} (96%) create mode 100644 src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html create mode 100644 src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts create mode 100644 src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts index 67a4f0818ec..97138ab8db8 100644 --- a/src/app/my-dspace-page/my-dspace-search.module.ts +++ b/src/app/my-dspace-page/my-dspace-search.module.ts @@ -16,6 +16,7 @@ import { WorkflowItemSearchResultListElementComponent } from '../shared/object-l import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component'; import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component'; import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component'; +import { ClaimedDeclinedTaskSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component'; const ENTRY_COMPONENTS = [ // put only entry components that use custom decorator @@ -24,6 +25,7 @@ const ENTRY_COMPONENTS = [ ClaimedSearchResultListElementComponent, ClaimedApprovedSearchResultListElementComponent, ClaimedDeclinedSearchResultListElementComponent, + ClaimedDeclinedTaskSearchResultListElementComponent, PoolSearchResultListElementComponent, ItemSearchResultDetailElementComponent, WorkspaceItemSearchResultDetailElementComponent, diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts index ab867d62d6d..5afbde7d7d9 100644 --- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts @@ -6,6 +6,12 @@ import { NotificationsService } from '../../../notifications/notifications.servi import { TranslateService } from '@ngx-translate/core'; import { SearchService } from '../../../../core/shared/search/search.service'; import { RequestService } from '../../../../core/data/request.service'; +import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { + ClaimedDeclinedTaskTaskSearchResult +} from '../../../object-collection/shared/claimed-declined-task-task-search-result.model'; +import { Observable, of as observableOf } from 'rxjs'; +import { RemoteData } from 'src/app/core/data/remote-data'; export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task'; @@ -31,4 +37,14 @@ export class ClaimedTaskActionsDeclineTaskComponent extends ClaimedTaskActionsAb super(injector, router, notificationsService, translate, searchService, requestService); } + reloadObjectExecution(): Observable | DSpaceObject> { + return observableOf(this.object); + } + + convertReloadedObject(dso: DSpaceObject): DSpaceObject { + return Object.assign(new ClaimedDeclinedTaskTaskSearchResult(), dso, { + indexableObject: dso + }); + } + } diff --git a/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts index eaf63bf6dd0..0afb79a2747 100644 --- a/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts +++ b/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts @@ -2,7 +2,7 @@ import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.mode import { SearchResult } from '../../search/models/search-result.model'; /** - * Represents a search result object of a Declined ClaimedTask object + * Represents a search result object of a Declined/Rejected ClaimedTask object (sent back to the submitter) */ export class ClaimedDeclinedTaskSearchResult extends SearchResult { } diff --git a/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts new file mode 100644 index 00000000000..dffb3c1313f --- /dev/null +++ b/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts @@ -0,0 +1,8 @@ +import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model'; +import { SearchResult } from '../../search/models/search-result.model'; + +/** + * Represents a search result object of a Declined ClaimedTask object (sent back to the Review Managers) + */ +export class ClaimedDeclinedTaskTaskSearchResult extends SearchResult { +} diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts index 5cf4d91b20e..ec101f1ee7d 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts +++ b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts @@ -6,4 +6,5 @@ export enum MyDspaceItemStatusType { ARCHIVED = 'mydspace.status.archived', DECLINED = 'mydspace.status.declined', APPROVED = 'mydspace.status.approved', + DECLINED_TASk = 'mydspace.status.declined-task', } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html index 8ebcdbd69a3..97ea34cef07 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html @@ -1,6 +1,6 @@ + +
    +
    +
    + {{identifier.identifierType.toLocaleUpperCase()}} +
    +
    {{identifier.value}} + ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
    +
    +
    +
    {{'item.edit.tabs.status.labels.itemPage' | translate}}:
    @@ -18,4 +29,5 @@
    + diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index f01f5c1f7ab..a719e621dc3 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -3,14 +3,23 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade'; import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { ItemOperation } from '../item-operation/itemOperation.model'; -import { distinctUntilChanged, first, map, mergeMap, toArray } from 'rxjs/operators'; -import { BehaviorSubject, Observable, from as observableFrom } from 'rxjs'; +import {distinctUntilChanged, first, map, mergeMap, startWith, switchMap, toArray} from 'rxjs/operators'; +import {BehaviorSubject, Observable, from as observableFrom, Subscription, combineLatest, of} from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { hasValue } from '../../../shared/empty.util'; -import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators'; +import { + getAllSucceededRemoteDataPayload, + getFirstCompletedRemoteData, getFirstSucceededRemoteData, + getFirstSucceededRemoteDataPayload +} from '../../../core/shared/operators'; +import {IdentifierDataService} from '../../../core/data/identifier-data.service'; +import {IdentifierData} from '../../../shared/object-list/identifier-data/identifier-data.model'; +import {Identifier} from '../../../shared/object-list/identifier-data/identifier.model'; +import {ConfigurationProperty} from '../../../core/shared/configuration-property.model'; +import {ConfigurationDataService} from '../../../core/data/configuration-data.service'; @Component({ selector: 'ds-item-status', @@ -51,15 +60,32 @@ export class ItemStatusComponent implements OnInit { */ actionsKeys; + /** + * Identifiers (handles, DOIs) + */ + identifiers$: Observable; + + /** + * Configuration and state variables regarding DOIs + */ + + public subs: Subscription[] = []; + /** * Route to the item's page */ itemPageRoute$: Observable; constructor(private route: ActivatedRoute, - private authorizationService: AuthorizationDataService) { + private authorizationService: AuthorizationDataService, + private identifierDataService: IdentifierDataService, + private configurationService: ConfigurationDataService, + ) { } + /** + * Initialise component + */ ngOnInit(): void { this.itemRD$ = this.route.parent.data.pipe(map((data) => data.dso)); this.itemRD$.pipe( @@ -72,6 +98,35 @@ export class ItemStatusComponent implements OnInit { lastModified: item.lastModified }); this.statusDataKeys = Object.keys(this.statusData); + + // Observable for item identifiers (retrieved from embedded link) + this.identifiers$ = this.identifierDataService.getIdentifierDataFor(item).pipe( + map((identifierRD) => { + if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) { + return identifierRD.payload.identifiers; + } else { + return null; + } + }), + ); + + // Observable for configuration determining whether the Register DOI feature is enabled + let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.register').pipe( + map((enabled: RemoteData) => { + let show: boolean = false; + if (enabled.hasSucceeded) { + if (enabled.payload !== undefined && enabled.payload !== null) { + if (enabled.payload.values !== undefined) { + enabled.payload.values.forEach((value) => { + show = true; + }); + } + } + } + return show; + }) + ); + /* The key is used to build messages i18n example: 'item.edit.tabs.status.buttons..label' @@ -92,27 +147,66 @@ export class ItemStatusComponent implements OnInit { } operations.push(new ItemOperation('delete', this.getCurrentUrl(item) + '/delete', FeatureID.CanDelete, true)); operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move', FeatureID.CanMove, true)); - this.operations$.next(operations); - observableFrom(operations).pipe( - mergeMap((operation) => { - if (hasValue(operation.featureID)) { - return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe( - distinctUntilChanged(), - map((authorized) => new ItemOperation(operation.operationKey, operation.operationUrl, operation.featureID, !authorized, authorized)) - ); - } else { - return [operation]; + // Observable that reads identifiers and their status and, and config properties, and decides + // if we're allowed to show a Register DOI feature + let showRegister$: Observable = combineLatest([this.identifiers$, registerConfigEnabled$]).pipe( + distinctUntilChanged(), + map(([identifiers, enabled]) => { + let no_doi: boolean = true; + let pending: boolean = false; + if (identifiers !== undefined && identifiers !== null) { + identifiers.forEach((identifier: Identifier) => { + if (hasValue(identifier) && identifier.identifierType == 'doi') { + // The item has some kind of DOI + no_doi = false; + if (identifier.identifierStatus == '10' || identifier.identifierStatus == '11' + || identifier.identifierStatus == null) { + // The item's DOI is pending, minted or null. + // It isn't registered, reserved, queued for registration or reservation or update, deleted + // or queued for deletion. + pending = true; + } + } + }); } - }), - toArray() - ).subscribe((ops) => this.operations$.next(ops)); + // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true + return ((pending || no_doi) && enabled); + }) + ) + + // Subscribe to changes from the showRegister check and rebuild operations list accordingly + this.subs.push(showRegister$.subscribe((show) => { + // Copy the static array first so we don't keep appending to it + let tmp_operations = [...operations]; + if (show) { + // Push the new Register DOI item operation + tmp_operations.push(new ItemOperation('registerDOI', this.getCurrentUrl(item) + '/registerdoi', FeatureID.CanRegisterDOI)); + } + // Check authorisations and merge into new operations list + observableFrom(tmp_operations).pipe( + mergeMap((operation) => { + if (hasValue(operation.featureID)) { + return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe( + distinctUntilChanged(), + map((authorized) => new ItemOperation(operation.operationKey, operation.operationUrl, operation.featureID, !authorized, authorized)) + ); + } else { + return [operation]; + } + }), + toArray() + ).subscribe((ops) => this.operations$.next(ops)); + })); + }); + this.itemPageRoute$ = this.itemRD$.pipe( getAllSucceededRemoteDataPayload(), map((item) => getItemPageRoute(item)) ); + } /** @@ -127,4 +221,10 @@ export class ItemStatusComponent implements OnInit { return hasValue(operation) ? operation.operationKey : undefined; } + ngOnDestroy(): void { + this.subs + .filter((subscription) => hasValue(subscription)) + .forEach((subscription) => subscription.unsubscribe()); + } + } diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.html b/src/app/shared/object-list/identifier-data/identifier-data.component.html new file mode 100644 index 00000000000..91470628c4b --- /dev/null +++ b/src/app/shared/object-list/identifier-data/identifier-data.component.html @@ -0,0 +1,5 @@ + +
    + {{ identifiers[0].value | translate }} +
    +     diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts new file mode 100644 index 00000000000..85989f34c69 --- /dev/null +++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts @@ -0,0 +1,56 @@ +import { Component, Input } from '@angular/core'; +import { catchError, map } from 'rxjs/operators'; +import { Observable, of as observableOf } from 'rxjs'; +import { hasValue } from '../../empty.util'; +import { environment } from 'src/environments/environment'; +import { Item } from 'src/app/core/shared/item.model'; +import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service'; +import {IdentifierData} from './identifier-data.model'; +import {IdentifierDataService} from '../../../core/data/identifier-data.service'; + +@Component({ + selector: 'ds-identifier-data', + templateUrl: './identifier-data.component.html' +}) +/** + * Component rendering the access status of an item as a badge + */ +export class IdentifierDataComponent { + + @Input() item: Item; + identifiers$: Observable; + + /** + * Whether to show the access status badge or not + */ + showAccessStatus: boolean; + + /** + * Initialize instance variables + * + * @param {IdentifierDataService} identifierDataService + */ + constructor(private identifierDataService: IdentifierDataService) { } + + ngOnInit(): void { + if (this.item == null) { + // Do not show the badge if the feature is inactive or if the item is null. + return; + } + if (this.item.identifiers == null) { + // In case the access status has not been loaded, do it individually. + this.item.identifiers = this.identifierDataService.getIdentifierDataFor(this.item); + } + this.identifiers$ = this.item.identifiers.pipe( + map((identifierRD) => { + if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) { + return identifierRD.payload; + } else { + return null; + } + }), + // EMpty array if none + //map((identifiers: IdentifierData) => hasValue(identifiers.identifiers) ? identifiers.identifiers : []) + ); + } +} diff --git a/src/app/shared/object-list/identifier-data/identifier-data.model.ts b/src/app/shared/object-list/identifier-data/identifier-data.model.ts new file mode 100644 index 00000000000..e707f396e4f --- /dev/null +++ b/src/app/shared/object-list/identifier-data/identifier-data.model.ts @@ -0,0 +1,33 @@ +import { autoserialize, deserialize } from 'cerialize'; +import { typedObject } from 'src/app/core/cache/builders/build-decorators'; +import { CacheableObject } from 'src/app/core/cache/cacheable-object.model'; +import { HALLink } from 'src/app/core/shared/hal-link.model'; +import { ResourceType } from 'src/app/core/shared/resource-type'; +import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators'; +import { IDENTIFIERS } from './identifier-data.resource-type'; +import {Identifier} from './identifier.model'; + +@typedObject +export class IdentifierData implements CacheableObject { + static type = IDENTIFIERS; + /** + * The type for this IdentifierData + */ + @excludeFromEquals + @autoserialize + type: ResourceType; + + /** + * The + */ + @autoserialize + identifiers: Identifier[]; + + /** + * The {@link HALLink}s for this IdentifierData + */ + @deserialize + _links: { + self: HALLink; + }; +} diff --git a/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts b/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts new file mode 100644 index 00000000000..823a43eff95 --- /dev/null +++ b/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts @@ -0,0 +1,9 @@ +import { ResourceType } from 'src/app/core/shared/resource-type'; + +/** + * The resource type for Identifiers + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const IDENTIFIERS = new ResourceType('identifiers'); diff --git a/src/app/shared/object-list/identifier-data/identifier.model.ts b/src/app/shared/object-list/identifier-data/identifier.model.ts new file mode 100644 index 00000000000..87b162afe16 --- /dev/null +++ b/src/app/shared/object-list/identifier-data/identifier.model.ts @@ -0,0 +1,12 @@ +import {autoserialize} from 'cerialize'; + +export class Identifier { + @autoserialize + value: string; + @autoserialize + identifierType: string; + @autoserialize + identifierStatus: string; + @autoserialize + type: string; +} diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 2790c664ec3..47e9f57b6d8 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1918,6 +1918,46 @@ "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper", + "item.edit.identifiers.doi.status.1": "Queued for registration", + + "item.edit.identifiers.doi.status.2": "Queued for reservation", + + "item.edit.identifiers.doi.status.3": "Registered", + + "item.edit.identifiers.doi.status.4": "Reserved", + + "item.edit.identifiers.doi.status.5": "Reserved", + + "item.edit.identifiers.doi.status.6": "Registered", + + "item.edit.identifiers.doi.status.7": "Queued for registration", + + "item.edit.identifiers.doi.status.8": "Queued for deletion", + + "item.edit.identifiers.doi.status.9": "Deleted", + + "item.edit.identifiers.doi.status.10": "Pending approval", + + "item.edit.identifiers.doi.status.11": "Minted, not registered", + + "item.edit.tabs.status.buttons.registerDOI.label": "Register a new or pending identifier", + + "item.edit.tabs.status.buttons.registerDOI.button": "Register DOI...", + + "item.edit.registerdoi.header": "Register a new or pending DOI", + + "item.edit.registerdoi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", + + "item.edit.registerdoi.confirm": "Confirm", + + "item.edit.registerdoi.cancel": "Cancel", + + "item.edit.registerdoi.success": "DOI registered successfully. Refresh Item Status page to see new DOI details.", + + "item.edit.registerdoi.error": "Error registering DOI", + + "item.edit.registerdoi.to-update": "The following DOI has already been minted and will be queued for registration online", + "item.edit.item-mapper.buttons.add": "Map item to selected collections", "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections", From 87bbe50732c817939452d55359a6bf64de31f4d8 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 31 Aug 2022 15:21:38 +1200 Subject: [PATCH 461/758] [TLC-249] Linting --- .../edit-item-page/edit-item-page.routing.module.ts | 2 +- .../item-register-doi/item-registerdoi.component.ts | 8 +++++++- .../item-status/item-status.component.ts | 12 ++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) 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 ee4c5636464..22fd5286536 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 @@ -10,7 +10,7 @@ import { ItemStatusComponent } from './item-status/item-status.component'; import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component'; import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component'; import { ItemMoveComponent } from './item-move/item-move.component'; -import { ItemRegisterDoiComponent } from './item-register-doi/item-registerdoi.component' +import { ItemRegisterDoiComponent } from './item-register-doi/item-registerdoi.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'; diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts index 060fef3b32c..15af4ea633f 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts @@ -27,7 +27,7 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent protected messageKey = 'registerdoi'; doiToUpdateMessage = 'item.edit.' + this.messageKey + '.to-update'; identifiers$: Observable; - processing: boolean = false; + processing = false; constructor(protected route: ActivatedRoute, protected router: Router, @@ -38,6 +38,9 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent super(route, router, notificationsService, itemDataService, translateService); } + /** + * Initialise component + */ ngOnInit(): void { this.itemRD$ = this.route.data.pipe( map((data) => data.dso), @@ -74,6 +77,9 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent this.registerDoi(); } + /** + * Request that a pending, minted or null DOI be queued for registration + */ registerDoi() { this.processing = true; this.itemDataService.registerDOI(this.item.id).pipe(getFirstCompletedRemoteData()).subscribe( diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index a719e621dc3..df636d78dcd 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -113,7 +113,7 @@ export class ItemStatusComponent implements OnInit { // Observable for configuration determining whether the Register DOI feature is enabled let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.register').pipe( map((enabled: RemoteData) => { - let show: boolean = false; + let show = false; if (enabled.hasSucceeded) { if (enabled.payload !== undefined && enabled.payload !== null) { if (enabled.payload.values !== undefined) { @@ -154,14 +154,14 @@ export class ItemStatusComponent implements OnInit { let showRegister$: Observable = combineLatest([this.identifiers$, registerConfigEnabled$]).pipe( distinctUntilChanged(), map(([identifiers, enabled]) => { - let no_doi: boolean = true; - let pending: boolean = false; + let no_doi = true; + let pending = false; if (identifiers !== undefined && identifiers !== null) { identifiers.forEach((identifier: Identifier) => { - if (hasValue(identifier) && identifier.identifierType == 'doi') { + if (hasValue(identifier) && identifier.identifierType === 'doi') { // The item has some kind of DOI no_doi = false; - if (identifier.identifierStatus == '10' || identifier.identifierStatus == '11' + if (identifier.identifierStatus === '10' || identifier.identifierStatus === '11' || identifier.identifierStatus == null) { // The item's DOI is pending, minted or null. // It isn't registered, reserved, queued for registration or reservation or update, deleted @@ -174,7 +174,7 @@ export class ItemStatusComponent implements OnInit { // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true return ((pending || no_doi) && enabled); }) - ) + ); // Subscribe to changes from the showRegister check and rebuild operations list accordingly this.subs.push(showRegister$.subscribe((show) => { From e0c0d3c8e0dcbbee1b00694afd2a3f922cab7945 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Thu, 8 Sep 2022 10:08:45 +1200 Subject: [PATCH 462/758] [TLC-337] Unit tests for register DOI component --- .../item-registerdoi.component.spec.ts | 106 ++++++++++++++++++ .../item-registerdoi.component.ts | 3 +- .../item-status/item-status.component.spec.ts | 24 +++- 3 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts new file mode 100644 index 00000000000..eaf4766a863 --- /dev/null +++ b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts @@ -0,0 +1,106 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { Item } from '../../../core/shared/item.model'; +import { RouterStub } from '../../../shared/testing/router.stub'; +import { of as observableOf } from 'rxjs'; +import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { RouterTestingModule } from '@angular/router/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { ActivatedRoute, Router } from '@angular/router'; +import { ItemDataService } from '../../../core/data/item-data.service'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { By } from '@angular/platform-browser'; +import { ItemRegisterDoiComponent } from './item-registerdoi.component'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { IdentifierDataService } from '../../../core/data/identifier-data.service'; +import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; + +let comp: ItemRegisterDoiComponent; +let fixture: ComponentFixture; + +let mockItem; +let itemPageUrl; +let routerStub; +let mockItemDataService: ItemDataService; +let mockIdentifierDataService: IdentifierDataService; +let routeStub; +let notificationsServiceStub; + +describe('ItemRegisterDoiComponent', () => { + beforeEach(waitForAsync(() => { + + mockItem = Object.assign(new Item(), { + id: 'fake-id', + handle: 'fake/handle', + lastModified: '2018', + isWithdrawn: true + }); + + itemPageUrl = `fake-url/${mockItem.id}`; + routerStub = Object.assign(new RouterStub(), { + url: `${itemPageUrl}/edit` + }); + + mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', { + getIdentifierDataFor: createSuccessfulRemoteDataObject$({"identifiers": []}), + getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$("true") + }); + + mockItemDataService = jasmine.createSpyObj('mockItemDataService', { + registerDOI: createSuccessfulRemoteDataObject$(mockItem) + }); + + routeStub = { + data: observableOf({ + dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), { + id: 'fake-id' + })) + }) + }; + + notificationsServiceStub = new NotificationsServiceStub(); + + TestBed.configureTestingModule({ + imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule], + declarations: [ItemRegisterDoiComponent], + providers: [ + { provide: ActivatedRoute, useValue: routeStub }, + { provide: Router, useValue: routerStub }, + { provide: ItemDataService, useValue: mockItemDataService }, + { provide: IdentifierDataService, useValue: mockIdentifierDataService}, + { provide: NotificationsService, useValue: notificationsServiceStub } + ], schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ItemRegisterDoiComponent); + comp = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should render a page with messages based on the \'registerdoi\' messageKey', () => { + const header = fixture.debugElement.query(By.css('h2')).nativeElement; + expect(header.innerHTML).toContain('item.edit.registerdoi.header'); + const description = fixture.debugElement.query(By.css('p')).nativeElement; + expect(description.innerHTML).toContain('item.edit.registerdoi.description'); + const confirmButton = fixture.debugElement.query(By.css('button.perform-action')).nativeElement; + expect(confirmButton.innerHTML).toContain('item.edit.registerdoi.confirm'); + const cancelButton = fixture.debugElement.query(By.css('button.cancel')).nativeElement; + expect(cancelButton.innerHTML).toContain('item.edit.registerdoi.cancel'); + }); + + describe('performAction', () => { + it('should call registerDOI function from the ItemDataService', () => { + spyOn(comp, 'processRestResponse'); + comp.performAction(); + expect(mockItemDataService.registerDOI).toHaveBeenCalledWith(comp.item.id); + expect(comp.processRestResponse).toHaveBeenCalled(); + }); + }); +}); diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts index 15af4ea633f..875bcbac7ee 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts @@ -85,7 +85,8 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent this.itemDataService.registerDOI(this.item.id).pipe(getFirstCompletedRemoteData()).subscribe( (response: RemoteData) => { this.processing = false; - this.router.navigateByUrl(getItemEditRoute(this.item)); + //this.router.navigateByUrl(getItemEditRoute(this.item)); + this.processRestResponse(response); } ); } diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts index 0829480670d..1f27d97f292 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts @@ -11,8 +11,14 @@ import { Item } from '../../../core/shared/item.model'; import { By } from '@angular/platform-browser'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { of as observableOf } from 'rxjs'; -import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; +import { IdentifierDataService } from '../../../core/data/identifier-data.service'; +import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; +import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; + +let mockIdentifierDataService: IdentifierDataService; +let mockConfigurationDataService: ConfigurationDataService; describe('ItemStatusComponent', () => { let comp: ItemStatusComponent; @@ -28,6 +34,20 @@ describe('ItemStatusComponent', () => { } }); + mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', { + getIdentifierDataFor: createSuccessfulRemoteDataObject$({"identifiers": []}), + getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$("true") + }); + + mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', { + findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'identifiers.item-status.register', + values: [ + 'true' + ] + })) + }); + const itemPageUrl = `/items/${mockItem.uuid}`; const routeStub = { @@ -50,6 +70,8 @@ describe('ItemStatusComponent', () => { { provide: ActivatedRoute, useValue: routeStub }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: AuthorizationDataService, useValue: authorizationService }, + { provide: IdentifierDataService, useValue: mockIdentifierDataService }, + { provide: ConfigurationDataService, useValue: mockConfigurationDataService } ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); })); From 8d70e1788b077fedd998e69398f07763c7e49759 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Fri, 16 Sep 2022 13:01:13 +1200 Subject: [PATCH 463/758] [TLC-249] Lint fixes --- .../item-register-doi/item-registerdoi.component.spec.ts | 4 ++-- .../edit-item-page/item-status/item-status.component.spec.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts index eaf4766a863..d7941f3bb5b 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts @@ -45,8 +45,8 @@ describe('ItemRegisterDoiComponent', () => { }); mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', { - getIdentifierDataFor: createSuccessfulRemoteDataObject$({"identifiers": []}), - getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$("true") + getIdentifierDataFor: createSuccessfulRemoteDataObject$({'identifiers': []}), + getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true') }); mockItemDataService = jasmine.createSpyObj('mockItemDataService', { diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts index 1f27d97f292..ce8293ce799 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts @@ -35,8 +35,8 @@ describe('ItemStatusComponent', () => { }); mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', { - getIdentifierDataFor: createSuccessfulRemoteDataObject$({"identifiers": []}), - getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$("true") + getIdentifierDataFor: createSuccessfulRemoteDataObject$({'identifiers': []}), + getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true') }); mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', { From ed5ab710a3f10c20d85de858e985d224a0e67cf4 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Fri, 16 Sep 2022 13:19:07 +1200 Subject: [PATCH 464/758] [TLC-249] Update data service usage since rebasing --- src/app/core/data/identifier-data.service.ts | 21 ++++++++----------- .../item-registerdoi.component.spec.ts | 1 - 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index 9847f0b2b53..874d486d356 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -2,31 +2,27 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; import { NotificationsService } from '../../shared/notifications/notifications.service'; -import { dataService } from '../cache/builders/build-decorators'; +import { dataService } from './base/data-service.decorator'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { DataService } from './data.service'; +import { BaseDataService } from './base/base-data.service'; import { RequestService } from './request.service'; import { DefaultChangeAnalyzer } from './default-change-analyzer.service'; import { CoreState } from '../core-state.model'; -import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model'; -import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type'; import { Observable } from 'rxjs'; import { RemoteData } from './remote-data'; import { Item } from '../shared/item.model'; -import {IDENTIFIERS} from '../../shared/object-list/identifier-data/identifier-data.resource-type'; -import {IdentifierData} from '../../shared/object-list/identifier-data/identifier-data.model'; -import {getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload} from '../shared/operators'; -import {map, startWith} from 'rxjs/operators'; +import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type'; +import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model'; +import { getFirstCompletedRemoteData } from '../shared/operators'; +import { map } from 'rxjs/operators'; import {ConfigurationProperty} from '../shared/configuration-property.model'; import {ConfigurationDataService} from './configuration-data.service'; @Injectable() @dataService(IDENTIFIERS) -export class IdentifierDataService extends DataService { - - protected linkPath = 'identifiers'; +export class IdentifierDataService extends BaseDataService { constructor( protected comparator: DefaultChangeAnalyzer, @@ -38,8 +34,9 @@ export class IdentifierDataService extends DataService { protected requestService: RequestService, protected store: Store, private configurationService: ConfigurationDataService, + protected linkPath = 'identifiers', ) { - super(); + super(linkPath, requestService, rdbService, objectCache, halService); } /** diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts index d7941f3bb5b..9f0bb280c7e 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts @@ -16,7 +16,6 @@ import { By } from '@angular/platform-browser'; import { ItemRegisterDoiComponent } from './item-registerdoi.component'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { IdentifierDataService } from '../../../core/data/identifier-data.service'; -import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; let comp: ItemRegisterDoiComponent; let fixture: ComponentFixture; From 7795f92234fda8dd3f015db918c0668b2ba6636f Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Sun, 18 Sep 2022 11:17:49 +1200 Subject: [PATCH 465/758] [TLC-249] Update data service usage since rebasing --- src/app/core/data/identifier-data.service.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index 874d486d356..d494b5171d6 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -34,9 +34,8 @@ export class IdentifierDataService extends BaseDataService { protected requestService: RequestService, protected store: Store, private configurationService: ConfigurationDataService, - protected linkPath = 'identifiers', ) { - super(linkPath, requestService, rdbService, objectCache, halService); + super('identifiers', requestService, rdbService, objectCache, halService); } /** From 21c9ef4ea2f5762dfd622f8b1c6be146831f7203 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Mon, 31 Oct 2022 11:03:58 +1300 Subject: [PATCH 466/758] [TLC-249] Ensure identifier data model mapped to type --- src/app/core/core.module.ts | 4 +++- src/app/core/shared/item.model.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index ede23ba43b7..9ad962caa7e 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -170,6 +170,7 @@ import { OrcidHistory } from './orcid/model/orcid-history.model'; import { OrcidAuthService } from './orcid/orcid-auth.service'; import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service'; import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service'; +import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model'; /** * When not in production, endpoint responses can be mocked for testing purposes @@ -356,7 +357,8 @@ export const models = ResearcherProfile, OrcidQueue, OrcidHistory, - AccessStatusObject + AccessStatusObject, + IdentifierData, ]; @NgModule({ diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts index a9acf8c10fa..3441896ed13 100644 --- a/src/app/core/shared/item.model.ts +++ b/src/app/core/shared/item.model.ts @@ -128,7 +128,7 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject * The identifier data for this Item * Will be undefined unless the identifiers {@link HALLink} has been resolved. */ - @link(IDENTIFIERS) + @link(IDENTIFIERS, false, 'identifiers') identifiers?: Observable>; /** From d0b5fc257a99af4e15ceb03625fee093e8223f21 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Tue, 1 Nov 2022 11:49:24 +1300 Subject: [PATCH 467/758] [TLC-249] Update spec test for new config form data service --- .../identifiers/section-identifiers.component.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts index 378ec911c77..b381bdf33cd 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts @@ -22,7 +22,7 @@ import { FormBuilderService } from '../../../shared/form/builder/form-builder.se import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock'; import { getMockFormService } from '../../../shared/mocks/form-service.mock'; import { FormService } from '../../../shared/form/form.service'; -import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service'; +import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; import { SectionDataObject } from '../models/section-data.model'; import { SectionsType } from '../sections-type'; import {mockSectionsData, mockSubmissionCollectionId, mockSubmissionId} from '../../../shared/mocks/submission.mock'; @@ -41,7 +41,7 @@ import { Item } from '../../../core/shared/item.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; -function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService { +function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService { return jasmine.createSpyObj('FormOperationsService', { getConfigAll: jasmine.createSpy('getConfigAll'), getConfigByHref: jasmine.createSpy('getConfigByHref'), @@ -146,7 +146,7 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => { { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() }, { provide: FormService, useValue: getMockFormService() }, { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder }, - { provide: SubmissionFormsConfigService, useValue: getMockSubmissionFormsConfigService() }, + { provide: SubmissionFormsConfigDataService, useValue: getMockSubmissionFormsConfigService() }, { provide: NotificationsService, useClass: NotificationsServiceStub }, { provide: SectionsService, useClass: SectionsServiceStub }, { provide: SubmissionService, useClass: SubmissionServiceStub }, From 838cde48417c0a2cefe855e617cc9d8a5feaf787 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Thu, 19 Jan 2023 15:01:04 +1300 Subject: [PATCH 468/758] [TLC-249] Addressing review feedback Adding comments and tidying some comments, imports Expect text for status not integer Send a 'type' parameter with a DOI registration Rename item-status.register to registerDOI As per todonohue's feedback on 2022-01-18 --- src/app/core/data/identifier-data.service.ts | 7 ++++++- src/app/core/data/item-data.service.ts | 4 +++- .../item-status/item-status.component.spec.ts | 2 +- .../item-status/item-status.component.ts | 9 +++------ .../identifier-data.component.ts | 19 +++++------------- .../identifier-data/identifier.model.ts | 20 ++++++++++++++++++- 6 files changed, 37 insertions(+), 24 deletions(-) diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index d494b5171d6..be4c5c8b594 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -20,6 +20,11 @@ import { map } from 'rxjs/operators'; import {ConfigurationProperty} from '../shared/configuration-property.model'; import {ConfigurationDataService} from './configuration-data.service'; +/** + * The service handling all REST requests to get item identifiers like handles and DOIs + * from the /identifiers endpoint, as well as the backend configuration that controls whether a 'Register DOI' + * button appears for admins in the item status page + */ @Injectable() @dataService(IDENTIFIERS) export class IdentifierDataService extends BaseDataService { @@ -50,7 +55,7 @@ export class IdentifierDataService extends BaseDataService { * Should we allow registration of new DOIs via the item status page? */ public getIdentifierRegistrationConfiguration(): Observable { - return this.configurationService.findByPropertyName('identifiers.item-status.register').pipe( + return this.configurationService.findByPropertyName('identifiers.item-status.registerDOI').pipe( getFirstCompletedRemoteData(), map((propertyRD: RemoteData) => propertyRD.hasSucceeded ? propertyRD.payload.values : []) ); diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index 5306dd468b6..79719e502c4 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -256,7 +256,9 @@ export abstract class BaseItemDataService extends IdentifiableDataService let headers = new HttpHeaders(); headers = headers.append('Content-Type', 'application/json'); options.headers = headers; - const request = new PostRequest(requestId, href, JSON.stringify({}), options); + // Pass identifier type as a simple parameter, no need for full JSON data + let hrefWithParams: string = this.buildHrefWithParams(href, [new RequestParam("type", "doi")]); + const request = new PostRequest(requestId, hrefWithParams, JSON.stringify({}), options); this.requestService.send(request); }); return this.rdbService.buildFromRequestUUID(requestId); diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts index ce8293ce799..1f447deb9e1 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts @@ -41,7 +41,7 @@ describe('ItemStatusComponent', () => { mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', { findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { - name: 'identifiers.item-status.register', + name: 'identifiers.item-status.registerDOI', values: [ 'true' ] diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index df636d78dcd..20f167fb807 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -3,7 +3,7 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade'; import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { ItemOperation } from '../item-operation/itemOperation.model'; -import {distinctUntilChanged, first, map, mergeMap, startWith, switchMap, toArray} from 'rxjs/operators'; +import {distinctUntilChanged, first, map, mergeMap, toArray} from 'rxjs/operators'; import {BehaviorSubject, Observable, from as observableFrom, Subscription, combineLatest, of} from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths'; @@ -12,11 +12,8 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { hasValue } from '../../../shared/empty.util'; import { getAllSucceededRemoteDataPayload, - getFirstCompletedRemoteData, getFirstSucceededRemoteData, - getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators'; import {IdentifierDataService} from '../../../core/data/identifier-data.service'; -import {IdentifierData} from '../../../shared/object-list/identifier-data/identifier-data.model'; import {Identifier} from '../../../shared/object-list/identifier-data/identifier.model'; import {ConfigurationProperty} from '../../../core/shared/configuration-property.model'; import {ConfigurationDataService} from '../../../core/data/configuration-data.service'; @@ -111,7 +108,7 @@ export class ItemStatusComponent implements OnInit { ); // Observable for configuration determining whether the Register DOI feature is enabled - let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.register').pipe( + let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.registerDOI').pipe( map((enabled: RemoteData) => { let show = false; if (enabled.hasSucceeded) { @@ -161,7 +158,7 @@ export class ItemStatusComponent implements OnInit { if (hasValue(identifier) && identifier.identifierType === 'doi') { // The item has some kind of DOI no_doi = false; - if (identifier.identifierStatus === '10' || identifier.identifierStatus === '11' + if (identifier.identifierStatus === 'PENDING' || identifier.identifierStatus === 'MINTED' || identifier.identifierStatus == null) { // The item's DOI is pending, minted or null. // It isn't registered, reserved, queued for registration or reservation or update, deleted diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts index 85989f34c69..5b495bfa62e 100644 --- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts +++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts @@ -1,10 +1,8 @@ import { Component, Input } from '@angular/core'; -import { catchError, map } from 'rxjs/operators'; -import { Observable, of as observableOf } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { Observable } from 'rxjs'; import { hasValue } from '../../empty.util'; -import { environment } from 'src/environments/environment'; import { Item } from 'src/app/core/shared/item.model'; -import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service'; import {IdentifierData} from './identifier-data.model'; import {IdentifierDataService} from '../../../core/data/identifier-data.service'; @@ -13,18 +11,13 @@ import {IdentifierDataService} from '../../../core/data/identifier-data.service' templateUrl: './identifier-data.component.html' }) /** - * Component rendering the access status of an item as a badge + * Component rendering an identifier, eg. DOI or handle */ export class IdentifierDataComponent { @Input() item: Item; identifiers$: Observable; - /** - * Whether to show the access status badge or not - */ - showAccessStatus: boolean; - /** * Initialize instance variables * @@ -34,11 +27,11 @@ export class IdentifierDataComponent { ngOnInit(): void { if (this.item == null) { - // Do not show the badge if the feature is inactive or if the item is null. + // Do not show the identifier if the feature is inactive or if the item is null. return; } if (this.item.identifiers == null) { - // In case the access status has not been loaded, do it individually. + // In case the identifier has not been loaded, do it individually. this.item.identifiers = this.identifierDataService.getIdentifierDataFor(this.item); } this.identifiers$ = this.item.identifiers.pipe( @@ -49,8 +42,6 @@ export class IdentifierDataComponent { return null; } }), - // EMpty array if none - //map((identifiers: IdentifierData) => hasValue(identifiers.identifiers) ? identifiers.identifiers : []) ); } } diff --git a/src/app/shared/object-list/identifier-data/identifier.model.ts b/src/app/shared/object-list/identifier-data/identifier.model.ts index 87b162afe16..f528824b36f 100644 --- a/src/app/shared/object-list/identifier-data/identifier.model.ts +++ b/src/app/shared/object-list/identifier-data/identifier.model.ts @@ -1,12 +1,30 @@ -import {autoserialize} from 'cerialize'; +import { autoserialize } from 'cerialize'; +/** + * Identifier model. Identifiers using this model are returned in lists from the /item/{id}/identifiers endpoint + * + * @author Kim Shepherd + */ export class Identifier { + /** + * The value of the identifier, eg. http://hdl.handle.net/123456789/123 or https://doi.org/test/doi/1234 + */ @autoserialize value: string; + /** + * The type of identiifer, eg. "doi", or "handle", or "other" + */ @autoserialize identifierType: string; + /** + * The status of the identifier. Some schemes, like DOI, will have a different status based on whether it is + * queued for remote registration, reservation, or update, or has been registered, simply minted locally, etc. + */ @autoserialize identifierStatus: string; + /** + * The type of resource, in this case Identifier + */ @autoserialize type: string; } From 52a37760270c522ef34f9e45985d78d19f663011 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Thu, 19 Jan 2023 16:02:15 +1300 Subject: [PATCH 469/758] [TLC-249] Addressing review feedback #2 Update WorkspaceitemSectionIdentifiersObject model to include a display types string array, so identifier types can be included or excluded from the step as needed. Update section template to work with the above new data As per todonohue's feedback on 2022-01-18 --- ...workspaceitem-section-identifiers.model.ts | 1 + .../identifier-data.component.ts | 4 +- .../section-identifiers.component.html | 40 +++++++++++-------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts index 7d22bf0b611..6a8956dff35 100644 --- a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts +++ b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts @@ -5,4 +5,5 @@ export interface WorkspaceitemSectionIdentifiersObject { doi?: string handle?: string otherIdentifiers?: string[] + displayTypes?: string[] } diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts index 5b495bfa62e..cb6d1d97e5a 100644 --- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts +++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts @@ -3,8 +3,8 @@ import { map } from 'rxjs/operators'; import { Observable } from 'rxjs'; import { hasValue } from '../../empty.util'; import { Item } from 'src/app/core/shared/item.model'; -import {IdentifierData} from './identifier-data.model'; -import {IdentifierDataService} from '../../../core/data/identifier-data.service'; +import { IdentifierData } from './identifier-data.model'; +import { IdentifierDataService } from '../../../core/data/identifier-data.service'; @Component({ selector: 'ds-identifier-data', diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html index 1c781199310..39645704dab 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.html +++ b/src/app/submission/sections/identifiers/section-identifiers.component.html @@ -9,26 +9,34 @@ {{'submission.sections.identifiers.info' | translate}}
      - -
    • {{'submission.sections.identifiers.no_handle' | translate}}
      • -       - -
    • {{'submission.sections.identifiers.handle_label' | translate}}{{identifierData.handle}}
      • + + +
    • {{'submission.sections.identifiers.no_handle' | translate}}
      • +       + +
    • {{'submission.sections.identifiers.handle_label' | translate}}{{identifierData.handle}}
      • +       + - -
    • {{'submission.sections.identifiers.no_doi' | translate}}
      • -       - -
    • {{'submission.sections.identifiers.doi_label' | translate}} - {{identifierData.doi}} -
      • + + +
    • {{'submission.sections.identifiers.no_doi' | translate}}
      • +       + +
    • {{'submission.sections.identifiers.doi_label' | translate}} + {{identifierData.doi}} +
      • +       + - -
    • {{'submission.sections.identifiers.otherIdentifiers_label' | translate}} - {{identifierData.otherIdentifiers.join(',')}} -
      • + + +
    • {{'submission.sections.identifiers.otherIdentifiers_label' | translate}} + {{identifierData.otherIdentifiers.join(',')}} +
      • +
    From 39fb61ca856c75f9b6d32518d0b6d97346cfb40b Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Thu, 19 Jan 2023 16:15:31 +1300 Subject: [PATCH 470/758] [TLC-249] Lint fixes (imports, quotes) --- src/app/core/data/item-data.service.ts | 2 +- .../item-register-doi/item-registerdoi.component.ts | 4 ++-- .../item-status/item-status.component.ts | 10 +++++----- .../identifiers/section-identifiers.component.spec.ts | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index 79719e502c4..96007f5598b 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -257,7 +257,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService headers = headers.append('Content-Type', 'application/json'); options.headers = headers; // Pass identifier type as a simple parameter, no need for full JSON data - let hrefWithParams: string = this.buildHrefWithParams(href, [new RequestParam("type", "doi")]); + let hrefWithParams: string = this.buildHrefWithParams(href, [new RequestParam('type', 'doi')]); const request = new PostRequest(requestId, hrefWithParams, JSON.stringify({}), options); this.requestService.send(request); }); diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts index 875bcbac7ee..5f20c2a3d94 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts @@ -11,9 +11,9 @@ import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../ import { first, map } from 'rxjs/operators'; import { hasValue } from '../../../shared/empty.util'; import { Observable } from 'rxjs'; -import {getItemEditRoute, getItemPageRoute} from '../../item-page-routing-paths'; +import { getItemPageRoute } from '../../item-page-routing-paths'; import { IdentifierDataService } from '../../../core/data/identifier-data.service'; -import {Identifier} from '../../../shared/object-list/identifier-data/identifier.model'; +import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; @Component({ selector: 'ds-item-registerdoi', diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index 20f167fb807..0f3b44f26db 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -4,7 +4,7 @@ import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { ItemOperation } from '../item-operation/itemOperation.model'; import {distinctUntilChanged, first, map, mergeMap, toArray} from 'rxjs/operators'; -import {BehaviorSubject, Observable, from as observableFrom, Subscription, combineLatest, of} from 'rxjs'; +import { BehaviorSubject, Observable, from as observableFrom, Subscription, combineLatest } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; @@ -13,10 +13,10 @@ import { hasValue } from '../../../shared/empty.util'; import { getAllSucceededRemoteDataPayload, } from '../../../core/shared/operators'; -import {IdentifierDataService} from '../../../core/data/identifier-data.service'; -import {Identifier} from '../../../shared/object-list/identifier-data/identifier.model'; -import {ConfigurationProperty} from '../../../core/shared/configuration-property.model'; -import {ConfigurationDataService} from '../../../core/data/configuration-data.service'; +import { IdentifierDataService } from '../../../core/data/identifier-data.service'; +import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; +import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; +import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; @Component({ selector: 'ds-item-status', diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts index b381bdf33cd..6a001c4d5f4 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts @@ -7,7 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NgxPaginationModule } from 'ngx-pagination'; import { cold } from 'jasmine-marbles'; -import {Observable, of as observableOf} from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; @@ -25,7 +25,7 @@ import { FormService } from '../../../shared/form/form.service'; import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service'; import { SectionDataObject } from '../models/section-data.model'; import { SectionsType } from '../sections-type'; -import {mockSectionsData, mockSubmissionCollectionId, mockSubmissionId} from '../../../shared/mocks/submission.mock'; +import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock'; import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; import { SubmissionSectionIdentifiersComponent } from './section-identifiers.component'; import { CollectionDataService } from '../../../core/data/collection-data.service'; From d6f458863f40f6ac0c102f9a0b888e58cae857f2 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 25 Jan 2023 13:01:57 +1300 Subject: [PATCH 471/758] [TLC-249] Improve model of identifier data in workspace section --- ...workspaceitem-section-identifiers.model.ts | 6 +-- .../section-identifiers.component.html | 37 ++++--------------- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts index 6a8956dff35..f6bfb1ae04f 100644 --- a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts +++ b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts @@ -1,9 +1,9 @@ /* * Object model for the data returned by the REST API to present minted identifiers in a submission section */ +import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; + export interface WorkspaceitemSectionIdentifiersObject { - doi?: string - handle?: string - otherIdentifiers?: string[] + identifiers?: Identifier[] displayTypes?: string[] } diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html index 39645704dab..dd0b5d2930a 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.html +++ b/src/app/submission/sections/identifiers/section-identifiers.component.html @@ -3,41 +3,18 @@ @author Kim Shepherd --> - -
    + +
    {{'submission.sections.identifiers.info' | translate}}
      - - - -
    • {{'submission.sections.identifiers.no_handle' | translate}}
      • -       - -
    • {{'submission.sections.identifiers.handle_label' | translate}}{{identifierData.handle}}
      • -       -       - - - - -
    • {{'submission.sections.identifiers.no_doi' | translate}}
      • -       - -
    • {{'submission.sections.identifiers.doi_label' | translate}} - {{identifierData.doi}} -
      • -       -       - - - - -
    • {{'submission.sections.identifiers.otherIdentifiers_label' | translate}} - {{identifierData.otherIdentifiers.join(',')}} -
      • + + +
    • {{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}} + {{identifier.value}}
      •
    + From 9471aa98977ac843a88ce0748d59759507d9e352 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 25 Jan 2023 14:23:41 +1300 Subject: [PATCH 472/758] [TLC-249] Update en.json5 with DOI status labels --- src/assets/i18n/en.json5 | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 47e9f57b6d8..c811383c869 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1918,27 +1918,29 @@ "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper", - "item.edit.identifiers.doi.status.1": "Queued for registration", + "item.edit.identifiers.doi.status.UNKNOWN": "Unknown", - "item.edit.identifiers.doi.status.2": "Queued for reservation", + "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration", - "item.edit.identifiers.doi.status.3": "Registered", + "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation", - "item.edit.identifiers.doi.status.4": "Reserved", + "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered", - "item.edit.identifiers.doi.status.5": "Reserved", + "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved", - "item.edit.identifiers.doi.status.6": "Registered", + "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)", - "item.edit.identifiers.doi.status.7": "Queued for registration", + "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)", - "item.edit.identifiers.doi.status.8": "Queued for deletion", + "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration", - "item.edit.identifiers.doi.status.9": "Deleted", + "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion", - "item.edit.identifiers.doi.status.10": "Pending approval", + "item.edit.identifiers.doi.status.DELETED": "Deleted", - "item.edit.identifiers.doi.status.11": "Minted, not registered", + "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)", + + "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)", "item.edit.tabs.status.buttons.registerDOI.label": "Register a new or pending identifier", From b5c6e7f1b76a10827354116221f92d712e468782 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 25 Jan 2023 16:02:23 +1300 Subject: [PATCH 473/758] [TLC-249] Identifier mock data updated in unit test --- .../section-identifiers.component.spec.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts index 6a001c4d5f4..e9663ae20cd 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts @@ -72,9 +72,20 @@ const mockItem = Object.assign(new Item(), { // Mock identifier data to use with tests const identifierData: WorkspaceitemSectionIdentifiersObject = { - doi: 'https://doi.org/10.33515/dspace/1', - handle: '123456789/999', - otherIdentifiers: ['123-123-123', 'ANBX-159'] + identifiers: [{ + value: 'https://doi.org/10.33515/dspace-61', + identifierType: 'doi', + identifierStatus: 'TO_BE_REGISTERED', + type: 'identifier' + }, + { + value: '123456789/418', + identifierType: 'handle', + identifierStatus: null, + type: 'identifier' + } + ], + displayTypes: ["doi", "handle"] }; // Mock section object to use with tests From b779509bf0ed027d555739c0078f387b5ab7fbea Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 25 Jan 2023 16:14:00 +1300 Subject: [PATCH 474/758] [TLC-249] Identifier mock data updated in unit test --- .../sections/identifiers/section-identifiers.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts index e9663ae20cd..041e2af23a4 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts @@ -85,7 +85,7 @@ const identifierData: WorkspaceitemSectionIdentifiersObject = { type: 'identifier' } ], - displayTypes: ["doi", "handle"] + displayTypes: ['doi', 'handle'] }; // Mock section object to use with tests From ce84c3fe36080ca888cad48db895398612c2fc0d Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 1 Feb 2023 13:50:29 +1300 Subject: [PATCH 475/758] [TLC-380] Renaming, changes as per review feedback --- src/app/core/data/identifier-data.service.ts | 2 +- .../edit-item-page.routing.module.ts | 6 +++--- ...ard.ts => item-page-register-doi.guard.ts} | 0 ....html => item-register-doi-component.html} | 0 ...ts => item-register-doi.component.spec.ts} | 12 +++++------ ...nent.ts => item-register-doi.component.ts} | 4 ++-- .../item-status/item-status.component.spec.ts | 2 +- .../item-status/item-status.component.ts | 2 +- src/assets/i18n/en.json5 | 20 +++++++++---------- 9 files changed, 24 insertions(+), 24 deletions(-) rename src/app/item-page/edit-item-page/{item-page-registerdoi.guard.ts => item-page-register-doi.guard.ts} (100%) rename src/app/item-page/edit-item-page/item-register-doi/{item-registerdoi-component.html => item-register-doi-component.html} (100%) rename src/app/item-page/edit-item-page/item-register-doi/{item-registerdoi.component.spec.ts => item-register-doi.component.spec.ts} (93%) rename src/app/item-page/edit-item-page/item-register-doi/{item-registerdoi.component.ts => item-register-doi.component.ts} (97%) diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index be4c5c8b594..6596f6493c6 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -55,7 +55,7 @@ export class IdentifierDataService extends BaseDataService { * Should we allow registration of new DOIs via the item status page? */ public getIdentifierRegistrationConfiguration(): Observable { - return this.configurationService.findByPropertyName('identifiers.item-status.registerDOI').pipe( + return this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe( getFirstCompletedRemoteData(), map((propertyRD: RemoteData) => propertyRD.hasSucceeded ? propertyRD.payload.values : []) ); 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 22fd5286536..88172e26207 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 @@ -10,7 +10,7 @@ import { ItemStatusComponent } from './item-status/item-status.component'; import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component'; import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component'; import { ItemMoveComponent } from './item-move/item-move.component'; -import { ItemRegisterDoiComponent } from './item-register-doi/item-registerdoi.component'; +import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.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'; @@ -40,7 +40,7 @@ import { ItemPageRelationshipsGuard } from './item-page-relationships.guard'; import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard'; import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard'; import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component'; -import { ItemPageRegisterDoiGuard } from './item-page-registerdoi.guard'; +import { ItemPageRegisterDoiGuard } from './item-page-register-doi.guard'; /** * Routing module that handles the routing for the Edit Item page administrator functionality @@ -149,7 +149,7 @@ import { ItemPageRegisterDoiGuard } from './item-page-registerdoi.guard'; path: ITEM_EDIT_REGISTER_DOI_PATH, component: ItemRegisterDoiComponent, canActivate: [ItemPageRegisterDoiGuard], - data: { title: 'item.edit.registerdoi.title' }, + data: { title: 'item.edit.register-doi.title' }, }, { path: ITEM_EDIT_AUTHORIZATIONS_PATH, diff --git a/src/app/item-page/edit-item-page/item-page-registerdoi.guard.ts b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts similarity index 100% rename from src/app/item-page/edit-item-page/item-page-registerdoi.guard.ts rename to src/app/item-page/edit-item-page/item-page-register-doi.guard.ts diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html similarity index 100% rename from src/app/item-page/edit-item-page/item-register-doi/item-registerdoi-component.html rename to src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts similarity index 93% rename from src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts rename to src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts index 9f0bb280c7e..ac17d7c7513 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts @@ -13,7 +13,7 @@ import { ItemDataService } from '../../../core/data/item-data.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { ItemRegisterDoiComponent } from './item-registerdoi.component'; +import { ItemRegisterDoiComponent } from './item-register-doi.component'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { IdentifierDataService } from '../../../core/data/identifier-data.service'; @@ -83,15 +83,15 @@ describe('ItemRegisterDoiComponent', () => { fixture.detectChanges(); }); - it('should render a page with messages based on the \'registerdoi\' messageKey', () => { + it('should render a page with messages based on the \'register-doi\' messageKey', () => { const header = fixture.debugElement.query(By.css('h2')).nativeElement; - expect(header.innerHTML).toContain('item.edit.registerdoi.header'); + expect(header.innerHTML).toContain('item.edit.register-doi.header'); const description = fixture.debugElement.query(By.css('p')).nativeElement; - expect(description.innerHTML).toContain('item.edit.registerdoi.description'); + expect(description.innerHTML).toContain('item.edit.register-doi.description'); const confirmButton = fixture.debugElement.query(By.css('button.perform-action')).nativeElement; - expect(confirmButton.innerHTML).toContain('item.edit.registerdoi.confirm'); + expect(confirmButton.innerHTML).toContain('item.edit.register-doi.confirm'); const cancelButton = fixture.debugElement.query(By.css('button.cancel')).nativeElement; - expect(cancelButton.innerHTML).toContain('item.edit.registerdoi.cancel'); + expect(cancelButton.innerHTML).toContain('item.edit.register-doi.cancel'); }); describe('performAction', () => { diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts similarity index 97% rename from src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts rename to src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts index 5f20c2a3d94..9345ba18cc2 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-registerdoi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts @@ -16,8 +16,8 @@ import { IdentifierDataService } from '../../../core/data/identifier-data.servic import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; @Component({ - selector: 'ds-item-registerdoi', - templateUrl: './item-registerdoi-component.html' + selector: 'ds-item-register-doi', + templateUrl: './item-register-doi-component.html' }) /** * Component responsible for rendering the Item Registe DOI page diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts index 1f447deb9e1..a67de2f435a 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts @@ -41,7 +41,7 @@ describe('ItemStatusComponent', () => { mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', { findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { - name: 'identifiers.item-status.registerDOI', + name: 'identifiers.item-status.register-doi', values: [ 'true' ] diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index 0f3b44f26db..94122f56589 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -108,7 +108,7 @@ export class ItemStatusComponent implements OnInit { ); // Observable for configuration determining whether the Register DOI feature is enabled - let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.registerDOI').pipe( + let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe( map((enabled: RemoteData) => { let show = false; if (enabled.hasSucceeded) { diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index c811383c869..18fa6e0b4b0 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1327,7 +1327,7 @@ "curation-task.task.vscan.label": "Virus Scan", - "curation-task.task.registerdoi.label": "Register DOI", + "curation-task.task.register-doi.label": "Register DOI", @@ -1942,23 +1942,23 @@ "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)", - "item.edit.tabs.status.buttons.registerDOI.label": "Register a new or pending identifier", + "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending identifier", - "item.edit.tabs.status.buttons.registerDOI.button": "Register DOI...", + "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...", - "item.edit.registerdoi.header": "Register a new or pending DOI", + "item.edit.register-doi.header": "Register a new or pending DOI", - "item.edit.registerdoi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", + "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", - "item.edit.registerdoi.confirm": "Confirm", + "item.edit.register-doi.confirm": "Confirm", - "item.edit.registerdoi.cancel": "Cancel", + "item.edit.register-doi.cancel": "Cancel", - "item.edit.registerdoi.success": "DOI registered successfully. Refresh Item Status page to see new DOI details.", + "item.edit.register-doi.success": "DOI registered successfully. Refresh Item Status page to see new DOI details.", - "item.edit.registerdoi.error": "Error registering DOI", + "item.edit.register-doi.error": "Error registering DOI", - "item.edit.registerdoi.to-update": "The following DOI has already been minted and will be queued for registration online", + "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online", "item.edit.item-mapper.buttons.add": "Map item to selected collections", From e86f0d3d13fe8f69130abd86cbbd6e34e4eef5f1 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 1 Feb 2023 16:30:44 +1300 Subject: [PATCH 476/758] [TLC-380] WIP trying new routing / create flow --- src/app/core/data/identifier-data.service.ts | 44 ++++++++++++++++++- src/app/core/data/item-data.service.ts | 6 ++- .../item-register-doi.component.ts | 4 +- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index 6596f6493c6..53f811bc40f 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -1,4 +1,4 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; import { NotificationsService } from '../../shared/notifications/notifications.service'; @@ -16,9 +16,18 @@ import { Item } from '../shared/item.model'; import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type'; import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model'; import { getFirstCompletedRemoteData } from '../shared/operators'; -import { map } from 'rxjs/operators'; +import { find, map, switchMap } from 'rxjs/operators'; import {ConfigurationProperty} from '../shared/configuration-property.model'; import {ConfigurationDataService} from './configuration-data.service'; +import { HttpOptions } from '../dspace-rest/dspace-rest.service'; +import { hasValue } from '../../shared/empty.util'; +import { PostRequest } from './request.models'; +import { GenericConstructor } from '../shared/generic-constructor'; +import { ResponseParsingService } from './parsing.service'; +import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service'; +import { sendRequest } from '../shared/request.operators'; +import { RestRequest } from './rest-request.model'; +import { OrcidHistory } from '../orcid/model/orcid-history.model'; /** * The service handling all REST requests to get item identifiers like handles and DOIs @@ -60,4 +69,35 @@ export class IdentifierDataService extends BaseDataService { map((propertyRD: RemoteData) => propertyRD.hasSucceeded ? propertyRD.payload.values : []) ); } + + public registerIdentifier(item: Item, type: string): Observable> { + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'text/uri-list'); + options.headers = headers; + let params = new HttpParams(); + params = params.append('type', 'doi'); + options.params = params; + + const requestId = this.requestService.generateRequestId(); + const hrefObs = this.getEndpoint(); + + hrefObs.pipe( + find((href: string) => hasValue(href)), + map((href: string) => { + + const request = new PostRequest(requestId, href, item._links.self.href, options); + Object.assign(request, { + getResponseParser(): GenericConstructor { + return StatusCodeOnlyResponseParsingService; + } + }); + return request; + }) + ).subscribe((request) => { + this.requestService.send(request); + }); + + return this.rdbService.buildFromRequestUUID(requestId); + } } diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index 96007f5598b..7082058612c 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -233,7 +233,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService } /** - * Get the endpoint for an item's bundles + * Get the endpoint for an item's identifiers * @param itemId */ public getIdentifiersEndpoint(itemId: string): Observable { @@ -264,6 +264,10 @@ export abstract class BaseItemDataService extends IdentifiableDataService return this.rdbService.buildFromRequestUUID(requestId); } + + + + /** * Get the endpoint to move the item * @param itemId diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts index 9345ba18cc2..f0ea46ba4a9 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts @@ -82,13 +82,13 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent */ registerDoi() { this.processing = true; - this.itemDataService.registerDOI(this.item.id).pipe(getFirstCompletedRemoteData()).subscribe( + this.identifierDataService.registerIdentifier(this.item, 'doi').subscribe( (response: RemoteData) => { this.processing = false; //this.router.navigateByUrl(getItemEditRoute(this.item)); this.processRestResponse(response); } - ); + ) } } From 0a69560a8c7ce1526985f2005ad1e5d6c04c2c30 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Thu, 2 Feb 2023 09:35:49 +1300 Subject: [PATCH 477/758] [TLC-380] Refactor to use new endpoints, better naming --- src/app/core/data/identifier-data.service.ts | 48 ++++++------------- .../edit-item-page.routing-paths.ts | 2 +- .../item-register-doi.component.ts | 13 ++--- .../item-status/item-status.component.ts | 2 +- src/assets/i18n/en.json5 | 4 +- 5 files changed, 26 insertions(+), 43 deletions(-) diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts index 53f811bc40f..03422dadfb0 100644 --- a/src/app/core/data/identifier-data.service.ts +++ b/src/app/core/data/identifier-data.service.ts @@ -16,18 +16,13 @@ import { Item } from '../shared/item.model'; import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type'; import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model'; import { getFirstCompletedRemoteData } from '../shared/operators'; -import { find, map, switchMap } from 'rxjs/operators'; +import { map, switchMap } from 'rxjs/operators'; import {ConfigurationProperty} from '../shared/configuration-property.model'; import {ConfigurationDataService} from './configuration-data.service'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; -import { hasValue } from '../../shared/empty.util'; import { PostRequest } from './request.models'; -import { GenericConstructor } from '../shared/generic-constructor'; -import { ResponseParsingService } from './parsing.service'; -import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service'; import { sendRequest } from '../shared/request.operators'; import { RestRequest } from './rest-request.model'; -import { OrcidHistory } from '../orcid/model/orcid-history.model'; /** * The service handling all REST requests to get item identifiers like handles and DOIs @@ -71,33 +66,20 @@ export class IdentifierDataService extends BaseDataService { } public registerIdentifier(item: Item, type: string): Observable> { - const options: HttpOptions = Object.create({}); - let headers = new HttpHeaders(); - headers = headers.append('Content-Type', 'text/uri-list'); - options.headers = headers; - let params = new HttpParams(); - params = params.append('type', 'doi'); - options.params = params; - const requestId = this.requestService.generateRequestId(); - const hrefObs = this.getEndpoint(); - - hrefObs.pipe( - find((href: string) => hasValue(href)), - map((href: string) => { - - const request = new PostRequest(requestId, href, item._links.self.href, options); - Object.assign(request, { - getResponseParser(): GenericConstructor { - return StatusCodeOnlyResponseParsingService; - } - }); - return request; - }) - ).subscribe((request) => { - this.requestService.send(request); - }); - - return this.rdbService.buildFromRequestUUID(requestId); + return this.getEndpoint().pipe( + map((endpointURL: string) => { + const options: HttpOptions = Object.create({}); + let headers = new HttpHeaders(); + headers = headers.append('Content-Type', 'text/uri-list'); + options.headers = headers; + let params = new HttpParams(); + params = params.append('type', type); + options.params = params; + return new PostRequest(requestId, endpointURL, item._links.self.href, options); + }), + sendRequest(this.requestService), + switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid) as Observable>) + ); } } diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts b/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts index 2826d06bb45..6b0907dcebf 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts @@ -5,4 +5,4 @@ export const ITEM_EDIT_PUBLIC_PATH = 'public'; export const ITEM_EDIT_DELETE_PATH = 'delete'; export const ITEM_EDIT_MOVE_PATH = 'move'; export const ITEM_EDIT_AUTHORIZATIONS_PATH = 'authorizations'; -export const ITEM_EDIT_REGISTER_DOI_PATH = 'registerdoi'; +export const ITEM_EDIT_REGISTER_DOI_PATH = 'register-doi'; diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts index f0ea46ba4a9..17ec16b1bd4 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts @@ -7,7 +7,7 @@ import { RemoteData } from '../../../core/data/remote-data'; import { Item } from '../../../core/shared/item.model'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ItemDataService } from '../../../core/data/item-data.service'; -import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../../core/shared/operators'; +import { getFirstSucceededRemoteData } from '../../../core/shared/operators'; import { first, map } from 'rxjs/operators'; import { hasValue } from '../../../shared/empty.util'; import { Observable } from 'rxjs'; @@ -20,11 +20,11 @@ import { Identifier } from '../../../shared/object-list/identifier-data/identifi templateUrl: './item-register-doi-component.html' }) /** - * Component responsible for rendering the Item Registe DOI page + * Component responsible for rendering the Item Register DOI page */ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent { - protected messageKey = 'registerdoi'; + protected messageKey = 'register-doi'; doiToUpdateMessage = 'item.edit.' + this.messageKey + '.to-update'; identifiers$: Observable; processing = false; @@ -84,9 +84,10 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent this.processing = true; this.identifierDataService.registerIdentifier(this.item, 'doi').subscribe( (response: RemoteData) => { - this.processing = false; - //this.router.navigateByUrl(getItemEditRoute(this.item)); - this.processRestResponse(response); + if (response.hasCompleted) { + this.processing = false; + this.processRestResponse(response); + } } ) } diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index 94122f56589..a7d8f80ea00 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -179,7 +179,7 @@ export class ItemStatusComponent implements OnInit { let tmp_operations = [...operations]; if (show) { // Push the new Register DOI item operation - tmp_operations.push(new ItemOperation('registerDOI', this.getCurrentUrl(item) + '/registerdoi', FeatureID.CanRegisterDOI)); + tmp_operations.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI)); } // Check authorisations and merge into new operations list observableFrom(tmp_operations).pipe( diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 18fa6e0b4b0..0c62342b2db 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1942,7 +1942,7 @@ "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)", - "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending identifier", + "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI", "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...", @@ -1954,7 +1954,7 @@ "item.edit.register-doi.cancel": "Cancel", - "item.edit.register-doi.success": "DOI registered successfully. Refresh Item Status page to see new DOI details.", + "item.edit.register-doi.success": "DOI queued for registration successfully.", "item.edit.register-doi.error": "Error registering DOI", From 639fe69c5f52ee972bec75b162f4a0af9227ddb3 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Thu, 2 Feb 2023 09:35:55 +1300 Subject: [PATCH 478/758] [TLC-380] Refactor to use new endpoints, better naming --- src/app/core/data/item-data.service.ts | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index 7082058612c..80da91acb39 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -242,32 +242,6 @@ export abstract class BaseItemDataService extends IdentifiableDataService ); } - /** - * Register a DOI for a given item - * @param itemId - */ - public registerDOI(itemId: string): Observable> { - const requestId = this.requestService.generateRequestId(); - const hrefObs = this.getIdentifiersEndpoint(itemId); - hrefObs.pipe( - take(1) - ).subscribe((href) => { - const options: HttpOptions = Object.create({}); - let headers = new HttpHeaders(); - headers = headers.append('Content-Type', 'application/json'); - options.headers = headers; - // Pass identifier type as a simple parameter, no need for full JSON data - let hrefWithParams: string = this.buildHrefWithParams(href, [new RequestParam('type', 'doi')]); - const request = new PostRequest(requestId, hrefWithParams, JSON.stringify({}), options); - this.requestService.send(request); - }); - return this.rdbService.buildFromRequestUUID(requestId); - } - - - - - /** * Get the endpoint to move the item * @param itemId From e65bb88e23dd4210b56f04b206e52766439186b8 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Mon, 6 Feb 2023 10:32:54 +1300 Subject: [PATCH 479/758] [TLC-249] Attempting art's sub fix (doesn't work) --- .../item-status/item-status.component.ts | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index a7d8f80ea00..24b352685e0 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -3,7 +3,7 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade'; import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { ItemOperation } from '../item-operation/itemOperation.model'; -import {distinctUntilChanged, first, map, mergeMap, toArray} from 'rxjs/operators'; +import { distinctUntilChanged, first, map, mergeMap, switchMap, take, toArray } from 'rxjs/operators'; import { BehaviorSubject, Observable, from as observableFrom, Subscription, combineLatest } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths'; @@ -174,27 +174,36 @@ export class ItemStatusComponent implements OnInit { ); // Subscribe to changes from the showRegister check and rebuild operations list accordingly - this.subs.push(showRegister$.subscribe((show) => { - // Copy the static array first so we don't keep appending to it - let tmp_operations = [...operations]; - if (show) { - // Push the new Register DOI item operation - tmp_operations.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI)); - } + this.subs.push(showRegister$.pipe( + switchMap((show: boolean) => { + console.dir('show? ' + show); + // Copy the static array first so we don't keep appending to it + let tmp_operations = [...operations]; + if (show) { + // Push the new Register DOI item operation + tmp_operations.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI)); + } + // emit the operations one at a time + return tmp_operations + }), // Check authorisations and merge into new operations list - observableFrom(tmp_operations).pipe( - mergeMap((operation) => { - if (hasValue(operation.featureID)) { - return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe( - distinctUntilChanged(), - map((authorized) => new ItemOperation(operation.operationKey, operation.operationUrl, operation.featureID, !authorized, authorized)) - ); - } else { - return [operation]; - } - }), - toArray() - ).subscribe((ops) => this.operations$.next(ops)); + mergeMap((operation: ItemOperation) => { + console.dir("operation! " + (operation.featureID)); + if (hasValue(operation.featureID)) { + return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe( + //distinctUntilChanged(), + map((authorized) => new ItemOperation(operation.operationKey, operation.operationUrl, operation.featureID, !authorized, authorized)) + ); + } else { + return [operation]; + } + }), + //take(operations.length + 1), + // wait until all observables have completed and emit them all as a single array + toArray(), + ).subscribe((ops: ItemOperation[]) => { + console.dir('next!'); + this.operations$.next(ops); })); }); From 76407866c02abf70e881dff8577512c879a3a52b Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Tue, 7 Feb 2023 14:58:30 +1300 Subject: [PATCH 480/758] [TLC-249] Update item status button logic to avoid nested subs --- .../item-status/item-status.component.ts | 101 ++++++++---------- 1 file changed, 46 insertions(+), 55 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index 24b352685e0..c2db518415f 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -3,20 +3,21 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade'; import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { ItemOperation } from '../item-operation/itemOperation.model'; -import { distinctUntilChanged, first, map, mergeMap, switchMap, take, toArray } from 'rxjs/operators'; -import { BehaviorSubject, Observable, from as observableFrom, Subscription, combineLatest } from 'rxjs'; +import { distinctUntilChanged, first, map, mergeMap, switchMap, toArray } from 'rxjs/operators'; +import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { hasValue } from '../../../shared/empty.util'; import { - getAllSucceededRemoteDataPayload, + getAllSucceededRemoteDataPayload, getFirstSucceededRemoteData, getRemoteDataPayload, } from '../../../core/shared/operators'; import { IdentifierDataService } from '../../../core/data/identifier-data.service'; import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; +import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model'; @Component({ selector: 'ds-item-status', @@ -52,11 +53,6 @@ export class ItemStatusComponent implements OnInit { */ operations$: BehaviorSubject = new BehaviorSubject([]); - /** - * The keys of the actions (to loop over) - */ - actionsKeys; - /** * Identifiers (handles, DOIs) */ @@ -109,27 +105,23 @@ export class ItemStatusComponent implements OnInit { // Observable for configuration determining whether the Register DOI feature is enabled let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe( - map((enabled: RemoteData) => { - let show = false; - if (enabled.hasSucceeded) { - if (enabled.payload !== undefined && enabled.payload !== null) { - if (enabled.payload.values !== undefined) { - enabled.payload.values.forEach((value) => { - show = true; - }); - } - } + getFirstSucceededRemoteData(), + getRemoteDataPayload(), + map((enabled: ConfigurationProperty) => { + if (enabled !== undefined && enabled.values) { + return true; } - return show; + return false; }) ); /* + Construct a base list of operations. The key is used to build messages i18n example: 'item.edit.tabs.status.buttons..label' The value is supposed to be a href for the button */ - const operations = []; + const operations: ItemOperation[] = []; operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations', FeatureID.CanManagePolicies, true)); operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper', FeatureID.CanManageMappings, true)); if (item.isWithdrawn) { @@ -146,11 +138,16 @@ export class ItemStatusComponent implements OnInit { operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move', FeatureID.CanMove, true)); this.operations$.next(operations); - // Observable that reads identifiers and their status and, and config properties, and decides - // if we're allowed to show a Register DOI feature - let showRegister$: Observable = combineLatest([this.identifiers$, registerConfigEnabled$]).pipe( - distinctUntilChanged(), - map(([identifiers, enabled]) => { + /* + When the identifier data stream changes, determine whether the register DOI button should be shown or not. + This is based on whether the DOI is in the right state (minted or pending, not already queued for registration + or registered) and whether the configuration property identifiers.item-status.register-doi is true + */ + this.identifierDataService.getIdentifierDataFor(item).pipe( + getFirstSucceededRemoteData(), + getRemoteDataPayload(), + mergeMap((data: IdentifierData) => { + let identifiers = data.identifiers; let no_doi = true; let pending = false; if (identifiers !== undefined && identifiers !== null) { @@ -169,43 +166,37 @@ export class ItemStatusComponent implements OnInit { }); } // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true - return ((pending || no_doi) && enabled); - }) - ); - - // Subscribe to changes from the showRegister check and rebuild operations list accordingly - this.subs.push(showRegister$.pipe( - switchMap((show: boolean) => { - console.dir('show? ' + show); - // Copy the static array first so we don't keep appending to it - let tmp_operations = [...operations]; - if (show) { - // Push the new Register DOI item operation - tmp_operations.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI)); + return registerConfigEnabled$.pipe( + map((enabled: boolean) => { + return enabled && (pending || no_doi); + } + )); + }), + // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe + switchMap((showDoi: boolean) => { + let ops = [...operations]; + if (showDoi) { + ops.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI, true)); } - // emit the operations one at a time - return tmp_operations + return ops; }), - // Check authorisations and merge into new operations list - mergeMap((operation: ItemOperation) => { - console.dir("operation! " + (operation.featureID)); - if (hasValue(operation.featureID)) { - return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe( - //distinctUntilChanged(), - map((authorized) => new ItemOperation(operation.operationKey, operation.operationUrl, operation.featureID, !authorized, authorized)) + // Merge map checks and transforms each operation in the array based on whether it is authorized or not (disabled) + mergeMap((op: ItemOperation) => { + if (hasValue(op.featureID)) { + return this.authorizationService.isAuthorized(op.featureID, item.self).pipe( + distinctUntilChanged(), + map((authorized) => new ItemOperation(op.operationKey, op.operationUrl, op.featureID, !authorized, authorized)) ); } else { - return [operation]; + return [op]; } }), - //take(operations.length + 1), - // wait until all observables have completed and emit them all as a single array + // Wait for all operations to be emitted and return as an array toArray(), - ).subscribe((ops: ItemOperation[]) => { - console.dir('next!'); - this.operations$.next(ops); - })); - + ).subscribe((data) => { + // Update the operations$ subject that draws the administrative buttons on the status page + this.operations$.next(data); + }); }); this.itemPageRoute$ = this.itemRD$.pipe( From 08096e682987e67cd8b14f81c9134a7b6698353d Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Tue, 7 Feb 2023 17:12:02 +1300 Subject: [PATCH 481/758] [TLC-249] Lint --- .../item-register-doi/item-register-doi.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts index 17ec16b1bd4..54878c60261 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts @@ -89,7 +89,7 @@ export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent this.processRestResponse(response); } } - ) + ); } } From 83462324447c87630319c342bd936ff7f310fd5c Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Tue, 7 Feb 2023 17:22:59 +1300 Subject: [PATCH 482/758] [TLC-249] Fix import typo (from merge conflict) --- src/app/item-page/edit-item-page/edit-item-page.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bbce1843753..24d27b33408 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 @@ -36,7 +36,7 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource- import { ItemVersionsModule } from '../versions/item-versions.module'; import { IdentifierDataService } from '../../core/data/identifier-data.service'; import { IdentifierDataComponent } from '../../shared/object-list/identifier-data/identifier-data.component'; -import { ItemRegisterDoiComponent } from './item-register-doi/item-registerdoi.component'; +import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component'; import { DsoSharedModule } from '../../dso-shared/dso-shared.module'; From 129342435fc26eb1d20ac76b8d1a1ad77bbb73bf Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Tue, 7 Feb 2023 17:48:06 +1300 Subject: [PATCH 483/758] [TLC-249] Further test fixes --- .../item-register-doi/item-register-doi.component.spec.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts index ac17d7c7513..af521146426 100644 --- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts @@ -45,7 +45,8 @@ describe('ItemRegisterDoiComponent', () => { mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', { getIdentifierDataFor: createSuccessfulRemoteDataObject$({'identifiers': []}), - getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true') + getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true'), + registerIdentifier: createSuccessfulRemoteDataObject$({'identifiers': []}), }); mockItemDataService = jasmine.createSpyObj('mockItemDataService', { @@ -98,7 +99,7 @@ describe('ItemRegisterDoiComponent', () => { it('should call registerDOI function from the ItemDataService', () => { spyOn(comp, 'processRestResponse'); comp.performAction(); - expect(mockItemDataService.registerDOI).toHaveBeenCalledWith(comp.item.id); + expect(mockIdentifierDataService.registerIdentifier).toHaveBeenCalledWith(comp.item, 'doi'); expect(comp.processRestResponse).toHaveBeenCalled(); }); }); From 06de559974c085e0098831054cc9e0f6b446502c Mon Sep 17 00:00:00 2001 From: Art Lowel Date: Tue, 7 Feb 2023 14:49:22 +0100 Subject: [PATCH 484/758] Retrieve the XSRF token first, and set it as both the XSRF header and cookie --- src/app/core/auth/auth-request.service.ts | 8 ++- .../core/auth/browser-auth-request.service.ts | 9 ++-- .../core/auth/server-auth-request.service.ts | 54 +++++++++++++------ src/app/core/services/server-xhr.service.ts | 16 ++++++ src/app/core/xsrf/xsrf.interceptor.ts | 2 + src/modules/app/server-app.module.ts | 6 +++ 6 files changed, 69 insertions(+), 26 deletions(-) create mode 100644 src/app/core/services/server-xhr.service.ts diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts index 5c0c3340c7e..7c1f17dec23 100644 --- a/src/app/core/auth/auth-request.service.ts +++ b/src/app/core/auth/auth-request.service.ts @@ -100,14 +100,12 @@ export abstract class AuthRequestService { ); } /** - * Factory function to create the request object to send. This needs to be a POST client side and - * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow - * only the server IP to send a GET to this endpoint. + * Factory function to create the request object to send. * * @param href The href to send the request to * @protected */ - protected abstract createShortLivedTokenRequest(href: string): GetRequest | PostRequest; + protected abstract createShortLivedTokenRequest(href: string): Observable; /** * Send a request to retrieve a short-lived token which provides download access of restricted files @@ -117,7 +115,7 @@ export abstract class AuthRequestService { filter((href: string) => isNotEmpty(href)), distinctUntilChanged(), map((href: string) => new URLCombiner(href, this.shortlivedtokensEndpoint).toString()), - map((endpointURL: string) => this.createShortLivedTokenRequest(endpointURL)), + switchMap((endpointURL: string) => this.createShortLivedTokenRequest(endpointURL)), tap((request: RestRequest) => this.requestService.send(request)), switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)), getFirstCompletedRemoteData(), diff --git a/src/app/core/auth/browser-auth-request.service.ts b/src/app/core/auth/browser-auth-request.service.ts index 85d5f543404..485e2ef9c4a 100644 --- a/src/app/core/auth/browser-auth-request.service.ts +++ b/src/app/core/auth/browser-auth-request.service.ts @@ -4,6 +4,7 @@ import { PostRequest } from '../data/request.models'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { RequestService } from '../data/request.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; +import { Observable, of as observableOf } from 'rxjs'; /** * Client side version of the service to send authentication requests @@ -20,15 +21,13 @@ export class BrowserAuthRequestService extends AuthRequestService { } /** - * Factory function to create the request object to send. This needs to be a POST client side and - * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow - * only the server IP to send a GET to this endpoint. + * Factory function to create the request object to send. * * @param href The href to send the request to * @protected */ - protected createShortLivedTokenRequest(href: string): PostRequest { - return new PostRequest(this.requestService.generateRequestId(), href); + protected createShortLivedTokenRequest(href: string): Observable { + return observableOf(new PostRequest(this.requestService.generateRequestId(), href)); } } diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts index 9954e7c7ef6..05131b73752 100644 --- a/src/app/core/auth/server-auth-request.service.ts +++ b/src/app/core/auth/server-auth-request.service.ts @@ -4,8 +4,19 @@ import { PostRequest } from '../data/request.models'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { RequestService } from '../data/request.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; -import { HttpHeaders, HttpXsrfTokenExtractor } from '@angular/common/http'; -import { XSRF_REQUEST_HEADER } from '../xsrf/xsrf.interceptor'; +import { + HttpHeaders, + HttpXsrfTokenExtractor, + HttpClient, + HttpResponse +} from '@angular/common/http'; +import { + XSRF_REQUEST_HEADER, + XSRF_RESPONSE_HEADER, + DSPACE_XSRF_COOKIE +} from '../xsrf/xsrf.interceptor'; +import { map } from 'rxjs/operators'; +import { Observable } from 'rxjs'; /** * Server side version of the service to send authentication requests @@ -17,29 +28,40 @@ export class ServerAuthRequestService extends AuthRequestService { halService: HALEndpointService, requestService: RequestService, rdbService: RemoteDataBuildService, - protected tokenExtractor: HttpXsrfTokenExtractor, + protected httpClient: HttpClient, ) { super(halService, requestService, rdbService); } /** - * Factory function to create the request object to send. This needs to be a POST client side and - * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow - * only the server IP to send a GET to this endpoint. + * Factory function to create the request object to send. * * @param href The href to send the request to * @protected */ - protected createShortLivedTokenRequest(href: string): PostRequest { - let options = new HttpHeaders(); - options = options.set('Content-Type', 'application/json; charset=utf-8'); - options = options.set(XSRF_REQUEST_HEADER, this.tokenExtractor.getToken()); - let requestOptions = { - headers: options, - }; - return Object.assign(new PostRequest(this.requestService.generateRequestId(), href, {}, requestOptions), { - responseMsToLive: 2 * 1000 // A short lived token is only valid for 2 seconds. - }); + protected createShortLivedTokenRequest(href: string): Observable { + // First do a call to the root endpoint in order to get an XSRF token + return this.httpClient.get(this.halService.getRootHref(), { observe: 'response' }).pipe( + // retrieve the XSRF token from the response header + map((response: HttpResponse) => response.headers.get(XSRF_RESPONSE_HEADER)), + // Use that token to create an HttpHeaders object + map((xsrfToken: string) => new HttpHeaders() + .set('Content-Type', 'application/json; charset=utf-8') + // set the token as the XSRF header + .set(XSRF_REQUEST_HEADER, xsrfToken) + // and as the DSPACE-XSRF-COOKIE + .set('Cookie', `${DSPACE_XSRF_COOKIE}=${xsrfToken}`)), + map((headers: HttpHeaders) => + // Create a new PostRequest using those headers and the given href + new PostRequest( + this.requestService.generateRequestId(), + href, + {}, + { + headers: headers, + } + )) + ) } } diff --git a/src/app/core/services/server-xhr.service.ts b/src/app/core/services/server-xhr.service.ts new file mode 100644 index 00000000000..835072bbd34 --- /dev/null +++ b/src/app/core/services/server-xhr.service.ts @@ -0,0 +1,16 @@ +import { XhrFactory } from '@angular/common'; +import { Injectable } from '@angular/core'; +import * as xhr2 from 'xhr2'; + +/** + * Overrides the default XhrFactoru server side, to allow us to set cookies in requests to the + * backend. This was added to be able to perform a working XSRF request from the node server, as it + * needs to set a cookie for the XSRF token + */ +@Injectable() +export class ServerXhrService implements XhrFactory { + build(): XMLHttpRequest { + xhr2.prototype._restrictedHeaders.cookie = false; + return new xhr2.XMLHttpRequest(); + } +} diff --git a/src/app/core/xsrf/xsrf.interceptor.ts b/src/app/core/xsrf/xsrf.interceptor.ts index d527924a28d..cded432397d 100644 --- a/src/app/core/xsrf/xsrf.interceptor.ts +++ b/src/app/core/xsrf/xsrf.interceptor.ts @@ -19,6 +19,8 @@ export const XSRF_REQUEST_HEADER = 'X-XSRF-TOKEN'; export const XSRF_RESPONSE_HEADER = 'DSPACE-XSRF-TOKEN'; // Name of cookie where we store the XSRF token export const XSRF_COOKIE = 'XSRF-TOKEN'; +// Name of cookie the backend expects the XSRF token to be in +export const DSPACE_XSRF_COOKIE = 'DSPACE-XSRF-COOKIE'; /** * Custom Http Interceptor intercepting Http Requests & Responses to diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts index 81426e7fcc8..7d162c5fd1e 100644 --- a/src/modules/app/server-app.module.ts +++ b/src/modules/app/server-app.module.ts @@ -33,6 +33,8 @@ import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mo import { AuthRequestService } from '../../app/core/auth/auth-request.service'; import { ServerAuthRequestService } from '../../app/core/auth/server-auth-request.service'; import { ServerInitService } from './server-init.service'; +import { XhrFactory } from '@angular/common'; +import { ServerXhrService } from '../../app/core/services/server-xhr.service'; export function createTranslateLoader(transferState: TransferState) { return new TranslateServerLoader(transferState, 'dist/server/assets/i18n/', '.json'); @@ -104,6 +106,10 @@ export function createTranslateLoader(transferState: TransferState) { provide: HardRedirectService, useClass: ServerHardRedirectService, }, + { + provide: XhrFactory, + useClass: ServerXhrService, + }, ] }) export class ServerAppModule { From 88cb397dc9dde018741d2a372b72866370db8456 Mon Sep 17 00:00:00 2001 From: Yury Bondarenko Date: Tue, 7 Feb 2023 15:01:01 +0100 Subject: [PATCH 485/758] Fix direct CSR By moving from environment.ts to config.yml we made it so the environment is _not_ up to date with the server configuration when main.js is first loaded. Because of this the app behaved as if CSR always happened _after_ SSR, effectively breaking direct CSR. Here the "criterion" for SSR/non-SSR HTML is changed from the related configuration property to the presence of Angular Universal transfer state. This means we can correctly determine when to bootstrap the app for direct CSR, and it's' now "safe" to just send index.html by itself. --- server.ts | 22 +++++----------------- src/index.csr.html | 18 ------------------ src/main.browser.ts | 19 +++++++++++++------ 3 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 src/index.csr.html diff --git a/server.ts b/server.ts index 81137ad56a8..0fecf6bd52b 100644 --- a/server.ts +++ b/server.ts @@ -31,7 +31,6 @@ import * as expressStaticGzip from 'express-static-gzip'; import { existsSync, readFileSync } from 'fs'; import { join } from 'path'; -import { APP_BASE_HREF } from '@angular/common'; import { enableProdMode } from '@angular/core'; import { ngExpressEngine } from '@nguniversal/express-engine'; @@ -57,7 +56,7 @@ const DIST_FOLDER = join(process.cwd(), 'dist/browser'); // Set path fir IIIF viewer. const IIIF_VIEWER = join(process.cwd(), 'dist/iiif'); -const indexHtml = existsSync(join(DIST_FOLDER, 'index.html')) ? 'index.html' : 'index'; +const indexHtml = join(DIST_FOLDER, 'index.html'); const cookieParser = require('cookie-parser'); @@ -207,7 +206,6 @@ function ngApp(req, res) { baseUrl: environment.ui.nameSpace, originUrl: environment.ui.baseUrl, requestUrl: req.originalUrl, - providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }] }, (err, data) => { if (hasNoValue(err) && hasValue(data)) { res.locals.ssr = true; // mark response as SSR @@ -222,25 +220,15 @@ function ngApp(req, res) { if (hasValue(err)) { console.warn('Error details : ', err); } - res.render(indexHtml, { - req, - providers: [{ - provide: APP_BASE_HREF, - useValue: req.baseUrl - }] - }); + + res.sendFile(indexHtml); } }); } else { // If preboot is disabled, just serve the client console.log('Universal off, serving for direct CSR'); - res.render(indexHtml, { - req, - providers: [{ - provide: APP_BASE_HREF, - useValue: req.baseUrl - }] - }); + + res.sendFile(indexHtml); } } diff --git a/src/index.csr.html b/src/index.csr.html deleted file mode 100644 index b1ef4343b13..00000000000 --- a/src/index.csr.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - DSpace - - - - - - - - - - - diff --git a/src/main.browser.ts b/src/main.browser.ts index d5efe828c31..68debfb3557 100644 --- a/src/main.browser.ts +++ b/src/main.browser.ts @@ -2,21 +2,27 @@ import 'zone.js'; import 'reflect-metadata'; import 'core-js/es/reflect'; -import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { load as loadWebFont } from 'webfontloader'; -import { hasValue } from './app/shared/empty.util'; - import { BrowserAppModule } from './modules/app/browser-app.module'; import { environment } from './environments/environment'; import { AppConfig } from './config/app-config.interface'; import { extendEnvironmentWithAppConfig } from './config/config.util'; +import { enableProdMode } from '@angular/core'; const bootstrap = () => platformBrowserDynamic() .bootstrapModule(BrowserAppModule, {}); +/** + * We use this to determine have been serven SSR HTML or not. + * + * At this point, {@link environment} may not be in sync with the configuration. + * Therefore, we cannot depend on it to determine how to bootstrap the app. + */ +const hasTransferState = document.querySelector('script#dspace-angular-state') !== null; + const main = () => { // Load fonts async // https://github.com/typekit/webfontloader#configuration @@ -30,22 +36,23 @@ const main = () => { enableProdMode(); } - if (hasValue(environment.universal) && environment.universal.preboot) { + if (hasTransferState) { + // Configuration will be taken from transfer state during initialization return bootstrap(); } else { + // Configuration must be fetched explicitly return fetch('assets/config.json') .then((response) => response.json()) .then((appConfig: AppConfig) => { // extend environment with app config for browser when not prerendered extendEnvironmentWithAppConfig(environment, appConfig); - return bootstrap(); }); } }; // support async tag or hmr -if (document.readyState === 'complete' && hasValue(environment.universal) && !environment.universal.preboot) { +if (document.readyState === 'complete' && !hasTransferState) { main(); } else { document.addEventListener('DOMContentLoaded', main); From ce6324a569e6ecde23b49ab4eca9a4e5b1229248 Mon Sep 17 00:00:00 2001 From: Nathan Buckingham Date: Tue, 7 Feb 2023 11:50:42 -0500 Subject: [PATCH 486/758] Fix lint and test issues --- .../core/auth/auth-request.service.spec.ts | 5 +- .../auth/browser-auth-request.service.spec.ts | 14 ++++-- .../auth/server-auth-request.service.spec.ts | 50 ++++++++++++------- .../core/auth/server-auth-request.service.ts | 10 ++-- src/app/core/services/server-xhr.service.ts | 8 +-- 5 files changed, 55 insertions(+), 32 deletions(-) diff --git a/src/app/core/auth/auth-request.service.spec.ts b/src/app/core/auth/auth-request.service.spec.ts index 704922c5b5f..063aad612f1 100644 --- a/src/app/core/auth/auth-request.service.spec.ts +++ b/src/app/core/auth/auth-request.service.spec.ts @@ -11,6 +11,7 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service'; import objectContaining = jasmine.objectContaining; import { AuthStatus } from './models/auth-status.model'; import { RestRequestMethod } from '../data/rest-request-method'; +import { Observable, of as observableOf } from 'rxjs'; describe(`AuthRequestService`, () => { let halService: HALEndpointService; @@ -34,8 +35,8 @@ describe(`AuthRequestService`, () => { super(hes, rs, rdbs); } - protected createShortLivedTokenRequest(href: string): PostRequest { - return new PostRequest(this.requestService.generateRequestId(), href); + protected createShortLivedTokenRequest(href: string): Observable { + return observableOf(new PostRequest(this.requestService.generateRequestId(), href)); } } diff --git a/src/app/core/auth/browser-auth-request.service.spec.ts b/src/app/core/auth/browser-auth-request.service.spec.ts index 18d27340aff..2875553feb4 100644 --- a/src/app/core/auth/browser-auth-request.service.spec.ts +++ b/src/app/core/auth/browser-auth-request.service.spec.ts @@ -1,6 +1,8 @@ import { AuthRequestService } from './auth-request.service'; import { RequestService } from '../data/request.service'; import { BrowserAuthRequestService } from './browser-auth-request.service'; +import { Observable } from 'rxjs'; +import { PostRequest } from '../data/request.models'; describe(`BrowserAuthRequestService`, () => { let href: string; @@ -17,13 +19,17 @@ describe(`BrowserAuthRequestService`, () => { describe(`createShortLivedTokenRequest`, () => { it(`should return a PostRequest`, () => { - const result = (service as any).createShortLivedTokenRequest(href); - expect(result.constructor.name).toBe('PostRequest'); + const obs = (service as any).createShortLivedTokenRequest(href) as Observable; + obs.subscribe((result: PostRequest) => { + expect(result.constructor.name).toBe('PostRequest'); + }); }); it(`should return a request with the given href`, () => { - const result = (service as any).createShortLivedTokenRequest(href); - expect(result.href).toBe(href) ; + const obs = (service as any).createShortLivedTokenRequest(href) as Observable; + obs.subscribe((result: PostRequest) => { + expect(result.href).toBe(href); + }); }); }); }); diff --git a/src/app/core/auth/server-auth-request.service.spec.ts b/src/app/core/auth/server-auth-request.service.spec.ts index 2612f9d5b47..181603eef7e 100644 --- a/src/app/core/auth/server-auth-request.service.spec.ts +++ b/src/app/core/auth/server-auth-request.service.spec.ts @@ -1,44 +1,60 @@ import { AuthRequestService } from './auth-request.service'; import { RequestService } from '../data/request.service'; import { ServerAuthRequestService } from './server-auth-request.service'; -import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock'; +import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; +import { Observable, of as observableOf } from 'rxjs'; +import { XSRF_RESPONSE_HEADER } from '../xsrf/xsrf.interceptor'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; +import { PostRequest } from '../data/request.models'; describe(`ServerAuthRequestService`, () => { let href: string; let requestService: RequestService; let service: AuthRequestService; - let xsrfExtractor: HttpXsrfTokenExtractorMock; - - const mockToken = 'mockToken'; + let httpClient: HttpClient; + let httpResponse: HttpResponse; + let halService: HALEndpointService; + const mockToken = 'mock-token'; beforeEach(() => { href = 'https://rest.api/auth/shortlivedtokens'; requestService = jasmine.createSpyObj('requestService', { 'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2' }); - xsrfExtractor = new HttpXsrfTokenExtractorMock(mockToken); - service = new ServerAuthRequestService(null, requestService, null, xsrfExtractor); + httpResponse = { + body: { bar: false }, + headers: new HttpHeaders({ XSRF_RESPONSE_HEADER: mockToken }), + statusText: '200' + } as HttpResponse; + httpClient = jasmine.createSpyObj('httpClient', { + get: observableOf(httpResponse), + }); + halService = jasmine.createSpyObj('halService', { + 'getRootHref': '/api' + }); + service = new ServerAuthRequestService(halService, requestService, null, httpClient); }); describe(`createShortLivedTokenRequest`, () => { it(`should return a PostRequest`, () => { - const result = (service as any).createShortLivedTokenRequest(href); - expect(result.constructor.name).toBe('PostRequest'); + const obs = (service as any).createShortLivedTokenRequest(href) as Observable; + obs.subscribe((result: PostRequest) => { + expect(result.constructor.name).toBe('PostRequest'); + }); }); it(`should return a request with the given href`, () => { - const result = (service as any).createShortLivedTokenRequest(href); - expect(result.href).toBe(href) ; + const obs = (service as any).createShortLivedTokenRequest(href) as Observable; + obs.subscribe((result: PostRequest) => { + expect(result.href).toBe(href) ; + }); }); it(`should return a request with a xsrf header`, () => { - const result = (service as any).createShortLivedTokenRequest(href); - expect(result.options.headers.get('X-XSRF-TOKEN')).toBe(mockToken); - }); - - it(`should have a responseMsToLive of 2 seconds`, () => { - const result = (service as any).createShortLivedTokenRequest(href); - expect(result.responseMsToLive).toBe(2 * 1000) ; + const obs = (service as any).createShortLivedTokenRequest(href) as Observable; + obs.subscribe((result: PostRequest) => { + expect(result.options.headers.get(XSRF_RESPONSE_HEADER)).toBe(mockToken); + }); }); }); }); diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts index 05131b73752..183e0855893 100644 --- a/src/app/core/auth/server-auth-request.service.ts +++ b/src/app/core/auth/server-auth-request.service.ts @@ -6,7 +6,6 @@ import { RequestService } from '../data/request.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { HttpHeaders, - HttpXsrfTokenExtractor, HttpClient, HttpResponse } from '@angular/common/http'; @@ -53,15 +52,16 @@ export class ServerAuthRequestService extends AuthRequestService { .set('Cookie', `${DSPACE_XSRF_COOKIE}=${xsrfToken}`)), map((headers: HttpHeaders) => // Create a new PostRequest using those headers and the given href - new PostRequest( + Object.assign(new PostRequest( this.requestService.generateRequestId(), href, {}, { headers: headers, - } - )) - ) + }, + ),{}) + ) + ); } } diff --git a/src/app/core/services/server-xhr.service.ts b/src/app/core/services/server-xhr.service.ts index 835072bbd34..69ae7414022 100644 --- a/src/app/core/services/server-xhr.service.ts +++ b/src/app/core/services/server-xhr.service.ts @@ -1,16 +1,16 @@ import { XhrFactory } from '@angular/common'; import { Injectable } from '@angular/core'; -import * as xhr2 from 'xhr2'; +import { prototype, XMLHttpRequest } from 'xhr2'; /** - * Overrides the default XhrFactoru server side, to allow us to set cookies in requests to the + * Overrides the default XhrFactory server side, to allow us to set cookies in requests to the * backend. This was added to be able to perform a working XSRF request from the node server, as it * needs to set a cookie for the XSRF token */ @Injectable() export class ServerXhrService implements XhrFactory { build(): XMLHttpRequest { - xhr2.prototype._restrictedHeaders.cookie = false; - return new xhr2.XMLHttpRequest(); + prototype._restrictedHeaders.cookie = false; + return new XMLHttpRequest(); } } From c099bc468d752fb357ac6ad786701c12728ef6c4 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 7 Feb 2023 12:22:32 -0600 Subject: [PATCH 487/758] Add "debug" config and "allowStale" configs --- config/config.example.yml | 12 ++++++++++++ server.ts | 15 +++++++++------ src/config/cache-config.interface.ts | 6 ++++++ src/config/default-app-config.ts | 3 +++ src/environments/environment.test.ts | 3 +++ 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/config/config.example.yml b/config/config.example.yml index 52b06b1b084..500c2c476ae 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -49,6 +49,8 @@ cache: # NOTE: To control the cache size, use the "max" setting. Keep in mind, individual cached pages are usually small (<100KB). # Enabling *both* caches will mean that a page may be cached twice, once in each cache (but may expire at different times via timeToLive). serverSide: + # Set to true to see all cache hits/misses/refreshes in your console logs. Useful for debugging SSR caching issues. + debug: false # When enabled (i.e. max > 0), known bots will be sent pages from a server side cache specific for bots. # (Keep in mind, bot detection cannot be guarranteed. It is possible some bots will bypass this cache.) botCache: @@ -62,6 +64,11 @@ cache: # NOTE: For the bot cache, this setting may impact how quickly search engine bots will index new content on your site. # For example, setting this to one week may mean that search engine bots may not find all new content for one week. timeToLive: 86400000 # 1 day + # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page + # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive). + # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache). + # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR. + allowStale: true # When enabled (i.e. max > 0), all anonymous users will be sent pages from a server side cache. # This allows anonymous users to interact more quickly with the site, but also means they may see slightly # outdated content (based on timeToLive) @@ -74,6 +81,11 @@ cache: # copy is automatically refreshed on the next request. # NOTE: For the anonymous cache, it is recommended to keep this value low to avoid anonymous users seeing outdated content. timeToLive: 10000 # 10 seconds + # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page + # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive). + # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache). + # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR. + allowStale: true # Authentication settings auth: diff --git a/server.ts b/server.ts index 8c9835cf16f..478a4c0ec19 100644 --- a/server.ts +++ b/server.ts @@ -324,7 +324,7 @@ function initCache() { botCache = new LRU( { max: environment.cache.serverSide.botCache.max, ttl: environment.cache.serverSide.botCache.timeToLive || 24 * 60 * 60 * 1000, // 1 day - allowStale: true // If object is found to be stale, return stale value before deleting + allowStale: environment.cache.serverSide.botCache.allowStale || true // if object is stale, return stale value before deleting }); } @@ -335,7 +335,7 @@ function initCache() { anonymousCache = new LRU( { max: environment.cache.serverSide.anonymousCache.max, ttl: environment.cache.serverSide.anonymousCache.timeToLive || 10 * 1000, // 10 seconds - allowStale: true // If object is found to be stale, return stale value before deleting + allowStale: environment.cache.serverSide.anonymousCache.allowStale || true // if object is stale, return stale value before deleting }); } } @@ -399,24 +399,25 @@ function cacheCheck(req, res, next) { * @returns cached copy (if found) or undefined (if not found) */ function checkCacheForRequest(cacheName: string, cache: LRU, req, res): any { - let debug = false; // Enable to see cache hits & re-rendering in logs - // Get the cache key for this request const key = getCacheKey(req); // Check if this page is in our cache let cachedCopy = cache.get(key); if (cachedCopy) { - if (debug) { console.log(`CACHE HIT FOR ${key} in ${cacheName} cache`); } + if (environment.cache.serverSide.debug) { console.log(`CACHE HIT FOR ${key} in ${cacheName} cache`); } // Check if cached copy is expired (If expired, the key will now be gone from cache) + // NOTE: This will only occur when "allowStale=true", as it means the "get(key)" above returned a stale value. if (!cache.has(key)) { - if (debug) { console.log(`CACHE EXPIRED FOR ${key} in ${cacheName} cache. Re-rendering...`); } + if (environment.cache.serverSide.debug) { console.log(`CACHE EXPIRED FOR ${key} in ${cacheName} cache. Re-rendering...`); } // Update cached copy by rerendering server-side // NOTE: In this scenario the currently cached copy will be returned to the current user. // This re-render is peformed behind the scenes to update cached copy for next user. serverSideRender(req, res, false); } + } else { + if (environment.cache.serverSide.debug) { console.log(`CACHE MISS FOR ${key} in ${cacheName} cache.`); } } // return page from cache @@ -455,11 +456,13 @@ function saveToCache(req, page: any) { // (NOTE: has() will return false if page is expired in cache) if (botCacheEnabled() && !botCache.has(key)) { botCache.set(key, page); + if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in bot cache.`); } } // If anonymous cache is enabled, save it to that cache if it doesn't exist or is expired if (anonymousCacheEnabled() && !anonymousCache.has(key)) { anonymousCache.set(key, page); + if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in anonymous cache.`); } } } } diff --git a/src/config/cache-config.interface.ts b/src/config/cache-config.interface.ts index 1826bd0d304..9560fe46a5a 100644 --- a/src/config/cache-config.interface.ts +++ b/src/config/cache-config.interface.ts @@ -11,12 +11,16 @@ export interface CacheConfig extends Config { // In-memory caches of server-side rendered (SSR) content. These caches can be used to limit the frequency // of re-generating SSR pages to improve performance. serverSide: { + // Debug server-side caching. Set to true to see cache hits/misses/refreshes in console logs. + debug: boolean, // Cache specific to known bots. Allows you to serve cached contents to bots only. botCache: { // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache. max: number; // Amount of time after which cached pages are considered stale (in ms) timeToLive: number; + // true = return page from cache after timeToLive expires. false = return a fresh page after timeToLive expires + allowStale: boolean; }, // Cache specific to anonymous users. Allows you to serve cached content to non-authenticated users. anonymousCache: { @@ -24,6 +28,8 @@ export interface CacheConfig extends Config { max: number; // Amount of time after which cached pages are considered stale (in ms) timeToLive: number; + // true = return page from cache after timeToLive expires. false = return a fresh page after timeToLive expires + allowStale: boolean; } } } diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 9e5b5358723..e7851d4b34b 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -76,6 +76,7 @@ export class DefaultAppConfig implements AppConfig { }, // In-memory cache of server-side rendered content serverSide: { + debug: false, // Cache specific to known bots. Allows you to serve cached contents to bots only. // Defaults to caching 1,000 pages. Each page expires after 1 day botCache: { @@ -83,6 +84,7 @@ export class DefaultAppConfig implements AppConfig { max: 1000, // Amount of time after which cached pages are considered stale (in ms) timeToLive: 24 * 60 * 60 * 1000, // 1 day + allowStale: true, }, // Cache specific to anonymous users. Allows you to serve cached content to non-authenticated users. // Defaults to caching 0 pages. But, when enabled, each page expires after 10 seconds (to minimize anonymous users seeing out-of-date content) @@ -91,6 +93,7 @@ export class DefaultAppConfig implements AppConfig { max: 0, // disabled by default // Amount of time after which cached pages are considered stale (in ms) timeToLive: 10 * 1000, // 10 seconds + allowStale: true, } } }; diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 613024f7980..0bb36da61f3 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -58,13 +58,16 @@ export const environment: BuildConfig = { }, // In-memory cache of server-side rendered pages. Disabled in test environment (max=0) serverSide: { + debug: false, botCache: { max: 0, timeToLive: 24 * 60 * 60 * 1000, // 1 day + allowStale: true, }, anonymousCache: { max: 0, timeToLive: 10 * 1000, // 10 seconds + allowStale: true, } } }, From 9435f1c4a73e7a3e3ce1e26619ce322c8839ab1c Mon Sep 17 00:00:00 2001 From: Nathan Buckingham Date: Tue, 7 Feb 2023 13:59:57 -0500 Subject: [PATCH 488/758] Add done() to async tests --- .../auth/browser-auth-request.service.spec.ts | 6 +++-- .../auth/server-auth-request.service.spec.ts | 22 +++++++++++++------ .../core/auth/server-auth-request.service.ts | 4 ++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/app/core/auth/browser-auth-request.service.spec.ts b/src/app/core/auth/browser-auth-request.service.spec.ts index 2875553feb4..b41d981bcf6 100644 --- a/src/app/core/auth/browser-auth-request.service.spec.ts +++ b/src/app/core/auth/browser-auth-request.service.spec.ts @@ -18,17 +18,19 @@ describe(`BrowserAuthRequestService`, () => { }); describe(`createShortLivedTokenRequest`, () => { - it(`should return a PostRequest`, () => { + it(`should return a PostRequest`, (done) => { const obs = (service as any).createShortLivedTokenRequest(href) as Observable; obs.subscribe((result: PostRequest) => { expect(result.constructor.name).toBe('PostRequest'); + done(); }); }); - it(`should return a request with the given href`, () => { + it(`should return a request with the given href`, (done) => { const obs = (service as any).createShortLivedTokenRequest(href) as Observable; obs.subscribe((result: PostRequest) => { expect(result.href).toBe(href); + done(); }); }); }); diff --git a/src/app/core/auth/server-auth-request.service.spec.ts b/src/app/core/auth/server-auth-request.service.spec.ts index 181603eef7e..df6d78256bb 100644 --- a/src/app/core/auth/server-auth-request.service.spec.ts +++ b/src/app/core/auth/server-auth-request.service.spec.ts @@ -3,9 +3,12 @@ import { RequestService } from '../data/request.service'; import { ServerAuthRequestService } from './server-auth-request.service'; import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http'; import { Observable, of as observableOf } from 'rxjs'; -import { XSRF_RESPONSE_HEADER } from '../xsrf/xsrf.interceptor'; import { HALEndpointService } from '../shared/hal-endpoint.service'; import { PostRequest } from '../data/request.models'; +import { + XSRF_REQUEST_HEADER, + XSRF_RESPONSE_HEADER +} from '../xsrf/xsrf.interceptor'; describe(`ServerAuthRequestService`, () => { let href: string; @@ -21,9 +24,11 @@ describe(`ServerAuthRequestService`, () => { requestService = jasmine.createSpyObj('requestService', { 'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2' }); + let headers = new HttpHeaders(); + headers = headers.set(XSRF_RESPONSE_HEADER, mockToken); httpResponse = { body: { bar: false }, - headers: new HttpHeaders({ XSRF_RESPONSE_HEADER: mockToken }), + headers: headers, statusText: '200' } as HttpResponse; httpClient = jasmine.createSpyObj('httpClient', { @@ -36,24 +41,27 @@ describe(`ServerAuthRequestService`, () => { }); describe(`createShortLivedTokenRequest`, () => { - it(`should return a PostRequest`, () => { + it(`should return a PostRequest`, (done) => { const obs = (service as any).createShortLivedTokenRequest(href) as Observable; obs.subscribe((result: PostRequest) => { expect(result.constructor.name).toBe('PostRequest'); + done(); }); }); - it(`should return a request with the given href`, () => { + it(`should return a request with the given href`, (done) => { const obs = (service as any).createShortLivedTokenRequest(href) as Observable; obs.subscribe((result: PostRequest) => { - expect(result.href).toBe(href) ; + expect(result.href).toBe(href); + done(); }); }); - it(`should return a request with a xsrf header`, () => { + it(`should return a request with a xsrf header`, (done) => { const obs = (service as any).createShortLivedTokenRequest(href) as Observable; obs.subscribe((result: PostRequest) => { - expect(result.options.headers.get(XSRF_RESPONSE_HEADER)).toBe(mockToken); + expect(result.options.headers.get(XSRF_REQUEST_HEADER)).toBe(mockToken); + done(); }); }); }); diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts index 183e0855893..d6302081bce 100644 --- a/src/app/core/auth/server-auth-request.service.ts +++ b/src/app/core/auth/server-auth-request.service.ts @@ -52,14 +52,14 @@ export class ServerAuthRequestService extends AuthRequestService { .set('Cookie', `${DSPACE_XSRF_COOKIE}=${xsrfToken}`)), map((headers: HttpHeaders) => // Create a new PostRequest using those headers and the given href - Object.assign(new PostRequest( + new PostRequest( this.requestService.generateRequestId(), href, {}, { headers: headers, }, - ),{}) + ) ) ); } From 5d2f63ff65ca28948b3bd5359db63e8a3cc3d813 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 8 Feb 2023 10:17:36 +0100 Subject: [PATCH 489/758] 99053: Added test to check that the TYPE_REQUEST_FORGOT doesn't use the authentication-password.domain.valid --- .../register-email-form.component.spec.ts | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts index 4fea169e35e..89af6ff05ac 100644 --- a/src/app/register-email-form/register-email-form.component.spec.ts +++ b/src/app/register-email-form/register-email-form.component.spec.ts @@ -74,15 +74,6 @@ describe('RegisterEmailFormComponent', () => { const elem = fixture.debugElement.queryAll(By.css('input#email'))[0].nativeElement; expect(elem).toBeDefined(); }); - - it('should not retrieve the validDomains for TYPE_REQUEST_FORGOT', () => { - spyOn(configurationDataService, 'findByPropertyName'); - comp.typeRequest = TYPE_REQUEST_FORGOT; - - comp.ngOnInit(); - - expect(configurationDataService.findByPropertyName).not.toHaveBeenCalled(); - }); }); describe('email validation', () => { it('should be invalid when no email is present', () => { @@ -96,6 +87,18 @@ describe('RegisterEmailFormComponent', () => { comp.form.patchValue({email: 'valid@email.org'}); expect(comp.form.invalid).toBeFalse(); }); + it('should accept email with other domain names on TYPE_REQUEST_FORGOT form', () => { + spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'authentication-password.domain.valid', + values: ['marvel.com'], + }))); + comp.typeRequest = TYPE_REQUEST_FORGOT; + + comp.ngOnInit(); + + comp.form.patchValue({ email: 'valid@email.org' }); + expect(comp.form.invalid).toBeFalse(); + }); it('should not accept email with other domain names', () => { spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { name: 'authentication-password.domain.valid', From ad870829d2e962c6d259ab74e9c5ee1e8562af48 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Wed, 8 Feb 2023 11:13:03 +0100 Subject: [PATCH 490/758] 97732 Remove unnecessary subscriptions --- .../context-help-toggle.component.ts | 13 +++---------- .../context-help-wrapper.component.ts | 19 ++++++------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts index 14f9ebeb639..6685df71063 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ContextHelpService } from '../../shared/context-help.service'; -import { Observable, Subscription } from 'rxjs'; +import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; /** @@ -12,22 +12,15 @@ import { map } from 'rxjs/operators'; templateUrl: './context-help-toggle.component.html', styleUrls: ['./context-help-toggle.component.scss'] }) -export class ContextHelpToggleComponent implements OnInit, OnDestroy { +export class ContextHelpToggleComponent implements OnInit { buttonVisible$: Observable; constructor( private contextHelpService: ContextHelpService, ) { } - private subs: Subscription[]; - ngOnInit(): void { this.buttonVisible$ = this.contextHelpService.tooltipCount$().pipe(map(x => x > 0)); - this.subs = [this.buttonVisible$.subscribe()]; - } - - ngOnDestroy() { - this.subs.forEach(sub => sub.unsubscribe()); } onClick() { diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts index c5bb40cf1ba..e170d522b5c 100644 --- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts +++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts @@ -61,8 +61,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy { parsedContent$: Observable; - private subs: {always: Subscription[], tooltipBound: Subscription[]} - = {always: [], tooltipBound: []}; + private subs: Subscription[] = []; constructor( private translateService: TranslateService, @@ -78,14 +77,13 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy { dontParseLinks ? [text] : this.parseLinks(text)) ); this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$(); - this.subs.always = [this.parsedContent$.subscribe(), this.shouldShowIcon$.subscribe()]; } @ViewChild('tooltip', { static: false }) set setTooltip(tooltip: NgbTooltip) { this.tooltip = tooltip; - this.clearSubs('tooltipBound'); + this.clearSubs(); if (this.tooltip !== undefined) { - this.subs.tooltipBound = [ + this.subs = [ this.contextHelpService.getContextHelp$(this.id) .pipe(hasValueOperator()) .subscribe((ch: ContextHelp) => { @@ -159,13 +157,8 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy { }); } - private clearSubs(filter: null | 'tooltipBound' = null) { - if (filter === null) { - [].concat(...Object.values(this.subs)).forEach(sub => sub.unsubscribe()); - this.subs = {always: [], tooltipBound: []}; - } else { - this.subs[filter].forEach(sub => sub.unsubscribe()); - this.subs[filter] = []; - } + private clearSubs() { + this.subs.forEach(sub => sub.unsubscribe()); + this.subs = []; } } From 6bfcc25502394abf78d33020bca42e78fee9571f Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 8 Feb 2023 12:28:14 +0100 Subject: [PATCH 491/758] [CST-7757] subscriptions data service tests --- .../subscriptions-data.service.spec.ts | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 src/app/shared/subscriptions/subscriptions-data.service.spec.ts diff --git a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts new file mode 100644 index 00000000000..9c4c69123d3 --- /dev/null +++ b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts @@ -0,0 +1,133 @@ +import { SubscriptionsDataService } from './subscriptions-data.service'; +import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; +import { Subscription } from './models/subscription.model'; +import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service'; +import { HttpClient } from '@angular/common/http'; +import { NotificationsService } from '../notifications/notifications.service'; +import { RequestService } from '../../core/data/request.service'; +import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; +import { Store } from '@ngrx/store'; +import { ObjectCacheService } from '../../core/cache/object-cache.service'; +import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; +import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; +import { getMockRequestService } from '../mocks/request.service.mock'; +import { getMockRemoteDataBuildService } from '../mocks/remote-data-build.service.mock'; +import { SearchDataImpl } from '../../core/data/base/search-data'; +import { NotificationsServiceStub } from '../testing/notifications-service.stub'; +import { HALEndpointServiceStub } from '../testing/hal-endpoint-service.stub'; +import { createPaginatedList } from '../testing/utils.test'; + + +describe('SubscriptionsDataService', () => { + + + let service: SubscriptionsDataService; + let searchData: SearchDataImpl; + + let comparator: DSOChangeAnalyzer; + let http: HttpClient; + let notificationsService: NotificationsService; + let requestService: RequestService; + let rdbService: RemoteDataBuildService; + let store: Store; + let objectCache: ObjectCacheService; + let halService: HALEndpointService; + let nameService: DSONameService; + + function initService() { + comparator = {} as any; + http = {} as HttpClient; + notificationsService = new NotificationsServiceStub() as any; + requestService = getMockRequestService(); + rdbService = getMockRemoteDataBuildService(); + halService = new HALEndpointServiceStub('linkPath') as any; + service = new SubscriptionsDataService(comparator, http, notificationsService, requestService, rdbService, store, objectCache, halService, nameService); + spyOn((service as any).deleteData, 'delete').and.returnValue(createNoContentRemoteDataObject$()); + } + + describe('createSubscription', () => { + + beforeEach(() => { + initService(); + }); + + it('should create the subscription', () => { + const id = 'test-id'; + const ePerson = 'test-ePerson'; + const subscription = new Subscription(); + service.createSubscription(subscription, ePerson, id).subscribe((res) => { + expect(requestService.generateRequestId).toHaveBeenCalled(); + expect(res.hasCompleted).toBeTrue(); + }); + }); + + }); + + describe('deleteSubscription', () => { + + beforeEach(() => { + initService(); + }); + + it('should delete the subscription', () => { + const id = 'test-id'; + service.deleteSubscription(id).subscribe((res) => { + expect((service as any).deleteData.delete).toHaveBeenCalledWith(id); + expect(res.hasCompleted).toBeTrue(); + }); + }); + + }); + + describe('updateSubscription', () => { + + beforeEach(() => { + initService(); + }); + + it('should update the subscription', () => { + const id = 'test-id'; + const ePerson = 'test-ePerson'; + const subscription = new Subscription(); + service.updateSubscription(subscription, ePerson, id).subscribe((res) => { + expect(requestService.generateRequestId).toHaveBeenCalled(); + expect(res.hasCompleted).toBeTrue(); + }); + }); + + }); + + describe('findByEPerson', () => { + + beforeEach(() => { + initService(); + }); + + it('should update the subscription', () => { + const ePersonId = 'test-ePersonId'; + spyOn(service, 'findListByHref').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList())); + service.findByEPerson(ePersonId).subscribe((res) => { + expect(service.findListByHref).toHaveBeenCalled(); + expect(res.hasCompleted).toBeTrue(); + }); + }); + + }); + + describe('getSubscriptionsByPersonDSO', () => { + + beforeEach(() => { + initService(); + }); + + it('should get the subscriptions', () => { + const id = 'test-id'; + const ePersonId = 'test-ePersonId'; + service.getSubscriptionsByPersonDSO(ePersonId, id).subscribe(() => { + expect(searchData.searchBy).toHaveBeenCalled(); + }); + }); + + }); + +}); From b4acb5cbedbfcedc2f3c806600840e43edebc747 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 8 Feb 2023 15:07:02 +0100 Subject: [PATCH 492/758] Fixed text (without HTML tags) not being passed to child components --- src/app/shared/theme-support/themed.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts index d75568e0ba2..3b69be0916f 100644 --- a/src/app/shared/theme-support/themed.component.ts +++ b/src/app/shared/theme-support/themed.component.ts @@ -91,7 +91,7 @@ export abstract class ThemedComponent implements OnInit, OnDestroy, OnChanges ).subscribe((constructor: GenericConstructor) => { const factory = this.resolver.resolveComponentFactory(constructor); - this.compRef = this.vcr.createComponent(factory, undefined, undefined, [this.themedElementContent.nativeElement.children]); + this.compRef = this.vcr.createComponent(factory, undefined, undefined, [this.themedElementContent.nativeElement.childNodes]); this.connectInputsAndOutputs(); this.cdr.markForCheck(); this.themedElementContent.nativeElement.remove(); From 04d0621b4ab68e70885bba39f2b9b7d40f3ff93f Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Wed, 8 Feb 2023 15:21:07 +0100 Subject: [PATCH 493/758] Fixed default @Input() values not working for themed components --- src/app/shared/theme-support/themed.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts index 3b69be0916f..b2a5d83c995 100644 --- a/src/app/shared/theme-support/themed.component.ts +++ b/src/app/shared/theme-support/themed.component.ts @@ -110,7 +110,7 @@ export abstract class ThemedComponent implements OnInit, OnDestroy, OnChanges protected connectInputsAndOutputs(): void { if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) { - this.inAndOutputNames.forEach((name: any) => { + this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => { this.compRef.instance[name] = this[name]; }); } From c8e7ac3e8c6e1789de4a856ebe9036b6fee03202 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 8 Feb 2023 18:26:37 +0100 Subject: [PATCH 494/758] [CST-7757] subscription modal tests --- .../subscription-modal.component.spec.ts | 78 +++++++++++++++++-- .../subscription-modal.component.ts | 6 +- 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts index 221f70f77d3..90f2e51e631 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CommonModule } from '@angular/common'; -import { ReactiveFormsModule } from '@angular/forms'; +import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; import { NgbActiveModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; @@ -24,11 +24,11 @@ describe('SubscriptionModalComponent', () => { let de: DebugElement; let subscriptionServiceStub; - const notificationServiceStub = { - notificationWithAnchor() { - return true; - } - }; + + const notificationServiceStub = jasmine.createSpyObj('authService', { + notificationWithAnchor: true, + success: undefined, + }); const emptyPageInfo = Object.assign(new PageInfo(), { 'elementsPerPage': 0, @@ -101,6 +101,72 @@ describe('SubscriptionModalComponent', () => { })); + describe('when submitting subscriptions', () => { + + const testSubscriptionId = 'test-subscription-id'; + const testTypes = ['test1', 'test2']; + const testFrequencies = ['f', 'g']; + + beforeEach(() => { + fixture = TestBed.createComponent(SubscriptionModalComponent); + component = fixture.componentInstance; + component.dso = mockItem; + (component as any).subscriptionDefaultTypes = testTypes; + (component as any).frequencyDefaultValues = testFrequencies; + de = fixture.debugElement; + subscriptionServiceStub.createSubscription.calls.reset(); + subscriptionServiceStub.updateSubscription.calls.reset(); + fixture.detectChanges(); + }); + + it('should edit an existing subscription', () => { + component.subscriptionForm = new FormGroup({}); + for (let t of testTypes) { + const formGroup = new FormGroup({ + subscriptionId: new FormControl(testSubscriptionId), + frequencies: new FormGroup({ + f: new FormControl(false), + g: new FormControl(true), + }) + }); + component.subscriptionForm.addControl(t, formGroup); + component.subscriptionForm.get('test1').markAsDirty(); + component.subscriptionForm.get('test1').markAsTouched(); + } + + fixture.detectChanges(); + component.submit(); + + expect(subscriptionServiceStub.createSubscription).not.toHaveBeenCalled(); + expect(subscriptionServiceStub.updateSubscription).toHaveBeenCalled(); + expect(component.subscriptionForm.controls).toBeTruthy(); + }); + + it('should create a new subscription', () => { + component.subscriptionForm = new FormGroup({}); + for (let t of testTypes) { + const formGroup = new FormGroup({ + subscriptionId: new FormControl(undefined), + frequencies: new FormGroup({ + f: new FormControl(false), + g: new FormControl(true), + }) + }); + component.subscriptionForm.addControl(t, formGroup); + component.subscriptionForm.get('test1').markAsDirty(); + component.subscriptionForm.get('test1').markAsTouched(); + } + + fixture.detectChanges(); + component.submit(); + + expect(subscriptionServiceStub.createSubscription).toHaveBeenCalled(); + expect(subscriptionServiceStub.updateSubscription).not.toHaveBeenCalled(); + expect(component.subscriptionForm.controls).toBeTruthy(); + }); + + }); + describe('when no subscription is given', () => { beforeEach(() => { fixture = TestBed.createComponent(SubscriptionModalComponent); diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index 3d40c6f7e04..5de0426e0ba 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -62,12 +62,12 @@ export class SubscriptionModalComponent implements OnInit { /** * Types of subscription to be shown on select */ - private subscriptionDefaultTypes = ['content']; + subscriptionDefaultTypes = ['content']; /** * Frequencies to be shown as checkboxes */ - private frequencyDefaultValues = ['D', 'W', 'M']; + frequencyDefaultValues = ['D', 'W', 'M']; /** * True if form status has changed and at least one frequency is checked @@ -115,7 +115,7 @@ export class SubscriptionModalComponent implements OnInit { }); } - private initFormByAllSubscriptions(): void { + initFormByAllSubscriptions(): void { this.subscriptionForm = new FormGroup({}); for (let t of this.subscriptionDefaultTypes) { const formGroup = new FormGroup({}); From 325d78dded116680a3cb88e813a5770aada65428 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 8 Feb 2023 19:38:42 +0100 Subject: [PATCH 495/758] [CST-7757] modal fixes --- .../subscription-modal.component.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index e095e094dc6..fbab2513cbf 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -6,7 +6,9 @@

    {{'subscriptions.modal.title' | translate}}

    -

    {{dso.name}} {{dso.type}}

    +

    {{dso.name}} + +

    @@ -14,10 +16,10 @@

    {{'subscriptions.modal.title' | translate}}
    -
    - +
    + + [for]="'checkbox-' + frequency">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency | translate }}
    From 27f541ef8420ffca01256c9de239767c4c74f749 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 8 Feb 2023 19:56:54 +0100 Subject: [PATCH 496/758] [CST-7757] modal fixes --- .../subscription-modal/subscription-modal.component.html | 1 + .../subscription-view/subscription-view.component.html | 7 +++---- .../subscription-view/subscription-view.component.spec.ts | 2 +- src/assets/i18n/en.json5 | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index fbab2513cbf..5cbfb138d43 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -27,6 +27,7 @@

    {{'subscriptions.modal.title' | translate}}
    +

    {{'subscriptions.modal.delete-info' | translate}}

    		 + +

    {{dso.name}}

    +    		 {{subscription.subscriptionType}} diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts index 00f0b8d22ce..aa40f2bf438 100644 --- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts +++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts @@ -94,7 +94,7 @@ describe('SubscriptionViewComponent', () => { }); it('should have dso object info', () => { - expect(de.query(By.css('.dso-info > span'))).toBeTruthy(); + expect(de.query(By.css('.dso-info > ds-type-badge'))).toBeTruthy(); expect(de.query(By.css('.dso-info > p > a'))).toBeTruthy(); }); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index be9ffc99ed6..ba0200a892f 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -4589,6 +4589,8 @@ "subscriptions.modal.close": "Close", + "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile", + "subscriptions.modal.new-subscription-form.type.content": "Content", "subscriptions.modal.new-subscription-form.frequency.D": "Daily", @@ -4619,8 +4621,7 @@ "subscriptions.table.action": "Action", - "subscriptions.table.empty.message": "You have not subscribed any notification yet. To subscribe notification about an object please use the contextual menu in the object detail view", - + "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.", "thumbnail.default.alt": "Thumbnail Image", From 0755e300e803247931b9b7fc2083edd94c746677 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 9 Feb 2023 11:41:14 +0100 Subject: [PATCH 497/758] [CST-7217] Add margins to better align badge --- .../search-facet-option/search-facet-option.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html index 4e03767b9f9..9a4bffadb8d 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html @@ -5,7 +5,7 @@ From 516b91f520f273bcfee62be6cd095bd27c6d3060 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 9 Feb 2023 12:06:15 +0100 Subject: [PATCH 498/758] [CST-7757] Hide delete info for new subscriptions and fix issue with unavailable items --- .../subscription-modal.component.html | 2 +- .../subscription-modal.component.ts | 4 ++ .../subscription-view.component.html | 42 ++++++++++++------- src/assets/i18n/en.json5 | 8 ++++ 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html index 5cbfb138d43..0e723a8140f 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html @@ -27,7 +27,7 @@

    {{'subscriptions.modal.title' | translate}}

    -

    {{'subscriptions.modal.delete-info' | translate}}

    +

    {{'subscriptions.modal.delete-info' | translate}}

    		 - {{subscription.subscriptionType}} + + +

    {{dso.name}}

    +     + +

    {{ 'subscriptions.table.not-available' | translate }}

    +

    {{ 'subscriptions.table.not-available-message' | translate }}

    +     +    		 + {{subscription.subscriptionType}} - + - {{ 'subscriptions.frequency.'+ parameterList.value | translate}}, + {{ 'subscriptions.frequency.' + parameterList.value | translate}}, - + -
    - - -
    +
    + + +
    - - - - - - - - - - - - - - -
    {{'subscriptions.table.subscription_type' | translate}}{{'subscriptions.table.subscription_frequency' | translate}}{{'subscriptions.table.action' | translate}}
    {{subscription.subscriptionType}} - - {{ 'subscriptions.frequency.'+ parameterList.value | translate}}, - - - - -
    -
    -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    -
    - {{ 'context-menu.actions.subscription.frequency.required' | translate }} -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - - - -
    \ No newline at end of file diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss deleted file mode 100644 index 62dd1105e70..00000000000 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.scss +++ /dev/null @@ -1,12 +0,0 @@ -.alert{ - font-weight: bold; - color:red; -} - -// .modal-footer{ -// justify-content: space-between; -// } - -.add-button{ - padding: 0px 15px 15px 15px; -} \ No newline at end of file diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts deleted file mode 100644 index ad92d572361..00000000000 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.spec.ts +++ /dev/null @@ -1,221 +0,0 @@ -import { ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing'; - -// Import modules -import { CommonModule } from '@angular/common'; -import { ReactiveFormsModule } from '@angular/forms'; -import { By } from '@angular/platform-browser'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { DebugElement } from '@angular/core'; - -import { SubscriptionModalComponent } from './subscription-modal.component'; - -// Import mocks -import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; -import { findByEPersonAndDsoRes, findByEPersonAndDsoResEmpty } from '../../../testing/subscriptions-data.mock'; -import { ItemInfo } from '../../../testing/relationships-mocks'; - -// Import utils -import { NotificationsService } from '../../../notifications/notifications.service'; -import { SubscriptionService } from '../../subscription.service'; - -import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; - - -describe('SubscriptionModalComponent', () => { - let component: SubscriptionModalComponent; - let fixture: ComponentFixture; - let de: DebugElement; - - let subscriptionServiceStub; - const notificationServiceStub = { - notificationWithAnchor() { - return true; - } - }; - - - describe('when empty subscriptions', () => { - - beforeEach(async () => { - - subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - getSubscriptionByPersonDSO: createSuccessfulRemoteDataObject$(findByEPersonAndDsoResEmpty), - createSubscription: createSuccessfulRemoteDataObject$({}), - updateSubscription: createSuccessfulRemoteDataObject$({}), - }); - - await TestBed.configureTestingModule({ - imports: [ - CommonModule, - NgbModule, - ReactiveFormsModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [SubscriptionModalComponent], - providers: [ - { provide: ComponentFixtureAutoDetect, useValue: true }, - { provide: NotificationsService, useValue: notificationServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, - ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(SubscriptionModalComponent); - component = fixture.componentInstance; - component.epersonId = 'testid123'; - component.dso = ItemInfo.payload; - de = fixture.debugElement; - - await fixture.whenStable(); - await fixture.whenRenderingDone(); - - fixture.detectChanges(); - - }); - - it('should be no table', () => { - expect(de.query(By.css('table'))).toBeNull(); - }); - - it('should show empty form', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should show form with empty checkboxes', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - }); - - - describe('when we have subscriptions', () => { - - beforeEach(async () => { - - subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - getSubscriptionByPersonDSO: createSuccessfulRemoteDataObject$(findByEPersonAndDsoRes), - createSubscription: createSuccessfulRemoteDataObject$({}), - updateSubscription: createSuccessfulRemoteDataObject$({}), - }); - - await TestBed.configureTestingModule({ - imports: [ - CommonModule, - NgbModule, - ReactiveFormsModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [SubscriptionModalComponent], - providers: [ - { provide: ComponentFixtureAutoDetect, useValue: true }, - { provide: NotificationsService, useValue: notificationServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, - ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(SubscriptionModalComponent); - component = fixture.componentInstance; - component.epersonId = 'testid123'; - component.dso = ItemInfo.payload; - de = fixture.debugElement; - await fixture.whenStable(); - await fixture.whenRenderingDone(); - - fixture.detectChanges(); - - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should render 2 subscriptions', () => { - expect(de.queryAll(By.css('tbody > tr')).length).toEqual(2); - }); - - it('should show no form', () => { - expect(de.query(By.css('form'))).toBeNull(); - }); - - it('should have 2 edit buttons', () => { - expect(de.queryAll(By.css('.btn-outline-primary')).length).toEqual(2); - }); - - it('should have 2 delete buttons', () => { - expect(de.queryAll(By.css('.btn-outline-danger')).length).toEqual(2); - }); - - describe('When creating new subscription', () => { - - beforeEach(() => { - // add button click - const button = de.query(By.css('.btn-success')).nativeElement; - button.click(); - }); - - - it('should show form when add button click event', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should show form with empty checkboxes', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - it('should call create request when submit click event', () => { - const checkbox = de.query(By.css('#checkbox-2')).nativeElement; - checkbox.click(); - - const button = de.queryAll(By.css('.btn-success'))[1].nativeElement; - button.click(); - expect(subscriptionServiceStub.createSubscription).toHaveBeenCalled(); - }); - - }); - - - describe('When updating subscription', () => { - - beforeEach(() => { - // edit button click - const button = de.query(By.css('.btn-outline-primary')).nativeElement; - button.click(); - }); - - it('should show form when edit button click event', () => { - expect(de.query(By.css('form'))).toBeTruthy(); - }); - - it('should show form with empty checkboxes', () => { - expect(de.query(By.css('#checkbox-0'))?.nativeElement?.checked).toEqual(false); - expect(de.query(By.css('#checkbox-1'))?.nativeElement?.checked).toEqual(true); - expect(de.query(By.css('#checkbox-2'))?.nativeElement?.checked).toEqual(false); - }); - - it('should call update request when submit click event', () => { - const button = de.queryAll(By.css('.btn-success'))[1].nativeElement; - button.click(); - expect(subscriptionServiceStub.updateSubscription).toHaveBeenCalled(); - }); - - }); - - }); - -}); diff --git a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts deleted file mode 100644 index d01b2946d7f..00000000000 --- a/src/app/shared/subscriptions/components/subscription-modal/subscription-modal.component.ts +++ /dev/null @@ -1,355 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; - -import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; - -import { Subscription } from '../../models/subscription.model'; - -import { BehaviorSubject, Observable } from 'rxjs'; - -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; - -import { SubscriptionService } from '../../subscription.service'; -import { NotificationsService } from '../../../notifications/notifications.service'; -import { NotificationType } from '../../../notifications/models/notification-type'; -import { NotificationOptions } from '../../../notifications/models/notification-options.model'; - -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; - -import { PaginatedList } from '../../../../core/data/paginated-list.model'; - -import { hasValue } from '../../../empty.util'; -import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; - -import { filter, switchMap, take } from 'rxjs/operators'; -import { NoContent } from '../../../../core/shared/NoContent.model'; -import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators'; - -@Component({ - selector: 'ds-subscription-modal', - templateUrl: './subscription-modal.component.html', - styleUrls: ['./subscription-modal.component.scss'] -}) -export class SubscriptionModalComponent implements OnInit { - - /** - * DSpaceObject of which to get the subscriptions - */ - @Input() dso: DSpaceObject; - - /** - * EPerson of which to get the subscriptions - */ - @Input() epersonId: string; - - - /** - * Close event emit to close modal - */ - @Output() close: EventEmitter = new EventEmitter(); - - /** - * List of subscription for the dso object and eperson relation - */ - subscriptions: Subscription[]; - - /** - * A boolean representing if a request operation is pending - * @type {BehaviorSubject} - */ - public processing$ = new BehaviorSubject(false); - - /** - * Reactive form group that will be used to add subscriptions - */ - subscriptionForm: FormGroup; - - /** - * Used to show validation errors when user submits - */ - submitted = false; - - /** - * Reference to NgbModal - */ - public modalRef: NgbModalRef; - - /** - * Types of subscription to be shown on select - */ - types = [ - { name: 'Content', value: 'content' }, - { name: 'Statistics', value: 'statistics' }, - ]; - - /** - * Frequencies to be shown as checkboxes - */ - frequencies = [ - { name: 'daily', value: 'D' }, - { name: 'monthly', value: 'M' }, - { name: 'weekly', value: 'W' }, - ]; - - constructor(private formGroup: FormBuilder, - private modalService: NgbModal, - private notificationsService: NotificationsService, - private subscriptionService: SubscriptionService - ) { - } - - /** - * Function to get subscriptionParameterList form array cleaner - */ - get subscriptionParameterList(): FormArray { - return this.subscriptionForm.get('subscriptionParameterList') as FormArray; - } - - /** - * When component starts initialize starting functionality - */ - ngOnInit(): void { - this.initSubscription(); - } - - /** - * Get subscription for the eperson & dso object relation - * If no subscription start with an empty form - */ - initSubscription(): void { - this.subscriptions = []; - this.processing$.next(true); - this.getSubscription(this.epersonId, this.dso?.uuid).subscribe((subscriptionsRes: PaginatedList) => { - - if (subscriptionsRes.pageInfo.totalElements > 0) { - this.subscriptions = subscriptionsRes.page; - } else { - this.initEmptyForm('content'); - } - - this.processing$.next(false); - }, err => { - this.processing$.next(false); - }); - } - - /** - * Function to get subscriptions based on the eperson & dso - * - * @param epersonId Eperson that is logged in - * @param uuid DSpaceObject id that subscriptions are related to - */ - getSubscription(epersonId: string, uuid: string): Observable> { - return this.subscriptionService.getSubscriptionByPersonDSO(epersonId, uuid).pipe( - getFirstCompletedRemoteData(), - getRemoteDataPayload(), - ); - } - - /** - * Starts a new empty form - * - * @param subscriptionType type of subscription to start the form - */ - initEmptyForm(subscriptionType): void { - this.subscriptionForm = this.formGroup.group({ - type: subscriptionType, - subscriptionParameterList: this.formGroup.array([], Validators.required) - }); - } - - /** - * When add button is clicked, if there is no subscription being added it will add a new form - */ - addNewSubscription(): void { - if (!this.subscriptionForm) { - this.initEmptyForm('content'); - } - } - - /** - * Starts a form with information filled by the subscription - * - * @param subscription subscription to start the form - */ - editForm(subscription): void { - this.subscriptionForm = this.formGroup.group({ - id: subscription.id, - type: subscription.subscriptionType, - subscriptionParameterList: this.formGroup.array([], Validators.required) - }); - - subscription.subscriptionParameterList.forEach((parameter) => { - this.addFrequency(parameter.value); - }); - } - - - /** - * When add button is clicked, if there is no subscription being added it will add a new form - */ - editSubscription(subscription: Subscription): void { - if (!this.subscriptionForm) { - this.editForm(subscription); - } - } - - /** - * When frequency checkboxes are being changed we add/remove frequencies from subscriptionParameterList - */ - selectCheckbox(event, frequency): void { - if (event.target.checked) { - this.addFrequency(frequency); - } else { - this.removeFrequency(frequency); - } - } - - /** - * When subscription type select box is changed set new value of type - * - * @param event Event of changing selectbox - */ - changed(event): void { - this.subscriptionForm.patchValue({ 'type': event.target.value }); - } - - /** - * Add a new frequency to the subscriptionParameterList form array - */ - addFrequency(frequency): void { - this.subscriptionParameterList.push( - this.formGroup.group({ - name: 'frequency', - value: frequency - }) - ); - } - - /** - * Remove frequency from subscriptionParameterList form array - */ - removeFrequency(frequency): void { - const index = this.subscriptionParameterList.controls.findIndex(el => el.value.value === frequency); - this.subscriptionParameterList.removeAt(index); - } - - /** - * When user saves it will check if form is valid and send request to create or update a subscription - */ - submit(): void { - this.processing$.next(true); - this.submitted = true; - if (this.subscriptionForm.valid) { - if (this.subscriptionForm.value.id) { - this.updateForm(this.subscriptionForm.value); - } else { - this.createForm(this.subscriptionForm.value); - } - } - } - - /** - * Sends request to create a new subscription, refreshes the table of subscriptions and notifies about summary page - */ - createForm(body): void { - this.subscriptionService.createSubscription(body, this.epersonId, this.dso.uuid).subscribe((res) => { - this.refresh(); - this.notify(); - this.processing$.next(false); - }, - err => { - this.processing$.next(false); - } - ); - } - - /** - * Sends request to update a subscription, refreshes the table of subscriptions and notifies about summary page - */ - updateForm(body) { - this.subscriptionService.updateSubscription(body, this.epersonId, this.dso.uuid).subscribe((res) => { - this.refresh(); - this.notify(); - this.processing$.next(false); - }, - err => { - this.processing$.next(false); - } - ); - } - - - /** - * Sends the request to delete the subscription with a specific id - */ - deleteSubscription(id): Observable { - return this.subscriptionService.deleteSubscription(id); - } - - /** - * Creates a notification with the link to the subscription summary page - */ - notify(): void { - const options = new NotificationOptions(); - options.timeOut = 0; - const link = '/subscriptions'; - this.notificationsService.notificationWithAnchor( - NotificationType.Success, - options, - link, - 'context-menu.actions.subscription.notification.here-text', - 'context-menu.actions.subscription.notification.content', - 'here' - ); - } - - /** - * When an action is done it will reinitialize the table and remove subscription form - */ - refresh(): void { - this.initSubscription(); - this.subscriptionForm = null; - this.submitted = false; - } - - /** - * When close button is pressed emit function to close modal - */ - c(text): void { - this.close.emit(text); - } - - /** - * Returns if a specific frequency exists in the subscriptionParameterList - */ - getIsChecked(frequency): boolean { - return !!this.subscriptionForm.get('subscriptionParameterList').value.find(el => el.value === frequency.value); - } - - /** - * Deletes Subscription, show notification on success/failure & updates list - * - * @param subscription Subscription to be deleted - */ - deleteSubscriptionPopup(subscription: Subscription): void { - if (hasValue(subscription.id)) { - const modalRef = this.modalService.open(ConfirmationModalComponent); - modalRef.componentInstance.dso = this.dso; - modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-subscription.header'; - modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-subscription.info'; - modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-subscription.cancel'; - modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-subscription.confirm'; - modalRef.componentInstance.brandColor = 'danger'; - modalRef.componentInstance.confirmIcon = 'fas fa-trash'; - - modalRef.componentInstance.response.pipe( - take(1), - filter((confirm: boolean) => confirm), - switchMap(() => this.deleteSubscription(subscription.id)) - ).subscribe(() => { - this.refresh(); - }); - - } - } -} diff --git a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.html deleted file mode 100644 index 1ff192b6387..00000000000 --- a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.html +++ /dev/null @@ -1,29 +0,0 @@ - - {{dso.type}} -

    {{dso.name}}

    - - - {{subscription.subscriptionType}} - - - - - {{ 'subscriptions.frequency.'+ parameterList.value | translate}}, - - - - -
    - - -
    - - - - - - diff --git a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.scss b/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.spec.ts deleted file mode 100644 index 12d92dc8922..00000000000 --- a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.spec.ts +++ /dev/null @@ -1,130 +0,0 @@ -import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing'; -import { ComponentFixtureAutoDetect } from '@angular/core/testing'; -import { cold, getTestScheduler, hot } from 'jasmine-marbles'; - -// Import modules -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { BrowserModule, By } from '@angular/platform-browser'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; -import { SharedModule } from '../../../shared.module'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; -import { DebugElement,ChangeDetectionStrategy } from '@angular/core'; - -import { SubscriptionViewComponent } from './subscription-view.component'; - -// Import mocks -import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; -import { MockActivatedRoute } from '../../../mocks/active-router.mock'; -import { ItemInfo } from '../../../testing/relationships-mocks'; -import { findByEPersonAndDsoRes, findByEPersonAndDsoResEmpty, subscription } from '../../../testing/subscriptions-data.mock'; - -// Import utils -import { NotificationsService } from '../../../notifications/notifications.service'; -import { NotificationsServiceStub } from '../../../testing/notifications-service.stub'; -import { SubscriptionService } from '../../subscription.service'; -import { Subscription } from '../../models/subscription.model'; - -import { BehaviorSubject, Observable, of as observableOf } from 'rxjs'; - -import { - createNoContentRemoteDataObject$, - createSuccessfulRemoteDataObject, - createSuccessfulRemoteDataObject$ -} from '../../../remote-data.utils'; - - - -describe('SubscriptionViewComponent', () => { - let component: SubscriptionViewComponent; - let fixture: ComponentFixture; - let de: DebugElement; - let modalService; - - const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionService', { - getSubscriptionByPersonDSO: observableOf(findByEPersonAndDsoResEmpty), - deleteSubscription: createSuccessfulRemoteDataObject$({}), - updateSubscription: createSuccessfulRemoteDataObject$({}), - }); - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ - CommonModule, - NgbModule, - ReactiveFormsModule, - BrowserModule, - RouterTestingModule, - SharedModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - declarations: [ SubscriptionViewComponent ], - providers: [ - { provide: ComponentFixtureAutoDetect, useValue: true }, - { provide: NotificationsService, useValue: NotificationsServiceStub }, - { provide: SubscriptionService, useValue: subscriptionServiceStub }, - ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(SubscriptionViewComponent); - component = fixture.componentInstance; - component.eperson = 'testid123'; - component.dso = ItemInfo.payload; - component.subscription = Object.assign(new Subscription(), subscription); - de = fixture.debugElement; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should have dso object info', () => { - expect(de.query(By.css('.dso-info > span'))).toBeTruthy(); - expect(de.query(By.css('.dso-info > p > a'))).toBeTruthy(); - }); - - it('should have subscription type info', () => { - expect(de.query(By.css('.subscription-type'))).toBeTruthy(); - }); - - it('should have subscription paramenter info', () => { - expect(de.query(By.css('.subscription-parmenters > span'))).toBeTruthy(); - }); - - it('should have subscription action info', () => { - expect(de.query(By.css('.btn-outline-primary'))).toBeTruthy(); - expect(de.query(By.css('.btn-outline-danger'))).toBeTruthy(); - }); - - it('should open modal when clicked edit button', () => { - modalService = (component as any).modalService; - const modalSpy = spyOn(modalService, 'open'); - - const editBtn = de.query(By.css('.btn-outline-primary')).nativeElement; - editBtn.click(); - - expect(modalService.open).toHaveBeenCalled(); - }); - - it('should call delete function when clicked delete button', () => { - const deleteSpy = spyOn(component, 'deleteSubscriptionPopup'); - - const deleteBtn = de.query(By.css('.btn-outline-danger')).nativeElement; - deleteBtn.click(); - - expect(deleteSpy).toHaveBeenCalled(); - }); - -}); diff --git a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.ts deleted file mode 100644 index cb831534b6f..00000000000 --- a/src/app/shared/subscriptions/components/subscription-view/subscription-view.component.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { Subscription } from '../../models/subscription.model'; -import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; - -import { take } from 'rxjs/operators'; - -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { hasValue } from '../../../empty.util'; -import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component'; -import { SubscriptionService } from '../../subscription.service'; - -@Component({ - // eslint-disable-next-line @angular-eslint/component-selector - selector: '[ds-subscription-view]', - templateUrl: './subscription-view.component.html', - styleUrls: ['./subscription-view.component.scss'] -}) -export class SubscriptionViewComponent { - - /** - * Subscription to be rendered - */ - @Input() subscription: Subscription; - - /** - * DSpaceObject of the subscription - */ - @Input() dso: DSpaceObject; - - /** - * EPerson of the subscription - */ - @Input() eperson: string; - - /** - * When an action is made emit a reload event - */ - @Output() reload = new EventEmitter(); - - /** - * Reference to NgbModal - */ - public modalRef: NgbModalRef; - - constructor( - private modalService: NgbModal, - private subscriptionService: SubscriptionService, - ) { } - - - /** - * Open modal - * - * @param content - */ - public openSubscription(content: any) { - this.modalRef = this.modalService.open(content); - } - - /** - * Return the prefix of the route to the dso object page ( e.g. "items") - */ - getPageRoutePrefix(): string { - let routePrefix; - switch (this.dso.type.toString()) { - case 'community': - routePrefix = '/communities'; - break; - case 'collection': - routePrefix = '/collections'; - break; - case 'item': - routePrefix = '/items'; - break; - } - return routePrefix; - } - - /** - * Deletes Subscription, show notification on success/failure & updates list - * @param subscription Subscription to be deleted - */ - deleteSubscriptionPopup(subscription: Subscription) { - if (hasValue(subscription.id)) { - const modalRef = this.modalService.open(ConfirmationModalComponent); - modalRef.componentInstance.dso = this.dso; - modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-subscription.header'; - modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-subscription.info'; - modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-subscription.cancel'; - modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-subscription.confirm'; - modalRef.componentInstance.brandColor = 'danger'; - modalRef.componentInstance.confirmIcon = 'fas fa-trash'; - modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => { - if (confirm) { - this.subscriptionService.deleteSubscription(subscription.id).subscribe( (res) => { - this.reload.emit(); - }); - } - }); - } - } -} diff --git a/src/app/shared/subscriptions/subscription.service.ts b/src/app/shared/subscriptions/subscription.service.ts deleted file mode 100644 index 2129155f0e8..00000000000 --- a/src/app/shared/subscriptions/subscription.service.ts +++ /dev/null @@ -1,171 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; - -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators'; - - -import { NotificationsService } from '../notifications/notifications.service'; -import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service'; -import { RequestParam } from '../../core/cache/models/request-param.model'; -import { ObjectCacheService } from '../../core/cache/object-cache.service'; -import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; -import { RemoteData } from '../../core/data/remote-data'; -import { CreateRequest, PutRequest } from '../../core/data/request.models'; -import { FindListOptions } from '../../core/data/find-list-options.model'; -import { RestRequest } from '../../core/data/rest-request.model'; - -import { RequestService } from '../../core/data/request.service'; -import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; -import { Subscription } from './models/subscription.model'; -import { dataService } from '../../core/data/base/data-service.decorator'; -import { SUBSCRIPTION } from './models/subscription.resource-type'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { NoContent } from '../../core/shared/NoContent.model'; -import { isNotEmpty, isNotEmptyOperator } from '../empty.util'; - -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { sendRequest } from 'src/app/core/shared/request.operators'; -import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service'; -import { DeleteDataImpl } from '../../core/data/base/delete-data'; -import { SearchDataImpl } from '../../core/data/base/search-data'; -import { FindAllData } from '../../core/data/base/find-all-data'; -import { followLink } from '../utils/follow-link-config.model'; - -/** - * Provides methods to retrieve subscription resources from the REST API related CRUD actions. - */ -@Injectable({ - providedIn: 'root' -}) -@dataService(SUBSCRIPTION) -export class SubscriptionService extends IdentifiableDataService { - protected findByEpersonLinkPath = 'findByEPerson'; - - private deleteData: DeleteDataImpl; - private findAllData: FindAllData; - private searchData: SearchDataImpl; - - constructor( - protected comparator: DSOChangeAnalyzer, - protected http: HttpClient, - protected notificationsService: NotificationsService, - protected requestService: RequestService, - protected rdbService: RemoteDataBuildService, - protected store: Store, - protected objectCache: ObjectCacheService, - protected halService: HALEndpointService, - protected nameService: DSONameService, - ) { - super('subscriptions', requestService, rdbService, objectCache, halService); - - this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive); - this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint); - } - /** - * Get subscriptions for a given item or community or collection & eperson. - * - * @param eperson The eperson to search for - * @param uuid The uuid of the dsobjcet to search for - */ - getSubscriptionByPersonDSO(eperson: string, uuid: string): Observable>> { - - const optionsWithObject = Object.assign(new FindListOptions(), { - searchParams: [ - new RequestParam('dspace_object_id', uuid), - new RequestParam('eperson_id', eperson) - ] - }); - - return this.searchData.searchBy('findByEPersonAndDso', optionsWithObject, false, true); - } - - /** - * Create a subscription for a given item or community or collection. - * - * @param subscription The subscription to create - * @param eperson The eperson to create for - * @param uuid The uuid of the dsobjcet to create for - */ - createSubscription(subscription,eperson: string, uuid: string): Observable> { - - return this.halService.getEndpoint(this.linkPath).pipe( - isNotEmptyOperator(), - take(1), - map((endpointUrl: string) => `${endpointUrl}?dspace_object_id=${uuid}&eperson_id=${eperson}`), - map((endpointURL: string) => new CreateRequest(this.requestService.generateRequestId(), endpointURL, JSON.stringify(subscription))), - sendRequest(this.requestService), - switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)), - getFirstCompletedRemoteData(), - ) as Observable>; - } - - /** - * Update a subscription for a given item or community or collection. - * - * @param subscription The subscription to update - * @param eperson The eperson to update for - * @param uuid The uuid of the dsobjcet to update for - */ - updateSubscription(subscription,eperson: string, uuid: string) { - - return this.halService.getEndpoint(this.linkPath).pipe( - isNotEmptyOperator(), - take(1), - map((endpointUrl: string) => `${endpointUrl}/${subscription.id}?dspace_object_id=${uuid}&eperson_id=${eperson}`), - map((endpointURL: string) => new PutRequest(this.requestService.generateRequestId(), endpointURL, JSON.stringify(subscription))), - sendRequest(this.requestService), - switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)), - getFirstCompletedRemoteData(), - ) as Observable>; - } - - - /** - * Deletes the subscription with a give id - * - * @param id the id of Subscription to delete - */ - deleteSubscription( id: string ): Observable> { - return this.halService.getEndpoint(this.linkPath).pipe( - filter((href: string) => isNotEmpty(href)), - distinctUntilChanged(), - switchMap((endpointUrl) => this.deleteData.delete(id)), - getFirstCompletedRemoteData(), - ); - } - - /** - * Retrieves the list of subscription with {@link dSpaceObject} and {@link ePerson} - * - * @param options options for the find all request - */ - findAllSubscriptions(options?): Observable>> { - return this.findAllData.findAll(options, true, true, followLink('dSpaceObject'), followLink('ePerson')); - } - - - /** - * Retrieves the list of subscription with {@link dSpaceObject} and {@link ePerson} - * - * @param epersonId The eperson id - * @param options The options for the find all request - */ - findByEPerson(epersonId: string, options?: FindListOptions): Observable>> { - const optionsWithObject = Object.assign(new FindListOptions(), options, { - searchParams: [ - new RequestParam('id', epersonId) - ] - }); - - return this.getEndpoint().pipe( - map(href => `${href}/search/${this.findByEpersonLinkPath}`), - switchMap(href => this.findListByHref(href, optionsWithObject, true, true, followLink('dSpaceObject'), followLink('ePerson'))) - ); - - - } - -} From 39caa96e8c537cb925c9de922cee765402e0396d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 15:45:49 +0200 Subject: [PATCH 560/758] [DSC-1070] Fix errors in test classes --- .../subscription-menu.component.spec.ts | 14 -------------- .../subscription/subscription-menu.component.ts | 8 +------- .../dynamic-relation-group-modal.component.spec.ts | 2 +- .../authority-confidence-state.directive.spec.ts | 8 ++++---- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/app/shared/context-menu/subscription/subscription-menu.component.spec.ts b/src/app/shared/context-menu/subscription/subscription-menu.component.spec.ts index 2064fa396e4..751c108a5fa 100644 --- a/src/app/shared/context-menu/subscription/subscription-menu.component.spec.ts +++ b/src/app/shared/context-menu/subscription/subscription-menu.component.spec.ts @@ -11,8 +11,6 @@ import { SubscriptionMenuComponent } from './subscription-menu.component'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { Item } from '../../../core/shared/item.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { AuthService } from '../../../core/auth/auth.service'; -import { EPersonMock } from '../../testing/eperson.mock'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; describe('SubscriptionMenuComponent', () => { @@ -22,7 +20,6 @@ describe('SubscriptionMenuComponent', () => { let dso: DSpaceObject; let modalService; - let authServiceStub: any; let authorizationServiceStub: any; const ngbModal = jasmine.createSpyObj('modal', { @@ -37,11 +34,6 @@ describe('SubscriptionMenuComponent', () => { } }); - authServiceStub = jasmine.createSpyObj('authorizationService', { - getAuthenticatedUserFromStore: jasmine.createSpy('getAuthenticatedUserFromStore'), - isAuthenticated: jasmine.createSpy('isAuthenticated') - }); - authorizationServiceStub = jasmine.createSpyObj('authorizationService', { isAuthorized: jasmine.createSpy('isAuthorized') }); @@ -50,7 +42,6 @@ describe('SubscriptionMenuComponent', () => { declarations: [SubscriptionMenuComponent], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], providers: [ - { provide: AuthService, useValue: authServiceStub }, { provide: NgbModal, useValue: ngbModal }, { provide: 'contextMenuObjectProvider', useValue: dso }, { provide: 'contextMenuObjectTypeProvider', useValue: DSpaceObjectType.ITEM }, @@ -69,8 +60,6 @@ describe('SubscriptionMenuComponent', () => { describe('when the user is authorized', () => { beforeEach(() => { - authServiceStub.getAuthenticatedUserFromStore.and.returnValue(observableOf(EPersonMock)); - (authServiceStub.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(true)); authorizationServiceStub.isAuthorized.and.returnValue(observableOf(true)); fixture.detectChanges(); }); @@ -78,7 +67,6 @@ describe('SubscriptionMenuComponent', () => { it('should check the authorization of the current user', fakeAsync(() => { flush(); expect(authorizationServiceStub.isAuthorized).toHaveBeenCalled(); - expect(component.epersonId).toBe(EPersonMock.id); })); it('should render a button', () => { @@ -99,8 +87,6 @@ describe('SubscriptionMenuComponent', () => { describe('when the user is not authorized', () => { beforeEach(() => { - authServiceStub.getAuthenticatedUserFromStore.and.returnValue(observableOf(null)); - (authServiceStub.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false)); authorizationServiceStub.isAuthorized.and.returnValue(observableOf(false)); fixture.detectChanges(); }); diff --git a/src/app/shared/context-menu/subscription/subscription-menu.component.ts b/src/app/shared/context-menu/subscription/subscription-menu.component.ts index ede7d649149..29f1404fc59 100644 --- a/src/app/shared/context-menu/subscription/subscription-menu.component.ts +++ b/src/app/shared/context-menu/subscription/subscription-menu.component.ts @@ -2,10 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Observable, of as observableOf } from 'rxjs'; -import { filter, take } from 'rxjs/operators'; -import { AuthService } from '../../../core/auth/auth.service'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ContextMenuEntryComponent } from '../context-menu-entry.component'; @@ -13,7 +10,6 @@ import { rendersContextMenuEntriesForType } from '../context-menu.decorator'; import { ContextMenuEntryType } from '../context-menu-entry-type'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; -import { isNotEmpty } from '../../empty.util'; @Component({ selector: 'ds-subscription-menu', @@ -57,14 +53,12 @@ export class SubscriptionMenuComponent extends ContextMenuEntryComponent impleme * @param {DSpaceObjectType} injectedContextMenuObjectType * @param {AuthorizationDataService} authorizationService * @param {NgbModal} modalService - * @param {AuthService} authService */ constructor( @Inject('contextMenuObjectProvider') public injectedContextMenuObject: DSpaceObject, @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType, protected authorizationService: AuthorizationDataService, - private modalService: NgbModal, - private authService: AuthService + private modalService: NgbModal ) { super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.Subscriptions); } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts index 65d2b4b4fa6..e25d9348d3b 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts @@ -16,7 +16,7 @@ import { FormFieldModel } from '../../../../models/form-field.model'; import { FormBuilderService } from '../../../../form-builder.service'; import { FormService } from '../../../../../form.service'; import { FormComponent } from '../../../../../form.component'; -import { Chips } from '../../../../../../chips/models/chips.model'; +import { Chips } from '../../../../../chips/models/chips.model'; import { FormFieldMetadataValueObject } from '../../../../models/form-field-metadata-value.model'; import { DsDynamicInputModel } from '../../ds-dynamic-input.model'; import { VocabularyService } from '../../../../../../../core/submission/vocabularies/vocabulary.service'; diff --git a/src/app/shared/form/directives/authority-confidence-state.directive.spec.ts b/src/app/shared/form/directives/authority-confidence-state.directive.spec.ts index e7a33a219d7..68e0de72ee5 100644 --- a/src/app/shared/form/directives/authority-confidence-state.directive.spec.ts +++ b/src/app/shared/form/directives/authority-confidence-state.directive.spec.ts @@ -6,10 +6,10 @@ import { v4 as uuidv4 } from 'uuid'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { AuthorityConfidenceStateDirective } from './authority-confidence-state.directive'; -import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; -import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model'; -import { ConfidenceType } from '../../core/shared/confidence-type'; -import { AUTHORITY_GENERATE, AUTHORITY_REFERENCE } from '../../core/shared/metadata.utils'; +import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; +import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model'; +import { ConfidenceType } from '../../../core/shared/confidence-type'; +import { AUTHORITY_GENERATE, AUTHORITY_REFERENCE } from '../../../core/shared/metadata.utils'; describe('AuthorityConfidenceStateDirective', () => { let component: TestComponent; From f950b2fee88f1eec4f3534fac40c30b747755fb2 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 15:51:21 +0200 Subject: [PATCH 561/758] [DSC-1070] Fix item-status.component after merge --- .../item-status/item-status.component.ts | 74 ++++++++++++++----- 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts index 61a24526867..8b7fcab2708 100644 --- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts +++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts @@ -4,15 +4,13 @@ import { Item } from '../../../core/shared/item.model'; import { ActivatedRoute } from '@angular/router'; import { ItemOperation } from '../item-operation/itemOperation.model'; import { distinctUntilChanged, first, map, mergeMap, switchMap, toArray } from 'rxjs/operators'; -import { BehaviorSubject, combineLatest, from, Observable, of, Subscription } from 'rxjs'; +import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs'; import { RemoteData } from '../../../core/data/remote-data'; import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; import { hasValue } from '../../../shared/empty.util'; -import { - getAllSucceededRemoteDataPayload, getFirstSucceededRemoteData, getRemoteDataPayload, -} from '../../../core/shared/operators'; +import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, } from '../../../core/shared/operators'; import { IdentifierDataService } from '../../../core/data/identifier-data.service'; import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model'; import { ConfigurationProperty } from '../../../core/shared/configuration-property.model'; @@ -107,22 +105,16 @@ export class ItemStatusComponent implements OnInit { // Observable for configuration determining whether the Register DOI feature is enabled let registerConfigEnabled$: Observable = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe( - getFirstSucceededRemoteData(), - getRemoteDataPayload(), - map((enabled: ConfigurationProperty) => { - if (enabled !== undefined && enabled.values) { - return true; - } - return false; - }) + getFirstCompletedRemoteData(), + map((enabledRD: RemoteData) => enabledRD.hasSucceeded && enabledRD.payload.values.length > 0) ); - /* - Construct a base list of operations. - The key is used to build messages - i18n example: 'item.edit.tabs.status.buttons..label' - The value is supposed to be a href for the button - */ + /** + * Construct a base list of operations. + * The key is used to build messages + * i18n example: 'item.edit.tabs.status.buttons..label' + * The value is supposed to be a href for the button + */ const operations: ItemOperation[] = []; operations.push(new ItemOperation('authorizations', this.getCurrentUrl(item) + '/authorizations', FeatureID.CanManagePolicies, true)); operations.push(new ItemOperation('mappedCollections', this.getCurrentUrl(item) + '/mapper', FeatureID.CanManageMappings, true)); @@ -140,7 +132,51 @@ export class ItemStatusComponent implements OnInit { operations.push(new ItemOperation('move', this.getCurrentUrl(item) + '/move', FeatureID.CanMove, true)); this.operations$.next(operations); - const ops$ = from(operations).pipe( + /** + * When the identifier data stream changes, determine whether the register DOI button should be shown or not. + * This is based on whether the DOI is in the right state (minted or pending, not already queued for registration + * or registered) and whether the configuration property identifiers.item-status.register-doi is true + */ + const ops$ = this.identifierDataService.getIdentifierDataFor(item).pipe( + getFirstCompletedRemoteData(), + mergeMap((dataRD: RemoteData) => { + if (dataRD.hasSucceeded) { + let identifiers = dataRD.payload.identifiers; + let no_doi = true; + let pending = false; + if (identifiers !== undefined && identifiers !== null) { + identifiers.forEach((identifier: Identifier) => { + if (hasValue(identifier) && identifier.identifierType === 'doi') { + // The item has some kind of DOI + no_doi = false; + if (identifier.identifierStatus === 'PENDING' || identifier.identifierStatus === 'MINTED' + || identifier.identifierStatus == null) { + // The item's DOI is pending, minted or null. + // It isn't registered, reserved, queued for registration or reservation or update, deleted + // or queued for deletion. + pending = true; + } + } + }); + } + // If there is no DOI, or a pending/minted/null DOI, and the config is enabled, return true + return registerConfigEnabled$.pipe( + map((enabled: boolean) => { + return enabled && (pending || no_doi); + } + )); + } else { + return of(false); + } + }), + // Switch map pushes the register DOI operation onto a copy of the base array then returns to the pipe + switchMap((showDoi: boolean) => { + let ops = [...operations]; + if (showDoi) { + ops.push(new ItemOperation('register-doi', this.getCurrentUrl(item) + '/register-doi', FeatureID.CanRegisterDOI, true)); + } + return ops; + }), mergeMap((operation) => { if (hasValue(operation.featureID)) { return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe( From 7e593a2388aa71210aaad9ca41621cb2ddad71ce Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 18:38:26 +0200 Subject: [PATCH 562/758] [DSC-1070] Fix unit tests --- .../my-dspace-configuration.service.spec.ts | 4 +- .../item-version-menu.component.spec.ts | 62 +++++++++++-------- .../item-version-menu.component.ts | 7 +-- .../list/dynamic-list-checkbox-group.model.ts | 8 +-- ...arch-result-grid-element.component.spec.ts | 6 +- 5 files changed, 47 insertions(+), 40 deletions(-) diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts index a6cd9f5436d..55d6e234c08 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts @@ -173,7 +173,7 @@ describe('MyDSpaceConfigurationService', () => { }); }); - describe('when getAvailableConfigurationTypes is called', () => { + fdescribe('when getAvailableConfigurationTypes is called', () => { it('should return properly list when user is submitter', () => { roleService.setSubmitter(true); @@ -230,8 +230,8 @@ describe('MyDSpaceConfigurationService', () => { expect(list$).toBeObservable(cold('(b|)', { b: [ MyDSpaceConfigurationValueType.Workspace, - MyDSpaceConfigurationValueType.SupervisedItems, MyDSpaceConfigurationValueType.OtherWorkspace, + MyDSpaceConfigurationValueType.SupervisedItems, MyDSpaceConfigurationValueType.Workflow ] })); diff --git a/src/app/shared/context-menu/item-version/item-version-menu.component.spec.ts b/src/app/shared/context-menu/item-version/item-version-menu.component.spec.ts index a8519d9108a..6118a5b339d 100644 --- a/src/app/shared/context-menu/item-version/item-version-menu.component.spec.ts +++ b/src/app/shared/context-menu/item-version/item-version-menu.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, fakeAsync, flush, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; @@ -10,25 +10,27 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { Item } from '../../../core/shared/item.model'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; -import { AuthService } from '../../../core/auth/auth.service'; -import { EPersonMock } from '../../testing/eperson.mock'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { ItemVersionMenuComponent } from './item-version-menu.component'; import { SharedModule } from '../../shared.module'; +import { DsoVersioningModalService } from '../../dso-page/dso-versioning-modal-service/dso-versioning-modal.service'; describe('ItemVersionMenuComponent', () => { let component: ItemVersionMenuComponent; let fixture: ComponentFixture; let de: DebugElement; let dso: DSpaceObject; - - let authServiceStub: any; let authorizationServiceStub: any; const ngbModal = jasmine.createSpyObj('modal', { open: jasmine.createSpy('open') }); + const versioningModalService = jasmine.createSpyObj('DsoVersioningModalService', { + isNewVersionButtonDisabled: jasmine.createSpy('isNewVersionButtonDisabled'), + openCreateVersionModal: jasmine.createSpy('openCreateVersionModal') + }); + beforeEach(waitForAsync(() => { dso = Object.assign(new Item(), { id: 'test-item', @@ -37,11 +39,6 @@ describe('ItemVersionMenuComponent', () => { } }); - authServiceStub = jasmine.createSpyObj('authorizationService', { - getAuthenticatedUserFromStore: jasmine.createSpy('getAuthenticatedUserFromStore'), - isAuthenticated: jasmine.createSpy('isAuthenticated') - }); - authorizationServiceStub = jasmine.createSpyObj('authorizationService', { isAuthorized: jasmine.createSpy('isAuthorized') }); @@ -51,11 +48,11 @@ describe('ItemVersionMenuComponent', () => { imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), SharedModule], providers: [ - { provide: AuthService, useValue: authServiceStub }, { provide: NgbModal, useValue: ngbModal }, { provide: 'contextMenuObjectProvider', useValue: dso }, { provide: 'contextMenuObjectTypeProvider', useValue: DSpaceObjectType.ITEM }, - { provide: AuthorizationDataService, useValue: authorizationServiceStub } + { provide: AuthorizationDataService, useValue: authorizationServiceStub }, + { provide: DsoVersioningModalService, useValue: versioningModalService } ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents(); @@ -70,35 +67,46 @@ describe('ItemVersionMenuComponent', () => { describe('when the user is authorized', () => { beforeEach(() => { - authServiceStub.getAuthenticatedUserFromStore.and.returnValue(observableOf(EPersonMock)); - (authServiceStub.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(true)); authorizationServiceStub.isAuthorized.and.returnValue(observableOf(true)); - fixture.detectChanges(); + }); - it('should check the authorization of the current user', fakeAsync(() => { - flush(); - expect(authorizationServiceStub.isAuthorized).toHaveBeenCalled(); - })); + describe('and the button should not be disabled', () => { + beforeEach(() => { + versioningModalService.isNewVersionButtonDisabled.and.returnValue(observableOf(false)); + fixture.detectChanges(); + }); - it('should render a button', () => { - const button = fixture.debugElement.query(By.css('ds-item-version-container')); - expect(button).not.toBeNull(); + it('should render a button', () => { + const button = fixture.debugElement.query(By.css('.dropdown-item')); + expect(button).not.toBeNull(); + }); + }); + + describe('and the button should be disabled', () => { + beforeEach(() => { + versioningModalService.isNewVersionButtonDisabled.and.returnValue(observableOf(true)); + fixture.detectChanges(); + }); + + it('should not render a button', () => { + const button = fixture.debugElement.query(By.css('.dropdown-item')); + expect(button).toBeNull(); + }); }); }); describe('when the user is not authorized', () => { beforeEach(() => { - (authServiceStub.isAuthenticated as jasmine.Spy).and.returnValue(observableOf(false)); + versioningModalService.isNewVersionButtonDisabled.and.returnValue(observableOf(false)); authorizationServiceStub.isAuthorized.and.returnValue(observableOf(false)); fixture.detectChanges(); }); - it('should not render a button', fakeAsync(() => { - const button = fixture.debugElement.query(By.css('ds-item-version-container')); - flush(); + it('should not render a button', () => { + const button = fixture.debugElement.query(By.css('.dropdown-item')); expect(button).toBeNull(); - })); + }); }); }); diff --git a/src/app/shared/context-menu/item-version/item-version-menu.component.ts b/src/app/shared/context-menu/item-version/item-version-menu.component.ts index 35abdab5cdb..8d141f0cf83 100644 --- a/src/app/shared/context-menu/item-version/item-version-menu.component.ts +++ b/src/app/shared/context-menu/item-version/item-version-menu.component.ts @@ -3,7 +3,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { BehaviorSubject, combineLatest } from 'rxjs'; import { take } from 'rxjs/operators'; -import { AuthService } from '../../../core/auth/auth.service'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { ContextMenuEntryComponent } from '../context-menu-entry.component'; @@ -45,14 +44,12 @@ export class ItemVersionMenuComponent extends ContextMenuEntryComponent implemen * @param {DSpaceObject} injectedContextMenuObject * @param {DSpaceObjectType} injectedContextMenuObjectType * @param {AuthorizationDataService} authorizationService - * @param {AuthService} authService * @param {DsoVersioningModalService} versioningModalService */ constructor( @Inject('contextMenuObjectProvider') public injectedContextMenuObject: DSpaceObject, @Inject('contextMenuObjectTypeProvider') protected injectedContextMenuObjectType: DSpaceObjectType, protected authorizationService: AuthorizationDataService, - private authService: AuthService, private versioningModalService: DsoVersioningModalService, ) { super(injectedContextMenuObject, injectedContextMenuObjectType, ContextMenuEntryType.ItemVersion); @@ -65,7 +62,7 @@ export class ItemVersionMenuComponent extends ContextMenuEntryComponent implemen combineLatest([isAuthorized$, isDisabled$]).pipe( take(1) ).subscribe(([isAuthorized, isDisabled]) => { - this.canShow$.next(isAuthorized && !isDisabled) + this.canShow$.next(isAuthorized && !isDisabled); }); } @@ -74,6 +71,6 @@ export class ItemVersionMenuComponent extends ContextMenuEntryComponent implemen * Open modal to create a new version */ createNewVersion(): void { - this.versioningModalService.openCreateVersionModal(this.contextMenuObject) + this.versioningModalService.openCreateVersionModal(this.contextMenuObject); } } diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts index cf1d0aa6292..c59bf7d0c7f 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts @@ -28,7 +28,7 @@ export class DynamicListCheckboxGroupModel extends DynamicCheckboxGroupModel { @serializable() typeBindRelations: DynamicFormControlRelation[]; @serializable() toggleSecurityVisibility = false; isListGroup = true; - valueUpdates: Subject; + valueChanges: Subject; constructor(config: DynamicListCheckboxGroupModelConfig, layout?: DynamicFormControlLayout) { super(config, layout); @@ -38,9 +38,9 @@ export class DynamicListCheckboxGroupModel extends DynamicCheckboxGroupModel { this._value = []; this.repeatable = config.repeatable; - this.valueUpdates = new Subject(); - this.valueUpdates.subscribe((value: VocabularyEntry | VocabularyEntry[]) => this.value = value); - this.valueUpdates.next(config.value); + this.valueChanges = new Subject(); + this.valueChanges.subscribe((value: VocabularyEntry | VocabularyEntry[]) => this.value = value); + this.valueChanges.next(config.value); this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : []; } diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts index 65d61af1d86..2f1eef5d74a 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts @@ -124,7 +124,8 @@ const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), { value: 'Michel' } ] - } + }, + thumbnail: createNoContentRemoteDataObject$() }) }); const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), { @@ -178,7 +179,8 @@ const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), { value: 'OrgUnit' } ] - } + }, + thumbnail: createNoContentRemoteDataObject$() }) }); From dd7526dff336b87979453fe295ccd98d94181d1d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 19 May 2023 11:37:30 +0200 Subject: [PATCH 563/758] [DSC-1070] disable default statistics menu --- src/app/collection-page/collection-page-routing.module.ts | 2 +- src/app/community-page/community-page-routing.module.ts | 2 +- src/app/cris-item-page/cris-item-page-routing.module.ts | 4 ++-- src/app/home-page/home-page-routing.module.ts | 2 +- src/app/item-page/item-page-routing.module.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts index 625cf9f345d..2ddc429ccd5 100644 --- a/src/app/collection-page/collection-page-routing.module.ts +++ b/src/app/collection-page/collection-page-routing.module.ts @@ -77,7 +77,7 @@ import { EditCollectionResolver } from '../core/shared/resolvers/edit-collection public: [{ id: 'statistics_collection_:id', active: true, - visible: true, + visible: false, index: 2, model: { type: MenuItemType.LINK, diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts index c37f8832f84..a689f1fdb56 100644 --- a/src/app/community-page/community-page-routing.module.ts +++ b/src/app/community-page/community-page-routing.module.ts @@ -56,7 +56,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; public: [{ id: 'statistics_community_:id', active: true, - visible: true, + visible: false, index: 2, model: { type: MenuItemType.LINK, diff --git a/src/app/cris-item-page/cris-item-page-routing.module.ts b/src/app/cris-item-page/cris-item-page-routing.module.ts index 226359984f4..a67d4f5fd16 100644 --- a/src/app/cris-item-page/cris-item-page-routing.module.ts +++ b/src/app/cris-item-page/cris-item-page-routing.module.ts @@ -21,7 +21,7 @@ const routes: Routes = [ public: [{ id: 'statistics_item_:id', active: true, - visible: true, + visible: false, model: { type: MenuItemType.LINK, text: 'menu.section.statistics', @@ -45,7 +45,7 @@ const routes: Routes = [ public: [{ id: 'statistics_item_:id', active: true, - visible: true, + visible: false, model: { type: MenuItemType.LINK, text: 'menu.section.statistics', diff --git a/src/app/home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts index fe057831f97..93ce488109f 100644 --- a/src/app/home-page/home-page-routing.module.ts +++ b/src/app/home-page/home-page-routing.module.ts @@ -19,7 +19,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model'; public: [{ id: 'statistics_site', active: true, - visible: true, + visible: false, index: 2, model: { type: MenuItemType.LINK, diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts index 16cb33f6e12..cfb28240f74 100644 --- a/src/app/item-page/item-page-routing.module.ts +++ b/src/app/item-page/item-page-routing.module.ts @@ -70,7 +70,7 @@ import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver'; public: [{ id: 'statistics_item_:id', active: true, - visible: true, + visible: false, index: 2, model: { type: MenuItemType.LINK, From d95d26dfbd183dcdadf2a3ab6fa11730e5bbde84 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 19 May 2023 12:21:13 +0200 Subject: [PATCH 564/758] [DSC-1070] fix tests --- .../dso-edit-metadata-headers.component.spec.ts | 2 +- src/app/my-dspace-page/my-dspace-configuration.service.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts index a0a1da1f1e9..0f05b18a7a6 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts @@ -27,6 +27,6 @@ describe('DsoEditMetadataHeadersComponent', () => { }); it('should display three headers', () => { - expect(fixture.debugElement.queryAll(By.css('.ds-flex-cell')).length).toEqual(3); + expect(fixture.debugElement.queryAll(By.css('.ds-flex-cell')).length).toEqual(4); }); }); diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts index 55d6e234c08..8b0608804df 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts @@ -173,7 +173,7 @@ describe('MyDSpaceConfigurationService', () => { }); }); - fdescribe('when getAvailableConfigurationTypes is called', () => { + describe('when getAvailableConfigurationTypes is called', () => { it('should return properly list when user is submitter', () => { roleService.setSubmitter(true); From 296e040e72dfc0ffc108f95d2abd2bbaebc6e7e1 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Fri, 19 May 2023 18:08:56 +0200 Subject: [PATCH 565/758] [DSC-1070] Edit metadata security --- ...-edit-metadata-field-values.component.html | 5 +- ...so-edit-metadata-field-values.component.ts | 48 +++++++++++++++++ .../dso-edit-metadata-form.ts | 21 ++++++++ .../dso-edit-metadata-value.component.html | 10 ++-- .../dso-edit-metadata-value.component.ts | 25 +++++++++ .../dso-edit-metadata.component.html | 1 + .../dso-edit-metadata.component.ts | 22 ++++++-- .../edit-metadata-security.component.html | 2 +- .../edit-metadata-security.component.ts | 54 ++++++++----------- 9 files changed, 147 insertions(+), 41 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html index 9f74216d54f..f83085a2bb9 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html @@ -5,11 +5,14 @@ [mdValue]="mdValue" [dsoType]="dsoType" [saving$]="saving$" + [customSecurityMetadata]="getCustomSecurityMetadata()" + [defaultMetadataSecurity]="getDefaultSecurityMetadata()" [isOnlyValue]="form.fields[mdField].length === 1" (edit)="mdValue.editing = true" (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()" (remove)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()" (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()" - (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)"> + (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)" + (updateSecuritylevel)="onUpdateSecurityLevelValue($event, idx)">

    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts index 2702e0ba1f8..8f682610635 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts @@ -4,6 +4,8 @@ import { Observable } from 'rxjs/internal/Observable'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; +import { map } from 'rxjs'; +import { MetadataSecurityConfiguration } from 'src/app/core/submission/models/metadata-security-configuration'; @Component({ selector: 'ds-dso-edit-metadata-field-values', @@ -46,6 +48,10 @@ export class DsoEditMetadataFieldValuesComponent { */ @Input() draggingMdField$: BehaviorSubject; + /** + * Security Settings configuration for the current entity + */ + @Input() metadataSecurityConfiguration: Observable; /** * Emit when the value has been saved within the form */ @@ -78,4 +84,46 @@ export class DsoEditMetadataFieldValuesComponent { this.form.resetReinstatable(); this.valueSaved.emit(); } + + /** + * Get the custom security metadata for the current field + */ + getCustomSecurityMetadata(): Observable { + if (this.metadataSecurityConfiguration) { + return this.metadataSecurityConfiguration.pipe( + map((value: MetadataSecurityConfiguration) => { + if (value.metadataCustomSecurity[this.mdField]) { + return value.metadataCustomSecurity[this.mdField]; + } + }) + ); + } + } + + /** + * Get the default security metadata for the current field + */ + getDefaultSecurityMetadata(): Observable { + if (this.metadataSecurityConfiguration) { + return this.metadataSecurityConfiguration.pipe( + map((value: MetadataSecurityConfiguration) => { + if (value.metadataCustomSecurity[this.mdField]) { + return value.metadataSecurityDefault; + } + }) + ); + } + } + + /** + * Update the security level for the field at the given index + */ + onUpdateSecurityLevelValue(securityLevel: number, index: number) { + if (this.form.fields[this.mdField]?.length > 0) { + this.form.fields[this.mdField][index].change = DsoEditMetadataChangeType.UPDATE; + this.form.fields[this.mdField][index].newValue.securityLevel = securityLevel; + + this.valueSaved.emit(); + } + } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index 8206ec91359..cebf32db1d9 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -350,8 +350,10 @@ export class DsoEditMetadataForm { }); }); // Reset the order of values within their fields to match their place property + // And reinstate the security level values this.fieldKeys.forEach((field: string) => { this.setValuesForFieldSorted(field, this.fields[field]); + this.reinstateSecurityLevel(field); }); this.reinstatableNewValues = {}; } @@ -387,6 +389,19 @@ export class DsoEditMetadataForm { this.fields[mdField] = values.sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place); } + /** + * Set the change property of each value within a metadata field, + * in case the security level has been changed and we are trying to reinstate the changes + * @param mdField + */ + private reinstateSecurityLevel(mdField: string){ + this.fields[mdField].forEach((value: DsoEditMetadataValue) => { + if (hasValue(value.newValue.securityLevel) && value.newValue.securityLevel !== value.originalValue.securityLevel) { + value.change = DsoEditMetadataChangeType.UPDATE; + } + }); + } + /** * Get the json PATCH operations for the current changes within this form * For each metadata field, it'll return operations in the following order: replace, remove (from last to first place), add and move @@ -410,6 +425,12 @@ export class DsoEditMetadataForm { language: value.newValue.language, })); } + // "replace" the security level value + if (value.originalValue.securityLevel !== value.newValue.securityLevel) { + replaceOperations.push(new MetadataPatchReplaceOperation(field, value.originalValue.place, { + securityLevel: value.newValue.securityLevel + })); + } } else if (value.change === DsoEditMetadataChangeType.REMOVE) { removeOperations.push(new MetadataPatchRemoveOperation(field, value.originalValue.place)); } else if (value.change === DsoEditMetadataChangeType.ADD) { diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index 4c54f82282f..03e8de084d4 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -15,13 +15,13 @@
    -
    +
    - +
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index a3c618fdfe3..d8efde3dc61 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -57,6 +57,17 @@ export class DsoEditMetadataValueComponent implements OnInit { */ @Input() isOnlyValue = false; + /** + * Custom security metadata array for the current metadata field + */ + @Input() customSecurityMetadata: Observable; + + /** + * Default security metadata array for the current metadata field + * Used when no security level metadata is set + */ + @Input() defaultMetadataSecurity: Observable; + /** * Emits when the user clicked edit */ @@ -82,6 +93,12 @@ export class DsoEditMetadataValueComponent implements OnInit { */ @Output() dragging: EventEmitter = new EventEmitter(); + /** + * Emits the new value of security level + */ + @Output() updateSecuritylevel: EventEmitter = new EventEmitter(); + + /** * The DsoEditMetadataChangeType enumeration for access in the component's template * @type {DsoEditMetadataChangeType} @@ -129,4 +146,12 @@ export class DsoEditMetadataValueComponent implements OnInit { map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null), ); } + + /** + * Emits the edit event + * @param securityLevel + */ + changeSelectedSecurity(securityLevel: number){ + this.updateSecuritylevel.emit(securityLevel); + } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 24c3dc5cd7a..82c5e6dcac2 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -60,6 +60,7 @@ [form]="form" [dsoType]="dsoType" [saving$]="saving$" + [metadataSecurityConfiguration]="getSecuritySettings()" [draggingMdField$]="draggingMdField$" [mdField]="mdField" (valueSaved)="onValueSaved()"> diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index d67a7ea738d..04e5f491a8a 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -1,3 +1,5 @@ +import { Item } from './../../core/shared/item.model'; +import { MetadataSecurityConfigurationService } from './../../core/submission/metadatasecurityconfig-data.service'; import { Component, Inject, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AlertType } from '../../shared/alert/aletr-type'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; @@ -9,9 +11,7 @@ import { Subscription } from 'rxjs/internal/Subscription'; import { RemoteData } from '../../core/data/remote-data'; import { hasNoValue, hasValue } from '../../shared/empty.util'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; -import { - getFirstCompletedRemoteData, -} from '../../core/shared/operators'; +import { getFirstCompletedRemoteData} from '../../core/shared/operators'; import { UpdateDataService } from '../../core/data/update-data.service'; import { ResourceType } from '../../core/shared/resource-type'; import { NotificationsService } from '../../shared/notifications/notifications.service'; @@ -22,6 +22,7 @@ import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analy import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator'; import { GenericConstructor } from '../../core/shared/generic-constructor'; import { HALDataService } from '../../core/data/base/hal-data-service.interface'; +import { MetadataSecurityConfiguration } from 'src/app/core/submission/models/metadata-security-configuration'; @Component({ selector: 'ds-dso-edit-metadata', @@ -110,6 +111,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { protected translateService: TranslateService, protected parentInjector: Injector, protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer, + protected metadataSecurityConfigurationService: MetadataSecurityConfigurationService, @Inject(DATA_SERVICE_FACTORY) protected getDataServiceFor: (resourceType: ResourceType) => GenericConstructor>) { } @@ -136,6 +138,20 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { ); } + /** + * Get the security settings for the current DSpaceObject, + * based on entityType (e.g. Person) + */ + getSecuritySettings(): Observable { + if (this.dso instanceof Item) { + const entityType: string = (this.dso as Item).entityType; + return this.metadataSecurityConfigurationService.findById(entityType).pipe( + getFirstCompletedRemoteData(), + map((securitySettings: RemoteData) => securitySettings.payload) + ); + } + } + /** * Initialise (resolve) the data-service for the current DSpaceObject */ diff --git a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.html b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.html index 6856319e329..3294577d17e 100644 --- a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.html +++ b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.html @@ -1,7 +1,7 @@
    -
    diff --git a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts index f7dc7815031..a2905421cfd 100644 --- a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts +++ b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts @@ -1,15 +1,14 @@ -import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { environment } from '../../../../environments/environment'; import { LevelSecurityConfig } from '../../../../config/metadata-security-config'; +import { hasNoValue } from 'src/app/shared/empty.util'; @Component({ selector: 'ds-edit-metadata-security', templateUrl: './edit-metadata-security.component.html', styleUrls: ['./edit-metadata-security.component.scss'], - }) -export class EditMetadataSecurityComponent implements OnInit, OnChanges { - +export class EditMetadataSecurityComponent implements OnInit { @Input() securityLevel: number; @Input() securityConfigLevel: number[]; @Output() changeSecurityLevel = new EventEmitter(); @@ -19,41 +18,34 @@ export class EditMetadataSecurityComponent implements OnInit, OnChanges { this.filterSecurityLevelsMap(); } - ngOnChanges(changes: SimpleChanges) { - if (changes && changes.securityConfigLevel && changes.securityConfigLevel.currentValue) { - this.filterSecurityLevelsMap(); + /** + * Check if the selected security level is different from the current level, + * if so,update the security level & emit the new level + * @param level The security level to change to + */ + changeSelectedSecurityLevel(level: number) { + if (this.securityLevel !== level) { + this.securityLevel = level; + this.changeSecurityLevel.emit(level); } } - changeSelectedSecurity(level: number) { - this.changeSecurityLevel.emit(level); - } - private filterSecurityLevelsMap() { this.securityLevelsMap = environment.security.levels; - if (this.securityConfigLevel === undefined) { + if ( + hasNoValue(this.securityConfigLevel) || + (this.securityConfigLevel.length === 1 && + this.securityConfigLevel.includes(0)) + ) { this.securityLevelsMap = null; + this.changeSecurityLevel.emit(0); } else { - if (this.securityConfigLevel === null) { - this.securityLevelsMap = null; - this.changeSecurityLevel.emit(0); - } else { - if (this.securityConfigLevel.length === 1 && this.securityConfigLevel.includes(0)) { - this.securityLevelsMap = null; - this.changeSecurityLevel.emit(0); - } else { - if (this.securityConfigLevel.length === 1) { - // include even value 0 => public - this.securityLevelsMap = this.securityLevelsMap.filter((el: any, index) => { - return index === 0 || this.securityConfigLevel.includes(el.value); - }); - } else { - this.securityLevelsMap = this.securityLevelsMap.filter((el: any) => { - return this.securityConfigLevel.includes(el.value); - }); - } + // Filter securityLevelsMap based on securityConfigLevel + this.securityLevelsMap = this.securityLevelsMap.filter( + (el: any, index) => { + return index === 0 || this.securityConfigLevel.includes(el.value); } - } + ); } } } From cc663d27e79cfc0057b1a35e0b90fbc0904eac83 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 22 May 2023 15:43:25 +0200 Subject: [PATCH 566/758] [DSC-1070] Unit Test & fixes --- src/app/core/shared/metadata.models.ts | 3 --- ...it-metadata-field-values.component.spec.ts | 17 +++++++++++++++++ ...so-edit-metadata-field-values.component.ts | 9 +++++---- .../dso-edit-metadata-value.component.html | 2 +- .../dso-edit-metadata-value.component.ts | 4 ++-- .../dso-edit-metadata.component.spec.ts | 19 +++++++++++++++++++ .../dso-edit-metadata.component.ts | 2 +- .../edit-metadata-security.component.ts | 2 +- 8 files changed, 46 insertions(+), 12 deletions(-) diff --git a/src/app/core/shared/metadata.models.ts b/src/app/core/shared/metadata.models.ts index 7999eb3251b..6b18fa438bd 100644 --- a/src/app/core/shared/metadata.models.ts +++ b/src/app/core/shared/metadata.models.ts @@ -125,9 +125,6 @@ export class MetadatumViewModel { /** The security level value */ securityLevel: number; - - /** The security level value of configuration */ - securityConfigurationLevelLimit?: number[]; } /** Serializer used for MetadataMaps. diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts index 3ca0dba3b64..658c9d199f3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts @@ -1,3 +1,4 @@ +import { MetadataSecurityConfiguration } from './../../../core/submission/models/metadata-security-configuration'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { VarDirective } from '../../../shared/utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; @@ -95,6 +96,22 @@ describe('DsoEditMetadataFieldValuesComponent', () => { }); }); + describe('security metadata', () => { + it('should fetch custom security metadata', () => { + const dummyMetadataSecurityConfiguration: MetadataSecurityConfiguration = Object.assign(new MetadataSecurityConfiguration(), { + metadataCustomSecurity: new Map([ + ['person.email', [0, 1]], + ]), + metadataSecurityDefault: [0], + }); + component.metadataSecurityConfiguration = of(dummyMetadataSecurityConfiguration); + component.mdField = 'person.email'; + component.getCustomSecurityMetadata().subscribe((metadata: number[]) => { + expect(metadata).toEqual(dummyMetadataSecurityConfiguration.metadataCustomSecurity['person.email']); + }); + }); + }); + describe('when draggingMdField$ emits null', () => { beforeEach(() => { draggingMdField$.next(null); diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts index 8f682610635..dce8b1bf8c0 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts @@ -4,8 +4,8 @@ import { Observable } from 'rxjs/internal/Observable'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; -import { map } from 'rxjs'; -import { MetadataSecurityConfiguration } from 'src/app/core/submission/models/metadata-security-configuration'; +import { map, take } from 'rxjs'; +import { MetadataSecurityConfiguration } from '../../../core/submission/models/metadata-security-configuration'; @Component({ selector: 'ds-dso-edit-metadata-field-values', @@ -91,6 +91,7 @@ export class DsoEditMetadataFieldValuesComponent { getCustomSecurityMetadata(): Observable { if (this.metadataSecurityConfiguration) { return this.metadataSecurityConfiguration.pipe( + take(1), map((value: MetadataSecurityConfiguration) => { if (value.metadataCustomSecurity[this.mdField]) { return value.metadataCustomSecurity[this.mdField]; @@ -103,12 +104,12 @@ export class DsoEditMetadataFieldValuesComponent { /** * Get the default security metadata for the current field */ - getDefaultSecurityMetadata(): Observable { + getDefaultSecurityMetadata(): Observable { if (this.metadataSecurityConfiguration) { return this.metadataSecurityConfiguration.pipe( map((value: MetadataSecurityConfiguration) => { if (value.metadataCustomSecurity[this.mdField]) { - return value.metadataSecurityDefault; + return value.metadataSecurityDefault[0] ?? 0; } }) ); diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index 03e8de084d4..88a83440c03 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -18,7 +18,7 @@
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index d8efde3dc61..982487a2eea 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -12,7 +12,7 @@ import { map } from 'rxjs/operators'; import { getItemPageRoute } from '../../../item-page/item-page-routing-paths'; import { DSONameService } from '../../../core/breadcrumbs/dso-name.service'; import { EMPTY } from 'rxjs/internal/observable/empty'; -import { MetadataSecurityConfiguration } from 'src/app/core/submission/models/metadata-security-configuration'; +import { MetadataSecurityConfiguration } from '../../../core/submission/models/metadata-security-configuration'; @Component({ selector: 'ds-dso-edit-metadata-value', @@ -66,7 +66,7 @@ export class DsoEditMetadataValueComponent implements OnInit { * Default security metadata array for the current metadata field * Used when no security level metadata is set */ - @Input() defaultMetadataSecurity: Observable; + @Input() defaultMetadataSecurity: Observable; /** * Emits when the user clicked edit diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts index 7067c44fbb4..51e536bc4d3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts @@ -16,11 +16,19 @@ import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorato import { Operation } from 'fast-json-patch'; import { RemoteData } from '../../core/data/remote-data'; import { Observable } from 'rxjs/internal/Observable'; +import { MetadataSecurityConfigurationService } from '../../core/submission/metadatasecurityconfig-data.service'; +import { mockSubmissionObject } from '../../shared/mocks/submission.mock'; +import { MetadataSecurityConfiguration } from '../../core/submission/models/metadata-security-configuration'; const ADD_BTN = 'add'; const REINSTATE_BTN = 'reinstate'; const SAVE_BTN = 'save'; const DISCARD_BTN = 'discard'; +const submissionObject: any = mockSubmissionObject; + +const metadataSecurityConfigDataServiceSpy = jasmine.createSpyObj('metadataSecurityConfigDataService', { + findById: createSuccessfulRemoteDataObject$(submissionObject.metadataSecurityConfiguration), +}); @Injectable() class TestDataService { @@ -77,6 +85,7 @@ describe('DsoEditMetadataComponent', () => { TestDataService, { provide: DATA_SERVICE_FACTORY, useValue: jasmine.createSpy('getDataServiceFor').and.returnValue(TestDataService) }, { provide: NotificationsService, useValue: notificationsService }, + { provide: MetadataSecurityConfigurationService, useValue: metadataSecurityConfigDataServiceSpy }, ArrayMoveChangeAnalyzer, ], schemas: [NO_ERRORS_SCHEMA] @@ -164,6 +173,16 @@ describe('DsoEditMetadataComponent', () => { expect(fixture.debugElement.query(By.css('ds-dso-edit-metadata-value'))).toBeNull(); }); }); + + it('should fetch security settings for Item', () => { + component.dso = Object.assign(new Item(), { + ...dso, + entityType: 'Person' + }); + component.getSecuritySettings().subscribe((securitySettings: MetadataSecurityConfiguration) => { + expect(securitySettings).toBeDefined(); + }); + }); }); function assertButton(name: string, exists: boolean, disabled: boolean = false): void { diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index 04e5f491a8a..a4992243efe 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -22,7 +22,7 @@ import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analy import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator'; import { GenericConstructor } from '../../core/shared/generic-constructor'; import { HALDataService } from '../../core/data/base/hal-data-service.interface'; -import { MetadataSecurityConfiguration } from 'src/app/core/submission/models/metadata-security-configuration'; +import { MetadataSecurityConfiguration } from '../../core/submission/models/metadata-security-configuration'; @Component({ selector: 'ds-dso-edit-metadata', diff --git a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts index a2905421cfd..4443f46825c 100644 --- a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts +++ b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { environment } from '../../../../environments/environment'; import { LevelSecurityConfig } from '../../../../config/metadata-security-config'; -import { hasNoValue } from 'src/app/shared/empty.util'; +import { hasNoValue } from '../../../shared/empty.util'; @Component({ selector: 'ds-edit-metadata-security', From 370c3cc1c7f5f12747644d4831bbfd1b43bc08a4 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 23 May 2023 23:12:35 +0200 Subject: [PATCH 567/758] [DSC-1070] fix issue with dspace-object-data.service when using the item custom url instead of the uuid --- .../data/dspace-object-data.service.spec.ts | 23 +++++++ .../core/data/dspace-object-data.service.ts | 67 +++++++++++++++++++ src/app/core/data/item-data.service.ts | 13 +++- 3 files changed, 101 insertions(+), 2 deletions(-) diff --git a/src/app/core/data/dspace-object-data.service.spec.ts b/src/app/core/data/dspace-object-data.service.spec.ts index 0f167ea47e2..711c25c4924 100644 --- a/src/app/core/data/dspace-object-data.service.spec.ts +++ b/src/app/core/data/dspace-object-data.service.spec.ts @@ -19,6 +19,7 @@ describe('DSpaceObjectDataService', () => { uuid: '9b4f22f4-164a-49db-8817-3316b6ee5746' } as DSpaceObject; const dsoLink = 'https://rest.api/rest/api/dso/find{?uuid}'; + const itemsLink = 'https://rest.api/rest/api/items'; const requestURL = `https://rest.api/rest/api/dso/find?uuid=${testObject.uuid}`; const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2'; @@ -73,5 +74,27 @@ describe('DSpaceObjectDataService', () => { }); expect(result).toBeObservable(expected); }); + + it('should call HALEndpointService with the path to the dso endpoint', () => { + spyOn((service as any), 'findByCustomUrl'); + scheduler.schedule(() => service.findById('customurl')); + scheduler.flush(); + + expect((service as any).findByCustomUrl).toHaveBeenCalled(); + }); + }); + + describe('findByCustomUrl', () => { + + it('should return a RemoteData for the object with the given custom url', () => { + (service as any).halService.getEndpoint.and.returnValue(cold('a', { a: itemsLink })); + const result = (service as any).findByCustomUrl('customurl'); + const expected = cold('a', { + a: { + payload: testObject + } + }); + expect(result).toBeObservable(expected); + }); }); }); diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts index 2ad024133c7..0aa908375e5 100644 --- a/src/app/core/data/dspace-object-data.service.ts +++ b/src/app/core/data/dspace-object-data.service.ts @@ -1,4 +1,9 @@ import { Injectable } from '@angular/core'; + +import { Observable } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; +import { validate as uuidValidate } from 'uuid'; + import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; import { DSpaceObject } from '../shared/dspace-object.model'; @@ -7,10 +12,15 @@ import { HALEndpointService } from '../shared/hal-endpoint.service'; import { RequestService } from './request.service'; import { IdentifiableDataService } from './base/identifiable-data.service'; import { dataService } from './base/data-service.decorator'; +import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; +import { RemoteData } from './remote-data'; +import { RequestParam } from '../cache/models/request-param.model'; +import { isNotEmpty } from '../../shared/empty.util'; @Injectable() @dataService(DSPACE_OBJECT) export class DSpaceObjectDataService extends IdentifiableDataService { + constructor( protected requestService: RequestService, protected rdbService: RemoteDataBuildService, @@ -25,4 +35,61 @@ export class DSpaceObjectDataService extends IdentifiableDataService[]): Observable> { + + if (uuidValidate(id)) { + const href$ = this.getIDHrefObs(encodeURIComponent(id), ...linksToFollow); + return super.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + } else { + return this.findByCustomUrl(id, useCachedVersionIfAvailable, reRequestOnStale, linksToFollow); + } + } + + /** + * Returns an observable of {@link RemoteData} of an object, based on its CustomURL or ID, with a list of + * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object + * + * @param id CustomUrl or UUID of object we want to retrieve + * @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 linksToFollow List of {@link FollowLinkConfig} that indicate which + * {@link HALLink}s should be automatically resolved + * @param projections List of {@link projections} used to pass as parameters + */ + private findByCustomUrl(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, linksToFollow: FollowLinkConfig[] = [], projections: string[] = []): Observable> { + const searchMethod = 'findByCustomURL'; + + const options = Object.assign({}, { + searchParams: [ + new RequestParam('q', id), + ] + }); + + projections.forEach((projection) => { + options.searchParams.push(new RequestParam('projection', projection)); + }); + + const hrefObs = this.halService.getEndpoint('items').pipe( + filter((href: string) => isNotEmpty(href)), + map((href: string) => `${href}/search/${searchMethod}`), + map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)) + ); + + return this.findByHref(hrefObs, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow); + } } diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts index f034e0f46be..00c68fcb14f 100644 --- a/src/app/core/data/item-data.service.ts +++ b/src/app/core/data/item-data.service.ts @@ -475,7 +475,17 @@ export abstract class BaseItemDataService extends IdentifiableDataService }); } - + /** + * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of + * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object + * @param id ID of object we want to retrieve + * @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 linksToFollow List of {@link FollowLinkConfig} that indicate which + * {@link HALLink}s should be automatically resolved + */ findById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig[]): Observable> { if (uuidValidate(id)) { @@ -508,7 +518,6 @@ export abstract class BaseItemDataService extends IdentifiableDataService } } - /** * Returns an observable of {@link RemoteData} of an object, based on its CustomURL or ID, with a list of * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object From 02ab2d1f5c47e303d24d192f37e48626d452c3cb Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 24 May 2023 17:56:34 +0200 Subject: [PATCH 568/758] [DSC-1070] Adding new mdField with security level handle(on item edit) --- ...-edit-metadata-field-values.component.html | 6 +- ...so-edit-metadata-field-values.component.ts | 33 ----------- .../dso-edit-metadata-form.ts | 22 ++++++-- .../dso-edit-metadata-value.component.html | 9 +-- .../dso-edit-metadata-value.component.ts | 35 +++++++----- .../dso-edit-metadata.component.html | 9 ++- .../dso-edit-metadata.component.ts | 56 ++++++++++++++++++- .../edit-metadata-security.component.ts | 7 +++ 8 files changed, 114 insertions(+), 63 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html index f83085a2bb9..4970cfc3afc 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html @@ -5,14 +5,14 @@ [mdValue]="mdValue" [dsoType]="dsoType" [saving$]="saving$" - [customSecurityMetadata]="getCustomSecurityMetadata()" - [defaultMetadataSecurity]="getDefaultSecurityMetadata()" + [metadataSecurityConfiguration]="metadataSecurityConfiguration" + [mdField]="mdField" [isOnlyValue]="form.fields[mdField].length === 1" (edit)="mdValue.editing = true" (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()" (remove)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()" (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()" (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)" - (updateSecuritylevel)="onUpdateSecurityLevelValue($event, idx)"> + (updateSecurityLevel)="onUpdateSecurityLevelValue($event, idx)">
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts index dce8b1bf8c0..c489397a2da 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts @@ -4,7 +4,6 @@ import { Observable } from 'rxjs/internal/Observable'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; -import { map, take } from 'rxjs'; import { MetadataSecurityConfiguration } from '../../../core/submission/models/metadata-security-configuration'; @Component({ @@ -85,37 +84,6 @@ export class DsoEditMetadataFieldValuesComponent { this.valueSaved.emit(); } - /** - * Get the custom security metadata for the current field - */ - getCustomSecurityMetadata(): Observable { - if (this.metadataSecurityConfiguration) { - return this.metadataSecurityConfiguration.pipe( - take(1), - map((value: MetadataSecurityConfiguration) => { - if (value.metadataCustomSecurity[this.mdField]) { - return value.metadataCustomSecurity[this.mdField]; - } - }) - ); - } - } - - /** - * Get the default security metadata for the current field - */ - getDefaultSecurityMetadata(): Observable { - if (this.metadataSecurityConfiguration) { - return this.metadataSecurityConfiguration.pipe( - map((value: MetadataSecurityConfiguration) => { - if (value.metadataCustomSecurity[this.mdField]) { - return value.metadataSecurityDefault[0] ?? 0; - } - }) - ); - } - } - /** * Update the security level for the field at the given index */ @@ -123,7 +91,6 @@ export class DsoEditMetadataFieldValuesComponent { if (this.form.fields[this.mdField]?.length > 0) { this.form.fields[this.mdField][index].change = DsoEditMetadataChangeType.UPDATE; this.form.fields[this.mdField][index].newValue.securityLevel = securityLevel; - this.valueSaved.emit(); } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index cebf32db1d9..ff56d5e74df 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -428,16 +428,28 @@ export class DsoEditMetadataForm { // "replace" the security level value if (value.originalValue.securityLevel !== value.newValue.securityLevel) { replaceOperations.push(new MetadataPatchReplaceOperation(field, value.originalValue.place, { - securityLevel: value.newValue.securityLevel + securityLevel: value.newValue.securityLevel, + value: value.newValue.value, + language: value.newValue.language, })); } } else if (value.change === DsoEditMetadataChangeType.REMOVE) { removeOperations.push(new MetadataPatchRemoveOperation(field, value.originalValue.place)); } else if (value.change === DsoEditMetadataChangeType.ADD) { - addOperations.push(new MetadataPatchAddOperation(field, { - value: value.newValue.value, - language: value.newValue.language, - })); + let newValue; + if (hasValue(value.newValue?.securityLevel)) { + newValue = { + value: value.newValue.value, + language: value.newValue.language, + securityLevel: value.newValue.securityLevel + }; + } else { + newValue = { + value: value.newValue.value, + language: value.newValue.language, + }; + } + addOperations.push(new MetadataPatchAddOperation(field, newValue)); } else { console.warn('Illegal metadata change state detected for', value); } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index 88a83440c03..72354fd4ac3 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -17,10 +17,11 @@
    - +
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index 982487a2eea..5f608fb8a41 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -37,7 +37,12 @@ export class DsoEditMetadataValueComponent implements OnInit { /** * The metadata security configuration for the entity. */ - @Input() metadataSecurityConfiguration: MetadataSecurityConfiguration = null; + @Input() metadataSecurityConfiguration: Observable; + + /** + * The metadata field to display a value for + */ + @Input() mdField: string; /** * Type of DSO we're displaying values for @@ -57,17 +62,6 @@ export class DsoEditMetadataValueComponent implements OnInit { */ @Input() isOnlyValue = false; - /** - * Custom security metadata array for the current metadata field - */ - @Input() customSecurityMetadata: Observable; - - /** - * Default security metadata array for the current metadata field - * Used when no security level metadata is set - */ - @Input() defaultMetadataSecurity: Observable; - /** * Emits when the user clicked edit */ @@ -96,8 +90,12 @@ export class DsoEditMetadataValueComponent implements OnInit { /** * Emits the new value of security level */ - @Output() updateSecuritylevel: EventEmitter = new EventEmitter(); + @Output() updateSecurityLevel: EventEmitter = new EventEmitter(); + /** + * Emits true when the metadata has security settings + */ + @Output() hasSecurityLevel: EventEmitter = new EventEmitter(false); /** * The DsoEditMetadataChangeType enumeration for access in the component's template @@ -151,7 +149,14 @@ export class DsoEditMetadataValueComponent implements OnInit { * Emits the edit event * @param securityLevel */ - changeSelectedSecurity(securityLevel: number){ - this.updateSecuritylevel.emit(securityLevel); + changeSelectedSecurity(securityLevel: number) { + this.updateSecurityLevel.emit(securityLevel); + } + + /** + * Emits the value for the metadata security existence + */ + hasSecurityMetadata(event: boolean) { + this.hasSecurityLevel.emit(event); } } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 82c5e6dcac2..3ecd502ff6e 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -29,7 +29,8 @@
    + [autofocus]="true" + (mdFieldChange)="onMdFieldChange($event)">
    @@ -39,10 +40,14 @@ [mdValue]="form.newValue" [dsoType]="dsoType" [saving$]="savingOrLoadingFieldValidation$" + [metadataSecurityConfiguration]="getSecuritySettings()" + [mdField]="newMdField" [isOnlyValue]="true" (confirm)="confirmNewValue($event)" (remove)="form.newValue = undefined" - (undo)="form.newValue = undefined"> + (undo)="form.newValue = undefined" + (updateSecurityLevel)="onUpdateSecurityLevel($event)" + (hasSecurityLevel)="hasSecurityLevel($event)">
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index a4992243efe..5849a830bfe 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -3,7 +3,7 @@ import { MetadataSecurityConfigurationService } from './../../core/submission/me import { Component, Inject, Injector, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AlertType } from '../../shared/alert/aletr-type'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { DsoEditMetadataForm } from './dso-edit-metadata-form'; +import { DsoEditMetadataChangeType, DsoEditMetadataForm } from './dso-edit-metadata-form'; import { map } from 'rxjs/operators'; import { ActivatedRoute, Data } from '@angular/router'; import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest'; @@ -106,6 +106,18 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { */ dsoUpdateSubscription: Subscription; + /** + * Field to keep track of the current security level + * in case a new mdField is added and the security level needs to be set + */ + newMdFieldWithSecurityLevelValue = 0; + + /** + * Flag to indicate if the metadata security configuration is present + * for the newly added metadata field + */ + hasSecurityMetadata = false; + constructor(protected route: ActivatedRoute, protected notificationsService: NotificationsService, protected translateService: TranslateService, @@ -236,6 +248,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { this.loadingFieldValidation$.next(false); if (valid) { this.form.setMetadataField(this.newMdField); + this.setSecurityLevelForNewMdField(); this.onValueSaved(); } }); @@ -265,6 +278,47 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { this.onValueSaved(); } + /** + * Keep track of the metadata field that is currently being edited / added + * Reset the security level properties for the new metadata field + * @param value The value of the new metadata field + */ + onMdFieldChange(value: string){ + if (hasValue(value)) { + this.newMdFieldWithSecurityLevelValue = 0; + this.hasSecurityMetadata = false; + } + } + + /** + * Update the security level for the field at the given index + */ + onUpdateSecurityLevel(securityLevel: number) { + this.setSecurityLevelForNewMdField(securityLevel); + } + + /** + * Set the security level for the new metadata field + * If the new metadata field has no security level yet, store the security level in a temporary variable + * until the metadata field is validated and set. + * @param securityLevel The security level to set for the new metadata field + */ + setSecurityLevelForNewMdField(securityLevel?: number) { + if (hasValue(this.newMdField) && hasValue(this.form.fields[this.newMdField]) && this.hasSecurityMetadata) { + this.form.fields[this.newMdField][this.form.fields[this.newMdField].length - 1].change = DsoEditMetadataChangeType.ADD; + this.form.fields[this.newMdField][this.form.fields[this.newMdField].length - 1].newValue.securityLevel = this.newMdFieldWithSecurityLevelValue ?? securityLevel ?? 0; + } else if (hasNoValue(this.form.fields[this.newMdField]) && securityLevel) { + this.newMdFieldWithSecurityLevelValue = securityLevel; + } + } + + /** + * Check if the new metadata field has a security level + */ + hasSecurityLevel(event: boolean) { + this.hasSecurityMetadata = event; + } + /** * Unsubscribe from any open subscriptions */ diff --git a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts index 4443f46825c..0a6368dfc9a 100644 --- a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts +++ b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts @@ -12,10 +12,17 @@ export class EditMetadataSecurityComponent implements OnInit { @Input() securityLevel: number; @Input() securityConfigLevel: number[]; @Output() changeSecurityLevel = new EventEmitter(); + + /** + * Emits when a metadata field has a security level configuration + */ + @Output() hasSecurityLevel = new EventEmitter(); + public securityLevelsMap: LevelSecurityConfig[] = environment.security.levels; ngOnInit(): void { this.filterSecurityLevelsMap(); + this.hasSecurityLevel.emit(true); } /** From f37b0e0f13748175ca7e8ca35f44834bc7ac548c Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 25 May 2023 14:55:09 +0200 Subject: [PATCH 569/758] [DSC-1070] improvement in settiing security level default values (for new added mdFields) --- ...it-metadata-field-values.component.spec.ts | 16 ------- .../dso-edit-metadata-form.ts | 20 +++------ .../dso-edit-metadata-value.component.html | 3 +- .../dso-edit-metadata-value.component.ts | 5 +++ .../dso-edit-metadata.component.html | 1 + .../dso-edit-metadata.component.ts | 44 ++++++++++++++++--- .../edit-metadata-security.component.ts | 6 +++ 7 files changed, 58 insertions(+), 37 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts index 658c9d199f3..d0069560fee 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts @@ -96,22 +96,6 @@ describe('DsoEditMetadataFieldValuesComponent', () => { }); }); - describe('security metadata', () => { - it('should fetch custom security metadata', () => { - const dummyMetadataSecurityConfiguration: MetadataSecurityConfiguration = Object.assign(new MetadataSecurityConfiguration(), { - metadataCustomSecurity: new Map([ - ['person.email', [0, 1]], - ]), - metadataSecurityDefault: [0], - }); - component.metadataSecurityConfiguration = of(dummyMetadataSecurityConfiguration); - component.mdField = 'person.email'; - component.getCustomSecurityMetadata().subscribe((metadata: number[]) => { - expect(metadata).toEqual(dummyMetadataSecurityConfiguration.metadataCustomSecurity['person.email']); - }); - }); - }); - describe('when draggingMdField$ emits null', () => { beforeEach(() => { draggingMdField$.next(null); diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index ff56d5e74df..5a14d5c4869 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -436,20 +436,12 @@ export class DsoEditMetadataForm { } else if (value.change === DsoEditMetadataChangeType.REMOVE) { removeOperations.push(new MetadataPatchRemoveOperation(field, value.originalValue.place)); } else if (value.change === DsoEditMetadataChangeType.ADD) { - let newValue; - if (hasValue(value.newValue?.securityLevel)) { - newValue = { - value: value.newValue.value, - language: value.newValue.language, - securityLevel: value.newValue.securityLevel - }; - } else { - newValue = { - value: value.newValue.value, - language: value.newValue.language, - }; - } - addOperations.push(new MetadataPatchAddOperation(field, newValue)); + + addOperations.push(new MetadataPatchAddOperation(field, { + value: value.newValue.value, + language: value.newValue.language, + securityLevel: value.newValue.securityLevel + })); } else { console.warn('Illegal metadata change state detected for', value); } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html index 72354fd4ac3..f41a13c10be 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html @@ -18,7 +18,8 @@
    diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts index 5f608fb8a41..e00edf846bd 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts @@ -44,6 +44,11 @@ export class DsoEditMetadataValueComponent implements OnInit { */ @Input() mdField: string; + /** + * Flag whether this is a new metadata field or exists already + */ + @Input() isNewMdField = false; + /** * Type of DSO we're displaying values for * Determines i18n messages diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html index 3ecd502ff6e..86801db1759 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html @@ -42,6 +42,7 @@ [saving$]="savingOrLoadingFieldValidation$" [metadataSecurityConfiguration]="getSecuritySettings()" [mdField]="newMdField" + [isNewMdField]="true" [isOnlyValue]="true" (confirm)="confirmNewValue($event)" (remove)="form.newValue = undefined" diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts index 5849a830bfe..6e88042ded6 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts @@ -110,7 +110,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { * Field to keep track of the current security level * in case a new mdField is added and the security level needs to be set */ - newMdFieldWithSecurityLevelValue = 0; + newMdFieldWithSecurityLevelValue: number; /** * Flag to indicate if the metadata security configuration is present @@ -118,6 +118,8 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { */ hasSecurityMetadata = false; + securitySetings: MetadataSecurityConfiguration; + constructor(protected route: ActivatedRoute, protected notificationsService: NotificationsService, protected translateService: TranslateService, @@ -159,7 +161,10 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { const entityType: string = (this.dso as Item).entityType; return this.metadataSecurityConfigurationService.findById(entityType).pipe( getFirstCompletedRemoteData(), - map((securitySettings: RemoteData) => securitySettings.payload) + map((securitySettings: RemoteData) => { + this.securitySetings = securitySettings.payload; + return securitySettings.payload; + }) ); } } @@ -285,7 +290,7 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { */ onMdFieldChange(value: string){ if (hasValue(value)) { - this.newMdFieldWithSecurityLevelValue = 0; + this.newMdFieldWithSecurityLevelValue = null; this.hasSecurityMetadata = false; } } @@ -304,11 +309,38 @@ export class DsoEditMetadataComponent implements OnInit, OnDestroy { * @param securityLevel The security level to set for the new metadata field */ setSecurityLevelForNewMdField(securityLevel?: number) { + // if the metadata field already exists among the metadata fields, + // set the security level for the new metadata field in the right position if (hasValue(this.newMdField) && hasValue(this.form.fields[this.newMdField]) && this.hasSecurityMetadata) { - this.form.fields[this.newMdField][this.form.fields[this.newMdField].length - 1].change = DsoEditMetadataChangeType.ADD; - this.form.fields[this.newMdField][this.form.fields[this.newMdField].length - 1].newValue.securityLevel = this.newMdFieldWithSecurityLevelValue ?? securityLevel ?? 0; - } else if (hasNoValue(this.form.fields[this.newMdField]) && securityLevel) { + const lastIndex = this.form.fields[this.newMdField].length - 1; + const obj = this.form.fields[this.newMdField][lastIndex]; + + if (hasValue(securityLevel)) { + // metadata field is not set yet, so store the security level for the new metadata field this.newMdFieldWithSecurityLevelValue = securityLevel; + } else { + // metadata field is set, so set the security level for the new metadata field + obj.change = DsoEditMetadataChangeType.ADD; + const customSecurity = this.securitySetings.metadataCustomSecurity[this.newMdField]; + const lastCustomSecurityLevel = customSecurity[customSecurity.length - 1]; + + obj.newValue.securityLevel = this.newMdFieldWithSecurityLevelValue ?? lastCustomSecurityLevel; + } + } + + // if the security level value is changed before the metadata field is set, + // store the security level in a temporary variable + if (hasValue(securityLevel) && hasNoValue(this.form.fields[this.newMdField])) { + this.newMdFieldWithSecurityLevelValue = securityLevel; + } + + if (!this.hasSecurityMetadata) { + // for newly added metadata fields, set the security level to the default security level + // (in case there is no custom security level for the metadata field) + const defaultSecurity = this.securitySetings.metadataSecurityDefault; + const lastDefaultSecurityLevel = defaultSecurity[defaultSecurity.length - 1]; + + this.form.fields[this.newMdField][this.form.fields[this.newMdField].length - 1].newValue.securityLevel = lastDefaultSecurityLevel; } } diff --git a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts index 0a6368dfc9a..e047b846aa3 100644 --- a/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts +++ b/src/app/item-page/edit-item-page/edit-metadata-security/edit-metadata-security.component.ts @@ -11,6 +11,7 @@ import { hasNoValue } from '../../../shared/empty.util'; export class EditMetadataSecurityComponent implements OnInit { @Input() securityLevel: number; @Input() securityConfigLevel: number[]; + @Input() isNewMdField = false; @Output() changeSecurityLevel = new EventEmitter(); /** @@ -23,6 +24,11 @@ export class EditMetadataSecurityComponent implements OnInit { ngOnInit(): void { this.filterSecurityLevelsMap(); this.hasSecurityLevel.emit(true); + + if (this.isNewMdField) { + // If the metadata field is new, set the security level to the highest level automatically + this.securityLevel = this.securityConfigLevel[this.securityConfigLevel.length - 1]; + } } /** From ee154679c2d7198ed72d40f307367f0ddeb230ac Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 29 May 2023 13:18:05 +0200 Subject: [PATCH 570/758] [DSC-1106] Fix CMS metadata submission issue --- .../admin/edit-cms-metadata/edit-cms-metadata.component.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/admin/edit-cms-metadata/edit-cms-metadata.component.ts b/src/app/admin/edit-cms-metadata/edit-cms-metadata.component.ts index 3ab24c530bd..9ed54ecc7c9 100644 --- a/src/app/admin/edit-cms-metadata/edit-cms-metadata.component.ts +++ b/src/app/admin/edit-cms-metadata/edit-cms-metadata.component.ts @@ -74,15 +74,13 @@ export class EditCmsMetadataComponent implements OnInit { this.siteService.patch(this.site, operations).pipe(getFirstCompletedRemoteData()) .subscribe((restResponse) => { - if (restResponse.isSuccess) { + if (restResponse.hasSucceeded) { this.site = restResponse.payload; this.notificationsService.success(this.translateService.get('admin.edit-cms-metadata.success')); this.selectedMetadata = undefined; this.editMode.next(false); } else { - if (restResponse.isError) { - this.notificationsService.error(this.translateService.get('admin.edit-cms-metadata.error')); - } + this.notificationsService.error(this.translateService.get('admin.edit-cms-metadata.error')); } this.siteService.setStale(); }); From 01fd25ca6985656af3a08f2fe090deb62a09c95f Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 29 May 2023 15:42:09 +0200 Subject: [PATCH 571/758] [CST-7439] Improve correction step in order to react on section data changes --- .../section-correction.component.html | 10 ++--- .../section-correction.component.spec.ts | 23 ++++++------ .../section-correction.component.ts | 37 +++++++++++++------ 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/src/app/submission/sections/correction/section-correction.component.html b/src/app/submission/sections/correction/section-correction.component.html index f9d4a829142..53f38a66d05 100644 --- a/src/app/submission/sections/correction/section-correction.component.html +++ b/src/app/submission/sections/correction/section-correction.component.html @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ - + - +
    {{correction.label}} ({{correction.metadata}}) - @@ -31,14 +31,14 @@

    - + - + diff --git a/src/app/submission/sections/correction/section-correction.component.spec.ts b/src/app/submission/sections/correction/section-correction.component.spec.ts index 58dd4ab0f46..dd754ee2431 100644 --- a/src/app/submission/sections/correction/section-correction.component.spec.ts +++ b/src/app/submission/sections/correction/section-correction.component.spec.ts @@ -1,14 +1,14 @@ +import { ChangeDetectorRef, DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock'; import { BrowserModule, By } from '@angular/platform-browser'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; + +import { of } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; -import { SectionFormOperationsService } from '../form/section-form-operations.service'; -import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock'; -import { FormService } from '../../../shared/form/form.service'; -import { getMockFormService } from '../../../shared/mocks/form-service.mock'; -import { ChangeDetectorRef, DebugElement } from '@angular/core'; + +import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock'; +import { SubmissionSectionCorrectionComponent } from './section-correction.component'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { SubmissionSectionLicenseComponent } from '../license/section-license.component'; import { SectionDataObject } from '../models/section-data.model'; @@ -18,7 +18,6 @@ import { SectionsService } from '../sections.service'; import { OperationType } from '../../../core/submission/models/workspaceitem-section-correction.model'; import { AlertComponent } from '../../../shared/alert/alert.component'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { SubmissionSectionCorrectionComponent } from './section-correction.component'; const sectionObject: SectionDataObject = { config: 'https://dspace7.4science.it/or2018/api/config/submissionforms/license', @@ -92,7 +91,7 @@ const collectionId = mockSubmissionCollectionId; describe('CorrectionComponent', () => { let component: SubmissionSectionCorrectionComponent; let fixture: ComponentFixture; - const sectionsServiceStub: SectionsServiceStub = undefined; + let sectionsService: any; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ @@ -109,8 +108,6 @@ describe('CorrectionComponent', () => { SubmissionSectionCorrectionComponent ], providers: [ - {provide: SectionFormOperationsService, useValue: getMockFormOperationsService()}, - {provide: FormService, useValue: getMockFormService()}, {provide: SectionsService, useClass: SectionsServiceStub}, {provide: 'collectionIdProvider', useValue: collectionId}, {provide: 'sectionDataProvider', useValue: sectionObject}, @@ -123,11 +120,13 @@ describe('CorrectionComponent', () => { .compileComponents(); })); - beforeEach(() => { + beforeEach(waitForAsync(() => { fixture = TestBed.createComponent(SubmissionSectionCorrectionComponent); component = fixture.componentInstance; + sectionsService = TestBed.inject(SectionsService); + sectionsService.getSectionData.and.returnValue(of(sectionObject.data)); fixture.detectChanges(); - }); + })); it('should create correction component', () => { expect(component).toBeTruthy(); diff --git a/src/app/submission/sections/correction/section-correction.component.ts b/src/app/submission/sections/correction/section-correction.component.ts index eb22ec7194a..313d8be5c45 100644 --- a/src/app/submission/sections/correction/section-correction.component.ts +++ b/src/app/submission/sections/correction/section-correction.component.ts @@ -1,6 +1,7 @@ import { Component, Inject } from '@angular/core'; -import { Observable, of as observableOf } from 'rxjs'; +import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs'; +import { filter } from 'rxjs/operators'; import { renderSectionFor } from '../sections-decorator'; import { SectionsType } from '../sections-type'; @@ -14,6 +15,7 @@ import { WorkspaceitemSectionCorrectionMetadataObject, WorkspaceitemSectionCorrectionObject } from '../../../core/submission/models/workspaceitem-section-correction.model'; +import { hasValue, isNotEmpty } from '../../../shared/empty.util'; @Component({ selector: 'ds-submission-correction', @@ -25,16 +27,22 @@ export class SubmissionSectionCorrectionComponent extends SectionModelComponent /** * Contain the correction information regarding item's bitstream */ - public correctionBitstreamData: WorkspaceitemSectionCorrectionBitstreamObject[]; + public correctionBitstreamData$: BehaviorSubject = new BehaviorSubject([]); /** * Contain the correction information regarding item's metadata */ - public correctionMetadataData: WorkspaceitemSectionCorrectionMetadataObject[]; + public correctionMetadataData$: BehaviorSubject = new BehaviorSubject([]); public roleTypeEnum = RoleType; public operationType = OperationType; + /** + * The list of Subscription + * @type {Array} + */ + protected subs: Subscription[] = []; + constructor(protected sectionService: SectionsService, @Inject('collectionIdProvider') public injectedCollectionId: string, @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject, @@ -49,16 +57,15 @@ export class SubmissionSectionCorrectionComponent extends SectionModelComponent /** * Retrieve correction metadata list */ - getItemData(): WorkspaceitemSectionCorrectionMetadataObject[] { - const correctionObject: WorkspaceitemSectionCorrectionObject = this.sectionData.data as WorkspaceitemSectionCorrectionObject; - return correctionObject.metadata; + getItemData(sectionData: WorkspaceitemSectionCorrectionObject): WorkspaceitemSectionCorrectionMetadataObject[] { + return sectionData?.metadata || []; } /** * Retrieve correction bitstream list */ - getFileData(): WorkspaceitemSectionCorrectionBitstreamObject[] { - const correctionObjectBitstreams: WorkspaceitemSectionCorrectionBitstreamObject[] = (this.sectionData.data as WorkspaceitemSectionCorrectionObject)?.bitstream || []; + getFileData(sectionData: WorkspaceitemSectionCorrectionObject): WorkspaceitemSectionCorrectionBitstreamObject[] { + const correctionObjectBitstreams: WorkspaceitemSectionCorrectionBitstreamObject[] = sectionData?.bitstream || []; return [...correctionObjectBitstreams].sort((obj1: WorkspaceitemSectionCorrectionBitstreamObject, obj2: WorkspaceitemSectionCorrectionBitstreamObject) => { return obj1.filename > obj2.filename ? 1 : -1; } @@ -93,12 +100,20 @@ export class SubmissionSectionCorrectionComponent extends SectionModelComponent } protected onSectionDestroy() { - return; + this.subs + .filter((subscription) => hasValue(subscription)) + .forEach((subscription) => subscription.unsubscribe()); } protected onSectionInit(): void { - this.correctionMetadataData = this.getItemData(); - this.correctionBitstreamData = this.getFileData(); + this.subs.push( + this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType).pipe( + filter((data: WorkspaceitemSectionCorrectionObject) => isNotEmpty(data)) + ).subscribe((data: WorkspaceitemSectionCorrectionObject) => { + this.correctionMetadataData$.next(this.getItemData(data)); + this.correctionBitstreamData$.next(this.getFileData(data)); + }) + ); } } From 403f15c484a8101868bc26073fde8e7800170f91 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 30 May 2023 10:11:55 +0200 Subject: [PATCH 572/758] Fix lint --- src/app/core/browse/browse.service.ts | 2 +- src/app/core/browse/search-manager.ts | 2 +- .../core/end-user-agreement/end-user-agreement.service.ts | 1 - .../core/itemexportformat/item-export-format.service.ts | 2 +- src/app/core/metadata/metadata.service.ts | 3 +-- .../metadata/schema-json-ld/schema-types/schema-type.ts | 2 +- .../broker/events/openaire-broker-event-rest.service.ts | 1 - src/app/core/shared/search/search.service.ts | 1 - src/app/core/statistics/models/login-statistics.model.ts | 2 +- src/app/core/submission/models/edititem.model.ts | 1 - .../attachment-render/attachment-render.component.ts | 2 -- .../cris-layout-box-container.component.spec.ts | 2 +- src/app/cris-layout/cris-layout.component.spec.ts | 3 +-- .../dso-edit-metadata-field-values.component.spec.ts | 1 - .../guards/edit-item-relationships.guard.ts | 7 ++----- .../edit-item-relationships/relationships-data-service.ts | 2 -- src/app/explore-page/explore-i18n-breadcrumb.resolver.ts | 2 +- .../item-detail-page-modal.component.spec.ts | 2 -- .../edit-item-page/edit-item-page.routing.module.ts | 1 - src/app/my-dspace-page/my-dspace-page.component.ts | 2 +- src/app/openaire/reciter-suggestions/selectors.ts | 1 - src/app/profile-page/profile-page.component.ts | 1 - src/app/shared/alert/alert.component.ts | 2 +- .../dso-page-edit/dso-page-edit-menu.component.spec.ts | 2 +- .../edit-item-relationships-menu.component.spec.ts | 1 - .../edit-item-relationships-menu.component.ts | 4 +--- .../export-collection-menu.component.spec.ts | 2 +- .../request-correction-menu.component.spec.ts | 1 - .../bulk-import-collection-selector.component.ts | 2 +- .../export-excel-selector.component.ts | 4 ++-- .../shared/entity-dropdown/entity-dropdown.component.ts | 1 - .../multi-column-top-section.component.spec.ts | 2 -- .../file-download-button.component.spec.ts | 1 - .../modal/dynamic-relation-group-modal.component.spec.ts | 2 +- src/app/shared/form/builder/parsers/concat-field-parser.ts | 2 +- .../pipes/metric-style-config/metric-style-config.pipe.ts | 2 +- src/app/shared/mocks/mock-detect-duplicate-service.ts | 1 - src/app/shared/mocks/openaire.mock.ts | 2 -- .../item-detail-preview.component.spec.ts | 2 -- .../additional-metadata/additional-metadata.component.ts | 4 ++-- .../search-chart-bar-horizontal.component.ts | 2 +- .../search-chart-bar/search-chart-bar.component.ts | 2 +- src/app/shared/shared.module.ts | 2 -- src/app/shared/testing/relationships-service.stub.ts | 1 - .../site-statistics-page/site-statistics-page.component.ts | 1 - .../statistics-page/statistics-page.component.ts | 2 +- .../submission/objects/submission-section-object.model.ts | 1 - .../upload/file/edit/section-upload-file-edit.component.ts | 1 - .../suggestions-page/suggestions-page-routing.module.ts | 1 - 49 files changed, 27 insertions(+), 66 deletions(-) diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts index 34f4fe3dfe1..8956a9a43d0 100644 --- a/src/app/core/browse/browse.service.ts +++ b/src/app/core/browse/browse.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { distinctUntilChanged, map, startWith, switchMap } from 'rxjs/operators'; +import { distinctUntilChanged, map, startWith } from 'rxjs/operators'; import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../shared/empty.util'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { PaginatedList } from '../data/paginated-list.model'; diff --git a/src/app/core/browse/search-manager.ts b/src/app/core/browse/search-manager.ts index 1374f6597ac..723fbd0436b 100644 --- a/src/app/core/browse/search-manager.ts +++ b/src/app/core/browse/search-manager.ts @@ -20,7 +20,7 @@ import { hasValue } from '../../shared/empty.util'; import { FollowAuthorityMetadata } from '../../../config/search-follow-metadata.interface'; import { MetadataValue } from '../shared/metadata.models'; import { Metadata } from '../shared/metadata.utils'; -import { isArray } from 'lodash'; +import isArray from 'lodash/isArray'; /** * The service aims to manage browse requests and subsequent extra fetch requests. diff --git a/src/app/core/end-user-agreement/end-user-agreement.service.ts b/src/app/core/end-user-agreement/end-user-agreement.service.ts index ac36b359aed..8d2a94d55f5 100644 --- a/src/app/core/end-user-agreement/end-user-agreement.service.ts +++ b/src/app/core/end-user-agreement/end-user-agreement.service.ts @@ -7,7 +7,6 @@ import { hasValue } from '../../shared/empty.util'; import { EPersonDataService } from '../eperson/eperson-data.service'; import { getFirstCompletedRemoteData } from '../shared/operators'; import { ConfigurationDataService } from '../data/configuration-data.service'; -import { calcPossibleSecurityContexts } from '@angular/compiler/src/template_parser/binding_parser'; export const END_USER_AGREEMENT_COOKIE = 'hasAgreedEndUser'; export const END_USER_AGREEMENT_METADATA_FIELD = 'dspace.agreements.end-user'; diff --git a/src/app/core/itemexportformat/item-export-format.service.ts b/src/app/core/itemexportformat/item-export-format.service.ts index 710ff17b949..1d1b01995b6 100644 --- a/src/app/core/itemexportformat/item-export-format.service.ts +++ b/src/app/core/itemexportformat/item-export-format.service.ts @@ -29,7 +29,7 @@ import { IdentifiableDataService } from '../data/base/identifiable-data.service' import { SearchDataImpl } from '../data/base/search-data'; import { DSONameService } from '../breadcrumbs/dso-name.service'; import { isEmpty, isNotEmpty } from '../../shared/empty.util'; -import { findIndex } from 'lodash'; +import findIndex from 'lodash/findIndex'; export enum ItemExportFormatMolteplicity { SINGLE = 'SINGLE', diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts index 6ca10aec338..0a9cd0408d5 100644 --- a/src/app/core/metadata/metadata.service.ts +++ b/src/app/core/metadata/metadata.service.ts @@ -26,8 +26,7 @@ import { Bitstream } from '../shared/bitstream.model'; import { DSpaceObject } from '../shared/dspace-object.model'; import { Item } from '../shared/item.model'; import { - debounceTimeWorkaround, - getFirstCompletedRemoteData, getFirstSucceededRemoteData, + getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators'; import { RootDataService } from '../data/root-data.service'; diff --git a/src/app/core/metadata/schema-json-ld/schema-types/schema-type.ts b/src/app/core/metadata/schema-json-ld/schema-types/schema-type.ts index a57684afdc1..f1691c2bbf0 100644 --- a/src/app/core/metadata/schema-json-ld/schema-types/schema-type.ts +++ b/src/app/core/metadata/schema-json-ld/schema-types/schema-type.ts @@ -1,4 +1,4 @@ -import { isObject } from 'lodash'; +import isObject from 'lodash/isObject'; import { Item } from '../../../shared/item.model'; import { isNotEmpty } from '../../../../shared/empty.util'; diff --git a/src/app/core/openaire/broker/events/openaire-broker-event-rest.service.ts b/src/app/core/openaire/broker/events/openaire-broker-event-rest.service.ts index 500b7a925d1..6a9171d453f 100644 --- a/src/app/core/openaire/broker/events/openaire-broker-event-rest.service.ts +++ b/src/app/core/openaire/broker/events/openaire-broker-event-rest.service.ts @@ -9,7 +9,6 @@ import { ReplaceOperation } from 'fast-json-patch'; import { HALEndpointService } from '../../../shared/hal-endpoint.service'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service'; -import { RestResponse } from '../../../cache/response.models'; import { ObjectCacheService } from '../../../cache/object-cache.service'; import { dataService } from '../../../data/base/data-service.decorator'; import { RequestService } from '../../../data/request.service'; diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts index 65871512c34..1761b74eeb4 100644 --- a/src/app/core/shared/search/search.service.ts +++ b/src/app/core/shared/search/search.service.ts @@ -15,7 +15,6 @@ import { GenericConstructor } from '../generic-constructor'; import { HALEndpointService } from '../hal-endpoint.service'; import { URLCombiner } from '../../url-combiner/url-combiner'; import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../../shared/empty.util'; -import { SearchOptions } from '../../../shared/search/models/search-options.model'; import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model'; import { SearchResponseParsingService } from '../../data/search-response-parsing.service'; import { SearchObjects } from '../../../shared/search/models/search-objects.model'; diff --git a/src/app/core/statistics/models/login-statistics.model.ts b/src/app/core/statistics/models/login-statistics.model.ts index b539d36c8a2..2bf7e39c515 100644 --- a/src/app/core/statistics/models/login-statistics.model.ts +++ b/src/app/core/statistics/models/login-statistics.model.ts @@ -1,4 +1,4 @@ -import { autoserialize, deserialize, deserializeAs } from 'cerialize'; +import { autoserialize, deserialize } from 'cerialize'; import { typedObject } from '../../cache/builders/build-decorators'; import { CacheableObject } from '../../cache/cacheable-object.model'; import { HALLink } from '../../shared/hal-link.model'; diff --git a/src/app/core/submission/models/edititem.model.ts b/src/app/core/submission/models/edititem.model.ts index 02865f8dbdb..c14f15dd672 100644 --- a/src/app/core/submission/models/edititem.model.ts +++ b/src/app/core/submission/models/edititem.model.ts @@ -3,7 +3,6 @@ import { typedObject, inheritLinkAnnotations, link } from '../../cache/builders/ import { inheritSerialization, deserializeAs } from 'cerialize'; import { SubmissionObject } from './submission-object.model'; import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer'; -import { HALLink } from '../../shared/hal-link.model'; import { Observable } from 'rxjs'; import { RemoteData } from '../../data/remote-data'; import { EditItemMode } from './edititem-mode.model'; diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts index c22adbc4dfd..de716630b23 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.ts @@ -11,12 +11,10 @@ import { } from '@angular/core'; import { AttachmentRenderingType, - AttachmentTypeFieldRenderOptions, getAttachmentTypeRendering } from '../attachment-type.decorator'; import { Item } from '../../../../../../../../../core/shared/item.model'; import { GenericConstructor } from '../../../../../../../../../core/shared/generic-constructor'; -import { isEmpty } from '../../../../../../../../../shared/empty.util'; import { Bitstream } from '../../../../../../../../../core/shared/bitstream.model'; @Component({ diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/cris-layout-box-container.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/cris-layout-box-container.component.spec.ts index 14587fbdf2a..2801b4d6cfe 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/cris-layout-box-container.component.spec.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/cris-layout-box-container.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateLoader, TranslateService } from '@ngx-translate/core'; +import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { CrisLayoutBoxContainerComponent } from './cris-layout-box-container.component'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; diff --git a/src/app/cris-layout/cris-layout.component.spec.ts b/src/app/cris-layout/cris-layout.component.spec.ts index 82f785c55a8..88b0e4d229d 100644 --- a/src/app/cris-layout/cris-layout.component.spec.ts +++ b/src/app/cris-layout/cris-layout.component.spec.ts @@ -1,4 +1,3 @@ -import { PaginatedList, buildPaginatedList } from './../core/data/paginated-list.model'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core'; @@ -12,7 +11,7 @@ import { TabDataService } from '../core/layout/tab-data.service'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { By } from '@angular/platform-browser'; import { bothTabs, leadingTabs, loaderTabs } from '../shared/testing/layout-tab.mocks'; -import { createSuccessfulRemoteDataObject$, createSuccessfulRemoteDataObject } from '../shared/remote-data.utils'; +import { createSuccessfulRemoteDataObject } from '../shared/remote-data.utils'; import { ActivatedRoute } from '@angular/router'; import { createPaginatedList } from '../shared/testing/utils.test'; diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts index d0069560fee..3ca0dba3b64 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts @@ -1,4 +1,3 @@ -import { MetadataSecurityConfiguration } from './../../../core/submission/models/metadata-security-configuration'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { VarDirective } from '../../../shared/utils/var.directive'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/edit-item-relationships/guards/edit-item-relationships.guard.ts b/src/app/edit-item-relationships/guards/edit-item-relationships.guard.ts index 0b8e7a4579f..90ecb8a4e60 100644 --- a/src/app/edit-item-relationships/guards/edit-item-relationships.guard.ts +++ b/src/app/edit-item-relationships/guards/edit-item-relationships.guard.ts @@ -2,15 +2,12 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import { Observable } from 'rxjs'; -import { map, mergeMap } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { isNotEmpty } from '../../shared/empty.util'; import { EditItemDataService } from '../../core/submission/edititem-data.service'; -import { followLink } from '../../shared/utils/follow-link-config.model'; -import { getAllSucceededRemoteDataPayload, getFirstSucceededRemoteListPayload, getPaginatedListPayload } from '../../core/shared/operators'; -import { EditItem } from '../../core/submission/models/edititem.model'; +import { getAllSucceededRemoteDataPayload, getPaginatedListPayload } from '../../core/shared/operators'; import { AuthService, LOGIN_ROUTE } from '../../core/auth/auth.service'; -import { PaginatedList } from '../../core/data/paginated-list.model'; import { EditItemMode } from '../../core/submission/models/edititem-mode.model'; /** diff --git a/src/app/edit-item-relationships/relationships-data-service.ts b/src/app/edit-item-relationships/relationships-data-service.ts index 0e5dffb2960..e8296d47d33 100644 --- a/src/app/edit-item-relationships/relationships-data-service.ts +++ b/src/app/edit-item-relationships/relationships-data-service.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { combineLatest, Observable } from 'rxjs'; -import { first, map } from 'rxjs/operators'; /** * Service that performs all actions that have to do with the current mydspace configuration diff --git a/src/app/explore-page/explore-i18n-breadcrumb.resolver.ts b/src/app/explore-page/explore-i18n-breadcrumb.resolver.ts index 1f2cd92ba65..cace362e0d3 100644 --- a/src/app/explore-page/explore-i18n-breadcrumb.resolver.ts +++ b/src/app/explore-page/explore-i18n-breadcrumb.resolver.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; +import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model'; import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; diff --git a/src/app/item-detail-page-modal/item-detail-page-modal.component.spec.ts b/src/app/item-detail-page-modal/item-detail-page-modal.component.spec.ts index 4f797b1c12c..aa39fc6fec4 100644 --- a/src/app/item-detail-page-modal/item-detail-page-modal.component.spec.ts +++ b/src/app/item-detail-page-modal/item-detail-page-modal.component.spec.ts @@ -4,7 +4,6 @@ import { of as observableOf } from 'rxjs'; // Import modules import { CommonModule } from '@angular/common'; -import { ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; @@ -18,7 +17,6 @@ import { TabDataService } from '../core/layout/tab-data.service'; import { leadingTabs } from '../shared/testing/layout-tab.mocks'; import { Router } from '@angular/router'; import { RouterStub } from '../shared/testing/router.stub'; -import { SharedModule } from '../shared/shared.module'; 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 0ff27377c52..e508d2b82bc 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 @@ -11,7 +11,6 @@ import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.compo import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component'; import { ItemMoveComponent } from './item-move/item-move.component'; import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.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'; 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 88b484b9adb..112474a9d9e 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.ts +++ b/src/app/my-dspace-page/my-dspace-page.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Inject, InjectionToken, Input, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, InjectionToken, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; diff --git a/src/app/openaire/reciter-suggestions/selectors.ts b/src/app/openaire/reciter-suggestions/selectors.ts index 6a1617a7b66..d5db946817b 100644 --- a/src/app/openaire/reciter-suggestions/selectors.ts +++ b/src/app/openaire/reciter-suggestions/selectors.ts @@ -3,7 +3,6 @@ import { subStateSelector } from '../../shared/selector.util'; import { openaireSelector, OpenaireState } from '../openaire.reducer'; import { OpenaireSuggestionTarget } from '../../core/openaire/reciter-suggestions/models/openaire-suggestion-target.model'; import { SuggestionTargetState } from './suggestion-targets/suggestion-targets.reducer'; -import { CoreState } from '../../core/core-state.model'; /** * Returns the Reciter Suggestion Target state. diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts index 1eea140f37d..7d6df306730 100644 --- a/src/app/profile-page/profile-page.component.ts +++ b/src/app/profile-page/profile-page.component.ts @@ -18,7 +18,6 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { ConfigurationDataService } from '../core/data/configuration-data.service'; import { ConfigurationProperty } from '../core/shared/configuration-property.model'; -import { AuthStatus } from '../core/auth/models/auth-status.model'; @Component({ selector: 'ds-profile-page', diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts index b744b4aec49..c79c4303b70 100644 --- a/src/app/shared/alert/alert.component.ts +++ b/src/app/shared/alert/alert.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { trigger } from '@angular/animations'; -import { uniqueId } from 'lodash'; +import uniqueId from 'lodash/uniqueId'; import { AlertType } from './aletr-type'; import { fadeOutLeave, fadeOutState } from '../animations/fade'; diff --git a/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.spec.ts b/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.spec.ts index b5143c21378..bc01bfc4a11 100644 --- a/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.spec.ts +++ b/src/app/shared/context-menu/dso-page-edit/dso-page-edit-menu.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { DsoPageEditMenuComponent } from './dso-page-edit-menu.component'; import { DSpaceObject } from '../../../core/shared/dspace-object.model'; import { Item } from '../../../core/shared/item.model'; diff --git a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.spec.ts b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.spec.ts index 206636c9471..d99d689200a 100644 --- a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.spec.ts +++ b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.spec.ts @@ -6,7 +6,6 @@ import { RouterTestingModule } from '@angular/router/testing'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; import { EditItemDataService } from '../../../core/submission/edititem-data.service'; import { EditItemRelationshipsMenuComponent } from './edit-item-relationships-menu.component'; -import { EditItem } from '../../../core/submission/models/edititem.model'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { createPaginatedList } from '../../testing/utils.test'; import { EditItemMode } from '../../../core/submission/models/edititem-mode.model'; diff --git a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts index 5775f0880fe..1ae8ae52b7d 100644 --- a/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts +++ b/src/app/shared/context-menu/edit-item-relationships/edit-item-relationships-menu.component.ts @@ -1,13 +1,11 @@ import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { map, mergeMap, startWith, } from 'rxjs/operators'; +import { map, startWith, } from 'rxjs/operators'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { hasValue, isNotEmpty } from '../../empty.util'; import { EditItemMode } from '../../../core/submission/models/edititem-mode.model'; -import { followLink } from '../../utils/follow-link-config.model'; import { getAllSucceededRemoteDataPayload, getFirstSucceededRemoteListPayload, getPaginatedListPayload } from '../../../core/shared/operators'; -import { EditItem } from '../../../core/submission/models/edititem.model'; import { EditItemDataService } from '../../../core/submission/edititem-data.service'; import { rendersContextMenuEntriesForType } from '../context-menu.decorator'; import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'; diff --git a/src/app/shared/context-menu/export-collection/export-collection-menu.component.spec.ts b/src/app/shared/context-menu/export-collection/export-collection-menu.component.spec.ts index bc21be1c938..03febab1293 100644 --- a/src/app/shared/context-menu/export-collection/export-collection-menu.component.spec.ts +++ b/src/app/shared/context-menu/export-collection/export-collection-menu.component.spec.ts @@ -1,4 +1,4 @@ -import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { Router } from '@angular/router'; import { By } from '@angular/platform-browser'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/shared/context-menu/request-correction/request-correction-menu.component.spec.ts b/src/app/shared/context-menu/request-correction/request-correction-menu.component.spec.ts index 512b38899fd..cfcf78976fd 100644 --- a/src/app/shared/context-menu/request-correction/request-correction-menu.component.spec.ts +++ b/src/app/shared/context-menu/request-correction/request-correction-menu.component.spec.ts @@ -12,7 +12,6 @@ import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model' import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { NotificationsService } from '../../notifications/notifications.service'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; -import { RequestService } from '../../../core/data/request.service'; import { RequestCorrectionMenuComponent } from './request-correction-menu.component'; import { SubmissionService } from '../../../submission/submission.service'; import { Item } from '../../../core/shared/item.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/bulk-import-collection-selector/bulk-import-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/bulk-import-collection-selector/bulk-import-collection-selector.component.ts index c1f26a8a8aa..ee0ec54ce63 100644 --- a/src/app/shared/dso-selector/modal-wrappers/bulk-import-collection-selector/bulk-import-collection-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/bulk-import-collection-selector/bulk-import-collection-selector.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input } from '@angular/core'; -import { ActivatedRoute, Router, NavigationExtras } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { getBulkImportRoute } from '../../../../app-routing-paths'; import { Collection } from '../../../../core/shared/collection.model'; diff --git a/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts index 3c7220492ae..c39a6e8e659 100644 --- a/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/export-excel-selector/export-excel-selector.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts index 9a30e74f97b..dcab4cb717e 100644 --- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts +++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts @@ -23,7 +23,6 @@ import { } from '../../core/itemexportformat/item-export-format.service'; import { createSuccessfulRemoteDataObject } from '../remote-data.utils'; import { FindListOptions } from '../../core/data/find-list-options.model'; -import { ItemExportFormatMap } from '../../core/itemexportformat/model/item-export-format.model'; @Component({ selector: 'ds-entity-dropdown', diff --git a/src/app/shared/explore/section-component/multi-column-top-section/multi-column-top-section.component.spec.ts b/src/app/shared/explore/section-component/multi-column-top-section/multi-column-top-section.component.spec.ts index dc33760e20c..5c1e7733592 100644 --- a/src/app/shared/explore/section-component/multi-column-top-section/multi-column-top-section.component.spec.ts +++ b/src/app/shared/explore/section-component/multi-column-top-section/multi-column-top-section.component.spec.ts @@ -1,6 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { MultiColumnTopSectionComponent } from './multi-column-top-section.component'; diff --git a/src/app/shared/file-download-button/file-download-button.component.spec.ts b/src/app/shared/file-download-button/file-download-button.component.spec.ts index aff518c01d1..423b117544c 100644 --- a/src/app/shared/file-download-button/file-download-button.component.spec.ts +++ b/src/app/shared/file-download-button/file-download-button.component.spec.ts @@ -2,7 +2,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { cold } from 'jasmine-marbles'; import { of } from 'rxjs'; import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; import { Bitstream } from 'src/app/core/shared/bitstream.model'; diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts index e25d9348d3b..414cca05813 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.component.spec.ts @@ -1,5 +1,5 @@ // Load the implementations that should be tested -import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; +import { ChangeDetectorRef, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing'; import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts index 67f06964998..89441041093 100644 --- a/src/app/shared/form/builder/parsers/concat-field-parser.ts +++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts @@ -1,7 +1,7 @@ import {Inject} from '@angular/core'; import { FormFieldModel } from '../models/form-field.model'; import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model'; -import { DynamicFormControlLayout, DynamicInputModel, DynamicInputModelConfig } from '@ng-dynamic-forms/core'; +import { DynamicFormControlLayout } from '@ng-dynamic-forms/core'; import { CONCAT_FIRST_INPUT_SUFFIX, CONCAT_GROUP_SUFFIX, diff --git a/src/app/shared/metric/pipes/metric-style-config/metric-style-config.pipe.ts b/src/app/shared/metric/pipes/metric-style-config/metric-style-config.pipe.ts index 65a9c4cbca4..057d66c2335 100644 --- a/src/app/shared/metric/pipes/metric-style-config/metric-style-config.pipe.ts +++ b/src/app/shared/metric/pipes/metric-style-config/metric-style-config.pipe.ts @@ -1,4 +1,4 @@ -import { isEqual } from 'lodash'; +import isEqual from 'lodash/isEqual'; import { environment } from '../../../../../environments/environment'; import { MetricVisualizationConfig } from '../../../../../config/metric-visualization-config.interfaces'; import { Metric } from '../../../../core/shared/metric.model'; diff --git a/src/app/shared/mocks/mock-detect-duplicate-service.ts b/src/app/shared/mocks/mock-detect-duplicate-service.ts index b8670ed2ecd..598aad8a88b 100644 --- a/src/app/shared/mocks/mock-detect-duplicate-service.ts +++ b/src/app/shared/mocks/mock-detect-duplicate-service.ts @@ -1,4 +1,3 @@ -import { of as observableOf } from 'rxjs'; import { DetectDuplicateService } from '../../submission/sections/detect-duplicate/detect-duplicate.service'; diff --git a/src/app/shared/mocks/openaire.mock.ts b/src/app/shared/mocks/openaire.mock.ts index bb2bb663eb4..54951cb056d 100644 --- a/src/app/shared/mocks/openaire.mock.ts +++ b/src/app/shared/mocks/openaire.mock.ts @@ -5,7 +5,6 @@ import { OpenaireBrokerEventObject } from '../../core/openaire/broker/models/ope import { OpenaireBrokerTopicRestService } from '../../core/openaire/broker/topics/openaire-broker-topic-rest.service'; import { OpenaireBrokerEventRestService } from '../../core/openaire/broker/events/openaire-broker-event-rest.service'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; -import { OpenaireStateService } from '../../openaire/openaire-state.service'; import { Item } from '../../core/shared/item.model'; import { createNoContentRemoteDataObject$, @@ -13,7 +12,6 @@ import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; import { SearchResult } from '../search/models/search-result.model'; -import { SuggestionsService } from '../../openaire/reciter-suggestions/suggestions.service'; import { OpenaireSuggestionTarget } from '../../core/openaire/reciter-suggestions/models/openaire-suggestion-target.model'; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts index 1456ae73bdb..0b5acd343bd 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts @@ -32,8 +32,6 @@ import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field/ite import { ItemDetailPreviewComponent } from './item-detail-preview.component'; import { createPaginatedList } from '../../../testing/utils.test'; import { FindListOptions } from '../../../../core/data/find-list-options.model'; -import { environment } from 'src/environments/environment'; -import { By } from '@angular/platform-browser'; function getMockFileService(): FileService { return jasmine.createSpyObj('FileService', { diff --git a/src/app/shared/object-list/search-result-list-element/additional-metadata/additional-metadata.component.ts b/src/app/shared/object-list/search-result-list-element/additional-metadata/additional-metadata.component.ts index 6491a4a6ec5..1f4340982ac 100644 --- a/src/app/shared/object-list/search-result-list-element/additional-metadata/additional-metadata.component.ts +++ b/src/app/shared/object-list/search-result-list-element/additional-metadata/additional-metadata.component.ts @@ -9,8 +9,8 @@ import { ResolverStrategyService } from '../../../../cris-layout/services/resolv import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; import { AdditionalMetadataConfig } from '../../../../../config/additional-metadata.config'; import { getFirstSucceededRemoteDataPayload, getPaginatedListPayload } from '../../../../core/shared/operators'; -import {map, mapTo, take, tap} from 'rxjs/operators'; -import {interval, Observable, of, race} from 'rxjs'; +import {map, mapTo, take} from 'rxjs/operators'; +import {interval, Observable, race} from 'rxjs'; import { VocabularyService } from '../../../../core/submission/vocabularies/vocabulary.service'; interface LinkData { diff --git a/src/app/shared/search/search-charts/search-chart/search-chart-bar-horizontal/search-chart-bar-horizontal.component.ts b/src/app/shared/search/search-charts/search-chart/search-chart-bar-horizontal/search-chart-bar-horizontal.component.ts index d597fb44f53..883eadfcfaa 100644 --- a/src/app/shared/search/search-charts/search-chart/search-chart-bar-horizontal/search-chart-bar-horizontal.component.ts +++ b/src/app/shared/search/search-charts/search-chart/search-chart-bar-horizontal/search-chart-bar-horizontal.component.ts @@ -1,4 +1,4 @@ -import { isEqual } from 'lodash'; +import isEqual from 'lodash/isEqual'; import { facetLoad } from '../../../search-filters/search-filter/search-facet-filter/search-facet-filter.component'; import { Component, OnInit } from '@angular/core'; import { FilterType } from '../../../models/filter-type.model'; diff --git a/src/app/shared/search/search-charts/search-chart/search-chart-bar/search-chart-bar.component.ts b/src/app/shared/search/search-charts/search-chart/search-chart-bar/search-chart-bar.component.ts index 77594870ad8..cf5126cb549 100644 --- a/src/app/shared/search/search-charts/search-chart/search-chart-bar/search-chart-bar.component.ts +++ b/src/app/shared/search/search-charts/search-chart/search-chart-bar/search-chart-bar.component.ts @@ -1,4 +1,4 @@ -import { isEqual } from 'lodash'; +import isEqual from 'lodash/isEqual'; import { Component, OnInit } from '@angular/core'; import { FilterType } from '../../../models/filter-type.model'; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 8b75c9a341f..4f07cfdeefd 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -5,7 +5,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { NgbCollapseModule, - NgbDatepickerModule, NgbDropdownModule, NgbModule, NgbNavModule, @@ -15,7 +14,6 @@ import { } from '@ng-bootstrap/ng-bootstrap'; import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core'; import { NgxPaginationModule } from 'ngx-pagination'; -import { FileUploadModule } from 'ng2-file-upload'; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component'; import { diff --git a/src/app/shared/testing/relationships-service.stub.ts b/src/app/shared/testing/relationships-service.stub.ts index c3f8d00dcbf..af56a5542df 100644 --- a/src/app/shared/testing/relationships-service.stub.ts +++ b/src/app/shared/testing/relationships-service.stub.ts @@ -1,4 +1,3 @@ -import {of as observableOf, Observable , BehaviorSubject } from 'rxjs'; export class RelationshipsServiceStub { diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts index 4c398832b81..ee6736cc9d5 100644 --- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts +++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts @@ -5,7 +5,6 @@ import { UsageReportDataService } from '../../core/statistics/usage-report-data. import { ActivatedRoute, Router } from '@angular/router'; import { Site } from '../../core/shared/site.model'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; -import { switchMap } from 'rxjs/operators'; import { AuthService } from '../../core/auth/auth.service'; /** diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.ts b/src/app/statistics-page/statistics-page/statistics-page.component.ts index ee3081e81e6..9cf8cc7c08e 100644 --- a/src/app/statistics-page/statistics-page/statistics-page.component.ts +++ b/src/app/statistics-page/statistics-page/statistics-page.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { combineLatest, Observable } from 'rxjs'; import { UsageReportDataService } from '../../core/statistics/usage-report-data.service'; import { map, switchMap } from 'rxjs/operators'; diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts index 2faeeff762d..dcd256893a2 100644 --- a/src/app/submission/objects/submission-section-object.model.ts +++ b/src/app/submission/objects/submission-section-object.model.ts @@ -1,5 +1,4 @@ import { SectionsType } from '../sections/sections-type'; -import { SectionVisibility } from './section-visibility.model'; import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model'; import { SubmissionSectionError } from './submission-section-error.model'; import { SubmissionVisibilityType } from '../../core/config/models/config-submission-section.model'; diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts index 72956500d67..b57cc6b7ac9 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts @@ -5,7 +5,6 @@ import { DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER, DynamicDatePickerModel, DynamicDatePickerModelConfig, - DynamicFormArrayGroupModel, DynamicFormArrayModel, DynamicFormControlEvent, DynamicFormControlModel, diff --git a/src/app/suggestions-page/suggestions-page-routing.module.ts b/src/app/suggestions-page/suggestions-page-routing.module.ts index 20ed658707e..05dc6321b70 100644 --- a/src/app/suggestions-page/suggestions-page-routing.module.ts +++ b/src/app/suggestions-page/suggestions-page-routing.module.ts @@ -5,7 +5,6 @@ import { SuggestionsPageResolver } from './suggestions-page.resolver'; import { SuggestionsPageComponent } from './suggestions-page.component'; import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard'; @NgModule({ imports: [ From 0f0c27d054e163989c3b0d2c6fdaf7a0a5cb1f36 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 30 May 2023 16:47:20 +0200 Subject: [PATCH 573/758] [DSC-38] Export statistics map --- package.json | 4 +- src/app/core/export-service/export.service.ts | 17 ++++++ .../statistics-map.component.html | 44 ++++++++++----- .../statistics-map.component.ts | 45 +++++++--------- src/assets/i18n/en.json5 | 4 +- yarn.lock | 53 ++++++++++--------- 6 files changed, 100 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index 399441566af..239bd948a85 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "morgan": "^1.10.0", "ng-mocks": "^13.1.1", "ng2-file-upload": "1.4.0", - "ng2-google-charts": "^6.1.0", + "ng2-google-charts": "^7.0.0", "ng2-nouislider": "^1.8.3", "ngx-infinite-scroll": "^10.0.1", "ngx-moment": "^5.0.0", @@ -181,7 +181,7 @@ "eslint": "^8.2.0", "eslint-plugin-deprecation": "^1.3.2", "eslint-plugin-import": "^2.25.4", - "eslint-plugin-jsdoc": "^38.0.6", + "eslint-plugin-jsdoc": "^39.6.4", "eslint-plugin-unused-imports": "^2.0.0", "fork-ts-checker-webpack-plugin": "^6.0.3", "html-loader": "^1.3.2", diff --git a/src/app/core/export-service/export.service.ts b/src/app/core/export-service/export.service.ts index 7c7578f4760..53b53fc2df3 100644 --- a/src/app/core/export-service/export.service.ts +++ b/src/app/core/export-service/export.service.ts @@ -5,6 +5,7 @@ import { toJpeg, toPng } from 'html-to-image'; import { Options } from 'html-to-image/es/options'; import { saveAs } from 'file-saver'; import { BehaviorSubject } from 'rxjs'; +import { hasValue } from 'src/app/shared/empty.util'; export enum ExportImageType { png = 'png', @@ -69,4 +70,20 @@ export class ExportService { } + /** + * Creates an image from the given base64 string. + * @param base64 the base64 string + * @param type image type (png or jpeg) + * @param fileName + * @param isLoading + */ + exportImageWithBase64(base64: string, type: ExportImageType, fileName: string, isLoading: BehaviorSubject): void { + if (hasValue(base64)) { + saveAs(base64, fileName + '.' + type); + } else { + console.error('Base64 string is empty'); + } + + isLoading.next(false); + } } diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html index 62934b8924c..54af8dcd0e0 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.html @@ -1,13 +1,31 @@ -
    - - -
    -
    - -
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + +
    +     diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts index 6f0eead5f1b..9f803cf029a 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts @@ -1,10 +1,8 @@ -import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; +import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { UsageReport } from '../../../core/statistics/models/usage-report.model'; -import { GoogleChartInterface } from 'ng2-google-charts'; +import { GoogleChartComponent, GoogleChartInterface } from 'ng2-google-charts'; import { ExportImageType, ExportService } from '../../../core/export-service/export.service'; import { BehaviorSubject } from 'rxjs'; - - @Component({ selector: 'ds-statistics-map', templateUrl: './statistics-map.component.html', @@ -36,14 +34,20 @@ export class StatisticsMapComponent implements OnInit { * Loading utilized for export functions to disable buttons */ isLoading: BehaviorSubject = new BehaviorSubject(false); - /** - * Loading utilized for export functions to disable buttons - */ - isSecondLoading: BehaviorSubject = new BehaviorSubject(false); + + isLoading$: BehaviorSubject = new BehaviorSubject(false); + /** * Chart ElementRef */ - @ViewChild('googleChartRef') googleChartRef: ElementRef; + @ViewChild('googleChartRef') googleChartRef: GoogleChartComponent; + + exportImageType = ExportImageType; + + exportImageTypes = [ + { type: ExportImageType.png, label: 'PNG' }, + { type: ExportImageType.jpeg, label: 'JPEG/JPG' } + ]; constructor( private exportService: ExportService @@ -80,25 +84,16 @@ export class StatisticsMapComponent implements OnInit { ], options: { 'title': this.report.reportType } }; - } /** - * Download map as image in png version. + * Export the map as an image + * @param type of export */ - downloadPng() { - this.isLoading.next(false); - const node = this.googleChartRef.nativeElement; - this.exportService.exportAsImage(node, ExportImageType.png, this.report.reportType, this.isLoading); + exportMapAsImage(type: ExportImageType) { + this.isLoading$.next(true); + const chart = this.googleChartRef.wrapper.getChart(); + const imageURI: string = chart?.getImageURI(); + this.exportService.exportImageWithBase64(imageURI, type, this.report.reportType, this.isLoading$); } - - /** - * Download map as image in jpeg version. - */ - downloadJpeg() { - this.isSecondLoading.next(false); - const node = this.googleChartRef.nativeElement; - this.exportService.exportAsImage(node, ExportImageType.jpeg, this.report.reportType, this.isSecondLoading); - } - } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index fec5973a533..3408366b70f 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -6181,5 +6181,7 @@ "invitation.ignore-btn": "Ignore", - "authority-confidence.search-label":"Search" + "authority-confidence.search-label":"Search", + + "statistics-page.export-map-as-image": "Export map", } diff --git a/yarn.lock b/yarn.lock index caae587bf34..439ccf953ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1494,14 +1494,14 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== -"@es-joy/jsdoccomment@~0.22.1": - version "0.22.1" - resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.22.1.tgz#3c86d458780231769215a795105bd3b03b2616f2" - integrity sha512-/WMkqLYfwCf0waCAMC8Eddt3iAOdghkDF5vmyKEu8pfO66KRFY1L15yks8mfgURiwOAOJpAQ3blvB3Znj6ZwBw== +"@es-joy/jsdoccomment@~0.36.1": + version "0.36.1" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz#c37db40da36e4b848da5fd427a74bae3b004a30f" + integrity sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg== dependencies: comment-parser "1.3.1" esquery "^1.4.0" - jsdoc-type-pratt-parser "~2.2.5" + jsdoc-type-pratt-parser "~3.1.0" "@eslint/eslintrc@^1.2.1": version "1.2.1" @@ -5965,18 +5965,17 @@ eslint-plugin-import@^2.25.4: resolve "^1.20.0" tsconfig-paths "^3.12.0" -eslint-plugin-jsdoc@^38.0.6: - version "38.0.6" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-38.0.6.tgz#b26843bdc445202b9f0e3830bda39ec5aacbfa97" - integrity sha512-Wvh5ERLUL8zt2yLZ8LLgi8RuF2UkjDvD+ri1/i7yMpbfreK2S29B9b5JC7iBIoFR7KDaEWCLnUPHTqgwcXX1Sg== +eslint-plugin-jsdoc@^39.6.4: + version "39.9.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.9.1.tgz#e9ce1723411fd7ea0933b3ef0dd02156ae3068e2" + integrity sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw== dependencies: - "@es-joy/jsdoccomment" "~0.22.1" + "@es-joy/jsdoccomment" "~0.36.1" comment-parser "1.3.1" debug "^4.3.4" escape-string-regexp "^4.0.0" esquery "^1.4.0" - regextras "^0.8.0" - semver "^7.3.5" + semver "^7.3.8" spdx-expression-parse "^3.0.1" eslint-plugin-unused-imports@^2.0.0: @@ -8094,10 +8093,10 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdoc-type-pratt-parser@~2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.5.tgz#c9f93afac7ee4b5ed4432fe3f09f7d36b05ed0ff" - integrity sha512-2a6eRxSxp1BW040hFvaJxhsCMI9lT8QB8t14t+NY5tC5rckIR0U9cr2tjOeaFirmEOy6MHvmJnY7zTBHq431Lw== +jsdoc-type-pratt-parser@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e" + integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw== jsdom@19.0.0: version "19.0.0" @@ -9365,12 +9364,12 @@ ng2-file-upload@1.4.0: dependencies: tslib "^1.9.0" -ng2-google-charts@^6.1.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/ng2-google-charts/-/ng2-google-charts-6.2.0.tgz#c0b89e2b7bde0acbdca7489270e2bb8c91ba75bd" - integrity sha512-dbG93G22hDcNNfdR3vL1GyT8ez0N2J5c8UHrI0MO8+AdFWJm6v4iODRbTGrcUGWYxKsC4V5gRrzfVBtOhMnlhA== +ng2-google-charts@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/ng2-google-charts/-/ng2-google-charts-7.0.0.tgz#1e601dad1d6f2f964d052a8f6eeb6d56efd04c1a" + integrity sha512-MRc7oIDAvFVdvW2SQvE8xNjzL5NDdnB4GvJEBRW8PYsuNH1gj3RlQRdFRDdkzaRDy4y9jVI6x6yZZAYP3ZCVLw== dependencies: - tslib "^1.9.0" + tslib "^2.3.0" ng2-nouislider@^1.8.3: version "1.8.3" @@ -11440,11 +11439,6 @@ regexpu-core@^5.0.1: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" -regextras@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217" - integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ== - registry-auth-token@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" @@ -11928,6 +11922,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.3.8: + version "7.5.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" + integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== + dependencies: + lru-cache "^6.0.0" + send@0.16.2: version "0.16.2" resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" From 8eadb062d5ac333ce968a9cbcc81774d0a2403b0 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 30 May 2023 18:05:19 +0200 Subject: [PATCH 574/758] [DSC-38] ng2-google-charts downgrade --- package.json | 2 +- .../statistics-map.component.ts | 20 +++++++++++++++---- yarn.lock | 10 +++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index f14492785a2..872641ebe32 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "morgan": "^1.10.0", "ng-mocks": "^13.1.1", "ng2-file-upload": "1.4.0", - "ng2-google-charts": "^7.0.0", + "ng2-google-charts": "^6.1.0", "ng2-nouislider": "^1.8.3", "ngx-infinite-scroll": "^10.0.1", "ngx-pagination": "5.0.0", diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts index 9f803cf029a..46d28dd303b 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts @@ -1,8 +1,9 @@ -import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { Component, Inject, Input, OnInit, PLATFORM_ID, ViewChild } from '@angular/core'; import { UsageReport } from '../../../core/statistics/models/usage-report.model'; -import { GoogleChartComponent, GoogleChartInterface } from 'ng2-google-charts'; +import { GoogleChartComponent, GoogleChartInterface, GoogleChartType } from 'ng2-google-charts'; import { ExportImageType, ExportService } from '../../../core/export-service/export.service'; import { BehaviorSubject } from 'rxjs'; +import { isPlatformBrowser } from '@angular/common'; @Component({ selector: 'ds-statistics-map', templateUrl: './statistics-map.component.html', @@ -49,9 +50,20 @@ export class StatisticsMapComponent implements OnInit { { type: ExportImageType.jpeg, label: 'JPEG/JPG' } ]; + protected exportService: ExportService; + constructor( - private exportService: ExportService + @Inject(PLATFORM_ID) protected platformId: Object ) { + if (isPlatformBrowser(this.platformId)) { + import('../../../core/export-service/browser-export.service').then((s) => { + this.exportService = new s.BrowserExportService(); + }); + } else { + import('../../../core/export-service/server-export.service').then((s) => { + this.exportService = new s.ServerExportService(); + }); + } } ngOnInit(): void { @@ -77,7 +89,7 @@ export class StatisticsMapComponent implements OnInit { }); this.geoChart = { - chartType: 'GeoChart', + chartType: GoogleChartType.GeoChart, dataTable: [ this.chartColumns, ...this.data diff --git a/yarn.lock b/yarn.lock index 92b0dd79a03..fbb54046db0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8548,12 +8548,12 @@ ng2-file-upload@1.4.0: dependencies: tslib "^1.9.0" -ng2-google-charts@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/ng2-google-charts/-/ng2-google-charts-7.0.0.tgz#1e601dad1d6f2f964d052a8f6eeb6d56efd04c1a" - integrity sha512-MRc7oIDAvFVdvW2SQvE8xNjzL5NDdnB4GvJEBRW8PYsuNH1gj3RlQRdFRDdkzaRDy4y9jVI6x6yZZAYP3ZCVLw== +ng2-google-charts@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/ng2-google-charts/-/ng2-google-charts-6.2.0.tgz#c0b89e2b7bde0acbdca7489270e2bb8c91ba75bd" + integrity sha512-dbG93G22hDcNNfdR3vL1GyT8ez0N2J5c8UHrI0MO8+AdFWJm6v4iODRbTGrcUGWYxKsC4V5gRrzfVBtOhMnlhA== dependencies: - tslib "^2.3.0" + tslib "^1.9.0" ng2-nouislider@^1.8.3: version "1.8.3" From ee8c3275fce0f604ca7fa9760226104497c1a2e6 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 30 May 2023 19:14:27 +0200 Subject: [PATCH 575/758] [DSC-38] Unit test fix --- .../statistics-map.component.spec.ts | 24 +++++++++---------- .../statistics-map.component.ts | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts index 0fa818149ed..62ff1e1e30e 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.spec.ts @@ -5,7 +5,7 @@ import { UsageReport } from '../../../core/statistics/models/usage-report.model' import { USAGE_REPORT } from '../../../core/statistics/models/usage-report.resource-type'; import { GoogleChartInterface } from 'ng2-google-charts'; -import { ExportService, ExportImageType } from '../../../core/export-service/export.service'; +import { ExportService } from '../../../core/export-service/export.service'; import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; import { StatisticsType } from '../statistics-type.model'; @@ -55,14 +55,17 @@ describe('StatisticsMapComponent', () => { const exportServiceMock: any = { exportAsImage: jasmine.createSpy('exportAsImage'), - exportAsFile: jasmine.createSpy('exportAsFile') + exportAsFile: jasmine.createSpy('exportAsFile'), + exportImageWithBase64: jasmine.createSpy('exportImageWithBase64') }; + + let exportService: ExportService = exportServiceMock; beforeEach(async () => { await TestBed.configureTestingModule({ imports: [TranslateModule.forRoot()], declarations: [ StatisticsMapComponent ], providers: [ - { provide: ExportService, useValue: exportServiceMock } + // { provide: ExportService, useValue: exportServiceMock } ], }) .compileComponents(); @@ -71,6 +74,8 @@ describe('StatisticsMapComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(StatisticsMapComponent); component = fixture.componentInstance; + spyOn(component, 'exportMapAsImage'); + (component as any).exportService = exportServiceMock; fixture.detectChanges(); }); @@ -94,18 +99,11 @@ describe('StatisticsMapComponent', () => { it('should download map as png and jpg', () => { component.report = report; - fixture.detectChanges(); component.ngOnInit(); fixture.detectChanges(); - const downloadPngMapBtn = fixture.debugElement.query(By.css('[data-test="download-png-map-btn"]')); - downloadPngMapBtn.triggerEventHandler('click', null); - fixture.detectChanges(); - const node = fixture.debugElement.query(By.css('[data-test="google-chart-ref"]')).nativeElement; - expect(exportServiceMock.exportAsImage).toHaveBeenCalledWith(node, ExportImageType.png, report.reportType, component.isLoading); - - const downloadJpgMapBtn = fixture.debugElement.query(By.css('[data-test="download-jpg-map-btn"]')); - downloadJpgMapBtn.triggerEventHandler('click', null); + const drpdButton = fixture.debugElement.query(By.css('div[ngbdropdownmenu]>button[ngbdropdownitem]')); + drpdButton.triggerEventHandler('click', null); fixture.detectChanges(); - expect(exportServiceMock.exportAsImage).toHaveBeenCalledWith(node, ExportImageType.jpeg, report.reportType, component.isSecondLoading); + expect(component.exportMapAsImage).toHaveBeenCalled(); }); }); diff --git a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts index 46d28dd303b..fde75a47040 100644 --- a/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts +++ b/src/app/statistics-page/cris-statistics-page/statistics-map/statistics-map.component.ts @@ -102,7 +102,7 @@ export class StatisticsMapComponent implements OnInit { * Export the map as an image * @param type of export */ - exportMapAsImage(type: ExportImageType) { + exportMapAsImage(type: ExportImageType){ this.isLoading$.next(true); const chart = this.googleChartRef.wrapper.getChart(); const imageURI: string = chart?.getImageURI(); From 10d6e259ab6c835bd5108d87a177c150827fc1ff Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 30 May 2023 22:49:41 +0200 Subject: [PATCH 576/758] [DSC-1110] Fix issue with edit community logo --- src/app/core/shared/resolvers/edit-community.resolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/core/shared/resolvers/edit-community.resolver.ts b/src/app/core/shared/resolvers/edit-community.resolver.ts index 393bf08f484..c2b7e2a0121 100644 --- a/src/app/core/shared/resolvers/edit-community.resolver.ts +++ b/src/app/core/shared/resolvers/edit-community.resolver.ts @@ -1,7 +1,7 @@ import { CommunityDataService } from '../../data/community-data.service'; import { Injectable } from '@angular/core'; import { Community } from '../community.model'; -import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; +import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model'; import { EditDsoResolver } from './edit-dso.resolver'; /** @@ -16,6 +16,6 @@ export class EditCommunityResolver extends EditDsoResolver { } getFollowLinks(): FollowLinkConfig[] { - return []; + return [followLink('logo')]; } } From f9627d556b6ab9717ba8d907fb9debf9760b18f6 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 31 May 2023 14:53:24 +0200 Subject: [PATCH 577/758] [DSC-381] Truncate breadcrumb text and show a tooltip for truncated ones --- .../breadcrumb/is-text-truncated.pipe.ts | 22 +++++++++++++++ ...runcate-breadcrumb-item-characters.pipe.ts | 28 +++++++++++++++++++ .../breadcrumbs/breadcrumbs.component.html | 17 +++++++++-- src/app/root.module.ts | 4 +++ src/config/app-config.interface.ts | 1 + src/config/default-app-config.ts | 1 + src/environments/environment.test.ts | 3 +- 7 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 src/app/breadcrumbs/breadcrumb/is-text-truncated.pipe.ts create mode 100644 src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts diff --git a/src/app/breadcrumbs/breadcrumb/is-text-truncated.pipe.ts b/src/app/breadcrumbs/breadcrumb/is-text-truncated.pipe.ts new file mode 100644 index 00000000000..10481588267 --- /dev/null +++ b/src/app/breadcrumbs/breadcrumb/is-text-truncated.pipe.ts @@ -0,0 +1,22 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { hasValue } from '../../shared/empty.util'; + +@Pipe({ + name: 'dsIsTextTruncated', +}) +export class IsTextTruncatedPipe implements PipeTransform { + + /** + * @param truncatedText Translated truncated text (text after TruncateBreadcrumbItemCharactersPipe transform) + * @param fullText Full translated text + * @returns {string} The full text if the truncated text contains an ellipses, otherwise an empty string. + * In case an empty string is returned the tooltip will not be shown. + */ + transform(truncatedText: string, fullText: string): string { + if (hasValue(truncatedText) && truncatedText.includes('...')) { + return fullText; + } else { + return ''; + } + } +} diff --git a/src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts b/src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts new file mode 100644 index 00000000000..e43ea1c7cf3 --- /dev/null +++ b/src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts @@ -0,0 +1,28 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { environment } from '../../../environments/environment'; +import { hasValue } from '../../shared/empty.util'; + +@Pipe({ + name: 'dsTruncateText', +}) +export class TruncateBreadcrumbItemCharactersPipe implements PipeTransform { + /** + * The maximum number of characters to display in a breadcrumb item + * @type {number} + */ + readonly charLimit: number = environment.breadcrumbCharLimit; + + /** + * Truncates the text based on the configured char number allowed per breadcrumb element. + * If text is shorter than the number of chars allowed, it will return the text as it is. + * If text is longer than the number of chars allowed, it will return the text truncated with an ellipsis at the end. + * @param text Traslated text to be truncated + */ + transform(text: string): string { + if (hasValue(text) && text.length > this.charLimit) { + return text.substring(0, this.charLimit).concat('...'); + } else { + return text; + } + } +} diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html index 6f52b256479..5ea9b53b33f 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.html +++ b/src/app/breadcrumbs/breadcrumbs.component.html @@ -10,11 +10,24 @@ -
  • {{text | translate}}
    • +
  • +
    + + {{text | translate | dsTruncateText}} +
    +
    • -
  • {{text | translate}}
    • +
  • +
    +
    + {{text | translate | dsTruncateText}}
    +
    +
    • diff --git a/src/app/root.module.ts b/src/app/root.module.ts index 7671217c53b..84841ae7068 100644 --- a/src/app/root.module.ts +++ b/src/app/root.module.ts @@ -42,6 +42,8 @@ import { import { FooterModule } from './footer/footer.module'; import { SocialModule } from './social/social.module'; import { ExploreModule } from './shared/explore/explore.module'; +import { IsTextTruncatedPipe } from './breadcrumbs/breadcrumb/is-text-truncated.pipe'; +import { TruncateBreadcrumbItemCharactersPipe } from './breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe'; const IMPORTS = [ CommonModule, @@ -83,6 +85,8 @@ const DECLARATIONS = [ ThemedPageErrorComponent, PageErrorComponent, ContextHelpToggleComponent, + TruncateBreadcrumbItemCharactersPipe, + IsTextTruncatedPipe ]; const EXPORTS = [ diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index d0f336d2af4..441d8818c65 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -66,6 +66,7 @@ interface AppConfig extends Config { attachmentRendering: AttachmentRenderingConfig; advancedAttachmentRendering: AdvancedAttachmentRenderingConfig; searchResult: SearchResultConfig; + breadcrumbCharLimit: number; } /** diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 1261ea04ec4..9f3b6dfcd1b 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -713,4 +713,5 @@ export class DefaultAppConfig implements AppConfig { additionalMetadataFields: [] }; + breadcrumbCharLimit = 10; } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 7bdb8492324..a33e5694559 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -532,6 +532,7 @@ export const environment: BuildConfig = { metadataConfiguration: [] } ] - } + }, + breadcrumbCharLimit: 10, }; From 58d6417549e7e7d7b2f7807571c15370b760dcba Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 31 May 2023 16:02:13 +0200 Subject: [PATCH 578/758] [DSC-381] Fixed failing unit tests --- .../breadcrumbs/breadcrumbs.component.spec.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/app/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/breadcrumbs/breadcrumbs.component.spec.ts index 69387e75346..7c80c87c3af 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.spec.ts +++ b/src/app/breadcrumbs/breadcrumbs.component.spec.ts @@ -10,22 +10,29 @@ import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock'; import { RouterTestingModule } from '@angular/router/testing'; import { of as observableOf } from 'rxjs'; import { DebugElement } from '@angular/core'; +import { IsTextTruncatedPipe } from './breadcrumb/is-text-truncated.pipe'; +import { TruncateBreadcrumbItemCharactersPipe } from './breadcrumb/truncate-breadcrumb-item-characters.pipe'; describe('BreadcrumbsComponent', () => { let component: BreadcrumbsComponent; let fixture: ComponentFixture; let breadcrumbsServiceMock: BreadcrumbsService; + let truncateTextPipe: TruncateBreadcrumbItemCharactersPipe; const expectBreadcrumb = (listItem: DebugElement, text: string, url: string) => { const anchor = listItem.query(By.css('a')); - + const truncatedText = truncateTextPipe.transform(text); if (url == null) { expect(anchor).toBeNull(); - expect(listItem.nativeElement.innerHTML).toEqual(text); + // remove leading whitespace characters + const textWithoutSpaces = listItem.nativeElement.innerHTML.trimStart().replace(/^\s+/, ''); + expect(textWithoutSpaces).toEqual(truncatedText); } else { expect(anchor).toBeInstanceOf(DebugElement); expect(anchor.attributes.href).toEqual(url); - expect(anchor.nativeElement.innerHTML).toEqual(text); + // remove leading whitespace characters + const textWithoutSpaces = anchor.nativeElement.innerHTML.trimStart().replace(/^\s+/, ''); + expect(textWithoutSpaces).toEqual(truncatedText); } }; @@ -43,6 +50,8 @@ describe('BreadcrumbsComponent', () => { declarations: [ BreadcrumbsComponent, VarDirective, + IsTextTruncatedPipe, + TruncateBreadcrumbItemCharactersPipe, ], imports: [ RouterTestingModule.withRoutes([]), @@ -55,10 +64,12 @@ describe('BreadcrumbsComponent', () => { ], providers: [ { provide: BreadcrumbsService, useValue: breadcrumbsServiceMock }, + { provide: TruncateBreadcrumbItemCharactersPipe, useClass: TruncateBreadcrumbItemCharactersPipe }, ], }).compileComponents(); fixture = TestBed.createComponent(BreadcrumbsComponent); + truncateTextPipe = TestBed.inject(TruncateBreadcrumbItemCharactersPipe); component = fixture.componentInstance; fixture.detectChanges(); })); From 43a03ac8e8f76354713612ef82f96f7a048d7fc9 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Fri, 2 Jun 2023 17:45:34 +0200 Subject: [PATCH 579/758] [DSC-106]Date input usable via keyboard using tab --- .../date-picker/date-picker.component.ts | 48 ++++++++++++++++++- .../number-picker.component.html | 4 +- .../number-picker/number-picker.component.ts | 1 + .../sections/form/section-form.component.ts | 2 +- 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts index 3ff94542a87..e34989f9765 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, HostListener, Inject, Input, OnInit, Output, Renderer2 } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { DynamicDsDatePickerModel } from './date-picker.model'; import { hasValue } from '../../../../../empty.util'; @@ -7,6 +7,8 @@ import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core'; +import { DOCUMENT } from '@angular/common'; +import { isEqual } from 'lodash'; export const DS_DATE_PICKER_SEPARATOR = '-'; @@ -51,7 +53,9 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement disabledMonth = true; disabledDay = true; constructor(protected layoutService: DynamicFormLayoutService, - protected validationService: DynamicFormValidationService + protected validationService: DynamicFormValidationService, + private renderer: Renderer2, + @Inject(DOCUMENT) private _document: Document ) { super(layoutService, validationService); } @@ -164,6 +168,46 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement this.change.emit(value); } + /** + * Listen to keydown Tab event. + * Get the active element and blur it, in order to focus the next input field. + */ + @HostListener('keydown', ['$event']) + onKeyDown(event: KeyboardEvent) { + if (event.key === 'Tab') { + event.preventDefault(); + const activeElement: Element = this._document.activeElement; + (activeElement as any).blur(); + if (isEqual(activeElement.id, this.model.id.concat('_year')) ) { + this.focusInput('_month'); + } else if (isEqual(activeElement.id, this.model.id.concat('_month'))) { + this.focusInput('_day'); + } + } + } + + /** + * Focus the input field for the given type + * based on the model id. + * Used to focus the next input field + * in case of a disabled field. + * @param type '_month' | '_day' + */ + focusInput(type: '_month' | '_day') { + const field = this._document.getElementById(this.model.id.concat(type)); + if (field) { + + if (hasValue(this.year) && isEqual(type, '_month')) { + this.disabledMonth = false; + } else if (hasValue(this.month) && isEqual(type, '_day')) { + this.disabledDay = false; + } + setTimeout(() => { + this.renderer.selectRootElement(field).focus(); + }, 100); + } + } + onFocus(event) { this.focus.emit(event); } diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html index 314d9d3b70b..2353a6533cf 100644 --- a/src/app/shared/form/number-picker/number-picker.component.html +++ b/src/app/shared/form/number-picker/number-picker.component.html @@ -20,7 +20,7 @@ - - - - diff --git a/src/app/shared/context-menu/subscription/subscription-menu.component.ts b/src/app/shared/context-menu/subscription/subscription-menu.component.ts index 29f1404fc59..39005009366 100644 --- a/src/app/shared/context-menu/subscription/subscription-menu.component.ts +++ b/src/app/shared/context-menu/subscription/subscription-menu.component.ts @@ -10,6 +10,7 @@ import { rendersContextMenuEntriesForType } from '../context-menu.decorator'; import { ContextMenuEntryType } from '../context-menu-entry-type'; import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../../core/data/feature-authorization/feature-id'; +import { SubscriptionModalComponent } from '../../subscriptions/subscription-modal/subscription-modal.component'; @Component({ selector: 'ds-subscription-menu', @@ -35,17 +36,6 @@ export class SubscriptionMenuComponent extends ContextMenuEntryComponent impleme */ public modalRef: NgbModalRef; - types = [ - { name: 'Content', value: 'content' }, - { name: 'Statistics', value: 'statistics' }, - { name: 'Content & Statistics', value: 'content+statistics' }, - ]; - - /** - * DSpaceObject that is being viewed - */ - dso: DSpaceObject; - /** * Initialize instance variables * @@ -68,12 +58,11 @@ export class SubscriptionMenuComponent extends ContextMenuEntryComponent impleme } /** - * Open modal - * - * @param content + * Open the modal to subscribe to the related DSpaceObject */ - public openSubscription(content: any) { - this.modalRef = this.modalService.open(content); + public openSubscription() { + this.modalRef = this.modalService.open(SubscriptionModalComponent); + this.modalRef.componentInstance.dso = this.contextMenuObject; } } diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index f215643ebac..f6a2a47db8f 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -114,7 +114,12 @@ export class SubscriptionModalComponent implements OnInit { this.subscriptionForm.valueChanges.subscribe((newValue) => { let anyFrequencySelected = false; for (let f of this.frequencyDefaultValues) { - anyFrequencySelected = anyFrequencySelected || newValue.content.frequencies[f]; + for (let type of this.subscriptionDefaultTypes) { + anyFrequencySelected = anyFrequencySelected || newValue[type].frequencies[f]; + } + if (anyFrequencySelected) { + break; + } } this.isValid = anyFrequencySelected; }); From 9833025416e2043a1dd7be803aa76ae4477b0cca Mon Sep 17 00:00:00 2001 From: Mykhaylo Date: Thu, 22 Jun 2023 10:59:48 +0200 Subject: [PATCH 605/758] [DSC-1130] removed unsupported subscription type --- .../subscription-modal/subscription-modal.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts index f6a2a47db8f..29e287ef1d3 100644 --- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts +++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts @@ -67,7 +67,7 @@ export class SubscriptionModalComponent implements OnInit { /** * Types of subscription to be shown on select */ - subscriptionDefaultTypes = ['content', 'statistics', 'content+statistics']; + subscriptionDefaultTypes = ['content', 'statistics']; /** * Frequencies to be shown as checkboxes From e109046265f9995cf875edcd20ca394954a7eeb9 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 22 Jun 2023 15:09:20 +0200 Subject: [PATCH 606/758] [DSC-1140] Fixes undefined on save --- src/app/submission/sections/form/section-form.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts index 2fc8c51bad0..3550a11c56b 100644 --- a/src/app/submission/sections/form/section-form.component.ts +++ b/src/app/submission/sections/form/section-form.component.ts @@ -404,7 +404,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent implem const metadata = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event); const value = this.formOperationsService.getFieldValueFromChangeEvent(event); - const eventAutoSave = !event.$event.hasOwnProperty('autoSave') || event.$event.autoSave; + const eventAutoSave = !event.$event?.hasOwnProperty('autoSave') || event.$event?.autoSave; if (eventAutoSave && (environment.submission.autosave.metadata.indexOf(metadata) !== -1 && isNotEmpty(value)) || this.hasRelatedCustomError(metadata)) { this.submissionService.dispatchSave(this.submissionId); } From d45ab682d7d5658d066d75d239bf440ef4fd9d1f Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 22 Jun 2023 15:09:40 +0200 Subject: [PATCH 607/758] [DSC-1140] Optional tooltip on dsAuthorityConfidenceState --- .../authority-confidence-state.directive.ts | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/app/shared/form/directives/authority-confidence-state.directive.ts b/src/app/shared/form/directives/authority-confidence-state.directive.ts index b31bc7e2c63..d32f4c587d2 100644 --- a/src/app/shared/form/directives/authority-confidence-state.directive.ts +++ b/src/app/shared/form/directives/authority-confidence-state.directive.ts @@ -48,6 +48,11 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn */ @Input() visibleWhenAuthorityEmpty = true; + /** + * A boolean representing if to show html icon if authority value is empty + */ + @Input() showTooltip = true; + /** * The css class applied before directive changes */ @@ -63,6 +68,11 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn */ @Output() whenClickOnConfidenceNotAccepted: EventEmitter = new EventEmitter(); + /** + * Listener to hover event + */ + private onHoverUnsubscribe: () => void; + /** * Listener to click event */ @@ -91,7 +101,7 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn /** * Listener to hover event */ - @HostListener('mouseover') onHover() { + onHover() { this.renderer.setAttribute( this.elem.nativeElement, 'title', @@ -116,6 +126,21 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn this.renderer.removeClass(this.elem.nativeElement, this.previousClass); this.renderer.addClass(this.elem.nativeElement, this.newClass); } + + if (this.showTooltip && this.onHoverUnsubscribe == null) { + this.listenOnMouseOver(); + } + + if (!changes.showTooltip?.firstChange && !!changes.showTooltip?.currentValue) { + if (this.onHoverUnsubscribe != null) { + this.onHoverUnsubscribe(); + } + this.listenOnMouseOver(); + } + } + + private listenOnMouseOver() { + this.onHoverUnsubscribe = this.renderer.listen(this.elem.nativeElement, 'mouseover', () => this.onHover()); } /** From 02c7c5816f8a70dbb58891ed9b787ef17e8db221 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 22 Jun 2023 15:09:56 +0200 Subject: [PATCH 608/758] [DSC-1140] Fixes double tooltip visualization --- src/app/shared/form/chips/chips.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html index 937a1af276b..20d782581e8 100644 --- a/src/app/shared/form/chips/chips.component.html +++ b/src/app/shared/form/chips/chips.component.html @@ -34,6 +34,7 @@ dsAuthorityConfidenceState [authorityValue]="c.item[icon.metadata] || c.item" [visibleWhenAuthorityEmpty]="icon.visibleWhenAuthorityEmpty" + [showTooltip]="false" aria-hidden="true" (dragstart)="t.close();" (mouseover)="showTooltip(t, i, icon.metadata)" From b2136c61738797deb6c18cbe5f6b6dbaa6fbfba1 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 22 Jun 2023 15:10:18 +0200 Subject: [PATCH 609/758] [DSC-1140] dsAuthorityConfidenceState onHover unsubscription --- .../authority-confidence-state.directive.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/app/shared/form/directives/authority-confidence-state.directive.ts b/src/app/shared/form/directives/authority-confidence-state.directive.ts index d32f4c587d2..0b663a85534 100644 --- a/src/app/shared/form/directives/authority-confidence-state.directive.ts +++ b/src/app/shared/form/directives/authority-confidence-state.directive.ts @@ -14,6 +14,7 @@ import { HostListener, Input, OnChanges, + OnDestroy, Output, Renderer2, SimpleChanges, @@ -36,7 +37,7 @@ import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/mod @Directive({ selector: '[dsAuthorityConfidenceState]' }) -export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewInit { +export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewInit, OnDestroy { /** * The metadata value @@ -187,12 +188,18 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn const confidenceIcons: ConfidenceIconConfig[] = environment.submission.icons.authority.confidence; - const confidenceIndex: number = findIndex(confidenceIcons, {value: confidence}); + const confidenceIndex: number = findIndex(confidenceIcons, { value: confidence }); - const defaultConfidenceIndex: number = findIndex(confidenceIcons, {value: 'default' as any}); + const defaultConfidenceIndex: number = findIndex(confidenceIcons, { value: 'default' as any }); const defaultClass: string = (defaultConfidenceIndex !== -1) ? confidenceIcons[defaultConfidenceIndex].style : ''; return (confidenceIndex !== -1) ? confidenceIcons[confidenceIndex].style : defaultClass; } + public ngOnDestroy() { + if (this.onHoverUnsubscribe != null) { + this.onHoverUnsubscribe(); + } + } + } From 79fe9dc8ea381a003e1245f18be34f5a5dd97346 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 22 Jun 2023 15:15:00 +0200 Subject: [PATCH 610/758] [DSC-1140] Refactoring & Fix tooltip visibility on icons --- ...dynamic-relation-group-modal.components.ts | 7 +- .../shared/form/chips/chips.component.html | 2 +- .../shared/form/chips/chips.component.spec.ts | 47 +++++++++--- src/app/shared/form/chips/chips.component.ts | 71 ++++++++++++------- 4 files changed, 90 insertions(+), 37 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.components.ts index 806e0f7efd3..3e8d80b4781 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.components.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.components.ts @@ -288,7 +288,12 @@ export class DsDynamicRelationGroupModalComponent extends DynamicFormControlComp modelRow.group.forEach((control: DynamicInputModel) => { const controlValue: any = (control?.value as any)?.value || control?.value || PLACEHOLDER_PARENT_METADATA; const controlAuthority: any = (control?.value as any)?.authority || null; - item[control.name] = new FormFieldMetadataValueObject(controlValue, (control as any)?.language, (control as any)?.securityLevel, controlAuthority); + item[control.name] = + new FormFieldMetadataValueObject( + controlValue, (control as any)?.language, (control as any)?.securityLevel, controlAuthority, + null, 0, null, + (control?.value as any)?.otherInformation || null + ); }); }); return item; diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html index 20d782581e8..4ad7522650f 100644 --- a/src/app/shared/form/chips/chips.component.html +++ b/src/app/shared/form/chips/chips.component.html @@ -2,7 +2,7 @@ + + diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts index c272cbd28de..6e9198d8a05 100644 --- a/src/app/shared/form/chips/chips.component.ts +++ b/src/app/shared/form/chips/chips.component.ts @@ -1,4 +1,14 @@ -import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, } from '@angular/core'; +import { + ChangeDetectorRef, + Component, + EventEmitter, + Inject, + Input, + OnChanges, + Output, PLATFORM_ID, + SimpleChanges, +} from '@angular/core'; +import { isPlatformBrowser } from '@angular/common'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import isObject from 'lodash/isObject'; @@ -34,7 +44,13 @@ export class ChipsComponent implements OnChanges { dragged = -1; tipText$: BehaviorSubject = new BehaviorSubject([]); + /** + * Whether a platform id represents a browser platform. + */ + isPlatformBrowser: boolean; + constructor( + @Inject(PLATFORM_ID) protected platformId: string, private cdr: ChangeDetectorRef, private dragService: DragService, private translate: TranslateService) { @@ -54,6 +70,10 @@ export class ChipsComponent implements OnChanges { } } + ngOnInit(): void { + this.isPlatformBrowser = isPlatformBrowser(this.platformId); + } + chipsSelected(event: Event, index: number) { event.preventDefault(); this.selected.emit(index); From b35c4ba1152347135137c0698e9ab2bfe5c4bcbf Mon Sep 17 00:00:00 2001 From: Stefano Maffei Date: Thu, 20 Jul 2023 15:00:07 +0200 Subject: [PATCH 627/758] [DSC-1166] configured labels for categories --- src/assets/i18n/en.json5 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 2ffd38e2030..8a6ac4d1de4 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -5596,6 +5596,26 @@ "statistics.categories.downloadReports.tab": "Downloads reports", + "statistics.categories.itemReports.tab": "Item views reports", + + "statistics.table.itemReports.header.continent" : "Continent", + + "statistics.table.itemReports.header.views" : "Views", + + "statistics.table.itemReports.header.city" : "City", + + "statistics.table.itemReports.header.item" : "Item", + + "statistics.table.itemReports.title.TopContinents" : "Top region Item views", + + "statistics.table.itemReports.title.TopCities" : "Top cities Item views", + + "statistics.table.itemReports.title.TopItems" : "Most viewed Items", + + "statistics.table.itemReports.title.TopCategories" : "Top Item category", + + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top Item views per month", + "statistics.reports.title": "Reports", "submission.edit.breadcrumbs": "Edit Submission", From 6ee985c0bdd53779d136f0b8d9297f276411c9e2 Mon Sep 17 00:00:00 2001 From: Stefano Maffei Date: Thu, 20 Jul 2023 15:07:02 +0200 Subject: [PATCH 628/758] [DSC-1166] fixed missing statistics labels --- src/assets/i18n/en.json5 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8a6ac4d1de4..997cf8146ff 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -5606,6 +5606,10 @@ "statistics.table.itemReports.header.item" : "Item", + "statistics.table.mainReports.header.community" : "Community", + + "statistics.table.mainReports.header.collection" : "Collection", + "statistics.table.itemReports.title.TopContinents" : "Top region Item views", "statistics.table.itemReports.title.TopCities" : "Top cities Item views", From 147a8fb25f7149af09ccdeb18c987fc12b96ac91 Mon Sep 17 00:00:00 2001 From: Alexander K Date: Mon, 24 Jul 2023 13:30:09 +0200 Subject: [PATCH 629/758] [DSC-1091] Fix submission dropdown --- ...amic-form-control-container.component.html | 171 ++++++++++-------- src/app/shared/form/form.component.html | 32 +++- src/app/shared/form/form.component.spec.ts | 168 +++++++++++++++++ src/app/shared/form/form.component.ts | 32 +++- .../form/section-form-operations.service.ts | 2 +- .../form/section-form.component.spec.ts | 5 +- .../sections/form/section-form.component.ts | 12 +- 7 files changed, 329 insertions(+), 93 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 4d6f155d5aa..385104a727e 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,22 +1,26 @@ -
    +
    + - - -
    +
    + + +
    -
    -
    - -
    - +
    + +
    + - - -
    + + +
    + class="clearfix w-100 mb-2">
    - -
    - {{ message | translate: model.validators }} -
    -
    -
    - -
    -
    - + {{ message | translate: model.validators }} +
    +
    +
    + +
    +
    + - -
    -
    - + (changeSecurityLevel)="addSecurityLevelToMetadata($event)"> + +
    +
    + +
    +
    + + + + + + + +
    +     +
    - - - - - - - -
    -     - +
    diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html index b9ea9895304..29351a7fd81 100644 --- a/src/app/shared/form/form.component.html +++ b/src/app/shared/form/form.component.html @@ -11,20 +11,36 @@ (dfChange)="onChange($event)" (dfFocus)="onFocus($event)" (ngbEvent)="onCustomEvent($event)"> + + +
    + +
    +     +
    - -
    + +
    diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts index 2f3be3fded3..be29f7d31f0 100644 --- a/src/app/shared/form/form.component.spec.ts +++ b/src/app/shared/form/form.component.spec.ts @@ -4,9 +4,11 @@ import { CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { + DynamicFormArrayGroupModel, DynamicFormArrayModel, DynamicFormControlEvent, DynamicFormControlModel, + DynamicFormGroupModel, DynamicFormValidationService, DynamicInputModel } from '@ng-dynamic-forms/core'; @@ -24,6 +26,11 @@ import { FormFieldMetadataValueObject } from './builder/models/form-field-metada import { createTestComponent } from '../testing/utils.test'; import { BehaviorSubject } from 'rxjs'; import { storeModuleConfig } from '../../app.reducer'; +import { + DynamicScrollableDropdownModel, + DynamicScrollableDropdownModelConfig +} from './builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model'; +import { DynamicFormGroupModelConfig } from '@ng-dynamic-forms/core/lib/model/form-group/dynamic-form-group.model'; let TEST_FORM_MODEL; @@ -433,6 +440,167 @@ describe('FormComponent test suite', () => { expect(formComp.removeArrayItem.emit).toHaveBeenCalled(); })); + + it('should emit removeArrayItem Event when an scrollable dropdown field has been cleaned', inject([FormBuilderService], (service: FormBuilderService) => { + spyOn(formComp.removeArrayItem, 'emit'); + + formComp.clearScrollableDropdown(new Event('click'), formComp.formModel[0] as DynamicFormControlModel); + + expect(formComp.removeArrayItem.emit).toHaveBeenCalled(); + })); + }); + + describe('isArrayGroupEmpty', () => { + init(); + beforeEach(() => { + formFixture = TestBed.createComponent(FormComponent); + store = TestBed.inject(Store as any); + formComp = formFixture.componentInstance; + formComp.formId = 'testFormArray'; + formComp.formModel = TEST_FORM_MODEL_WITH_ARRAY; + formComp.displaySubmit = false; + formComp.displayCancel = false; + formFixture.detectChanges(); + spyOn(store, 'dispatch'); + }); + + afterEach(() => { + formFixture.destroy(); + formComp = null; + }); + + it('should return false if array group has multiple values', () => { + const group = { + context: { + groups: [ + { + group: [ + { + id: 'groupId', + value: 'groupValue1' + } + ], + }, + { + group: [ + { + id: 'groupId', + value: 'groupValue2' + } + ], + } + ] + } + }; + + const result = formComp.isArrayGroupEmpty(group); + + expect(result).toBeFalse(); + }); + + it('should return false if array group has only one value', () => { + const group = { + context: { + groups: [ + { + group: [ + { + id: 'groupId', + value: 'groupValue1' + } + ], + } + ] + } + }; + + const result = formComp.isArrayGroupEmpty(group); + + expect(result).toBeFalse(); + }); + + it('should return true if array group has one group but without value', () => { + const group = { + context: { + groups: [ + { + group: [ + { + id: 'groupId', + value: null + } + ], + } + ] + } + }; + + const result = formComp.isArrayGroupEmpty(group); + + expect(result).toBeTrue(); + }); + + it('should return true if array group does not have any value', () => { + const group = { + context: { + groups: [] + } + }; + + const result = formComp.isArrayGroupEmpty(group); + + expect(result).toBeTrue(); + }); + }); + + describe('isTheOnlyFieldInArrayGroup', () => { + init(); + beforeEach(() => { + formFixture = TestBed.createComponent(FormComponent); + store = TestBed.inject(Store as any); + formComp = formFixture.componentInstance; + formComp.formId = 'testFormArray'; + formComp.formModel = TEST_FORM_MODEL_WITH_ARRAY; + formComp.displaySubmit = false; + formComp.displayCancel = false; + formFixture.detectChanges(); + spyOn(store, 'dispatch'); + }); + + afterEach(() => { + formFixture.destroy(); + formComp = null; + }); + + it('should return true if it is the only field in array group', () => { + const parent = new DynamicFormArrayGroupModel({} as DynamicFormArrayModel, [{} as DynamicFormControlModel]); + const model = new DynamicScrollableDropdownModel({} as DynamicScrollableDropdownModelConfig); + model.parent = parent; + + const result = formComp.isTheOnlyFieldInArrayGroup(model); + + expect(result).toBeTrue(); + }); + + it('should return false if it is not the only field in array group', () => { + const parent = new DynamicFormArrayGroupModel({} as DynamicFormArrayModel, [{} as DynamicFormControlModel, {} as DynamicFormControlModel]); + const model = new DynamicScrollableDropdownModel({} as DynamicScrollableDropdownModelConfig); + model.parent = parent; + + const result = formComp.isTheOnlyFieldInArrayGroup(model); + + expect(result).toBeFalse(); + }); + + it('should return false if it is a field in not array group', () => { + const parent = new DynamicFormGroupModel({} as DynamicFormGroupModelConfig); + const model = new DynamicScrollableDropdownModel({} as DynamicScrollableDropdownModelConfig); + model.parent = parent; + + const result = formComp.isTheOnlyFieldInArrayGroup(model); + + expect(result).toBeFalse(); + }); }); }); diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts index 1d06d2cf7d7..05f88c095eb 100644 --- a/src/app/shared/form/form.component.ts +++ b/src/app/shared/form/form.component.ts @@ -4,6 +4,7 @@ import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/for import { Observable, Subscription } from 'rxjs'; import { + DynamicFormArrayGroupModel, DynamicFormArrayModel, DynamicFormControlEvent, DynamicFormControlModel, @@ -18,6 +19,10 @@ import { hasValue, isNotEmpty, isNotNull, isNull } from '../empty.util'; import { FormService } from './form.service'; import { FormEntry, FormError } from './form.reducer'; import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model'; +import cloneDeep from 'lodash/cloneDeep'; +import { + DynamicScrollableDropdownModel +} from './builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model'; /** * The default form component. @@ -297,7 +302,7 @@ export class FormComponent implements OnDestroy, OnInit { if (this.emitChange) { this.change.emit(event); } -} + } /** * Method called on submit. @@ -332,7 +337,14 @@ export class FormComponent implements OnDestroy, OnInit { // In case of qualdrop value or inline-group remove event must be dispatched before removing the control from array this.removeArrayItem.emit(event); } - this.formBuilderService.removeFormArrayGroup(index, formArrayControl, arrayContext); + if (index === 0 && formArrayControl.value?.length === 1) { + event.model = cloneDeep(event.model); + const fieldId = event.model.id; + formArrayControl.at(0).get(fieldId).setValue(null); + } else { + this.formBuilderService.removeFormArrayGroup(index, formArrayControl, arrayContext); + } + this.formService.changeForm(this.formId, this.formModel); if (!this.formBuilderService.isQualdropGroup(event.model as DynamicFormControlModel) && !this.isInlineGroupForm) { // dispatch remove event for any field type except for qualdrop value and inline-group @@ -340,6 +352,14 @@ export class FormComponent implements OnDestroy, OnInit { } } + clearScrollableDropdown($event, model: DynamicFormControlModel): void { + const control = this.formGroup.get(this.formBuilderService.getPath(model)) as FormControl; + const event = { $event, type: 'remove', model: cloneDeep(model), context: null, control, group: control.parent } as DynamicFormControlEvent; + control.setValue(null); + this.formService.changeForm(this.formId, this.formModel); + this.removeArrayItem.emit(event); + } + insertItem($event, arrayContext: DynamicFormArrayModel, index: number): void { const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as FormArray; this.formBuilderService.insertFormArrayGroup(index, formArrayControl, arrayContext); @@ -362,6 +382,14 @@ export class FormComponent implements OnDestroy, OnInit { return isNotEmpty(value) && value.isVirtual; } + isArrayGroupEmpty(group): boolean { + return group.context.groups?.length <= 1 && !group.context.groups?.[0]?.group?.[0]?.value; + } + + isTheOnlyFieldInArrayGroup(model: DynamicScrollableDropdownModel) { + return model.parent instanceof DynamicFormArrayGroupModel && model.parent?.group?.length === 1; + } + protected getEvent($event: any, arrayContext: DynamicFormArrayModel, index: number, type: string, formGroup?: FormGroup): DynamicFormControlEvent { const context = arrayContext.groups[index]; const itemGroupModel = context.context; diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts index 03310df8ca2..fedc5a26dfb 100644 --- a/src/app/submission/sections/form/section-form-operations.service.ts +++ b/src/app/submission/sections/form/section-form-operations.service.ts @@ -322,7 +322,7 @@ export class SectionFormOperationsService { } else if (event.context && event.context instanceof DynamicFormArrayGroupModel) { // Model is a DynamicRowArrayModel this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue); - } else if ((isNotEmpty(value) && typeof value === 'string') || (isNotEmpty(value) && value instanceof FormFieldMetadataValueObject && value.hasValue())) { + } else if ((isNotEmpty(value) && typeof value === 'string') || (isNotEmpty(value) && (value instanceof FormFieldMetadataValueObject || value instanceof VocabularyEntry) && value.hasValue())) { this.operationsBuilder.remove(pathCombiner.getPath(path)); } } diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts index fb40e71e94d..d1e4a9fc715 100644 --- a/src/app/submission/sections/form/section-form.component.spec.ts +++ b/src/app/submission/sections/form/section-form.component.spec.ts @@ -585,11 +585,14 @@ describe('SubmissionSectionFormComponent test suite', () => { it('should call dispatchOperationsFromEvent on form remove event', () => { spyOn(comp, 'hasStoredValue').and.returnValue(false); + formBuilderService.hasMappedGroupValue.and.returnValue(false); + formOperationsService.getFieldValueFromChangeEvent.and.returnValue('test'); comp.onRemove(dynamicFormControlEvent); expect(formOperationsService.dispatchOperationsFromEvent).toHaveBeenCalled(); - + expect(compAsAny.previousValue.path).toBeNull(); + expect(compAsAny.previousValue.value).toBeNull(); }); it('should check if has stored value in the section state', () => { diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts index 3550a11c56b..39329e61b4c 100644 --- a/src/app/submission/sections/form/section-form.component.ts +++ b/src/app/submission/sections/form/section-form.component.ts @@ -429,6 +429,10 @@ export class SubmissionSectionFormComponent extends SectionModelComponent implem * the [[DynamicFormControlEvent]] emitted */ onFocus(event: DynamicFormControlEvent): void { + this.updatePreviousValue(event); + } + + private updatePreviousValue(event: DynamicFormControlEvent): void { const value = this.formOperationsService.getFieldValueFromChangeEvent(event); const path = this.formBuilderService.getPath(event.model); if (this.formBuilderService.hasMappedGroupValue(event.model)) { @@ -440,6 +444,11 @@ export class SubmissionSectionFormComponent extends SectionModelComponent implem } } + private clearPreviousValue(): void { + this.previousValue.path = null; + this.previousValue.value = null; + } + /** * Method called when a form remove event is fired. * Dispatch form operations based on changes. @@ -448,6 +457,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent implem * the [[DynamicFormControlEvent]] emitted */ onRemove(event: DynamicFormControlEvent): void { + this.updatePreviousValue(event); const fieldId = this.formBuilderService.getId(event.model); const fieldIndex = this.formOperationsService.getArrayIndexFromEvent(event); @@ -465,7 +475,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent implem event, this.previousValue, this.hasStoredValue(fieldId, fieldIndex)); - + this.clearPreviousValue(); } /** From c99fb5f544a7a6abce92e406e4562ffd25bf7e6d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 26 Jul 2023 15:14:54 +0200 Subject: [PATCH 630/758] refactoring of advanced attachment rendering component's location --- .../attachment-render/attachment-rendering.module.ts | 8 ++++---- .../file-download-button.component.html | 0 .../file-download-button.component.scss | 0 .../file-download-button.component.spec.ts | 4 ++-- .../file-download-button.component.ts | 7 +++---- 5 files changed, 9 insertions(+), 10 deletions(-) rename src/app/{shared => cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types}/file-download-button/file-download-button.component.html (100%) rename src/app/{shared => cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types}/file-download-button/file-download-button.component.scss (100%) rename src/app/{shared => cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types}/file-download-button/file-download-button.component.spec.ts (93%) rename src/app/{shared => cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types}/file-download-button/file-download-button.component.ts (67%) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts index 1c8bdc4c502..90fc221b5b5 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-rendering.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { - FileDownloadButtonComponent -} from '../../../../../../../../../shared/file-download-button/file-download-button.component'; + +import { TranslateModule } from '@ngx-translate/core'; + +import { FileDownloadButtonComponent } from './types/file-download-button/file-download-button.component'; import { SearchModule } from '../../../../../../../../../shared/search/search.module'; import { SharedModule } from '../../../../../../../../../shared/shared.module'; -import { TranslateModule } from '@ngx-translate/core'; const COMPONENTS = [ FileDownloadButtonComponent diff --git a/src/app/shared/file-download-button/file-download-button.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.html similarity index 100% rename from src/app/shared/file-download-button/file-download-button.component.html rename to src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.html diff --git a/src/app/shared/file-download-button/file-download-button.component.scss b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.scss similarity index 100% rename from src/app/shared/file-download-button/file-download-button.component.scss rename to src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.scss diff --git a/src/app/shared/file-download-button/file-download-button.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.spec.ts similarity index 93% rename from src/app/shared/file-download-button/file-download-button.component.spec.ts rename to src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.spec.ts index 423b117544c..b6883e74233 100644 --- a/src/app/shared/file-download-button/file-download-button.component.spec.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.spec.ts @@ -6,8 +6,8 @@ import { of } from 'rxjs'; import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service'; import { Bitstream } from 'src/app/core/shared/bitstream.model'; import { Item } from 'src/app/core/shared/item.model'; -import { TranslateLoaderMock } from '../mocks/translate-loader.mock'; -import { SharedModule } from '../shared.module'; +import { TranslateLoaderMock } from '../../../../../../../../../../../shared/mocks/translate-loader.mock'; +import { SharedModule } from '../../../../../../../../../../../shared/shared.module'; import { FileDownloadButtonComponent } from './file-download-button.component'; diff --git a/src/app/shared/file-download-button/file-download-button.component.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.ts similarity index 67% rename from src/app/shared/file-download-button/file-download-button.component.ts rename to src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.ts index 5a560117f80..390856f1fa2 100644 --- a/src/app/shared/file-download-button/file-download-button.component.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.ts @@ -1,9 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { FileDownloadLinkComponent } from '../file-download-link/file-download-link.component'; import { - AttachmentRenderingType, - AttachmentTypeRendering -} from '../../cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-type.decorator'; + FileDownloadLinkComponent +} from '../../../../../../../../../../../shared/file-download-link/file-download-link.component'; +import { AttachmentRenderingType, AttachmentTypeRendering } from '../../../attachment-type.decorator'; @Component({ selector: 'ds-file-download-button', From 2122d84342176637ce897cf31f0221f04ea26c4c Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 26 Apr 2023 15:33:02 +0200 Subject: [PATCH 631/758] [DURACOM-134] send-back action fixed --- .../workflow-item-action-page.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts index b8998a6dd72..2ed5639c5a7 100644 --- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Location } from '@angular/common'; -import { Observable, forkJoin } from 'rxjs'; +import { Observable, combineLatest } from 'rxjs'; import { map, switchMap, take } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; import { WorkflowItem } from '../core/submission/models/workflowitem.model'; @@ -52,7 +52,7 @@ export abstract class WorkflowItemActionPageComponent implements OnInit { * Performs the action and shows a notification based on the outcome of the action */ performAction() { - forkJoin([this.wfi$, this.requestService.removeByHrefSubstring('/discover')]).pipe( + combineLatest([this.wfi$, this.requestService.removeByHrefSubstring('/discover')]).pipe( take(1), switchMap(([wfi]) => this.sendRequest(wfi.id)) ).subscribe((successful: boolean) => { From 86d41f17d7f55e00ab97524733f8e8aead7c704d Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Fri, 28 Apr 2023 18:03:52 +0200 Subject: [PATCH 632/758] [DURACOM-134] Administer workflow actions fixed --- ...m-admin-workflow-actions.component.spec.ts | 4 +- ...e-item-admin-workflow-actions.component.ts | 6 +- .../workflowitems-edit-page-routing-paths.ts | 7 +- ...ed-workspaceitems-delete-page.component.ts | 26 ++++ .../workspaceitems-delete-page.component.html | 24 ++++ .../workspaceitems-delete-page.component.scss | 4 + ...rkspaceitems-delete-page.component.spec.ts | 110 +++++++++++++++++ .../workspaceitems-delete-page.component.ts | 111 ++++++++++++++++++ ...workspaceitems-edit-page-routing.module.ts | 24 +++- .../workspaceitems-edit-page.module.ts | 7 +- src/assets/i18n/en.json5 | 16 ++- .../workspace-items-delete.component.html | 0 .../workspace-items-delete.component.scss | 0 .../workspace-items-delete.component.ts | 10 ++ src/themes/custom/lazy-theme.module.ts | 4 +- 15 files changed, 343 insertions(+), 10 deletions(-) create mode 100644 src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts create mode 100644 src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html create mode 100644 src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss create mode 100644 src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts create mode 100644 src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts create mode 100644 src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.html create mode 100644 src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.scss create mode 100644 src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts index 628fc3f89ca..a8f0581ec0e 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts @@ -11,7 +11,7 @@ import { URLCombiner } from '../../../../../core/url-combiner/url-combiner'; import { WorkspaceItemAdminWorkflowActionsComponent } from './workspace-item-admin-workflow-actions.component'; import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; import { - getWorkflowItemDeleteRoute, + getWorkspaceItemDeleteRoute, } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { Item } from '../../../../../core/shared/item.model'; import { RemoteData } from '../../../../../core/data/remote-data'; @@ -83,7 +83,7 @@ describe('WorkspaceItemAdminWorkflowActionsComponent', () => { it('should render a delete button with the correct link', () => { const button = fixture.debugElement.query(By.css('a.delete-link')); const link = button.nativeElement.href; - expect(link).toContain(new URLCombiner(getWorkflowItemDeleteRoute(wsi.id)).toString()); + expect(link).toContain(new URLCombiner(getWorkspaceItemDeleteRoute(wsi.id)).toString()); }); it('should render a policies button with the correct link', () => { diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts index adbd4216289..36678460da1 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts @@ -11,7 +11,7 @@ import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component'; import { - getWorkflowItemDeleteRoute + getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths'; import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../../../item-page/edit-item-page/edit-item-page.routing-paths'; import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model'; @@ -105,10 +105,10 @@ export class WorkspaceItemAdminWorkflowActionsComponent implements OnInit { } /** - * Returns the path to the delete page of this workflow item + * Returns the path to the delete page of this workspace item */ getDeleteRoute(): string { - return getWorkflowItemDeleteRoute(this.wsi.id); + return getWorkspaceItemDeleteRoute(this.wsi.id); } /** diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts index ece61f0321c..326eebe4a79 100644 --- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts +++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts @@ -1,5 +1,5 @@ import { URLCombiner } from '../core/url-combiner/url-combiner'; -import { getWorkflowItemModuleRoute } from '../app-routing-paths'; +import { getWorkflowItemModuleRoute, getWorkspaceItemModuleRoute } from '../app-routing-paths'; export function getWorkflowItemPageRoute(wfiId: string) { return new URLCombiner(getWorkflowItemModuleRoute(), wfiId).toString(); @@ -24,8 +24,13 @@ export function getAdvancedWorkflowRoute(wfiId: string) { return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, ADVANCED_WORKFLOW_PATH).toString(); } +export function getWorkspaceItemDeleteRoute(wsiId: string) { + return new URLCombiner(getWorkspaceItemModuleRoute(), wsiId, WORKSPACE_ITEM_DELETE_PATH).toString(); +} + export const WORKFLOW_ITEM_EDIT_PATH = 'edit'; export const WORKFLOW_ITEM_DELETE_PATH = 'delete'; export const WORKFLOW_ITEM_VIEW_PATH = 'view'; export const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback'; export const ADVANCED_WORKFLOW_PATH = 'advanced'; +export const WORKSPACE_ITEM_DELETE_PATH = 'delete'; diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts new file mode 100644 index 00000000000..681cba21c86 --- /dev/null +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts @@ -0,0 +1,26 @@ +import { ThemedComponent } from '../../shared/theme-support/themed.component'; +import { Component } from '@angular/core'; +import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component'; + +/** + * Themed wrapper for WorkspaceItemsDeletePageComponent + */ + +@Component({ + selector: 'ds-themed-workspace-items-delete', + styleUrls: [], + templateUrl: './../../shared/theme-support/themed.component.html' +}) +export class ThemedWorkspaceItemsDeletePageComponent extends ThemedComponent { + protected getComponentName(): string { + return 'WorkspaceItemsDeletePageComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../../themes/${themeName}/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component`); + } + + protected importUnthemedComponent(): Promise { + return import(`./workspaceitems-delete-page.component`); + } +} diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html new file mode 100644 index 00000000000..a0f0a1711ec --- /dev/null +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html @@ -0,0 +1,24 @@ +
    +

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

    + + + +
    + + +
    +

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

    + +
    +
    +

    {{ 'submission.general.discard.confirm.info' | translate }}

    +
    +
    + + +
    +     diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss new file mode 100644 index 00000000000..e52175abeaa --- /dev/null +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss @@ -0,0 +1,4 @@ + +:host ::ng-deep ds-modify-item-overview table { + display: inline-table !important; +} diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts new file mode 100644 index 00000000000..f52dd497d8a --- /dev/null +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts @@ -0,0 +1,110 @@ +import { RouteService } from '../..//core/services/route.service'; +import { NotificationsService } from '../..//shared/notifications/notifications.service'; +import { WorkspaceitemDataService } from '../..//core/submission/workspaceitem-data.service'; +import { RouterMock } from './../../shared/mocks/router.mock'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component'; +import { ActivatedRoute, Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { Location } from '@angular/common'; +import { of as observableOf } from 'rxjs'; +import { routeServiceStub } from '../../shared/testing/route-service.stub'; +import { LocationStub } from '../../shared/testing/location.stub'; +import { By } from '@angular/platform-browser'; +import { ActivatedRouteStub } from 'src/app/shared/testing/active-router.stub'; +import { createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils'; +import { WorkspaceItem } from 'src/app/core/submission/models/workspaceitem.model'; +import { DSpaceObject } from 'src/app/core/shared/dspace-object.model'; + +describe('WorkspaceitemsDeletePageComponent', () => { + let component: WorkspaceItemsDeletePageComponent; + let fixture: ComponentFixture; + + const workspaceitemDataServiceSpy = jasmine.createSpyObj('WorkspaceitemDataService', { + delete: jasmine.createSpy('delete') + }); + + const wsi = new WorkspaceItem(); + wsi.id = '1234'; + const dso = new DSpaceObject(); + dso.uuid = '1234'; + + const translateServiceStub = { + get: () => observableOf('test-message'), + onLangChange: new EventEmitter(), + onTranslationChange: new EventEmitter(), + onDefaultLangChange: new EventEmitter() + }; + + const modalService = { + open: () => {/** empty */}, + }; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot()], + declarations: [WorkspaceItemsDeletePageComponent], + providers: [ + { + provide: ActivatedRoute, + useValue: new ActivatedRouteStub( + {}, + { + wsi: createSuccessfulRemoteDataObject(wsi), + dso: createSuccessfulRemoteDataObject(dso), + } + ), + }, + { provide: Router, useValue: new RouterMock() }, + { + provide: WorkspaceitemDataService, + useValue: workspaceitemDataServiceSpy, + }, + { provide: Location, useValue: new LocationStub() }, + { provide: NgbModal, useValue: modalService }, + { + provide: NotificationsService, + useValue: new NotificationsServiceStub(), + }, + { provide: TranslateService, useValue: translateServiceStub }, + { provide: RouteService, useValue: routeServiceStub }, + ], + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(WorkspaceItemsDeletePageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should have the current WorkspaceItem', () => { + console.log( (component as any).activatedRoute, 'data wsi'); + (component as any).activatedRoute.data.subscribe((data) => { + console.log(data, 'dataaa'); + expect(data.wsi.payload.id).toEqual('1234'); + }); + }); + + it('should delete the target workspace item', () => { + spyOn((component as any).modalService, 'open').and.returnValue({}); + component.confirmDelete(By.css('#delete-modal')); + fixture.detectChanges(); + expect((component as any).modalService.open).toHaveBeenCalled(); + }); + + it('should call workspaceItemService.delete', () => { + spyOn(workspaceitemDataServiceSpy, 'delete').and.returnValue(observableOf(createSuccessfulRemoteDataObject({}))); + component.sendDeleteRequest(); + expect((component as any).workspaceItemService.delete).toHaveBeenCalledWith('1234'); + }); +}); diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts new file mode 100644 index 00000000000..cff5fd6994c --- /dev/null +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts @@ -0,0 +1,111 @@ +import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; +import { NoContent } from './../../core/shared/NoContent.model'; +import { RouteService } from 'src/app/core/services/route.service'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from './../../core/shared/operators'; +import { RemoteData } from 'src/app/core/data/remote-data'; +import { Component, OnInit } from '@angular/core'; +import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; +import { Observable, map, switchMap, take } from 'rxjs'; +import { ActivatedRoute, Data, Params, Router } from '@angular/router'; +import { Location } from '@angular/common'; +import { WorkspaceitemDataService } from 'src/app/core/submission/workspaceitem-data.service'; +import { TranslateService } from '@ngx-translate/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { DSpaceObject } from 'src/app/core/shared/dspace-object.model'; + +@Component({ + selector: 'ds-workspaceitems-delete-page', + templateUrl: './workspaceitems-delete-page.component.html', + styleUrls: ['./workspaceitems-delete-page.component.scss'] +}) +export class WorkspaceItemsDeletePageComponent implements OnInit { + + /** + * The workspaceitem to delete + */ + public wsi$: Observable; + + /** + * The dspace object + */ + public dso$: Observable; + + /** + * The previous query parameters + */ + private previousQueryParameters?: Params; + + constructor( + private activatedRoute: ActivatedRoute, + private router: Router, + private routeService: RouteService, + private workspaceItemService: WorkspaceitemDataService, + private notificationsService: NotificationsService, + private translationService: TranslateService, + private location: Location, + private modalService: NgbModal, + ) { } + + ngOnInit(): void { + this.wsi$ = this.activatedRoute.data.pipe(map((data: Data) => data.wsi as RemoteData), getRemoteDataPayload()); + this.dso$ = this.activatedRoute.data.pipe(map((data: Data) => data.dso as RemoteData), getRemoteDataPayload()); + this.previousQueryParameters = (this.location.getState() as { [key: string]: any }).previousQueryParams; + } + + /** + * Navigates to the previous url + * If there's not previous url, it continues to the mydspace page instead + */ + previousPage() { + this.routeService.getPreviousUrl().pipe(take(1)) + .subscribe((url: string) => { + let params: Params = {}; + if (!url) { + url = '/mydspace'; + params = this.previousQueryParameters; + } + if (url.split('?').length > 1) { + for (const param of url.split('?')[1].split('&')) { + params[param.split('=')[0]] = decodeURIComponent(param.split('=')[1]); + } + } + void this.router.navigate([url.split('?')[0]], { queryParams: params }); + } + ); + } + + /** + * Open the modal to confirm the deletion of the workspaceitem + */ + public async confirmDelete(content) { + await this.modalService.open(content).result.then( + (result) => { + if (result === 'ok') { + this.sendDeleteRequest(); + } + } + ); + } + + /** + * Delete the target workspaceitem object + */ + sendDeleteRequest() { + this.wsi$.pipe( + switchMap((wsi: WorkspaceItem) => this.workspaceItemService.delete(wsi.id).pipe( + getFirstCompletedRemoteData(), + )) + ).subscribe((response: RemoteData) => { + if (response.hasSucceeded) { + const title = this.translationService.get('workspace-item.delete.notification.success.title'); + const content = this.translationService.get('workspace-item.delete.title'); + this.notificationsService.success(title, content); + this.previousPage(); + } else { + const title = this.translationService.get('workspace-item.delete.notification.error.title'); + const content = this.translationService.get('workspace-item.delete.notification.error.content'); + this.notificationsService.error(title, content); + } + }); + } +} diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts index a66bec9f6b6..51edeb9ea77 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts @@ -8,6 +8,8 @@ import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item- import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver'; import { WorkspaceItemPageResolver } from './workspace-item-page.resolver'; import { PendingChangesGuard } from '../submission/edit/pending-changes/pending-changes.guard'; +import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component'; +import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component'; @NgModule({ imports: [ @@ -36,7 +38,27 @@ import { PendingChangesGuard } from '../submission/edit/pending-changes/pending- breadcrumb: I18nBreadcrumbResolver }, data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' } - } + }, + { + canActivate: [AuthenticatedGuard], + path: 'delete', + component: WorkspaceItemsDeletePageComponent, + resolve: { + dso: ItemFromWorkspaceResolver, + breadcrumb: I18nBreadcrumbResolver + }, + data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' } + }, + { + canActivate: [AuthenticatedGuard], + path: 'delete', + component: ThemedWorkspaceItemsDeletePageComponent, + resolve: { + dso: ItemFromWorkspaceResolver, + breadcrumb: I18nBreadcrumbResolver + }, + data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' } + }, ] } ]) diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts index 65a40f3f7c8..77cb7a6e66c 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts @@ -3,6 +3,8 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../shared/shared.module'; import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module'; import { SubmissionModule } from '../submission/submission.module'; +import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component'; +import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component'; @NgModule({ imports: [ @@ -11,7 +13,10 @@ import { SubmissionModule } from '../submission/submission.module'; SharedModule, SubmissionModule, ], - declarations: [] + declarations: [ + WorkspaceItemsDeletePageComponent, + ThemedWorkspaceItemsDeletePageComponent, + ] }) /** * This module handles all modules that need to access the workspaceitems edit page. diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 2ffd38e2030..a8b00470498 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -6729,9 +6729,23 @@ "workspace-item.view.title": "Workspace View", + "workspace-item.delete.breadcrumbs": "Workspace Delete", - "workflow-item.advanced.title": "Advanced workflow", + "workspace-item.delete.header": "Delete workspace item", + + "workspace-item.delete.button.confirm": "Delete", + + "workspace-item.delete.button.cancel": "Cancel", + + "workspace-item.delete.notification.success.title": "Deleted", + "workspace-item.delete.title": "This workspace item was successfully deleted", + + "workspace-item.delete.notification.error.title": "Something went wrong", + + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + + "workflow-item.advanced.title": "Advanced workflow", "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", diff --git a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.html b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.scss b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts new file mode 100644 index 00000000000..95494d76dd3 --- /dev/null +++ b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { WorkspaceItemsDeletePageComponent as BaseComponent } from '../../../../../app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component'; + + +@Component({ + selector: 'ds-workspaceitems-delete-page', + templateUrl: '../../../../../app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html', +}) +export class WorkspaceItemsDeletePageComponent extends BaseComponent { +} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index d26659e3473..1b2ce85ff85 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -137,6 +137,7 @@ import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module'; import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module'; import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module'; +import { WorkspaceItemsDeletePageComponent } from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component'; const DECLARATIONS = [ FileSectionComponent, @@ -193,7 +194,8 @@ const DECLARATIONS = [ ExternalSourceEntryImportModalComponent, ResultsBackButtonComponent, DsoEditMetadataComponent, - BrowseMostElementsComponent + BrowseMostElementsComponent, + WorkspaceItemsDeletePageComponent, ]; @NgModule({ From 30d11d5815cd60119014490e983c283ff4cb3a91 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 2 May 2023 15:49:41 +0200 Subject: [PATCH 633/758] [DURACOM-134] Fix import paths --- .../workspaceitems-delete-page.component.spec.ts | 16 ++++++++-------- .../workspaceitems-delete-page.component.ts | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts index f52dd497d8a..fc0bef83f0f 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts @@ -1,7 +1,7 @@ -import { RouteService } from '../..//core/services/route.service'; -import { NotificationsService } from '../..//shared/notifications/notifications.service'; -import { WorkspaceitemDataService } from '../..//core/submission/workspaceitem-data.service'; -import { RouterMock } from './../../shared/mocks/router.mock'; +import { RouteService } from '../../core/services/route.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; +import { RouterMock } from '../../shared/mocks/router.mock'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component'; @@ -15,10 +15,10 @@ import { of as observableOf } from 'rxjs'; import { routeServiceStub } from '../../shared/testing/route-service.stub'; import { LocationStub } from '../../shared/testing/location.stub'; import { By } from '@angular/platform-browser'; -import { ActivatedRouteStub } from 'src/app/shared/testing/active-router.stub'; -import { createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils'; -import { WorkspaceItem } from 'src/app/core/submission/models/workspaceitem.model'; -import { DSpaceObject } from 'src/app/core/shared/dspace-object.model'; +import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; +import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; +import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; describe('WorkspaceitemsDeletePageComponent', () => { let component: WorkspaceItemsDeletePageComponent; diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts index cff5fd6994c..77ed0519d6b 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts @@ -1,17 +1,17 @@ -import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; -import { NoContent } from './../../core/shared/NoContent.model'; -import { RouteService } from 'src/app/core/services/route.service'; -import { getFirstCompletedRemoteData, getRemoteDataPayload } from './../../core/shared/operators'; -import { RemoteData } from 'src/app/core/data/remote-data'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { NoContent } from '../../core/shared/NoContent.model'; +import { RouteService } from '../../core/services/route.service'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../core/shared/operators'; +import { RemoteData } from '../../core/data/remote-data'; import { Component, OnInit } from '@angular/core'; import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; -import { Observable, map, switchMap, take } from 'rxjs'; +import { map, Observable, switchMap, take } from 'rxjs'; import { ActivatedRoute, Data, Params, Router } from '@angular/router'; import { Location } from '@angular/common'; -import { WorkspaceitemDataService } from 'src/app/core/submission/workspaceitem-data.service'; +import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { TranslateService } from '@ngx-translate/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { DSpaceObject } from 'src/app/core/shared/dspace-object.model'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; @Component({ selector: 'ds-workspaceitems-delete-page', From 7d5f44205ec673e632738b052acb25ac1db96672 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 3 May 2023 11:11:10 +0200 Subject: [PATCH 634/758] [DURACOM-134] Fixes --- .../workspaceitems-delete-page.component.spec.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts index fc0bef83f0f..c11659df24b 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts @@ -25,7 +25,7 @@ describe('WorkspaceitemsDeletePageComponent', () => { let fixture: ComponentFixture; const workspaceitemDataServiceSpy = jasmine.createSpyObj('WorkspaceitemDataService', { - delete: jasmine.createSpy('delete') + delete: observableOf(createSuccessfulRemoteDataObject({})) }); const wsi = new WorkspaceItem(); @@ -88,9 +88,7 @@ describe('WorkspaceitemsDeletePageComponent', () => { }); it('should have the current WorkspaceItem', () => { - console.log( (component as any).activatedRoute, 'data wsi'); (component as any).activatedRoute.data.subscribe((data) => { - console.log(data, 'dataaa'); expect(data.wsi.payload.id).toEqual('1234'); }); }); @@ -103,7 +101,6 @@ describe('WorkspaceitemsDeletePageComponent', () => { }); it('should call workspaceItemService.delete', () => { - spyOn(workspaceitemDataServiceSpy, 'delete').and.returnValue(observableOf(createSuccessfulRemoteDataObject({}))); component.sendDeleteRequest(); expect((component as any).workspaceItemService.delete).toHaveBeenCalledWith('1234'); }); From 39a1f7f196b707d8dd5a019eb6eecf443656bb6e Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 27 Jul 2023 12:14:47 +0200 Subject: [PATCH 635/758] [CST-10123] fix issue with infinite RetrieveAuthenticatedEpersonSuccessAction dispatched --- src/app/core/auth/auth.effects.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index e7301d1ae42..2ed01e1eb86 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -137,6 +137,7 @@ export class AuthEffects { user$ = this.authService.retrieveAuthenticatedUserByHref(action.payload); } return user$.pipe( + take(1), map((user: EPerson) => new RetrieveAuthenticatedEpersonSuccessAction(user)), catchError((error) => observableOf(new RetrieveAuthenticatedEpersonErrorAction(error)))); }) From 996013716bbdcc1865aadb7475c9aeb4e72f642d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 19:03:37 +0200 Subject: [PATCH 636/758] Fix test --- .../workspaceitems-delete-page.component.spec.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts index c11659df24b..e2135636a54 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts @@ -6,7 +6,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component'; import { ActivatedRoute, Router } from '@angular/router'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; @@ -46,7 +46,10 @@ describe('WorkspaceitemsDeletePageComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot()], + imports: [ + NgbModalModule, + TranslateModule.forRoot() + ], declarations: [WorkspaceItemsDeletePageComponent], providers: [ { @@ -65,7 +68,6 @@ describe('WorkspaceitemsDeletePageComponent', () => { useValue: workspaceitemDataServiceSpy, }, { provide: Location, useValue: new LocationStub() }, - { provide: NgbModal, useValue: modalService }, { provide: NotificationsService, useValue: new NotificationsServiceStub(), From fde497e34f273798aec5f8a301701a92848a123e Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Thu, 18 May 2023 13:28:08 -0500 Subject: [PATCH 637/758] Comment out problematic test in "workspaceitems-delete-page" component --- .../workspaceitems-delete-page.component.spec.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts index e2135636a54..c0094e36aa6 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts @@ -14,7 +14,6 @@ import { Location } from '@angular/common'; import { of as observableOf } from 'rxjs'; import { routeServiceStub } from '../../shared/testing/route-service.stub'; import { LocationStub } from '../../shared/testing/location.stub'; -import { By } from '@angular/platform-browser'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; @@ -95,12 +94,12 @@ describe('WorkspaceitemsDeletePageComponent', () => { }); }); - it('should delete the target workspace item', () => { + /*it('should delete the target workspace item', () => { spyOn((component as any).modalService, 'open').and.returnValue({}); component.confirmDelete(By.css('#delete-modal')); fixture.detectChanges(); expect((component as any).modalService.open).toHaveBeenCalled(); - }); + });*/ it('should call workspaceItemService.delete', () => { component.sendDeleteRequest(); From 5a26a320604b94deb13883e481f23cffadaabfaf Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 23:21:45 +0200 Subject: [PATCH 638/758] Fix test --- .../workspaceitems-delete-page.component.spec.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts index c0094e36aa6..ac2878e8bd8 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts @@ -14,6 +14,7 @@ import { Location } from '@angular/common'; import { of as observableOf } from 'rxjs'; import { routeServiceStub } from '../../shared/testing/route-service.stub'; import { LocationStub } from '../../shared/testing/location.stub'; +import { By } from '@angular/platform-browser'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils'; import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; @@ -39,10 +40,6 @@ describe('WorkspaceitemsDeletePageComponent', () => { onDefaultLangChange: new EventEmitter() }; - const modalService = { - open: () => {/** empty */}, - }; - beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ @@ -94,12 +91,12 @@ describe('WorkspaceitemsDeletePageComponent', () => { }); }); - /*it('should delete the target workspace item', () => { - spyOn((component as any).modalService, 'open').and.returnValue({}); + it('should delete the target workspace item', () => { + spyOn((component as any).modalService, 'open').and.returnValue({result: Promise.resolve('ok')}); component.confirmDelete(By.css('#delete-modal')); fixture.detectChanges(); expect((component as any).modalService.open).toHaveBeenCalled(); - });*/ + }); it('should call workspaceItemService.delete', () => { component.sendDeleteRequest(); From ae5a22ea7816fb8482dd739e6633eb3977ecc7ce Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 18 May 2023 23:21:45 +0200 Subject: [PATCH 639/758] [DSC-1091] Fix failing tests --- src/app/shared/form/form.component.html | 1 - src/app/shared/form/form.component.spec.ts | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html index 29351a7fd81..8fb82659811 100644 --- a/src/app/shared/form/form.component.html +++ b/src/app/shared/form/form.component.html @@ -15,7 +15,6 @@
    + @@ -39,6 +44,11 @@ +
    {{'admin.registries.metadata.schemas.table.id' | translate}} {{'admin.registries.metadata.schemas.table.namespace' | translate}} {{'admin.registries.metadata.schemas.table.name' | translate}} +
    + {{'admin.registries.metadata.schemas.table.download' | translate}} +
    +
    {{schema.id}} {{schema.namespace}} {{schema.prefix}} +
    + +
    +
    diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index ca1ee2fd1c8..501f1821a84 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -256,6 +256,7 @@ "admin.registries.metadata.schemas.table.name": "Name", "admin.registries.metadata.schemas.table.namespace": "Namespace", + "admin.registries.metadata.schemas.table.download": "Download", "admin.registries.metadata.title": "Metadata Registry", @@ -7162,5 +7163,5 @@ "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 9985e794b02..81336daf11f 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -381,6 +381,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namespace", + // "admin.registries.metadata.schemas.table.downloads": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.downloads": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Registro dei metadati", @@ -11215,4 +11218,4 @@ "admin.system-wide-alert.title": "System-wide Alerts", -} \ No newline at end of file +} From 6db8b8ea2287b5e50854240cd1a4a6851b436b8d Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 31 Aug 2023 11:53:10 +0200 Subject: [PATCH 650/758] [CST-11640] Adds export-schema download process --- .../metadata-registry.component.html | 2 +- .../metadata-registry.component.ts | 16 ++++++- .../metadata-schema-export.service.spec.ts | 16 +++++++ .../metadata-schema-export.service.ts | 46 +++++++++++++++++++ src/assets/i18n/en.json5 | 2 +- 5 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.spec.ts create mode 100644 src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.ts diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html index 3078a10eaa3..dc0fc48401c 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -46,7 +46,7 @@
    diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html index 477f96e19e2..09594bd56ac 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html @@ -1,6 +1,6 @@ - From 59cb63a32efee2209797e6efaba14c94d38d48e5 Mon Sep 17 00:00:00 2001 From: "yevhenii.lohatskyi" Date: Thu, 7 Sep 2023 10:03:36 +0300 Subject: [PATCH 653/758] [DSC-1235] adjust display of cris-layout-metrics-box --- .../boxes/metrics/cris-layout-metrics-box.component.html | 2 +- .../boxes/metrics/metric-row/metric-row.component.html | 2 +- .../shared/metric/metric-loader/metric-loader.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.html index d1176864adf..fc6fabc57a7 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.html @@ -4,7 +4,7 @@
    + class="d-flex flex-wrap gap-3">
    diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html index 09594bd56ac..50584b04c41 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/metric-row/metric-row.component.html @@ -1,6 +1,6 @@ - diff --git a/src/app/shared/metric/metric-loader/metric-loader.component.html b/src/app/shared/metric/metric-loader/metric-loader.component.html index f8f338c4545..4d3eb179215 100644 --- a/src/app/shared/metric/metric-loader/metric-loader.component.html +++ b/src/app/shared/metric/metric-loader/metric-loader.component.html @@ -1,3 +1,3 @@ - From f6d7b0d2b2a8cd4b60f235f087e21533de2df53a Mon Sep 17 00:00:00 2001 From: Nikita Krivonosov Date: Fri, 8 Sep 2023 09:17:46 +0200 Subject: [PATCH 656/758] [CST-11736] Submission form: Wrong mapping between validation error and form model of a group --- src/app/shared/form/form.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts index 05f88c095eb..34d2d2266d6 100644 --- a/src/app/shared/form/form.component.ts +++ b/src/app/shared/form/form.component.ts @@ -203,10 +203,10 @@ export class FormComponent implements OnDestroy, OnInit { } if (field) { - const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel); + const modelArrayIndex = fieldIndex > 0 ? fieldIndex : null; + const model: DynamicFormControlModel = this.formBuilderService.findById(fieldId, formModel, modelArrayIndex); this.formService.addErrorToField(field, model, error.message); this.changeDetectorRef.detectChanges(); - } }); From 28527c24a48e2ead45c21734ce81ac5c403091a3 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Fri, 8 Sep 2023 16:08:16 +0200 Subject: [PATCH 657/758] [DSC-1224] Fixes failing tests --- .../metadata-registry.component.spec.ts | 13 ++++++++-- .../metadata-registry.component.ts | 2 -- .../metadata-schema-export.service.spec.ts | 24 +++++++++++++++++-- .../metadata-schema-export.service.ts | 6 ++--- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 944288a7a51..36ecdaf3162 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -1,6 +1,6 @@ import { MetadataRegistryComponent } from './metadata-registry.component'; import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing'; -import { of as observableOf } from 'rxjs'; +import { of, of as observableOf } from 'rxjs'; import { buildPaginatedList } from '../../../core/data/paginated-list.model'; import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; @@ -20,6 +20,9 @@ import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; +import { + MetadataSchemaExportService +} from '../../../shared/metadata-export/metadata-schema-export/metadata-schema-export.service'; describe('MetadataRegistryComponent', () => { let comp: MetadataRegistryComponent; @@ -75,7 +78,13 @@ describe('MetadataRegistryComponent', () => { { provide: RegistryService, useValue: registryServiceStub }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: PaginationService, useValue: paginationService }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() } + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { + provide: MetadataSchemaExportService, + useValue: jasmine.createSpyObj('metadataSchemaExportService', { + exportSchema: of(1), + }) + } ], schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(MetadataRegistryComponent, { diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts index 723338ff523..0f052ba25ef 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -7,7 +7,6 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio import { filter, map, switchMap, take } from 'rxjs/operators'; import { hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; -import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { MetadataSchema } from '../../../core/metadata/metadata-schema.model'; import { toFindListOptions } from '../../../shared/pagination/pagination.utils'; @@ -49,7 +48,6 @@ export class MetadataRegistryComponent { constructor(private registryService: RegistryService, private notificationsService: NotificationsService, - private router: Router, private paginationService: PaginationService, private translateService: TranslateService, private readonly metadataSchemaExportService: MetadataSchemaExportService) { diff --git a/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.spec.ts b/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.spec.ts index 9b3a5b96f50..cca41263ab5 100644 --- a/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.spec.ts +++ b/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.spec.ts @@ -1,16 +1,36 @@ import { TestBed } from '@angular/core/testing'; import { MetadataSchemaExportService } from './metadata-schema-export.service'; +import { CommonModule } from '@angular/common'; +import { RouterTestingModule } from '@angular/router/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import { ScriptDataService } from '../../../core/data/processes/script-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; describe('MetadataSchemaExportService', () => { let service: MetadataSchemaExportService; beforeEach(() => { - TestBed.configureTestingModule({}); + TestBed.configureTestingModule({ + imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule], + providers: [ + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { + provide: ScriptDataService, + useValue: jasmine.createSpyObj('scriptDataService', { + invoke: createSuccessfulRemoteDataObject$({ processId: '45' }), + }) + } + ], + }); service = TestBed.inject(MetadataSchemaExportService); }); it('should be created', () => { expect(service).toBeTruthy(); }); -}); +}) +; diff --git a/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.ts b/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.ts index 674b82e80e0..9190ddb86a3 100644 --- a/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.ts +++ b/src/app/shared/metadata-export/metadata-schema-export/metadata-schema-export.service.ts @@ -18,9 +18,9 @@ export class MetadataSchemaExportService { private readonly SCRIPT_NAME = 'export-schema'; constructor( - protected notificationsService: NotificationsService, - protected translate: TranslateService, - protected scriptDataService: ScriptDataService + protected readonly notificationsService: NotificationsService, + protected readonly translate: TranslateService, + protected readonly scriptDataService: ScriptDataService ) { } From f8abdb8561e6112942c81d817228698724f4b04c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 11 Sep 2023 09:37:30 +0200 Subject: [PATCH 658/758] [DSC-1224] Use button for registry download --- .../metadata-registry.component.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html index dc0fc48401c..fde93042e09 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -44,11 +44,13 @@

From c215e08720aa866c185de49eb41246a651423745 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 19 Sep 2023 14:47:42 +0200 Subject: [PATCH 666/758] [DSC-1250] revert code removed by mistake --- src/app/shared/form/chips/chips.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html index b5d872a0bee..175c9b99c2b 100644 --- a/src/app/shared/form/chips/chips.component.html +++ b/src/app/shared/form/chips/chips.component.html @@ -65,7 +65,7 @@ -
+
From ec108b31a537e2513af9c09a813c6863f351dd3e Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 20 Sep 2023 15:48:38 +0200 Subject: [PATCH 667/758] [DSC-291] Add bitbucket pipeline configuration file --- bitbucket-pipelines.yml | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 bitbucket-pipelines.yml diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml new file mode 100644 index 00000000000..8353a902456 --- /dev/null +++ b/bitbucket-pipelines.yml @@ -0,0 +1,50 @@ +definitions: + steps: + - step: &test-code-checks + services: + - docker + script: + - yarn install --frozen-lockfile + - yarn run lint --quiet + - yarn run check-circ-deps + - yarn run build:prod + - yarn run test:headless + - docker-compose -f ./docker/docker-compose-ci.yml up -d + - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli + - docker container ls + - yarn run serve:ssr + - yarn run e2e + +pipelines: + branches: + 'dspace-cris-7': + - parallel: + - stage: + name: + image: node:16 + caches: + - node + steps: + - step: *test-code-checks + - stage: + image: node:18 + caches: + - node + steps: + - step: *test-code-checks + + pull-requests: + '**': + - parallel: + - stage: + image: node:16 + caches: + - node + steps: + - step: *test-code-checks + - stage: + image: node:18 + caches: + - node + steps: + - step: *test-code-checks From a3b47dcec80749487c7fa2d5ce51358b8715c68c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 20 Sep 2023 15:58:58 +0200 Subject: [PATCH 668/758] [DSC-291] try default option --- bitbucket-pipelines.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 8353a902456..c8190f1bbf6 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -16,6 +16,21 @@ definitions: - yarn run e2e pipelines: + default: + - parallel: + - stage: + name: + image: node:16 + caches: + - node + steps: + - step: *test-code-checks + - stage: + image: node:18 + caches: + - node + steps: + - step: *test-code-checks branches: 'dspace-cris-7': - parallel: From 636b5f5452022ab9ea1634aca557a5593cdf1d94 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Wed, 20 Sep 2023 16:03:34 +0200 Subject: [PATCH 669/758] [DSC-1207] Replaced deprecated API call --- src/app/shared/sidebar/sidebar.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/sidebar/sidebar.service.ts b/src/app/shared/sidebar/sidebar.service.ts index 0b77fce439a..bea1528e758 100644 --- a/src/app/shared/sidebar/sidebar.service.ts +++ b/src/app/shared/sidebar/sidebar.service.ts @@ -35,10 +35,10 @@ export class SidebarService { * @returns {Observable} Emits true if the user's screen size is mobile or when the state in the store is currently collapsed */ get isCollapsed(): Observable { - return observableCombineLatest( + return observableCombineLatest([ this.isXsOrSm$, this.isCollapsedInStore - ).pipe( + ]).pipe( map(([mobile, store]) => mobile && store) ); } From f36dd947c1a9b4f854542df2f82b391f3cae1492 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 20 Sep 2023 16:03:43 +0200 Subject: [PATCH 670/758] [DSC-291] try default option with only a stage --- bitbucket-pipelines.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index c8190f1bbf6..60116030a8a 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -17,20 +17,13 @@ definitions: pipelines: default: - - parallel: - - stage: - name: - image: node:16 - caches: - - node - steps: - - step: *test-code-checks - - stage: - image: node:18 - caches: - - node - steps: - - step: *test-code-checks + - stage: + name: + image: node:16 + caches: + - node + steps: + - step: *test-code-checks branches: 'dspace-cris-7': - parallel: From 53abf51c20091aa0c9e9d39dd7450ad3626c831b Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 20 Sep 2023 16:26:12 +0200 Subject: [PATCH 671/758] [DSC-1251] consider empty value of configuration key request.item.type --- .../attachment-render.component.spec.ts | 14 ++++++++++++- .../file-download-button.component.html | 9 +++++--- .../file-download-button.component.spec.ts | 17 +++++++++++++++ .../file-download-link.component.spec.ts | 11 ++++++++++ .../file-download-link.component.ts | 21 +++++++++++++++++++ 5 files changed, 68 insertions(+), 4 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts index 541606ccdde..dbe7ec1e011 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/attachment-render.component.spec.ts @@ -6,16 +6,28 @@ import { AuthorizationDataService } from '../../../../../../../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../../../../../../../../shared/testing/authorization-service.stub'; +import { ConfigurationDataService } from '../../../../../../../../../core/data/configuration-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../../../../../../../../../shared/remote-data.utils'; +import { ConfigurationProperty } from '../../../../../../../../../core/shared/configuration-property.model'; describe('AttachmentRenderComponent', () => { let component: AttachmentRenderComponent; let fixture: ComponentFixture; + let configurationDataService: ConfigurationDataService; beforeEach(async () => { + configurationDataService = jasmine.createSpyObj('configurationDataService', { + findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'request.item.type', + values: [] + })) + }); + await TestBed.configureTestingModule({ declarations: [ AttachmentRenderComponent ], providers: [ - {provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub} + {provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub}, + {provide: ConfigurationDataService, useValue: configurationDataService} ], schemas: [ NO_ERRORS_SCHEMA ] }) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.html index a04507c87cb..d49b6fabcc8 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.html @@ -9,9 +9,12 @@ - {{ 'cris-layout.advanced-attachment.requestACopy' | - translate }} + diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.spec.ts index b6883e74233..d1d6d86eac9 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.spec.ts +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.spec.ts @@ -10,6 +10,9 @@ import { TranslateLoaderMock } from '../../../../../../../../../../../shared/moc import { SharedModule } from '../../../../../../../../../../../shared/shared.module'; import { FileDownloadButtonComponent } from './file-download-button.component'; +import { ConfigurationDataService } from '../../../../../../../../../../../core/data/configuration-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../../../../../../../../../../../shared/remote-data.utils'; +import { ConfigurationProperty } from '../../../../../../../../../../../core/shared/configuration-property.model'; describe('FileDownloadButtonComponent', () => { let component: FileDownloadButtonComponent; @@ -19,6 +22,7 @@ describe('FileDownloadButtonComponent', () => { let bitstream: Bitstream; let item: Item; + let configurationDataService: ConfigurationDataService; function init() { authorizationService = jasmine.createSpyObj('authorizationService', { @@ -36,6 +40,12 @@ describe('FileDownloadButtonComponent', () => { self: { href: 'obj-selflink' } } }); + configurationDataService = jasmine.createSpyObj('configurationDataService', { + findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'request.item.type', + values: [] + })) + }); } @@ -56,6 +66,7 @@ describe('FileDownloadButtonComponent', () => { declarations: [FileDownloadButtonComponent], providers: [ { provide: AuthorizationDataService, useValue: authorizationService }, + { provide: ConfigurationDataService, useValue: configurationDataService } ] }) .compileComponents(); @@ -91,4 +102,10 @@ describe('FileDownloadButtonComponent', () => { expect(fixture.debugElement.query(By.css('[data-test="requestACopy"]'))).toBeTruthy(); }); + it('should show a disabled can request a copy button when request.item.type has no value', () => { + (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(of(false)); + component.ngOnInit(); + fixture.detectChanges(); + expect(fixture.debugElement.query(By.css('[data-test="requestACopy"]')).nativeElement.disabled).toBeTruthy(); + }); }); 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 5633c94fe8c..8d22691bd5f 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 @@ -10,6 +10,9 @@ 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'; +import { ConfigurationDataService } from '../../core/data/configuration-data.service'; +import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; +import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; describe('FileDownloadLinkComponent', () => { let component: FileDownloadLinkComponent; @@ -20,6 +23,7 @@ describe('FileDownloadLinkComponent', () => { let bitstream: Bitstream; let item: Item; + let configurationDataService: ConfigurationDataService; function init() { authorizationService = jasmine.createSpyObj('authorizationService', { @@ -37,6 +41,12 @@ describe('FileDownloadLinkComponent', () => { self: {href: 'obj-selflink'} } }); + configurationDataService = jasmine.createSpyObj('configurationDataService', { + findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), { + name: 'request.item.type', + values: [] + })) + }); } function initTestbed() { @@ -44,6 +54,7 @@ describe('FileDownloadLinkComponent', () => { declarations: [FileDownloadLinkComponent, RouterLinkDirectiveStub], providers: [ {provide: AuthorizationDataService, useValue: authorizationService}, + {provide: ConfigurationDataService, useValue: configurationDataService} ] }) .compileComponents(); 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 22dcd120274..d2f1d215c0d 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 @@ -7,6 +7,9 @@ import { hasValue, isNotEmpty } from '../empty.util'; import { map } from 'rxjs/operators'; import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs'; import { Item } from '../../core/shared/item.model'; +import { ConfigurationDataService } from '../../core/data/configuration-data.service'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from 'src/app/core/shared/operators'; +import { ConfigurationProperty } from '../../core/shared/configuration-property.model'; @Component({ selector: 'ds-file-download-link', @@ -48,8 +51,16 @@ export class FileDownloadLinkComponent implements OnInit { canDownload$: Observable; + /** + * Whether or not the user can request a copy of the item + * based on the configuration property `request.item.type`. + */ + public canRequestItemCopy$: Observable; + + constructor( private authorizationService: AuthorizationDataService, + private configurationService: ConfigurationDataService, ) { } @@ -60,9 +71,19 @@ export class FileDownloadLinkComponent implements OnInit { this.bitstreamPath$ = observableCombineLatest([this.canDownload$, canRequestACopy$]).pipe( map(([canDownload, canRequestACopy]) => this.getBitstreamPath(canDownload, canRequestACopy)) ); + + this.canRequestItemCopy$ = this.configurationService.findByPropertyName('request.item.type').pipe( + getFirstCompletedRemoteData(), + getRemoteDataPayload(), + map((requestItemType: ConfigurationProperty) => + // in case requestItemType empty/commented out(undefined) - request-copy not allowed + hasValue(requestItemType) && requestItemType.values.length > 0 + ), + ); } else { this.bitstreamPath$ = observableOf(this.getBitstreamDownloadPath()); this.canDownload$ = observableOf(true); + this.canRequestItemCopy$ = observableOf(false); } } From 7f5f6e0658a2f4355d603574d6c02c72703648dc Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 20 Sep 2023 17:23:18 +0200 Subject: [PATCH 672/758] [DSC-291] try different node version --- bitbucket-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 60116030a8a..e458902a0d0 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -19,7 +19,7 @@ pipelines: default: - stage: name: - image: node:16 + image: node:18 caches: - node steps: From e82bfadaa7f95c44f412cba0bb015b51a67a79df Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 20 Sep 2023 17:26:40 +0200 Subject: [PATCH 673/758] [DSC-1252] display visibility switch for input groups --- src/app/shared/form/builder/parsers/field-parser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts index fc83883b6c5..15ce3068374 100644 --- a/src/app/shared/form/builder/parsers/field-parser.ts +++ b/src/app/shared/form/builder/parsers/field-parser.ts @@ -344,7 +344,7 @@ export abstract class FieldParser { (controlModel as DsDynamicInputModel).typeBindRelations = this.getTypeBindRelations(this.configData.typeBind, this.parserOptions.typeField); } - controlModel.securityConfigLevel = this.mapBetweenMetadataRowAndSecurityMetadataLevels(this.fieldId); + controlModel.securityConfigLevel = this.mapBetweenMetadataRowAndSecurityMetadataLevels(this.getFieldId()); return controlModel; } From 9e1b1ab0815498c50eada5c7fea238518576f837 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 20 Sep 2023 17:56:47 +0200 Subject: [PATCH 674/758] [DSC-740] fix --- .../cris-layout-collection-box.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html index e1126d358d7..94a641b3fe2 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/cris-layout-collection-box/cris-layout-collection-box.component.html @@ -8,8 +8,8 @@
-
{{ 'cris-layout.rendering.collections.mapped-collection.label' | translate }}
-
+
{{ 'cris-layout.rendering.collections.mapped-collection.label' | translate }}
+
{{ mappedCollection.firstMetadataValue('dc.title') }} From d445f51c983269fc9fae652309078a684908802d Mon Sep 17 00:00:00 2001 From: nikunj59 Date: Wed, 25 May 2022 08:19:34 +0200 Subject: [PATCH 675/758] [DSC-552] changes for plumx attribute added in metrix-plumx --- .../metric-plumx/metric-plumx.component.html | 15 +++---- .../metric-plumx.component.spec.ts | 45 ++++++++++++++++++- ...bmission-import-external.component.spec.ts | 2 +- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/src/app/shared/metric/metric-plumx/metric-plumx.component.html b/src/app/shared/metric/metric-plumx/metric-plumx.component.html index 208e148888a..72a7b054258 100644 --- a/src/app/shared/metric/metric-plumx/metric-plumx.component.html +++ b/src/app/shared/metric/metric-plumx/metric-plumx.component.html @@ -1,6 +1,7 @@
- - {{ remark | dsListMetricProps: "placeholder":isListElement }} - + >{{ remark | dsListMetricProps: "placeholder":isListElement }}
- - {{ remark | dsListMetricProps: "placeholder":isListElement }} - + >{{ remark | dsListMetricProps: "placeholder":isListElement }}
diff --git a/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts b/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts index 45c33735f6f..174bccfc455 100644 --- a/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts +++ b/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts @@ -20,7 +20,39 @@ describe('MetricPlumxComponent', () => { metricCount: 333, metricType: 'plumX', rank: null, - remark: '{"type":"Publication","src":"//cdn.plu.mx/widget-popup.js","href":"https://plu.mx/plum/a/?doi=10.1056/NEJMe2025111", "list-data-publication-badge-enabled":"true","data-publication-badge-enabled":"true"}', + remark: '{' + + ' "type":"Publication",' + + ' "src":"//cdn.plu.mx/widget-popup.js",' + + ' "href":"https://plu.mx/plum/a/?doi=10.1056/NEJMe2025111",' + + ' "list-data-publication-badge-enabled":"true",' + + ' "data-publication-badge-enabled":"true"},' + + ' "data-popup": "left",' + + ' "data-hide-when-empty": true,' + + ' "data-hide-usage": false,' + + ' "data-hide-captures": false,' + + ' "data-hide-mentions": false,' + + ' "data-hide-socialmedia": false,' + + ' "data-hide-citations": false,' + + ' "data-pass-hidden-categories": false,' + + ' "data-detail-same-page": false,' + + ' "list-data-lang": "en",' + + ' "list-data-no-name": true,' + + ' "list-data-num-artifacts": 5,' + + ' "list-data-width": "6em",' + + ' "list-data-no-description": true,' + + ' "list-data-no-stats": true,' + + ' "list-data-no-thumbnail": true,' + + ' "list-data-no-artifacts": true,' + + ' "list-data-popup": "bottom",' + + ' "list-data-hide-when-empty": true,' + + ' "list-data-hide-usage": false,' + + ' "list-data-hide-captures": false,' + + ' "list-data-hide-mentions": false,' + + ' "list-data-hide-socialmedia": false,' + + ' "list-data-hide-citations": false,' + + ' "list-data-pass-hidden-categories": false,' + + ' "list-data-detail-same-page": false' + + '}', startDate: null, type: null, _links: null @@ -48,13 +80,24 @@ describe('MetricPlumxComponent', () => { component.metric = metricMock; fixture.detectChanges(); }); + it('should create', () => { expect(component).toBeTruthy(); }); + it('should render plumx widget', (done) => { const innerHtmlMetric = fixture.debugElement.query(By.css('a')); expect(innerHtmlMetric.nativeElement.className).toEqual('plumx-plum-print-popup'); expect(innerHtmlMetric.nativeElement.href).toEqual('https://plu.mx/plum/a/?doi=10.1056/NEJMe2025111'); + expect(innerHtmlMetric.nativeElement.attributes['data-popup'].nodeValue).toEqual('left'); + expect(innerHtmlMetric.nativeElement.attributes['data-hide-when-empty'].nodeValue).toEqual('true'); + expect(innerHtmlMetric.nativeElement.attributes['data-hide-usage']).toBeUndefined(); + expect(innerHtmlMetric.nativeElement.attributes['data-hide-captures']).toBeUndefined(); + expect(innerHtmlMetric.nativeElement.attributes['data-hide-mentions']).toBeUndefined(); + expect(innerHtmlMetric.nativeElement.attributes['data-hide-socialmedia']).toBeUndefined(); + expect(innerHtmlMetric.nativeElement.attributes['data-hide-citations']).toBeUndefined(); + expect(innerHtmlMetric.nativeElement.attributes['data-pass-hidden-categories']).toBeUndefined(); + expect(innerHtmlMetric.nativeElement.attributes['data-detail-same-page']).toBeUndefined(); done(); }); }); diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index cc299886b51..f6e1ceb1f94 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -172,7 +172,7 @@ describe('SubmissionImportExternalComponent test suite', () => { ngbModal.open.and.returnValue({componentInstance: { externalSourceEntry: null}}); comp.import(entry); - expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg', scrollable: true }); + expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg', scrollable: true }); expect(comp.modalRef.componentInstance.externalSourceEntry).toEqual(entry); }); From b1f46a8273c9d78adc55fc329a2cc0838f51dec1 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 11 Jul 2023 16:05:33 +0200 Subject: [PATCH 676/758] [DURACOM-177] gap-* classes --- src/styles/_global-styles.scss | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss index 3322a2c6cc2..6a606d07db2 100644 --- a/src/styles/_global-styles.scss +++ b/src/styles/_global-styles.scss @@ -270,3 +270,27 @@ ul.dso-edit-menu-dropdown > li .nav-item.nav-link { padding: 0; display: inline; } + + +/* Flexbox gap */ + +.gap-0 { gap: 0; } +.gap-1 { gap: calc(#{$spacer} * .25); } +.gap-2 { gap: calc(#{$spacer} * .5); } +.gap-3 { gap: #{$spacer}; } +.gap-4 { gap: calc(#{$spacer} * 1.5); } +.gap-5 { gap: calc(#{$spacer} * 3); } + +.gapx-0 { column-gap: 0; } +.gapx-1 { column-gap: calc(#{$spacer} * .25); } +.gapx-2 { column-gap: calc(#{$spacer} * .5); } +.gapx-3 { column-gap: #{$spacer}; } +.gapx-4 { column-gap: calc(#{$spacer} * 1.5); } +.gapx-5 { column-gap: calc(#{$spacer} * 3); } + +.gapy-0 { row-gap: 0; } +.gapy-1 { row-gap: calc(#{$spacer} * .25); } +.gapy-2 { row-gap: calc(#{$spacer} * .5); } +.gapy-3 { row-gap: #{$spacer}; } +.gapy-4 { row-gap: calc(#{$spacer} * 1.5); } +.gapy-5 { row-gap: calc(#{$spacer} * 3); } From 23c557789e9af75d658531fb2d0131229f8338fd Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 21 Sep 2023 13:03:54 +0200 Subject: [PATCH 677/758] [DSC-552] Layout fixes --- .../person-search-result-list-element.component.html | 10 +++++----- .../metric-donuts/metric-donuts.component.html | 2 +- .../item-search-result-list-element.component.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html index cacbc2e1c82..9c3f012dfd2 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html @@ -17,9 +17,9 @@
-
-
-
+
+
+
-
- +
+
diff --git a/src/app/shared/object-list/metric-donuts/metric-donuts.component.html b/src/app/shared/object-list/metric-donuts/metric-donuts.component.html index 87e0f108d36..8e75097b496 100644 --- a/src/app/shared/object-list/metric-donuts/metric-donuts.component.html +++ b/src/app/shared/object-list/metric-donuts/metric-donuts.component.html @@ -1,4 +1,4 @@ -
+
-
-
-
+
+
+
From 9f16c6dabd0f3bb2aaea0252df7edc2db8b9f8bb Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 21 Sep 2023 18:02:42 +0200 Subject: [PATCH 678/758] [DSC-552] Test fixed --- .../metric-plumx/metric-plumx.component.html | 60 ++++++++-------- .../metric-plumx.component.spec.ts | 69 ++++++++++--------- 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/src/app/shared/metric/metric-plumx/metric-plumx.component.html b/src/app/shared/metric/metric-plumx/metric-plumx.component.html index 72a7b054258..088361c2be4 100644 --- a/src/app/shared/metric/metric-plumx/metric-plumx.component.html +++ b/src/app/shared/metric/metric-plumx/metric-plumx.component.html @@ -1,33 +1,33 @@
- diff --git a/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts b/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts index 174bccfc455..0eaf1f16c45 100644 --- a/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts +++ b/src/app/shared/metric/metric-plumx/metric-plumx.component.spec.ts @@ -6,11 +6,12 @@ import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; import { By } from '@angular/platform-browser'; import { ListMetricPropsPipe } from '../pipes/list-metric-props/list-metric-props.pipe'; import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service'; +import { Metric } from '../../../core/shared/metric.model'; describe('MetricPlumxComponent', () => { let component: MetricPlumxComponent; let fixture: ComponentFixture; - const metricMock = { + const metricMock: Metric = { acquisitionDate: new Date(), deltaPeriod1: null, deltaPeriod2: null, @@ -20,39 +21,39 @@ describe('MetricPlumxComponent', () => { metricCount: 333, metricType: 'plumX', rank: null, - remark: '{' + - ' "type":"Publication",' + - ' "src":"//cdn.plu.mx/widget-popup.js",' + - ' "href":"https://plu.mx/plum/a/?doi=10.1056/NEJMe2025111",' + - ' "list-data-publication-badge-enabled":"true",' + - ' "data-publication-badge-enabled":"true"},' + - ' "data-popup": "left",' + - ' "data-hide-when-empty": true,' + - ' "data-hide-usage": false,' + - ' "data-hide-captures": false,' + - ' "data-hide-mentions": false,' + - ' "data-hide-socialmedia": false,' + - ' "data-hide-citations": false,' + - ' "data-pass-hidden-categories": false,' + - ' "data-detail-same-page": false,' + - ' "list-data-lang": "en",' + - ' "list-data-no-name": true,' + - ' "list-data-num-artifacts": 5,' + - ' "list-data-width": "6em",' + - ' "list-data-no-description": true,' + - ' "list-data-no-stats": true,' + - ' "list-data-no-thumbnail": true,' + - ' "list-data-no-artifacts": true,' + - ' "list-data-popup": "bottom",' + - ' "list-data-hide-when-empty": true,' + - ' "list-data-hide-usage": false,' + - ' "list-data-hide-captures": false,' + - ' "list-data-hide-mentions": false,' + - ' "list-data-hide-socialmedia": false,' + - ' "list-data-hide-citations": false,' + - ' "list-data-pass-hidden-categories": false,' + - ' "list-data-detail-same-page": false' + - '}', + remark: JSON.stringify({ + 'type': 'Publication', + 'src': '//cdn.plu.mx/widget-popup.js', + 'href': 'https://plu.mx/plum/a/?doi=10.1056/NEJMe2025111', + 'list-data-publication-badge-enabled': true, + 'data-publication-badge-enabled': true, + 'data-popup': 'left', + 'data-hide-when-empty': true, + 'data-hide-usage': false, + 'data-hide-captures': false, + 'data-hide-mentions': false, + 'data-hide-socialmedia': false, + 'data-hide-citations': false, + 'data-pass-hidden-categories': false, + 'data-detail-same-page': false, + 'list-data-lang': 'en', + 'list-data-no-name': true, + 'list-data-num-artifacts': 5, + 'list-data-width': '6em', + 'list-data-no-description': true, + 'list-data-no-stats': true, + 'list-data-no-thumbnail': true, + 'list-data-no-artifacts': true, + 'list-data-popup': 'bottom', + 'list-data-hide-when-empty': true, + 'list-data-hide-usage': false, + 'list-data-hide-captures': false, + 'list-data-hide-mentions': false, + 'list-data-hide-socialmedia': false, + 'list-data-hide-citations': false, + 'list-data-pass-hidden-categories': false, + 'list-data-detail-same-page': false + }), startDate: null, type: null, _links: null From a00c9831b5f1e39a7e1b3d02803c6471e8166e87 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 21 Sep 2023 18:48:54 +0000 Subject: [PATCH 679/758] Merged in dspace-cris-7-DSC-291 (pull request #864) Add pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline * [DSC-291] WIP pipeline --- bitbucket-pipelines.yml | 58 ++++++++++------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index e458902a0d0..da014253bc1 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -1,58 +1,28 @@ +options: + runs-on: ubuntu-latest + definitions: steps: - - step: &test-code-checks - services: - - docker + - step: &unittest-code-checks + name: test-code-checks + image: + name: cypress/browsers:node18.12.0-chrome107 + run-as-user: 1000 + size: 2x + caches: + - node script: - yarn install --frozen-lockfile - yarn run lint --quiet - yarn run check-circ-deps - yarn run build:prod - yarn run test:headless - - docker-compose -f ./docker/docker-compose-ci.yml up -d - - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli - - docker container ls - - yarn run serve:ssr - - yarn run e2e pipelines: - default: - - stage: - name: - image: node:18 - caches: - - node - steps: - - step: *test-code-checks branches: 'dspace-cris-7': - - parallel: - - stage: - name: - image: node:16 - caches: - - node - steps: - - step: *test-code-checks - - stage: - image: node:18 - caches: - - node - steps: - - step: *test-code-checks - + - step: *unittest-code-checks pull-requests: '**': - - parallel: - - stage: - image: node:16 - caches: - - node - steps: - - step: *test-code-checks - - stage: - image: node:18 - caches: - - node - steps: - - step: *test-code-checks + - step: *unittest-code-checks + From 5e2960de90ad37db7f3aeab7a1fef9d36c226fb1 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Fri, 22 Sep 2023 17:41:38 +0200 Subject: [PATCH 680/758] [DSC-1255] complete translation of it.json5 --- src/assets/i18n/it.json5 | 1866 +++++++++++++------------------------- 1 file changed, 606 insertions(+), 1260 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 81336daf11f..92ddf9d6d2d 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -323,7 +323,6 @@ // "admin.registries.bitstream-formats.table.name": "Name", "admin.registries.bitstream-formats.table.name": "Nome", // "admin.registries.bitstream-formats.table.id" : "ID", - // TODO New key - Add a translation "admin.registries.bitstream-formats.table.id" : "ID", // "admin.registries.bitstream-formats.table.return": "Back", @@ -382,7 +381,6 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namespace", // "admin.registries.metadata.schemas.table.downloads": "Download", - // TODO New key - Add a translation "admin.registries.metadata.schemas.table.downloads": "Download", // "admin.registries.metadata.title": "Metadata Registry", @@ -408,7 +406,6 @@ // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Campo", // "admin.registries.schema.fields.table.id" : "ID", - // TODO New key - Add a translation "admin.registries.schema.fields.table.id" : "ID", // "admin.registries.schema.fields.table.scopenote": "Scope Note", @@ -942,16 +939,13 @@ "admin.access-control.groups.form.return": "Indietro", // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.", - // TODO New key - Add a translation - "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.", + "admin.access-control.groups.form.tooltip.editGroupPage": "In questa pagina è possibile modificare le proprietà e i membri di un gruppo. Nella sezione in alto, è possibile modificare il nome e la descrizione del gruppo, a meno che non si tratti di un gruppo di amministratori di una collection o una community. In quel caso il nome e la descrizione del gruppo sono generati automaticamente e non possono essere modificati. Nelle sezioni successive è possibile modificare l'appartenenza al gruppo. Per maggiori dettagli, vedere [la wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+o+gestire+un+gruppo+utente)", // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.", - // TODO New key - Add a translation - "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.", + "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Per aggiungere o rimuovere un EPerson a/da questo gruppo, cliccare sul pulsante 'Sfoglia tutti' o utilizzare la barra di ricerca in basso per cercare gli utenti (utilizzare il menu a tendina a sinistra della barra di ricerca per selezionare la ricerca per metadati o per e-mail). Cliccare quindi sull'icona + per ogni utente che si desidera aggiungere nell'elenco sottostante o sull'icona del cestino per ogni utente che si desidera rimuovere. L'elenco può avere diverse pagine: utilizzare i controlli di pagina in basso per spostarsi alle pagine successive. Per salvare le modifiche, cliccare sul pulsante 'Salvare' nella sezione in alto.", // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.", - // TODO New key - Add a translation - "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.", + "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Per aggiungere o rimuovere un Sottogruppo a/da questo gruppo, cliccare sul pulsante 'Sfoglia tutti' o utilizzare la barra di ricerca in basso per cercare gli utenti. Cliccare quindi sull'icona + per ogni utente che si desidera aggiungere nell'elenco sottostante o sull'icona del cestino per ogni utente che si desidera rimuovere. L'elenco può avere diverse pagine: utilizzare i controlli di pagina in basso per spostarsi alle pagine successive. Per salvare le modifiche, cliccare sul pulsante 'Salva' nella sezione in alto.", // "admin.notifications.openairebroker.breadcrumbs": "OpenAIRE Broker", "admin.notifications.openairebroker.breadcrumbs": "OpenAIRE Broker", @@ -1021,7 +1015,6 @@ "admin.workflow.item.workflow": "Flusso di lavoro", // "admin.workflow.item.workspace": "Workspace", - // TODO New key - Add a translation "admin.workflow.item.workspace": "Workspace", // "admin.workflow.item.delete": "Delete", @@ -1031,12 +1024,10 @@ "admin.workflow.item.send-back": "Rinviare", // "admin.workflow.item.policies": "Policies", - // TODO New key - Add a translation - "admin.workflow.item.policies": "Policies", + "admin.workflow.item.policies": "Policy", // "admin.workflow.item.supervision": "Supervision", - // TODO New key - Add a translation - "admin.workflow.item.supervision": "Supervision", + "admin.workflow.item.supervision": "Supervisione", @@ -1044,43 +1035,37 @@ "admin.metadata-import.breadcrumbs": "Importare metadati", // "admin.batch-import.breadcrumbs": "Import Batch", - // TODO New key - Add a translation - "admin.batch-import.breadcrumbs": "Import Batch", + "admin.batch-import.breadcrumbs": "Batch Import", // "admin.metadata-import.title": "Import Metadata", "admin.metadata-import.title": "Importare metadati", // "admin.batch-import.title": "Import Batch", - // TODO New key - Add a translation - "admin.batch-import.title": "Import Batch", + "admin.batch-import.title": "Batch Import", // "admin.metadata-import.page.header": "Import Metadata", "admin.metadata-import.page.header": "Importare metadati", // "admin.batch-import.page.header": "Import Batch", - // TODO New key - Add a translation - "admin.batch-import.page.header": "Import Batch", + "admin.batch-import.page.header": "Batch Import", // "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": "È possibile eliminare o sfogliare i file CSV che contengono operazioni di metadati batch sui file qui", + "admin.metadata-import.page.help": "È possibile rilasciare o sfogliare i file CSV che contengono operazioni di metadati batch sui file qui", // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import", - // TODO New key - Add a translation - "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import", + "admin.batch-import.page.help": "Selezionare la Collection in cui effettuare l'import. Quindi, rilasciare o sfogliare un file zip Simple Archive Format (SAF) che include gli elementi da importare", // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import", "admin.metadata-import.page.dropMsg": "Rilasciare un CSV di metadati da importare", // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import", - // TODO New key - Add a translation - "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import", + "admin.batch-import.page.dropMsg": "Rilasciare un batch ZIP da importare", // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import", - "admin.metadata-import.page.dropMsgReplace": "Rilascia per sostituire i metadati CSV da importare", + "admin.metadata-import.page.dropMsgReplace": "Rilasciare per sostituire i metadati CSV da importare", // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import", - // TODO New key - Add a translation - "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import", + "admin.batch-import.page.dropMsgReplace": "Rilasciare per sostituire il batch ZIP da importare", // "admin.metadata-import.page.button.return": "Back", "admin.metadata-import.page.button.return": "Indietro", @@ -1089,15 +1074,13 @@ "admin.metadata-import.page.button.proceed": "Procedere", // "admin.metadata-import.page.button.select-collection": "Select Collection", - // TODO New key - Add a translation - "admin.metadata-import.page.button.select-collection": "Select Collection", + "admin.metadata-import.page.button.select-collection": "Selezionare una Collection", // "admin.metadata-import.page.error.addFile": "Select file first!", "admin.metadata-import.page.error.addFile": "Seleziona prima il file!", // "admin.batch-import.page.error.addFile": "Select Zip file first!", - // TODO New key - Add a translation - "admin.batch-import.page.error.addFile": "Select Zip file first!", + "admin.batch-import.page.error.addFile": "Seleziona prima il file ZIP!", // "admin.metadata-import.page.validateOnly": "Validate Only", "admin.metadata-import.page.validateOnly": "Solo Validazione", @@ -1106,138 +1089,105 @@ "admin.metadata-import.page.validateOnly.hint": "Una volta selezionato, il CSV caricato sarà validato. Riceverai un report delle modifiche rilevate, ma nessuna modifica verrà salvata.", // "advanced-workflow-action.rating.form.rating.label": "Rating", - // TODO New key - Add a translation - "advanced-workflow-action.rating.form.rating.label": "Rating", + "advanced-workflow-action.rating.form.rating.label": "Valutazione", // "advanced-workflow-action.rating.form.rating.error": "You must rate the item", - // TODO New key - Add a translation - "advanced-workflow-action.rating.form.rating.error": "You must rate the item", + "advanced-workflow-action.rating.form.rating.error": "È necessario valutare l'item", // "advanced-workflow-action.rating.form.review.label": "Review", - // TODO New key - Add a translation - "advanced-workflow-action.rating.form.review.label": "Review", + "advanced-workflow-action.rating.form.review.label": "Revisione", // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating", - // TODO New key - Add a translation - "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating", + "advanced-workflow-action.rating.form.review.error": "Per inviare questa valutazione è necessario inserire una revisione", // "advanced-workflow-action.rating.description": "Please select a rating below", - // TODO New key - Add a translation - "advanced-workflow-action.rating.description": "Please select a rating below", + "advanced-workflow-action.rating.description": "Selezionare una valutazione qui sotto", // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review", - // TODO New key - Add a translation - "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review", + "advanced-workflow-action.rating.description-requiredDescription": "Selezionare una valutazione qui sotto e aggiungere anche una revisione", // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting", - // TODO New key - Add a translation - "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting", + "advanced-workflow-action.select-reviewer.description-single": "Selezionare un solo revisione prima di procedere con l'inserimento", // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting", - // TODO New key - Add a translation - "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting", + "advanced-workflow-action.select-reviewer.description-multiple": "Selezionare uno o più revisori prima di procedere con l'inserimento", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople", - // TODO New key - Add a translation "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Aggiungi EPeople", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Sfoglia tutto", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membri attuali", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadati", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (esatta)", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Ricerca", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID", - // TODO New key - Add a translation "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nome", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identità", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "E-mail", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID", - // TODO New key - Add a translation "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Rimuovi / Aggiungi", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Rimuovi membro con il nome \"{{name}}\"", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membro inserito con successo: \"{{name}}\"", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Impossibile aggiungere il membro: \"{{name}}\"", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membro eliminato con successo: \"{{name}}\"", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Impossibile eliminare il membro: \"{{name}}\"", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Aggiungi membro con il nome \"{{name}}\"", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Nessun gruppo attivo al momento, inserire prima un nome.", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Questo gruppo è vuoto, cercare e aggiungere membri.", // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search", - // TODO New key - Add a translation - "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search", + "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "La ricerca non ha trovato EPeople", // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.", - // TODO New key - Add a translation - "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.", + "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Nessun revisore selezionato.", // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.", - // TODO New key - Add a translation - "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.", + "admin.batch-import.page.validateOnly.hint": "Una volta selezionato, il file ZIP caricato verrà convalidato. Si riceverà un rapporto sulle modifiche rilevate, ma non verrà salvata alcuna modifica.", // "admin.batch-import.page.remove": "remove", - // TODO New key - Add a translation - "admin.batch-import.page.remove": "remove", + "admin.batch-import.page.remove": "rimuovere", // "alert.close.aria": "Close", @@ -1548,8 +1498,7 @@ "pagination.next.button.disabled.tooltip": "Non ci sono ulteriori pagine di risultati", // "browse.startsWith": ", starting with {{ startsWith }}", - // TODO New key - Add a translation - "browse.startsWith": ", starting with {{ startsWith }}", + "browse.startsWith": ", inizia per {{ startsWith }}", // "browse.startsWith.choose_start": "(Choose start)", "browse.startsWith.choose_start": "(Scegli start)", @@ -1625,8 +1574,7 @@ // "search.browse.item-back": "Back to Results", - // TODO New key - Add a translation - "search.browse.item-back": "Back to Results", + "search.browse.item-back": "Torna ai risultati", @@ -1637,7 +1585,6 @@ "bulk-import.back": "Indietro", // "bulk-import.breadcrumbs" : "Bulk import", - // TODO New key - Add a translation "bulk-import.breadcrumbs" : "Bulk import", // "bulk-import.collection-name" : "Collection", @@ -1647,11 +1594,9 @@ "bulk-import.error": "Si è verificato un errore durante la creazione del processo di importazione", // "bulk-import.file" : "Source file", - // TODO New key - Add a translation "bulk-import.file" : "Source file", // "bulk-import.header" : "Bulk import", - // TODO New key - Add a translation "bulk-import.header" : "Bulk import", // "bulk-import.processing": "Processing...", @@ -1664,7 +1609,6 @@ "bulk-import.submit": "Avvia importazione", // "bulk-import.title" : "Bulk import", - // TODO New key - Add a translation "bulk-import.title" : "Bulk import", @@ -1676,23 +1620,20 @@ "chart.load-more": "Carica più risultati", // "claimed-approved-search-result-list-element.title": "Approved", - // TODO New key - Add a translation - "claimed-approved-search-result-list-element.title": "Approved", + "claimed-approved-search-result-list-element.title": "Approvato", // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter", - // TODO New key - Add a translation - "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter", + "claimed-declined-search-result-list-element.title": "Respinto, rinviato al submitter", // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow", - // TODO New key - Add a translation - "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow", + "claimed-declined-task-search-result-list-element.title": "Rifiutato, rinviato al flusso di lavoro del Responsabile delle revisioni", // "collection.create.head": "Create a Collection", "collection.create.head": "Creare una collection", // "collection.create.notifications.success": "Successfully created the Collection", - "collection.create.notifications.success": "Creata con successo la collection", + "collection.create.notifications.success": "Collection creata con successo", // "collection.create.sub-head": "Create a Collection for Community {{ parent }}", "collection.create.sub-head": "Creare una collection per la Community {{ parent }}", @@ -1849,8 +1790,7 @@ "collection.edit.item.authorizations.load-more-button": "Carica più risorse", // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle", - // TODO New key - Add a translation - "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle", + "collection.edit.item.authorizations.show-bitstreams-button": "Mostra le policy del bitstream per il bundle", // "collection.edit.tabs.metadata.head": "Edit Metadata", "collection.edit.tabs.metadata.head": "Modifica metadati", @@ -1922,8 +1862,7 @@ "collection.edit.tabs.source.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"", // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded", - // TODO Source message changed - Revise the translation - "collection.edit.tabs.source.notifications.discarded.title": "Modifiche eliminate", + "collection.edit.tabs.source.notifications.discarded.title": "Modifiche annullate", // "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": "Le modifiche non sono state salvate. Assicurati che tutti i campi siano validi prima di salvare.", @@ -2105,16 +2044,12 @@ // "collection.source.controls.reset.running": "Resetting and reimporting...", "collection.source.controls.reset.running": "Reimpostazione e reimportazione...", // "collection.source.controls.harvest.status": "Harvest status:", - // TODO New key - Add a translation - "collection.source.controls.harvest.status": "Harvest status:", + "collection.source.controls.harvest.status": "Stato dell'harvest:", // "collection.source.controls.harvest.start": "Harvest start time:", - // TODO New key - Add a translation - "collection.source.controls.harvest.start": "Harvest start time:", + "collection.source.controls.harvest.start": "Ora di inizio dell'harvest:", // "collection.source.controls.harvest.last": "Last time harvested:", - // TODO New key - Add a translation - "collection.source.controls.harvest.last": "Last time harvested:", + "collection.source.controls.harvest.last": "Ulimo harvest effettuato:", // "collection.source.controls.harvest.message": "Harvest info:", - // TODO New key - Add a translation "collection.source.controls.harvest.message": "Harvest info:", // "collection.source.controls.harvest.no-information": "N/A", "collection.source.controls.harvest.no-information": "N/D", @@ -2341,12 +2276,10 @@ // "comcol-role.edit.scorereviewers.name": "Score Reviewers", - // TODO New key - Add a translation - "comcol-role.edit.scorereviewers.name": "Score Reviewers", + "comcol-role.edit.scorereviewers.name": "Valutatori", // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.", - // TODO New key - Add a translation - "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.", + "comcol-role.edit.scorereviewers.description": "I valutatori possono assegnare un punteggio ai contributi in entrata, questo definirà se il contributo verrà rifiutato o meno.", @@ -2562,8 +2495,7 @@ // "checksum-tooltip.info.MD5": "The MD5 message-digest algorithm can be used to verify the integrity of the file that you have uploaded. You can calculate its value locally via tools that are generally available in each operative system like md5sum", - // TODO New key - Add a translation - "checksum-tooltip.info.MD5": "The MD5 message-digest algorithm can be used to verify the integrity of the file that you have uploaded. You can calculate its value locally via tools that are generally available in each operative system like md5sum", + "checksum-tooltip.info.MD5": "L'algoritmo MD5 message-digest algorithm può essere utilizzato per verificare l'integrità del file caricato. Puoi calcolarne il valore localmente tramite strumenti generalmente disponibili in ciascun sistema operativo come md5sum", // "cookies.consent.accept-all": "Accept all", "cookies.consent.accept-all": "Accetta tutto", @@ -2587,12 +2519,10 @@ "cookies.consent.app.required.title": "(sempre obbligatorio)", // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.", - // TODO New key - Add a translation - "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.", + "cookies.consent.app.disable-all.description": "Utilizzare questo interruttore per abilitare o disabilitare tutti i servizi.", // "cookies.consent.app.disable-all.title": "Enable or disable all services", - // TODO New key - Add a translation - "cookies.consent.app.disable-all.title": "Enable or disable all services", + "cookies.consent.app.disable-all.title": "Abilitare o disabilitare tutti i servizi", // "cookies.consent.update": "There were changes since your last visit, please update your consent.", "cookies.consent.update": "Ci sono stati dei cambiamenti dal tuo ultimo accesso, aggiorna il tuo consenso.", @@ -2604,23 +2534,19 @@ "cookies.consent.decline": "Declinare", // "cookies.consent.ok": "That's ok", - // TODO New key - Add a translation - "cookies.consent.ok": "That's ok", + "cookies.consent.ok": "Accetta", // "cookies.consent.save": "Save", - // TODO New key - Add a translation - "cookies.consent.save": "Save", + "cookies.consent.save": "Salvare", // "cookies.consent.content-notice.title": "Cookie Consent", - // TODO New key - Add a translation - "cookies.consent.content-notice.title": "Cookie Consent", + "cookies.consent.content-notice.title": "Consenso ai cookie", // "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": "Raccogliamo e processiamo le tue informazioni personali per i seguenti scopi: Autenticazione, Preferenze, Accettazione e Statistiche.
Per saperne di più, leggi la nostra {privacyPolicy}.", + "cookies.consent.content-notice.description": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: Autenticazione, Preferenze, Accettazione e Statistiche.
Per saperne di più, leggi la nostra {privacyPolicy}.", // "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: Authentication, Preferences, Acknowledgement and Statistics.", - // TODO New key - Add a translation - "cookies.consent.content-notice.description.no-privacy": "We collect and process your personal information for the following purposes: Authentication, Preferences, Acknowledgement and Statistics.", + "cookies.consent.content-notice.description.no-privacy": "Raccogliamo ed elaboriamo le tue informazioni personali per i seguenti scopi: Autenticazione, Preferenze, Accettazione e Statistiche.", // "cookies.consent.content-notice.learnMore": "Customize", "cookies.consent.content-notice.learnMore": "Personalizza", @@ -2638,12 +2564,10 @@ "cookies.consent.content-modal.title": "Informazioni che raccogliamo", // "cookies.consent.content-modal.services": "services", - // TODO New key - Add a translation - "cookies.consent.content-modal.services": "services", + "cookies.consent.content-modal.services": "servizi", // "cookies.consent.content-modal.service": "service", - // TODO New key - Add a translation - "cookies.consent.content-modal.service": "service", + "cookies.consent.content-modal.service": "servizio", // "cookies.consent.app.title.authentication": "Authentication", "cookies.consent.app.title.authentication": "Autenticazione", @@ -2677,12 +2601,10 @@ // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha", - // TODO New key - Add a translation "cookies.consent.app.title.google-recaptcha": "Google reCaptcha", // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery", - // TODO New key - Add a translation - "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery", + "cookies.consent.app.description.google-recaptcha": "Utilizziamo il servizio Google reCAPTCHA nelle fasi di registrazione e recupero password", // "cookies.consent.purpose.functional": "Functional", @@ -2692,16 +2614,14 @@ "cookies.consent.purpose.statistical": "Statistico", // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery", - // TODO New key - Add a translation - "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery", + "cookies.consent.purpose.registration-password-recovery": "Registrazione e recupero password", // "cookies.consent.purpose.sharing": "Sharing", "cookies.consent.purpose.sharing": "Condivisione", // "curation-task.task.citationpage.label": "Generate Citation Page", - // TODO New key - Add a translation - "curation-task.task.citationpage.label": "Generate Citation Page", + "curation-task.task.citationpage.label": "Genera una pagina di citazioni", // "cris-layout.toggle.open": "Open section", @@ -2723,12 +2643,10 @@ "cris-layout.advanced-attachment.size": "Dimensione", // "cris-layout.advanced-attachment.checksum": "Checksum", - // TODO New key - Add a translation "cris-layout.advanced-attachment.checksum": "Checksum", // "cris-layout.advanced-attachment.checksum.info.MD5": "The MD5 message-digest algorithm can be used to verify the integrity of the file that you have uploaded. You can calculate its value locally via tools that are generally available in each operative system like md5sum", - // TODO New key - Add a translation - "cris-layout.advanced-attachment.checksum.info.MD5": "The MD5 message-digest algorithm can be used to verify the integrity of the file that you have uploaded. You can calculate its value locally via tools that are generally available in each operative system like md5sum", + "cris-layout.advanced-attachment.checksum.info.MD5": "L'algoritmo MD5 message-digest algorithm può essere utilizzato per verificare l'integrità del file caricato. Puoi calcolarne il valore localmente tramite strumenti generalmente disponibili in ciascun sistema operativo come md5sum", // "cris-layout.advanced-attachment.format": "Format", "cris-layout.advanced-attachment.format": "Formato", @@ -2764,8 +2682,7 @@ "curation-task.task.profileformats.label": "Formati Bitstream del profilo", // "curation-task.task.registerdoi.label": "Mint DOI", - // TODO New key - Add a translation - "curation-task.task.registerdoi.label": "Mint DOI", + "curation-task.task.registerdoi.label": "Genera DOI", // "curation-task.task.requiredmetadata.label": "Check for Required Metadata", "curation-task.task.requiredmetadata.label": "Verifica la disponibilità di metadati richiesti", @@ -2777,8 +2694,7 @@ "curation-task.task.vscan.label": "Scansione antivirus", // "curation-task.task.register-doi.label": "Register DOI", - // TODO New key - Add a translation - "curation-task.task.register-doi.label": "Register DOI", + "curation-task.task.register-doi.label": "Registra DOI", @@ -2846,8 +2762,7 @@ "dso-selector.create.community.head": "Nuova Community", // "dso-selector.create.community.or-divider": "or", - // TODO New key - Add a translation - "dso-selector.create.community.or-divider": "or", + "dso-selector.create.community.or-divider": "oppure", // "dso-selector.create.community.sub-level": "Create a new community in", "dso-selector.create.community.sub-level": "Creare una nuova community in", @@ -2880,12 +2795,10 @@ "dso-selector.export-metadata.dspaceobject.head": "Esportare metadati da", // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from", - // TODO New key - Add a translation - "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from", + "dso-selector.export-batch.dspaceobject.head": "Esporta batch (ZIP) da", // "dso-selector.import-batch.dspaceobject.head": "Import batch from", - // TODO New key - Add a translation - "dso-selector.import-batch.dspaceobject.head": "Import batch from", + "dso-selector.import-batch.dspaceobject.head": "Importa batch da", // "dso-selector.import-item.item.head": "Import items", "dso-selector.import-item.item.head": "Importare item", @@ -2912,8 +2825,7 @@ "dso-selector.set-scope.community.button": "Cerca in tutto DSpace", // "dso-selector.set-scope.community.or-divider": "or", - // TODO New key - Add a translation - "dso-selector.set-scope.community.or-divider": "or", + "dso-selector.set-scope.community.or-divider": "oppure", // "dso-selector.set-scope.community.input-header": "Search for a community or collection", "dso-selector.set-scope.community.input-header": "Cercare una community o una collection", @@ -2934,60 +2846,46 @@ "dso-selector.export-item.sub-level": "Esporta in item Excel in", // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻", - // TODO New key - Add a translation - "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻", + "dso-selector.results-could-not-be-retrieved": "Qualcosa è andato storto, aggiorna di nuovo ↻", // "supervision-group-selector.header": "Supervision Group Selector", - // TODO New key - Add a translation - "supervision-group-selector.header": "Supervision Group Selector", + "supervision-group-selector.header": "Selezione del gruppo di supervisione", // "supervision-group-selector.select.type-of-order.label": "Select a type of Order", - // TODO New key - Add a translation - "supervision-group-selector.select.type-of-order.label": "Select a type of Order", + "supervision-group-selector.select.type-of-order.label": "Seleziona un tipo di ordine", // "supervision-group-selector.select.type-of-order.option.none": "NONE", - // TODO New key - Add a translation - "supervision-group-selector.select.type-of-order.option.none": "NONE", + "supervision-group-selector.select.type-of-order.option.none": "NESSUNO", // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR", - // TODO New key - Add a translation - "supervision-group-selector.select.type-of-order.option.editor": "EDITOR", + "supervision-group-selector.select.type-of-order.option.editor": "EDITORE", // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER", - // TODO New key - Add a translation - "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER", + "supervision-group-selector.select.type-of-order.option.observer": "OSSERVATORE", // "supervision-group-selector.select.group.label": "Select a Group", - // TODO New key - Add a translation - "supervision-group-selector.select.group.label": "Select a Group", + "supervision-group-selector.select.group.label": "Seleziona un gruppo", // "supervision-group-selector.button.cancel": "Cancel", - // TODO New key - Add a translation - "supervision-group-selector.button.cancel": "Cancel", + "supervision-group-selector.button.cancel": "Annulla", // "supervision-group-selector.button.save": "Save", - // TODO New key - Add a translation - "supervision-group-selector.button.save": "Save", + "supervision-group-selector.button.save": "Salva", // "supervision-group-selector.select.type-of-order.error": "Please select a type of order", - // TODO New key - Add a translation - "supervision-group-selector.select.type-of-order.error": "Please select a type of order", + "supervision-group-selector.select.type-of-order.error": "Seleziona un tipo di ordine", // "supervision-group-selector.select.group.error": "Please select a group", - // TODO New key - Add a translation - "supervision-group-selector.select.group.error": "Please select a group", + "supervision-group-selector.select.group.error": "Seleziona un gruppo", // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}", - // TODO New key - Add a translation - "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}", + "supervision-group-selector.notification.create.success.title": "Ordine di supervisione per il gruppo {{ name }} creato con successo", // "supervision-group-selector.notification.create.failure.title": "Error", - // TODO New key - Add a translation - "supervision-group-selector.notification.create.failure.title": "Error", + "supervision-group-selector.notification.create.failure.title": "Errore", // "supervision-group-selector.notification.create.already-existing" : "A supervision order already exists on this item for selected group", - // TODO New key - Add a translation - "supervision-group-selector.notification.create.already-existing" : "A supervision order already exists on this item for selected group", + "supervision-group-selector.notification.create.already-existing" : "Per questo item esiste già un ordine di supervisione per il gruppo selezionato", // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}", "confirmation-modal.export-metadata.header": "Esportare i metadati per {{ dsoName }}", @@ -3002,20 +2900,16 @@ "confirmation-modal.export-metadata.confirm": "Export", // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}", - // TODO New key - Add a translation - "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}", + "confirmation-modal.export-batch.header": "Esporta batch (ZIP) per {{ dsoName }}", // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}", - // TODO New key - Add a translation - "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}", + "confirmation-modal.export-batch.info": "Sei sicuro di voler esportare batch (ZIP) per {{ dsoName }}?", // "confirmation-modal.export-batch.cancel": "Cancel", - // TODO New key - Add a translation - "confirmation-modal.export-batch.cancel": "Cancel", + "confirmation-modal.export-batch.cancel": "Annulla", // "confirmation-modal.export-batch.confirm": "Export", - // TODO New key - Add a translation - "confirmation-modal.export-batch.confirm": "Export", + "confirmation-modal.export-batch.confirm": "Esporta", // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"", "confirmation-modal.delete-eperson.header": "Elimina EPerson \"{{ dsoName }}\"", @@ -3042,7 +2936,6 @@ "confirmation-modal.delete-profile.confirm": "Elimina", // "confirmation-modal.delete-subscription.header": "Delete Subscription", - // TODO Source message changed - Revise the translation "confirmation-modal.delete-subscription.header": "Elimina iscrizione per \"{{ dsoName }}\"", // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"", @@ -3134,11 +3027,10 @@ "error.validation.custom-url.invalid-characters": "L'URL personalizzato contiene caratteri non validi.", // "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": "È necessario concedere questa licenza per completare la submission. Se non sei in grado di concedere questa licenza in questo momento, puoi salvare il tuo lavoro e tornare più tardi o rimuovere la submission.", + "error.validation.license.notgranted": "È necessario concedere questa licenza per completare l'immisione. Se non sei in grado di concedere questa licenza in questo momento, puoi salvare il tuo lavoro e tornare più tardi o rimuovere l'immissione.", // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.", - // TODO New key - Add a translation - "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.", + "error.validation.pattern": "L'input è limitato dal pattern in uso: {{ pattern }}.", // "error.validation.filerequired": "The file upload is mandatory", "error.validation.filerequired": "Il caricamento del file è obbligatorio", @@ -3156,94 +3048,74 @@ "error.validation.groupExists": "Gruppo già esistente", // "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "At least one investigator or one lead organization is required", - // TODO New key - Add a translation - "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "At least one investigator or one lead organization is required", + "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "È richiesto almeno un ricercatore o una unità principale", // "error.validation.notRepeatable": "This field is not repeatable, please choose only one value and discard the others.", - // TODO New key - Add a translation - "error.validation.notRepeatable": "This field is not repeatable, please choose only one value and discard the others.", + "error.validation.notRepeatable": "Questo campo non è ripetibile, scegliere un solo valore e scartare gli altri.", // "event.listelement.badge" : "Event", - // TODO New key - Add a translation - "event.listelement.badge" : "Event", + "event.listelement.badge" : "Evento", // "explore.browse-section.title" : "Browse", - // TODO New key - Add a translation - "explore.browse-section.title" : "Browse", + "explore.browse-section.title" : "Sfoglia", // "explore.counters-section.rprofiles" : "People", - // TODO New key - Add a translation - "explore.counters-section.rprofiles" : "People", + "explore.counters-section.rprofiles" : "Persone", // "explore.counters-section.publications" : "Research outputs", "explore.counters-section.publications" : "Output della ricerca", // "explore.counters-section.project_funding" : "Projects", - // TODO New key - Add a translation - "explore.counters-section.project_funding" : "Projects", + "explore.counters-section.project_funding" : "Progetti", // "explore.facet-section.title" : "Discover", - // TODO New key - Add a translation - "explore.facet-section.title" : "Discover", + "explore.facet-section.title" : "Scopri", // "explore.index.all" : "All", - // TODO New key - Add a translation - "explore.index.all" : "All", + "explore.index.all" : "Tutti", // "explore.index.author" : "Author", - // TODO New key - Add a translation - "explore.index.author" : "Author", + "explore.index.author" : "Autore", // "explore.index.graphitemtype" : "Graph by type", - // TODO New key - Add a translation - "explore.index.graphitemtype" : "Graph by type", + "explore.index.graphitemtype" : "Grafico per tipo", // "explore.index.graphpubldate" : "Graph by date", - // TODO New key - Add a translation - "explore.index.graphpubldate" : "Graph by date", + "explore.index.graphpubldate" : "Grafico per data", // "explore.index.birthDate" : "Birthday", - // TODO New key - Add a translation - "explore.index.birthDate" : "Birthday", + "explore.index.birthDate" : "Data di nascita", // "explore.index.metric.view" : "Most viewed", - // TODO New key - Add a translation - "explore.index.metric.view" : "Most viewed", + "explore.index.metric.view" : "Più visitati", // "explore.index.metric.download" : "Most downloaded", - // TODO New key - Add a translation - "explore.index.metric.download" : "Most downloaded", + "explore.index.metric.download" : "Più scaricati", // "explore.index.metric.scopus.citation" : "Most cited", - // TODO New key - Add a translation - "explore.index.metric.scopus.citation" : "Most cited", + "explore.index.metric.scopus.citation" : "Più citati", // "explore.index.chart.pie.itemtype_filter" : "Item Type", - // TODO New key - Add a translation - "explore.index.chart.pie.itemtype_filter" : "Item Type", + "explore.index.chart.pie.itemtype_filter" : "Tipo di item", // "explore.index.chart.bar.dateIssued.year": "Year", "explore.index.chart.bar.dateIssued.year": "Anno", // "explore.index.dateIssued" : "Date issued", - // TODO New key - Add a translation - "explore.index.dateIssued" : "Date issued", + "explore.index.dateIssued" : "Data di inserimento", // "explore.index.dateissued" : "Date issued", - // TODO New key - Add a translation - "explore.index.dateissued" : "Date issued", + "explore.index.dateissued" : "Data di inserimento", // "explore.index.dc.date.accessioned" : "Recent Additions", - // TODO New key - Add a translation - "explore.index.dc.date.accessioned" : "Recent Additions", + "explore.index.dc.date.accessioned" : "Aggiunte recenti", // "explore.index.dc.title" : "Title", "explore.index.dc.title" : "Titolo", // "explore.index.editor" : "Editor", - // TODO New key - Add a translation - "explore.index.editor" : "Editor", + "explore.index.editor" : "Editore", // "explore.index.eqtitle" : "Title", "explore.index.eqtitle" : "Titolo", @@ -3264,8 +3136,7 @@ "explore.index.funding" : "Finanziamento", // "explore.index.givenName" : "Given name", - // TODO New key - Add a translation - "explore.index.givenName" : "Given name", + "explore.index.givenName" : "Nome", // "explore.index.has_content_in_original_bundle" : "Has content in original bundle", "explore.index.has_content_in_original_bundle" : "Sono presenti dei contenuti nel bundle original", @@ -3319,8 +3190,7 @@ "explore.index.itemidentifier" : "Identificativo dell'item", // "explore.index.jobTitle" : "Job title", - // TODO New key - Add a translation - "explore.index.jobTitle" : "Job title", + "explore.index.jobTitle" : "Ruolo", // "explore.index.knowsLanguage" : "Knows languages", "explore.index.knowsLanguage" : "Lingue conosciute", @@ -3410,12 +3280,10 @@ "explore.infrastructure.breadcrumbs": "Infrastrutture", // "explore.fundings.breadcrumbs": "Fundings", - // TODO Source message changed - Revise the translation "explore.fundings.breadcrumbs": "Progetti", // "explore.projects.breadcrumbs": "Projects", - // TODO New key - Add a translation - "explore.projects.breadcrumbs": "Projects", + "explore.projects.breadcrumbs": "Progetti", // "explore.fundings_and_projects.breadcrumbs": "Projects", "explore.fundings_and_projects.breadcrumbs": "Progetti", @@ -3437,7 +3305,6 @@ // "feed.description": "Syndication feed", - // TODO New key - Add a translation "feed.description": "Syndication feed", @@ -3484,8 +3351,7 @@ "forgot-email.form.header": "Password dimenticata", // "forgot-email.form.info": "Enter the email address associated with the account.", - // TODO Source message changed - Revise the translation - "forgot-email.form.info": "Accedi a registra un account per iscriverti alle collections, per ricevere aggiornamenti via email e per poter inserire nuovi item in DSpace.", + "forgot-email.form.info": "Inserisci l'indirizzo email associato all'account.", // "forgot-email.form.email": "Email Address *", "forgot-email.form.email": "Indirizzo email *", @@ -3494,31 +3360,25 @@ "forgot-email.form.email.error.required": "Si prega di inserire un indirizzo email", // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address", - // TODO New key - Add a translation - "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address", + "forgot-email.form.email.error.not-email-form": "Si prega di inserire un idirizzo email valido", // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.", - // TODO Source message changed - Revise the translation - "forgot-email.form.email.hint": "Questo indirizzo verrà verificato e utilizzato come login name.", + "forgot-email.form.email.hint": "Una email con ulteriori indicazioni sarà invita a questo indrizzo.", // "forgot-email.form.submit": "Reset password", - // TODO Source message changed - Revise the translation - "forgot-email.form.submit": "Salva", + "forgot-email.form.submit": "Reimposta la password", // "forgot-email.form.success.head": "Password reset email sent", - // TODO Source message changed - Revise the translation - "forgot-email.form.success.head": "Email di verifica inviata", + "forgot-email.form.success.head": "Email di reimpostazione password inviata", // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.", "forgot-email.form.success.content": "È stata inviata un'email a {{ email }} contenente un URL speciale e ulteriori indicazioni.", // "forgot-email.form.error.head": "Error when trying to reset password", - // TODO Source message changed - Revise the translation - "forgot-email.form.error.head": "Errore durante il tentativo di registrare l'email", + "forgot-email.form.error.head": "Errore durante il tentativo di reimpostare la password", // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}", - // TODO New key - Add a translation - "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}", + "forgot-email.form.error.content": "Si è verificato un errore durante il tentativo di reimpostare la password per l'account associato al seguente indirizzo email: {{ email }}", @@ -3529,8 +3389,7 @@ "forgot-password.form.head": "Password dimenticata", // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box.", - // TODO Source message changed - Revise the translation - "forgot-password.form.info": "Inserisci una nuova password nella casella qui sotto e confermala digitandola di nuovo nella seconda casella. Dovrebbe avere una lunghezza di almeno sei caratteri.", + "forgot-password.form.info": "Inserisci una nuova password nella casella qui sotto e confermala digitandola di nuovo nella seconda casella.", // "forgot-password.form.card.security": "Security", "forgot-password.form.card.security": "Sicurezza", @@ -3752,49 +3611,39 @@ // "health.breadcrumbs": "Health", - // TODO New key - Add a translation "health.breadcrumbs": "Health", // "health-page.heading" : "Health", - // TODO New key - Add a translation "health-page.heading" : "Health", // "health-page.info-tab" : "Info", - // TODO New key - Add a translation - "health-page.info-tab" : "Info", + "health-page.info-tab" : "Informazioni", // "health-page.status-tab" : "Status", - // TODO New key - Add a translation - "health-page.status-tab" : "Status", + "health-page.status-tab" : "Stato", // "health-page.error.msg": "The health check service is temporarily unavailable", "health-page.error.msg": "Il servizio di health check è temporaneamente non disponibile.", // "health-page.property.status": "Status code", - // TODO New key - Add a translation - "health-page.property.status": "Status code", + "health-page.property.status": "Codice di stato", // "health-page.section.db.title": "Database", "health-page.section.db.title": "Database", // "health-page.section.geoIp.title": "GeoIp", - // TODO New key - Add a translation "health-page.section.geoIp.title": "GeoIp", // "health-page.section.solrAuthorityCore.title": "Solr: authority core", - // TODO New key - Add a translation "health-page.section.solrAuthorityCore.title": "Solr: authority core", // "health-page.section.solrOaiCore.title": "Solr: oai core", - // TODO New key - Add a translation "health-page.section.solrOaiCore.title": "Solr: oai core", // "health-page.section.solrSearchCore.title": "Solr: search core", - // TODO New key - Add a translation "health-page.section.solrSearchCore.title": "Solr: search core", // "health-page.section.solrStatisticsCore.title": "Solr: statistics core", - // TODO New key - Add a translation "health-page.section.solrStatisticsCore.title": "Solr: statistics core", // "health-page.section-info.app.title": "Application Backend", @@ -3804,12 +3653,10 @@ "health-page.section-info.java.title": "Java", // "health-page.status": "Status", - // TODO New key - Add a translation - "health-page.status": "Status", + "health-page.status": "Stato", // "health-page.status.ok.info": "Operational", - // TODO New key - Add a translation - "health-page.status.ok.info": "Operational", + "health-page.status.ok.info": "Operativo", // "health-page.status.error.info": "Problems detected", "health-page.status.error.info": "Sono stati rilevati dei problemi", @@ -3818,7 +3665,6 @@ "health-page.status.warning.info": "Sono stati rilevati dei potenziali problemi", // "health-page.title": "Health", - // TODO New key - Add a translation "health-page.title": "Health", // "health-page.section.no-issues": "No issues detected", @@ -3939,7 +3785,6 @@ // "item.badge.private": "Non-discoverable", - // TODO Source message changed - Revise the translation "item.badge.private": "Privato", // "item.badge.withdrawn": "Withdrawn", @@ -3951,7 +3796,6 @@ "item.bitstreams.upload.bundle": "Bundle", // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name", - // TODO Source message changed - Revise the translation "item.bitstreams.upload.bundle.placeholder": "Seleziona un bundle o inserisci il nome di un nuovo bundle", // "item.bitstreams.upload.bundle.new": "Create bundle", @@ -4110,88 +3954,67 @@ "item.edit.tabs.item-mapper.title": "Modifica item - Mapper Collection", // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.UNKNOWN": "Unknown", + "item.edit.identifiers.doi.status.UNKNOWN": "Sconosciuto", // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration", + "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "In coda per la registrazione", // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation", + "item.edit.identifiers.doi.status.TO_BE_RESERVED": "In coda per l'assegnazione", // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered", + "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrato", // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved", + "item.edit.identifiers.doi.status.IS_RESERVED": "Assegnato", // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)", + "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Assegnato (aggiornamento in coda)", // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)", + "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrato (aggiornamento in coda)", // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration", + "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "In coda per aggiornamento e registrazione", // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion", + "item.edit.identifiers.doi.status.TO_BE_DELETED": "In coda per l'eliminazione", // "item.edit.identifiers.doi.status.DELETED": "Deleted", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.DELETED": "Deleted", + "item.edit.identifiers.doi.status.DELETED": "Eliminato", // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)", + "item.edit.identifiers.doi.status.PENDING": "In sospeso (non registrato)", // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)", - // TODO New key - Add a translation - "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)", + "item.edit.identifiers.doi.status.MINTED": "Creato (non registrato)", // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI", + "item.edit.tabs.status.buttons.register-doi.label": "Registra un nuovo DOI o un DOI in sospeso", // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...", - // TODO New key - Add a translation - "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...", + "item.edit.tabs.status.buttons.register-doi.button": "Registra DOI...", // "item.edit.register-doi.header": "Register a new or pending DOI", - // TODO New key - Add a translation - "item.edit.register-doi.header": "Register a new or pending DOI", + "item.edit.register-doi.header": "Registra un nuovo DOI o un DOI in sospeso", // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", - // TODO New key - Add a translation - "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out", + "item.edit.register-doi.description": "Esaminare gli identificatori e i metadati dell'item in sospeso e cliccare su Conferma per procedere con la registrazione DOI, oppure su Annulla per tornare indietro", // "item.edit.register-doi.confirm": "Confirm", - // TODO New key - Add a translation - "item.edit.register-doi.confirm": "Confirm", + "item.edit.register-doi.confirm": "Conferma", // "item.edit.register-doi.cancel": "Cancel", - // TODO New key - Add a translation - "item.edit.register-doi.cancel": "Cancel", + "item.edit.register-doi.cancel": "Annulla", // "item.edit.register-doi.success": "DOI queued for registration successfully.", - // TODO New key - Add a translation - "item.edit.register-doi.success": "DOI queued for registration successfully.", + "item.edit.register-doi.success": "DOI in coda per la registrazione.", // "item.edit.register-doi.error": "Error registering DOI", - // TODO New key - Add a translation - "item.edit.register-doi.error": "Error registering DOI", + "item.edit.register-doi.error": "Errore nella registrazione del DOI", // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online", - // TODO New key - Add a translation - "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online", + "item.edit.register-doi.to-update": "Il seguente DOI è stato già creato e sarà inserito in coda per la registrazione online", // "item.edit.item-mapper.buttons.add": "Map item to selected collections", "item.edit.item-mapper.buttons.add": "Mappare l'item nelle collections selezionate", @@ -4256,12 +4079,10 @@ "item.edit.metadata.discard-button": "Annulla", // "item.edit.metadata.edit.buttons.confirm": "Confirm", - // TODO New key - Add a translation - "item.edit.metadata.edit.buttons.confirm": "Confirm", + "item.edit.metadata.edit.buttons.confirm": "Conferma", // "item.edit.metadata.edit.buttons.drag": "Drag to reorder", - // TODO New key - Add a translation - "item.edit.metadata.edit.buttons.drag": "Drag to reorder", + "item.edit.metadata.edit.buttons.drag": "Trascina per riordinare", // "item.edit.metadata.edit.buttons.edit": "Edit", "item.edit.metadata.edit.buttons.edit": "Edita", @@ -4276,8 +4097,7 @@ "item.edit.metadata.edit.buttons.unedit": "Interrompi la modifica", // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab", - // TODO New key - Add a translation - "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab", + "item.edit.metadata.edit.buttons.virtual": "Si tratta di un valore virtuale di metadati, cioè un valore ereditato da un'entità correlata. Non può essere modificato direttamente. Aggiungere o rimuovere la relazione corrispondente nella scheda 'Relazioni'.", // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.", "item.edit.metadata.empty": "Attualmente l'item non contiene metadati. Fai clic su Aggiungi per iniziare ad aggiungere il valore di un metadata.", @@ -4298,8 +4118,7 @@ "item.edit.metadata.headers.value": "Valore", // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", - // TODO New key - Add a translation - "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", + "item.edit.metadata.metadatafield.error": "Si è verificato un errore nella validazione del campo dei metadati", // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", "item.edit.metadata.metadatafield.invalid": "Scegli un campo di metadati valido", @@ -4308,7 +4127,6 @@ "item.edit.metadata.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"", // "item.edit.metadata.notifications.discarded.title": "Changes discarded", - // TODO Source message changed - Revise the translation "item.edit.metadata.notifications.discarded.title": "Modifiche eliminate", // "item.edit.metadata.notifications.error.title": "An error occurred", @@ -4324,7 +4142,6 @@ "item.edit.metadata.notifications.outdated.content": "L'item su cui stai attualmente lavorando è stato modificato da un altro utente. Le modifiche correnti verranno eliminate per evitare conflitti", // "item.edit.metadata.notifications.outdated.title": "Changes outdated", - // TODO Source message changed - Revise the translation "item.edit.metadata.notifications.outdated.title": "Modifiche obsolete", // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.", @@ -4337,8 +4154,7 @@ "item.edit.metadata.reinstate-button": "Annulla", // "item.edit.metadata.reset-order-button": "Undo reorder", - // TODO New key - Add a translation - "item.edit.metadata.reset-order-button": "Undo reorder", + "item.edit.metadata.reset-order-button": "Annulla il riordinamento", // "item.edit.metadata.save-button": "Save", "item.edit.metadata.save-button": "Salva", @@ -4401,16 +4217,13 @@ "item.edit.private.cancel": "Annulla", // "item.edit.private.confirm": "Make it non-discoverable", - // TODO Source message changed - Revise the translation "item.edit.private.confirm": "Rendilo privato", // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?", - // TODO Source message changed - Revise the translation - "item.edit.private.description": "Sei sicuro che questo oggetto debba essere reso privato nell'archivio?", + "item.edit.private.description": "Sei sicuro che questo item debba essere reso privato nell'archivio?", // "item.edit.private.error": "An error occurred while making the item non-discoverable", - // TODO Source message changed - Revise the translation - "item.edit.private.error": "Si è verificato un errore durante la creazione di un item privato", + "item.edit.private.error": "Si è verificato un errore durante la modifica dell'item in privato", // "item.edit.private.header": "Make item non-discoverable: {{ id }}", "item.edit.private.header": "Rendi privato l'item: {{ id }}", @@ -4424,22 +4237,18 @@ "item.edit.public.cancel": "Annulla", // "item.edit.public.confirm": "Make it discoverable", - // TODO Source message changed - Revise the translation "item.edit.public.confirm": "Rendilo pubblico", // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?", - // TODO Source message changed - Revise the translation - "item.edit.public.description": "Sei sicuro che questo articolo debba essere reso pubblico nell'archivio?", + "item.edit.public.description": "Sei sicuro che questo item debba essere reso pubblico nell'archivio?", // "item.edit.public.error": "An error occurred while making the item discoverable", - // TODO Source message changed - Revise the translation - "item.edit.public.error": "Si è verificato un errore durante la creazione di un item pubblico", + "item.edit.public.error": "Si è verificato un errore durante la modifica dell'item in pubblico", // "item.edit.public.header": "Make item discoverable: {{ id }}", "item.edit.public.header": "Rendi pubblico l'item: {{ id }}", // "item.edit.public.success": "The item is now discoverable", - // TODO Source message changed - Revise the translation "item.edit.public.success": "L'item è ora pubblico", @@ -4557,26 +4366,21 @@ "item.edit.tabs.status.buttons.mappedCollections.label": "Gestire le collections mappate", // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection", - // TODO Source message changed - Revise the translation - "item.edit.tabs.status.buttons.move.button": "Sposta...", + "item.edit.tabs.status.buttons.move.button": "Sposta questo item in un'altra collection...", // "item.edit.tabs.status.buttons.move.label": "Move item to another collection", "item.edit.tabs.status.buttons.move.label": "Spostare l'item in un'altra collection", // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...", - // TODO Source message changed - Revise the translation - "item.edit.tabs.status.buttons.private.button": "...", + "item.edit.tabs.status.buttons.private.button": "Rendilo privato...", // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable", - // TODO Source message changed - Revise the translation "item.edit.tabs.status.buttons.private.label": "Rendere l'item privato", // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...", - // TODO Source message changed - Revise the translation - "item.edit.tabs.status.buttons.public.button": "...", + "item.edit.tabs.status.buttons.public.button": "Rendilo pubblico...", // "item.edit.tabs.status.buttons.public.label": "Make item discoverable", - // TODO Source message changed - Revise the translation "item.edit.tabs.status.buttons.public.label": "Rendere l'item pubblico", // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...", @@ -4589,8 +4393,7 @@ "item.edit.tabs.status.buttons.unauthorized": "Non sei autorizzato a eseguire questa azione", // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item", - // TODO Source message changed - Revise the translation - "item.edit.tabs.status.buttons.withdraw.button": "Rimozione...", + "item.edit.tabs.status.buttons.withdraw.button": "Rimuovi questo item", // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository", "item.edit.tabs.status.buttons.withdraw.label": "Rimuovere l'item dal repository", @@ -4720,36 +4523,28 @@ "item.truncatable-part.show-less": "Riduci", // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", - // TODO New key - Add a translation - "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order", + "workflow-item.search.result.delete-supervision.modal.header": "Elimina l'ordine di supervisione", // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", - // TODO New key - Add a translation - "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order", + "workflow-item.search.result.delete-supervision.modal.info": "Sei sicuro di voler eliminare l'ordine di supervisione?", // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel", - // TODO New key - Add a translation - "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel", + "workflow-item.search.result.delete-supervision.modal.cancel": "Annulla", // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete", - // TODO New key - Add a translation - "workflow-item.search.result.delete-supervision.modal.confirm": "Delete", + "workflow-item.search.result.delete-supervision.modal.confirm": "Elimina", // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"", - // TODO New key - Add a translation - "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"", + "workflow-item.search.result.notification.deleted.success": "Ordine di supervisione \"{{name}}\" eliminato con successo", // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"", - // TODO New key - Add a translation - "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"", + "workflow-item.search.result.notification.deleted.failure": "Impossibile eliminare l'ordine di supervisione \"{{name}}\"", // "workflow-item.search.result.list.element.supervised-by": "Supervised by:", - // TODO New key - Add a translation - "workflow-item.search.result.list.element.supervised-by": "Supervised by:", + "workflow-item.search.result.list.element.supervised-by": "Supervisionato da:", // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group", - // TODO New key - Add a translation - "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group", + "workflow-item.search.result.list.element.supervised.remove-tooltip": "Rimuovi gruppo di supervisione", @@ -4902,11 +4697,9 @@ "item.page.bitstreams.collapse": "Riduci", // "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.page.return": "Back", @@ -4955,8 +4748,7 @@ "item.preview.dc.publisher" : "Editore", // "item.preview.dc.relation.grantno" : "Grant no.", - // TODO New key - Add a translation - "item.preview.dc.relation.grantno" : "Grant no.", + "item.preview.dc.relation.grantno" : "Numero di finanziamento", // "item.preview.dc.relation.ispartofseries" : "Serie", "item.preview.dc.relation.ispartofseries" : "Serie", @@ -4965,8 +4757,7 @@ "item.preview.dc.identifier.uri": "Identificativo:", // "item.preview.dc.contributor.advisor" : "Advisor", - // TODO New key - Add a translation - "item.preview.dc.contributor.advisor" : "Advisor", + "item.preview.dc.contributor.advisor" : "Consulente", // "item.preview.dc.contributor.author": "Authors:", "item.preview.dc.contributor.author": "Autori:", @@ -4975,8 +4766,7 @@ "item.preview.dc.contributor.applicant": "Richiedente", // "item.preview.dc.contributor.editor": "Editors:", - // TODO New key - Add a translation - "item.preview.dc.contributor.editor": "Editors:", + "item.preview.dc.contributor.editor": "Editori:", // "item.preview.dc.date.embargoEnd" : "Embargo End", "item.preview.dc.date.embargoEnd" : "Fine embargo", @@ -4988,14 +4778,12 @@ "item.preview.dc.description.abstract": "Abstract:", // "item.preview.dc.description.sponsorship" : "Sponsorship", - // TODO New key - Add a translation "item.preview.dc.description.sponsorship" : "Sponsorship", // "item.preview.dc.identifier.other": "Other identifier:", "item.preview.dc.identifier.other": "Altri identificativi:", // "item.preview.dc.identifier.pmid" : "Pubmed ID", - // TODO New key - Add a translation "item.preview.dc.identifier.pmid" : "Pubmed ID", // "item.preview.dc.language.iso": "Language:", @@ -5011,8 +4799,7 @@ "item.preview.dc.rights.uri" : "URI Diritti", // "item.preview.dc.subject": "Subjects:", - // TODO New key - Add a translation - "item.preview.dc.subject": "Subjects:", + "item.preview.dc.subject": "Soggetti:", // "item.preview.dc.title": "Title:", "item.preview.dc.title": "Titolo:", @@ -5072,8 +4859,7 @@ "item.preview.oairecerif.funder" : "Finanziatore", // "item.preview.oairecerif.funding.identifier" : "Grant Number / Funding identifier", - // TODO New key - Add a translation - "item.preview.oairecerif.funding.identifier" : "Grant Number / Funding identifier", + "item.preview.oairecerif.funding.identifier" : "Numero di finanziamento / Identificativo di finanziamento", // "item.preview.oairecerif.funding.endDate" : "End Date", "item.preview.oairecerif.funding.endDate" : "Data finale", @@ -5280,23 +5066,19 @@ "item-export.modal-launcher.multiple.btn": "Export", // "item-export.alert.single": "Export item {{title}}", - // TODO Source message changed - Revise the translation - "item-export.alert.single": "Esporta item ", + "item-export.alert.single": "Esporta item {{title}}", // "item-export.alert.multiple": "Export all items of a particular entity type belonging to the current search.", "item-export.alert.multiple": "Esportare tutti gli item di una determinata entità compresi nella ricerca corrente.", // "item-export.alert.multiple-with-type": "Export all items with type {{type}} belonging to the current search.", - // TODO New key - Add a translation - "item-export.alert.multiple-with-type": "Export all items with type {{type}} belonging to the current search.", + "item-export.alert.multiple-with-type": "Esporta tutti gli item del tipo {{type}} che fanno parte della ricerca corrente.", // "item-export.alert.export.limit": "This export will be limited to a maximum of {{limit}} items.", - // TODO New key - Add a translation - "item-export.alert.export.limit": "This export will be limited to a maximum of {{limit}} items.", + "item-export.alert.export.limit": "Sarà possibile esportare solo un massimo di {{limit}} item.", // "item-export.cannot-msg": "There are no items to export with the selected configuration", - // TODO New key - Add a translation - "item-export.cannot-msg": "There are no items to export with the selected configuration", + "item-export.cannot-msg": "Non ci sono item da esportare con la configurazione selezionata", // "item-export.form.entityType": "Entity Type", "item-export.form.entityType": "Tipo di entità", @@ -5317,131 +5099,100 @@ "item-export.form.btn.cancel": "Annulla", // "item-export.form.selection": "Export mode", - // TODO New key - Add a translation - "item-export.form.selection": "Export mode", + "item-export.form.selection": "Modalità di export", // "item-export.form.selection.all": "Export all", - // TODO New key - Add a translation - "item-export.form.selection.all": "Export all", + "item-export.form.selection.all": "Esporta tutti", // "item-export.form.selection.only-selected": "Export only selected", - // TODO New key - Add a translation - "item-export.form.selection.only-selected": "Export only selected", + "item-export.form.selection.only-selected": "Esporta solo gli item selezionati", // "item-export.modal.title": "Item Export Process Launcher", - // TODO New key - Add a translation - "item-export.modal.title": "Item Export Process Launcher", + "item-export.modal.title": "Avvio del processo di esportazione degli item", // "item-export.process.title": "Bulk export item", "item-export.process.title": "Bulk export dell'item", // "itemtemplate.edit.metadata.add-button": "Add", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.add-button": "Add", + "itemtemplate.edit.metadata.add-button": "Aggiungi", // "itemtemplate.edit.metadata.discard-button": "Discard", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.discard-button": "Discard", + "itemtemplate.edit.metadata.discard-button": "Elimina", // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm", + "itemtemplate.edit.metadata.edit.buttons.confirm": "Conferma", // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder", + "itemtemplate.edit.metadata.edit.buttons.drag": "Trascina per riordinare", // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.edit.buttons.edit": "Edit", + "itemtemplate.edit.metadata.edit.buttons.edit": "Modifica", // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.edit.buttons.remove": "Remove", + "itemtemplate.edit.metadata.edit.buttons.remove": "Rimuovi", // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes", + "itemtemplate.edit.metadata.edit.buttons.undo": "Annulla le modifiche", // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing", + "itemtemplate.edit.metadata.edit.buttons.unedit": "Smetti di modificare", // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.", + "itemtemplate.edit.metadata.empty": "Il template dell'item al momento non contiene nessun metadato. Clicca su 'Aggiungi' per inserire un metadato.", // "itemtemplate.edit.metadata.headers.edit": "Edit", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.headers.edit": "Edit", + "itemtemplate.edit.metadata.headers.edit": "Modifica", // "itemtemplate.edit.metadata.headers.field": "Field", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.headers.field": "Field", + "itemtemplate.edit.metadata.headers.field": "Campo", // "itemtemplate.edit.metadata.headers.language": "Lang", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.headers.language": "Lang", + "itemtemplate.edit.metadata.headers.language": "Lingua", // "itemtemplate.edit.metadata.headers.value": "Value", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.headers.value": "Value", + "itemtemplate.edit.metadata.headers.value": "Valore", // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field", + "itemtemplate.edit.metadata.metadatafield.error": "Si è verificato un errore durante la validazione del campo dei metadati", // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field", + "itemtemplate.edit.metadata.metadatafield.invalid": "Si prega di scegliere un campo di metadati valido", // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button", + "itemtemplate.edit.metadata.notifications.discarded.content": "Le tue modifiche sono state eliminate. Per riprtinarle, cliccare sul tasto 'Annulla'", // "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded", + "itemtemplate.edit.metadata.notifications.discarded.title": "Modifiche eliminate", // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.error.title": "An error occurred", + "itemtemplate.edit.metadata.notifications.error.title": "Si è verificato un errore", // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.", + "itemtemplate.edit.metadata.notifications.invalid.content": "Le tue modifiche non sono state salvate. Assicurati che tutti i campi siano validi prima di salvare.", // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid", + "itemtemplate.edit.metadata.notifications.invalid.title": "Metadati non validi", // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template 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 - "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts", + "itemtemplate.edit.metadata.notifications.outdated.content": "Il template dell'item su cui stai lavorando è stato modificato da un altro utente. Le tue ultime modifiche sono state eliminate per prevenire conflitti", // "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated", + "itemtemplate.edit.metadata.notifications.outdated.title": "Modifiche obsolete", // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.", + "itemtemplate.edit.metadata.notifications.saved.content": "Le tue modifiche ai metadati di questo template sono state salvate.", // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved", + "itemtemplate.edit.metadata.notifications.saved.title": "Metadati salvati", // "itemtemplate.edit.metadata.reinstate-button": "Undo", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.reinstate-button": "Undo", + "itemtemplate.edit.metadata.reinstate-button": "Annulla", // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.reset-order-button": "Undo reorder", + "itemtemplate.edit.metadata.reset-order-button": "Annulla riordinamento", // "itemtemplate.edit.metadata.save-button": "Save", - // TODO New key - Add a translation - "itemtemplate.edit.metadata.save-button": "Save", + "itemtemplate.edit.metadata.save-button": "Salva", @@ -5676,12 +5427,10 @@ "manage.relationships.unhide": "Mostrare", // "manage.relationships.search-list.title" : "All your items", - // TODO New key - Add a translation - "manage.relationships.search-list.title" : "All your items", + "manage.relationships.search-list.title" : "Tutti i tuoi item", // "manage.relationships.selected-list.title" : "Selected items", - // TODO New key - Add a translation - "manage.relationships.selected-list.title" : "Selected items", + "manage.relationships.selected-list.title" : "Item selezionati", // "manage.relationships.no.relationships.found" : "Empty selection", "manage.relationships.no.relationships.found" : "Selezione vuota", @@ -5690,28 +5439,22 @@ "manage.relationships.no.data.found" : "Nessun dato trovato", // "manage.relationships.error.select" : "An unexpected error occurs while selecting the entity.", - // TODO New key - Add a translation - "manage.relationships.error.select" : "An unexpected error occurs while selecting the entity.", + "manage.relationships.error.select" : "Si è verificato un errore inaspettato durante la selezione dell'entità.", // "manage.relationships.error.unselect" : "An unexpected error occurs while unselecting the entity.", - // TODO New key - Add a translation - "manage.relationships.error.unselect" : "An unexpected error occurs while unselecting the entity.", + "manage.relationships.error.unselect" : "Si è verificato un errore inaspettato durante la deselezione dell'entità.", // "manage.relationships.error.hide" : "An unexpected error occurs while hiding the entity.", - // TODO New key - Add a translation - "manage.relationships.error.hide" : "An unexpected error occurs while hiding the entity.", + "manage.relationships.error.hide" : "Si è verificato un errore inaspettato mentre si nascondeva l'entità", // "manage.relationships.error.unhide" : "An unexpected error occurs while exposing the entity.", - // TODO New key - Add a translation - "manage.relationships.error.unhide" : "An unexpected error occurs while exposing the entity.", + "manage.relationships.error.unhide" : "Si è verificato un errore inaspettato durante l'esposizione dell'entità.", // "manage.relationships.error.sort" : "An unexpected error occurs while sorting entities.", - // TODO New key - Add a translation - "manage.relationships.error.sort" : "An unexpected error occurs while sorting entities.", + "manage.relationships.error.sort" : "Si è verificato un errore inaspettato durante l'ordinamento delle entità.", // "manage.relationships.hidden-related-items-alert" : "Please note that hidden related items will always be visible among Item’s relations to administrators and owner of the Item", - // TODO New key - Add a translation - "manage.relationships.hidden-related-items-alert" : "Please note that hidden related items will always be visible among Item’s relations to administrators and owner of the Item", + "manage.relationships.hidden-related-items-alert" : "Si prega di notare che gli item correlati nascosti saranno sempre visibili tra le relazioni degli item agli amministratori e al proprietario dell'item", // "menu.header.admin": "Management", @@ -5774,7 +5517,6 @@ "menu.section.explore_publications": "Output della ricerca", // "menu.section.explore_researchoutputs": "Research Outputs", - // TODO Source message changed - Revise the translation "menu.section.explore_researchoutputs": "Output della ricerca", // "menu.section.explore_researcherprofiles": "People", @@ -5784,16 +5526,13 @@ "menu.section.explore_orgunits": "Strutture", // "menu.section.explore_fundings": "Fundings", - // TODO Source message changed - Revise the translation "menu.section.explore_fundings": "Progetti", // "menu.section.explore_projects": "Projects", - // TODO New key - Add a translation - "menu.section.explore_projects": "Projects", + "menu.section.explore_projects": "Progetti", // "menu.section.explore_fundings_and_projects": "Fundings & Projects", - // TODO Source message changed - Revise the translation - "menu.section.explore_fundings_and_projects": "Progetti", + "menu.section.explore_fundings_and_projects": "Finanziamenti & progetti", // "menu.section.communities_and_collections": "Communities & Collections", "menu.section.communities_and_collections": "Community & Collezioni", @@ -5838,14 +5577,12 @@ "menu.section.export_metadata": "Metadati", // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation "menu.section.export_batch": "Batch Export (ZIP)", // "menu.section.import_from_excel": "Import from excel", "menu.section.import_from_excel": "Importa da Excel", // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation "menu.section.export_batch": "Batch Export (ZIP)", // "menu.section.export_to_excel": "Export to excel", @@ -5876,8 +5613,7 @@ "menu.section.icon.find": "Trova sezione menu", // "menu.section.icon.health": "Health check menu section", - // TODO New key - Add a translation - "menu.section.icon.health": "Health check menu section", + "menu.section.icon.health": "Sezione del menu Health check", // "menu.section.icon.import": "Import menu section", "menu.section.icon.import": "Sezione del menu Importa", @@ -5892,8 +5628,7 @@ "menu.section.icon.pin": "Fissa la barra laterale", // "menu.section.icon.processes": "Processes Health", - // TODO Source message changed - Revise the translation - "menu.section.icon.processes": "Sezione del menu Processi", + "menu.section.icon.processes": "Processi", // "menu.section.icon.registries": "Registries menu section", "menu.section.icon.registries": "Sezione del menu Registri", @@ -6044,12 +5779,10 @@ "statistics.workflow.page.current-table.reviewstep" : "Riesamina", // "statistics.workflow.page.current-table.editstep" : "Edit", - // TODO New key - Add a translation - "statistics.workflow.page.current-table.editstep" : "Edit", + "statistics.workflow.page.current-table.editstep" : "Modifica", // "statistics.workflow.page.current-table.finaleditstep" : "Final edit", - // TODO New key - Add a translation - "statistics.workflow.page.current-table.finaleditstep" : "Final edit", + "statistics.workflow.page.current-table.finaleditstep" : "Modifica finale", // "statistics.workflow.page.current-table.step": "Step", "statistics.workflow.page.current-table.step": "Passo", @@ -6310,8 +6043,7 @@ "mydspace.results.no-uri": "Nessun URI", // "mydspace.results.is-correction": "Is a request of correction", - // TODO New key - Add a translation - "mydspace.results.is-correction": "Is a request of correction", + "mydspace.results.is-correction": "È una richiesta di correzione", // "mydspace.search-form.placeholder": "Search in mydspace...", "mydspace.search-form.placeholder": "Cerca in mydspace...", @@ -6323,12 +6055,10 @@ "mydspace.show.workspace": "I tuoi contributi", // "mydspace.show.supervisedWorkspace": "Supervised items", - // TODO New key - Add a translation - "mydspace.show.supervisedWorkspace": "Supervised items", + "mydspace.show.supervisedWorkspace": "Item supervisionati", // "mydspace.show.otherworkspace": "Other Workspace Submissions", - // TODO New key - Add a translation - "mydspace.show.otherworkspace": "Other Workspace Submissions", + "mydspace.show.otherworkspace": "Altri insierimenti in workspace", // "mydspace.status.archived": "Archived", "mydspace.status.archived": "Archiviati", @@ -6379,8 +6109,7 @@ "nav.community-browse.header": "Per Community", // "nav.context-help-toggle": "Toggle context help", - // TODO New key - Add a translation - "nav.context-help-toggle": "Toggle context help", + "nav.context-help-toggle": "Attivare la guida contestuale", // "nav.language": "Language switch", "nav.language": "Cambio di lingua", @@ -6389,12 +6118,10 @@ "nav.login": "Accedi", // "nav.user-profile-menu-and-logout": "User profile menu and Log Out", - // TODO New key - Add a translation - "nav.user-profile-menu-and-logout": "User profile menu and Log Out", + "nav.user-profile-menu-and-logout": "Menu profilo utente e Disconnetti", // "nav.logout": "Log Out", - // TODO Source message changed - Revise the translation - "nav.logout": "Menu profilo utente e Disconnetti", + "nav.logout": "Disconnetti", // "nav.main.description": "Main navigation bar", "nav.main.description": "Barra di navigazione principale", @@ -6415,23 +6142,19 @@ "nav.stop-impersonating": "Smetti di impersonare EPerson", // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", + "nav.subscriptions" : "Subscription", // "nav.toggle" : "Toggle navigation", - // TODO New key - Add a translation - "nav.toggle" : "Toggle navigation", + "nav.toggle" : "Attivare la navigazione", // "nav.user.description" : "User profile bar", - // TODO New key - Add a translation - "nav.user.description" : "User profile bar", + "nav.user.description" : "Barra del profilo utente", // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", + "nav.subscriptions" : "Subscription", // "none.listelement.badge": "Item", - "none.listelement.badge": "Articolo", + "none.listelement.badge": "Item", // "openaire.broker.title": "OpenAIRE Broker", "openaire.broker.title": "OpenAIRE Broker", @@ -6470,8 +6193,7 @@ "openaire.broker.events.description": "Di seguito l'elenco di tutti i suggerimenti ricevuti da OpenAIRE per l'argomento selezionato.", // "openaire.broker.events.topic": "Topic:", - // TODO New key - Add a translation - "openaire.broker.events.topic": "Topic:", + "openaire.broker.events.topic": "Argomento:", // "openaire.broker.noEvents": "No suggestions found.", "openaire.broker.noEvents": "Nessun suggerimento trovato.", @@ -6504,16 +6226,13 @@ "openaire.broker.event.action.import": "Importa progetto e accetta suggerimenti", // "openaire.broker.event.table.pidtype": "PID Type:", - // TODO New key - Add a translation - "openaire.broker.event.table.pidtype": "PID Type:", + "openaire.broker.event.table.pidtype": "Tipo di PID", // "openaire.broker.event.table.pidvalue": "PID Value:", - // TODO New key - Add a translation - "openaire.broker.event.table.pidvalue": "PID Value:", + "openaire.broker.event.table.pidvalue": "Valore di PID:", // "openaire.broker.event.table.subjectValue": "Subject Value:", - // TODO New key - Add a translation - "openaire.broker.event.table.subjectValue": "Subject Value:", + "openaire.broker.event.table.subjectValue": "Valore del soggetto:", // "openaire.broker.event.table.abstract": "Abstract:", "openaire.broker.event.table.abstract": "Abstract:", @@ -6522,28 +6241,22 @@ "openaire.broker.event.table.suggestedProject": "Dati del progetto suggerito da OpenAIRE", // "openaire.broker.event.table.project": "Project title:", - // TODO New key - Add a translation - "openaire.broker.event.table.project": "Project title:", + "openaire.broker.event.table.project": "Titolo del progetto:", // "openaire.broker.event.table.acronym": "Acronym:", - // TODO New key - Add a translation - "openaire.broker.event.table.acronym": "Acronym:", + "openaire.broker.event.table.acronym": "Acronimo:", // "openaire.broker.event.table.code": "Code:", - // TODO New key - Add a translation - "openaire.broker.event.table.code": "Code:", + "openaire.broker.event.table.code": "Codice:", // "openaire.broker.event.table.funder": "Funder:", - // TODO New key - Add a translation - "openaire.broker.event.table.funder": "Funder:", + "openaire.broker.event.table.funder": "Ente finanziatore:", // "openaire.broker.event.table.fundingProgram": "Funding program:", - // TODO New key - Add a translation - "openaire.broker.event.table.fundingProgram": "Funding program:", + "openaire.broker.event.table.fundingProgram": "Programma di finanziamento:", // "openaire.broker.event.table.jurisdiction": "Jurisdiction:", - // TODO New key - Add a translation - "openaire.broker.event.table.jurisdiction": "Jurisdiction:", + "openaire.broker.event.table.jurisdiction": "Giurisdizione:", // "openaire.broker.events.back": "Back to topics", "openaire.broker.events.back": "Torna agli argomenti", @@ -6555,8 +6268,7 @@ "openaire.broker.event.table.more": "Mostra di più", // "openaire.broker.event.project.found": "Bound to the local record:", - // TODO New key - Add a translation - "openaire.broker.event.project.found": "Bound to the local record:", + "openaire.broker.event.project.found": "Legato al record locale:", // "openaire.broker.event.project.notFound": "No local record found", "openaire.broker.event.project.notFound": "Nessun record locale trovato", @@ -6586,12 +6298,10 @@ "openaire.broker.event.modal.project.title": "Scegliere un progetto da rilegare", // "openaire.broker.event.modal.project.publication": "Publication:", - // TODO New key - Add a translation - "openaire.broker.event.modal.project.publication": "Publication:", + "openaire.broker.event.modal.project.publication": "Pubblicazione:", // "openaire.broker.event.modal.project.bountToLocal": "Bound to the local record:", - // TODO New key - Add a translation - "openaire.broker.event.modal.project.bountToLocal": "Bound to the local record:", + "openaire.broker.event.modal.project.bountToLocal": "Legato al record locale:", // "openaire.broker.event.modal.project.select": "Project search", "openaire.broker.event.modal.project.select": "Ricerca del progetto", @@ -6702,8 +6412,7 @@ "reciter.suggestion.hideEvidence": "Nascondi le prove", // "reciter.suggestion.not-found": "No suggestion found with the given identifier.", - // TODO New key - Add a translation - "reciter.suggestion.not-found": "No suggestion found with the given identifier.", + "reciter.suggestion.not-found": "Non è stato trovato alcun suggerimento con l'identificativo indicato", // "reciter.suggestion.suggestionFor": "Suggestion for", "reciter.suggestion.suggestionFor": "Suggerimento per", @@ -6724,16 +6433,14 @@ "reciter.suggestion.type.oaire": "Pubblicazioni", // "reciter.suggestion.type.orcidWorks": "Publications", - // TODO New key - Add a translation - "reciter.suggestion.type.orcidWorks": "Publications", + "reciter.suggestion.type.orcidWorks": "Pubblicazioni", // "orgunit.listelement.badge": "Organizational Unit", "orgunit.listelement.badge": "Unità organizzativa", // "orgunit.listelement.no-title": "Untitled", - // TODO New key - Add a translation - "orgunit.listelement.no-title": "Untitled", + "orgunit.listelement.no-title": "Senza titolo", // "orgunit.page.city": "City", "orgunit.page.city": "Città", @@ -6754,8 +6461,7 @@ "orgunit.page.id": "ID", // "orgunit.page.titleprefix": "Organizational Unit: ", - // TODO New key - Add a translation - "orgunit.page.titleprefix": "Organizational Unit: ", + "orgunit.page.titleprefix": "Unità organizzativa: ", @@ -6801,8 +6507,7 @@ "person.page.lastname": "Cognome", // "person.page.name": "Name", - // TODO New key - Add a translation - "person.page.name": "Name", + "person.page.name": "Nome", // "person.page.link.full": "Show all metadata", "person.page.link.full": "Mostra tutti i metadati", @@ -6817,11 +6522,10 @@ "person.page.titleprefix": "Persona: ", // "person.search.results.head": "Person Search Results", - "person.search.results.head": "Risultati della ricerca per Ricercatore", + "person.search.results.head": "Risultati della ricerca per persona", // "person-relationships.search.results.head": "Person Search Results", - // TODO New key - Add a translation - "person-relationships.search.results.head": "Person Search Results", + "person-relationships.search.results.head": "Risultati della ricerca per persona", // "person.search.title": "Person Search", "person.search.title": "Cerca i Ricercatori", @@ -6862,8 +6566,7 @@ "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.parameter.required.missing": "I seguenti parametri mancanti sono obbligatori:", // "process.new.notification.success.title": "Success", "process.new.notification.success.title": "Successo", @@ -6881,8 +6584,7 @@ "process.new.notification.process.processing": "Elaborazione...", // "process.new.notification.process.files": "Output Files: ", - // TODO New key - Add a translation - "process.new.notification.process.files": "Output Files: ", + "process.new.notification.process.files": "File di output: ", // "process.new.header": "Create a new process", "process.new.header": "Creare un nuovo processo", @@ -6896,20 +6598,16 @@ // "process.detail.arguments" : "Arguments", - // TODO New key - Add a translation - "process.detail.arguments" : "Arguments", + "process.detail.arguments" : "Parametri", // "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.arguments.empty" : "Questo processo non contiene alcun parametro", // "process.detail.back" : "Back", - // TODO New key - Add a translation - "process.detail.back" : "Back", + "process.detail.back" : "Indietro", // "process.detail.output" : "Process Output", - // TODO New key - Add a translation - "process.detail.output" : "Process Output", + "process.detail.output" : "Output del processo", // "process.detail.logs.button": "Retrieve process output", "process.detail.logs.button": "Recupera l'output del processo", @@ -6921,100 +6619,76 @@ "process.detail.logs.none": "Questo processo non ha output", // "process.detail.output-files" : "Output Files", - // TODO New key - Add a translation - "process.detail.output-files" : "Output Files", + "process.detail.output-files" : "File di output", // "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.output-files.empty" : "Questo processo non contiene nessun file di output", // "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.title" : "Processo: {{ id }} - {{ name }}", // "process.detail.start-time" : "Start time", - // TODO New key - Add a translation - "process.detail.start-time" : "Start time", + "process.detail.start-time" : "Orario di inizio", // "process.detail.end-time" : "Finish time", - // TODO New key - Add a translation - "process.detail.end-time" : "Finish time", + "process.detail.end-time" : "Orario di fine", // "process.detail.status" : "Status", - // TODO New key - Add a translation - "process.detail.status" : "Status", + "process.detail.status" : "Stato", // "process.detail.create" : "Create similar process", - // TODO New key - Add a translation - "process.detail.create" : "Create similar process", + "process.detail.create" : "Crea un processo analogo", // "process.detail.actions": "Actions", - // TODO New key - Add a translation - "process.detail.actions": "Actions", + "process.detail.actions": "Azioni", // "process.detail.delete.button": "Delete process", - // TODO New key - Add a translation - "process.detail.delete.button": "Delete process", + "process.detail.delete.button": "Elimina processo", // "process.detail.delete.header": "Delete process", - // TODO New key - Add a translation - "process.detail.delete.header": "Delete process", + "process.detail.delete.header": "Elimina processo", // "process.detail.delete.body": "Are you sure you want to delete the current process?", - // TODO New key - Add a translation - "process.detail.delete.body": "Are you sure you want to delete the current process?", + "process.detail.delete.body": "Sei sicuro di voler eliminare il processo corrente?", // "process.detail.delete.cancel": "Cancel", - // TODO New key - Add a translation - "process.detail.delete.cancel": "Cancel", + "process.detail.delete.cancel": "Annulla", // "process.detail.delete.confirm": "Delete process", - // TODO New key - Add a translation - "process.detail.delete.confirm": "Delete process", + "process.detail.delete.confirm": "Elimina processo", // "process.detail.delete.success": "The process was successfully deleted.", - // TODO New key - Add a translation - "process.detail.delete.success": "The process was successfully deleted.", + "process.detail.delete.success": "Il processo è stato eliminato con successo", // "process.detail.delete.error": "Something went wrong when deleting the process", - // TODO New key - Add a translation - "process.detail.delete.error": "Something went wrong when deleting the process", + "process.detail.delete.error": "Qualcosa è andato storto durante l'elininazione del processo", // "process.overview.delete.failed" : "An error occurs deleting the process.", - // TODO New key - Add a translation - "process.overview.delete.failed" : "An error occurs deleting the process.", + "process.overview.delete.failed" : "Si è verificato un errore durante l'eliminazine del processo.", // "process.overview.delete.success" : "Process deleted with success", - // TODO New key - Add a translation - "process.overview.delete.success" : "Process deleted with success", + "process.overview.delete.success" : "Processo eliminato con successo", // "process.overview.table.finish" : "Finish time (UTC)", - // TODO New key - Add a translation - "process.overview.table.finish" : "Finish time (UTC)", + "process.overview.table.finish" : "Orario di fine (UTC)", // "process.overview.table.id" : "Process ID", - // TODO New key - Add a translation - "process.overview.table.id" : "Process ID", + "process.overview.table.id" : "ID del processo", // "process.overview.table.name" : "Name", - // TODO New key - Add a translation - "process.overview.table.name" : "Name", + "process.overview.table.name" : "Nome", // "process.overview.table.start" : "Start time (UTC)", - // TODO New key - Add a translation - "process.overview.table.start" : "Start time (UTC)", + "process.overview.table.start" : "Orario di inizio (UTC)", // "process.overview.table.status" : "Status", - // TODO New key - Add a translation - "process.overview.table.status" : "Status", + "process.overview.table.status" : "Stato", // "process.overview.table.user" : "User", - // TODO New key - Add a translation - "process.overview.table.user" : "User", + "process.overview.table.user" : "Utente", // "process.overview.title": "Processes Overview", "process.overview.title": "Panoramica dei processi", @@ -7026,119 +6700,94 @@ "process.overview.new": "Nuovo", // "process.overview.table.actions": "Actions", - // TODO New key - Add a translation - "process.overview.table.actions": "Actions", + "process.overview.table.actions": "Azioni", // "process.overview.delete": "Delete {{count}} processes", - // TODO New key - Add a translation - "process.overview.delete": "Delete {{count}} processes", + "process.overview.delete": "Elimina {{count}} processi", // "process.overview.delete.clear": "Clear delete selection", - // TODO New key - Add a translation - "process.overview.delete.clear": "Clear delete selection", + "process.overview.delete.clear": "Ripulisci la sezione Elimina", // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.", - // TODO New key - Add a translation - "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.", + "process.overview.delete.processing": "{{count}} processi sono in fase di eliminazione. Attendere che l'attività sia completata. Potrebbe volerci qualche minuto.", // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?", - // TODO New key - Add a translation - "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?", + "process.overview.delete.body": "Sei sicuro di voler eliminare {{count}} processo/i?", // "process.overview.delete.header": "Delete processes", - // TODO New key - Add a translation - "process.overview.delete.header": "Delete processes", + "process.overview.delete.header": "Elimina processi", // "process.bulk.delete.error.head": "Error on deleteing process", - // TODO New key - Add a translation - "process.bulk.delete.error.head": "Error on deleteing process", + "process.bulk.delete.error.head": "Errore nell'eliminazione dei processi", // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ", - // TODO New key - Add a translation - "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted. ", + "process.bulk.delete.error.body": "Il processo con l'ID {{processId}} non può essere eliminato. I restanti processi saranno eliminati.", // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted", - // TODO New key - Add a translation - "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted", + "process.bulk.delete.success": "{{count}} processi sono stati eliminati con successo", // "audit.overview.title": "Audit Logs Overview", - "audit.overview.title": "Panoramica dei log di controllo", + "audit.overview.title": "Panoramica dei log di revisione", // "audit.overview.table.id" : "Audit ID", - // TODO New key - Add a translation - "audit.overview.table.id" : "Audit ID", + "audit.overview.table.id" : "ID della revisione", // "audit.overview.table.objectUUID" : "Object ID", - // TODO New key - Add a translation - "audit.overview.table.objectUUID" : "Object ID", + "audit.overview.table.objectUUID" : "ID dell'oggetto", // "audit.overview.table.objectType" : "Object Type", - // TODO New key - Add a translation - "audit.overview.table.objectType" : "Object Type", + "audit.overview.table.objectType" : "Tipo di oggetto", // "audit.overview.table.subjectUUID" : "Subject ID", - // TODO New key - Add a translation - "audit.overview.table.subjectUUID" : "Subject ID", + "audit.overview.table.subjectUUID" : "ID del soggetto", // "audit.overview.table.subjectType" : "Subject Type", - // TODO New key - Add a translation - "audit.overview.table.subjectType" : "Subject Type", + "audit.overview.table.subjectType" : "Tipo di soggetto", // "audit.overview.table.entityType" : "Audit Type", - // TODO New key - Add a translation - "audit.overview.table.entityType" : "Audit Type", + "audit.overview.table.entityType" : "Tipo di revisione", // "audit.overview.table.eperson" : "EPerson", - // TODO New key - Add a translation "audit.overview.table.eperson" : "EPerson", // "audit.overview.table.timestamp" : "Time", - // TODO New key - Add a translation - "audit.overview.table.timestamp" : "Time", + "audit.overview.table.timestamp" : "Orario", // "audit.overview.breadcrumbs": "Audit Logs Overview", - "audit.overview.breadcrumbs": "Panoramica dei log di controllo", + "audit.overview.breadcrumbs": "Panoramica dei log di revisione", // "audit.object.overview.title": "Subject Audit Logs Overview", - "audit.object.overview.title": "Cenni generali dei log di controllo dell'oggetto", + "audit.object.overview.title": "Cenni generali dei log di revisione dell'oggetto", // "audit.detail.title" : "Audit Detail", - // TODO New key - Add a translation - "audit.detail.title" : "Audit Detail", + "audit.detail.title" : "Dettagli della revisione", // "audit.detail.id" : "Audit Id", - // TODO New key - Add a translation - "audit.detail.id" : "Audit Id", + "audit.detail.id" : "ID della revisione", // "audit.detail.subjectUUID" : "Subject ID", - // TODO New key - Add a translation - "audit.detail.subjectUUID" : "Subject ID", + "audit.detail.subjectUUID" : "ID del soggetto", // "audit.detail.subjectType" : "Subject Type", - // TODO New key - Add a translation - "audit.detail.subjectType" : "Subject Type", + "audit.detail.subjectType" : "Tipo di soggetto", // "audit.detail.eventType" : "Audit Type", - // TODO New key - Add a translation - "audit.detail.eventType" : "Audit Type", + "audit.detail.eventType" : "Tipo di revisione", // "audit.detail.eperson" : "EPerson", - // TODO New key - Add a translation "audit.detail.eperson" : "EPerson", // "audit.detail.timeStamp" : "Time", - // TODO New key - Add a translation - "audit.detail.timeStamp" : "Time", + "audit.detail.timeStamp" : "Orario", // "audit.detail.back" : "All Audit Logs", - // TODO New key - Add a translation - "audit.detail.back" : "All Audit Logs", + "audit.detail.back" : "Tutti i log di revisione", // "audit.detail.back.subject": "Subject Audit Logs", - "audit.detail.back.subject": "Log di controllo del soggetto", + "audit.detail.back.subject": "Log di revisione del soggetto", // "patent.listelement.badge": "Patent", "patent.listelement.badge": "Brevetto", @@ -7152,64 +6801,49 @@ "profile.breadcrumbs": "Aggiorna profilo", // "profile.card.access-token": "Personal access token", - // TODO New key - Add a translation - "profile.card.access-token": "Personal access token", + "profile.card.access-token": "Token di accesso personale", // "profile.card.access-token.copy": "Copy token", - // TODO New key - Add a translation - "profile.card.access-token.copy": "Copy token", + "profile.card.access-token.copy": "Copia token", // "profile.card.access-token.copy-info": "Make sure to copy your personal access token now. You won’t be able to see it again!", - // TODO New key - Add a translation - "profile.card.access-token.copy-info": "Make sure to copy your personal access token now. You won’t be able to see it again!", + "profile.card.access-token.copy-info": "Assicurati di copiare il tuo token di accesso personale. Non potrai più farlo in seguito!", // "profile.card.access-token.info": "Tokens you have generated that can be used to access the DSpace-CRIS API.", - // TODO New key - Add a translation - "profile.card.access-token.info": "Tokens you have generated that can be used to access the DSpace-CRIS API.", + "profile.card.access-token.info": "I token che hai generato che possono essere utilizzati per accedere all'API di DSpace-CRIS", // "profile.card.access-token.create.error": "An error occurred while generating the token, please try again later.", - // TODO New key - Add a translation - "profile.card.access-token.create.error": "An error occurred while generating the token, please try again later.", + "profile.card.access-token.create.error": "Si è verificato un errore durante la generazione del token, si prega di riprovare più tardi.", // "profile.card.access-token.create-warning.title": "Generate a new personal access token", - // TODO New key - Add a translation - "profile.card.access-token.create-warning.title": "Generate a new personal access token", + "profile.card.access-token.create-warning.title": "Genera un nuovo token di accesso personale", // "profile.card.access-token.create-warning.msg": "Are you sure you want to generate a new personal access token?\nThis will revoke access for the existing personal access token. This action cannot be undone.", - // TODO New key - Add a translation - "profile.card.access-token.create-warning.msg": "Are you sure you want to generate a new personal access token?\nThis will revoke access for the existing personal access token. This action cannot be undone.", + "profile.card.access-token.create-warning.msg": "Sei sicuro di voler generare un nuovo toke di accesso personale? In questo modo si revoca l'accesso al token esistente. Questa azione non potrà essere annullata.", // "profile.card.access-token.delete-warning.title": "Revoke the new personal access token", - // TODO New key - Add a translation - "profile.card.access-token.delete-warning.title": "Revoke the new personal access token", + "profile.card.access-token.delete-warning.title": "Revoca del nuovo token di accesso personale", // "profile.card.access-token.delete-warning.msg": "Are you sure you want to revoke access for the personal access token? This action cannot be undone.", - // TODO New key - Add a translation - "profile.card.access-token.delete-warning.msg": "Are you sure you want to revoke access for the personal access token? This action cannot be undone.", + "profile.card.access-token.delete-warning.msg": "Sei sicuro di voler revocare l'accesso al token? Questa azione non potrà essere annullata.", // "profile.card.access-token.confirm": "Confirm", - // TODO New key - Add a translation - "profile.card.access-token.confirm": "Confirm", + "profile.card.access-token.confirm": "Conferma", // "profile.card.access-token.cancel": "Cancel", - // TODO New key - Add a translation - "profile.card.access-token.cancel": "Cancel", + "profile.card.access-token.cancel": "Annulla", // "profile.card.access-token.create": "Generate new token", - // TODO New key - Add a translation - "profile.card.access-token.create": "Generate new token", + "profile.card.access-token.create": "Genera un nuovo token", // "profile.card.access-token.delete": "Revoke token", - // TODO New key - Add a translation - "profile.card.access-token.delete": "Revoke token", + "profile.card.access-token.delete": "Revoca il token", // "profile.card.access-token.no-token-generated": "You don't have personal access token. Generate a personal access token for quick access to the DSpace-CRIS API.", - // TODO New key - Add a translation - "profile.card.access-token.no-token-generated": "You don't have personal access token. Generate a personal access token for quick access to the DSpace-CRIS API.", + "profile.card.access-token.no-token-generated": "Non sei in possesso di un token di accesso personale. Genera un token per accedere velocemente all'API di DSpace-CRIS.", // "profile.card.access-token.token-generated": "You have already generated a personal access token.", - // TODO New key - Add a translation - "profile.card.access-token.token-generated": "You have already generated a personal access token.", + "profile.card.access-token.token-generated": "Hai già generato un token di accesso personale.", // "profile.card.identify": "Identify", "profile.card.identify": "Identificare", @@ -7224,8 +6858,7 @@ "profile.groups.head": "Gruppi di autorizzazione a cui appartieni", // "profile.special.groups.head": "Authorization special groups you belong to", - // TODO New key - Add a translation - "profile.special.groups.head": "Authorization special groups you belong to", + "profile.special.groups.head": "Gruppi speciali di autorizzazione a cui appartieni", // "profile.head": "Update Profile", "profile.head": "Aggiorna profilo", @@ -7267,8 +6900,7 @@ "profile.security.form.error.matching-passwords": "Le password non corrispondono.", // "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.", - // TODO Source message changed - Revise the translation - "profile.security.form.info": "Facoltativamente, è possibile inserire una nuova password nella casella qui sotto e confermarla digitandola nuovamente nella seconda casella. Dovrebbe essere lungo almeno sei caratteri.", + "profile.security.form.info": "Facoltativamente, è possibile inserire una nuova password nella casella qui sotto e confermarla digitandola nuovamente nella seconda casella.", // "profile.security.form.label.password": "Password", "profile.security.form.label.password": "Password", @@ -7277,8 +6909,7 @@ "profile.security.form.label.passwordrepeat": "Ridigitare per confermare", // "profile.security.form.label.current-password": "Current password", - // TODO New key - Add a translation - "profile.security.form.label.current-password": "Current password", + "profile.security.form.label.current-password": "Password corrente", // "profile.security.form.notifications.success.content": "Your changes to the password were saved.", "profile.security.form.notifications.success.content": "Le modifiche apportate alla password sono state salvate.", @@ -7290,15 +6921,13 @@ "profile.security.form.notifications.error.title": "Errore durante la modifica delle password", // "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.", - // TODO New key - Add a translation - "profile.security.form.notifications.error.change-failed": "An error occurred while trying to change the password. Please check if the current password is correct.", + "profile.security.form.notifications.error.change-failed": "Si è verificato un errore durante la modifica della password. Assicurati che la password corrente sia corretta.", // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.", "profile.security.form.notifications.error.not-same": "Le password fornite non sono le stesse.", // "profile.security.form.notifications.error.general": "Please fill required fields of security form.", - // TODO New key - Add a translation - "profile.security.form.notifications.error.general": "Please fill required fields of security form.", + "profile.security.form.notifications.error.general": "Si prega di inserire i campi richiesti nel modulo di sicurezza.", // "profile.title": "Update Profile", "profile.title": "Aggiorna profilo", @@ -7335,15 +6964,13 @@ "project.page.status": "Parole chiave", // "project.page.titleprefix": "Research Project: ", - // TODO New key - Add a translation - "project.page.titleprefix": "Research Project: ", + "project.page.titleprefix": "Progetto di ricerca: ", // "project.search.results.head": "Project Search Results", - "project.search.results.head": "Progetto di ricerca: ", + "project.search.results.head": "Risultati della ricerca per progetti", // "project-relationships.search.results.head": "Project Search Results", - // TODO New key - Add a translation - "project-relationships.search.results.head": "Project Search Results", + "project-relationships.search.results.head": "Risultati della ricerca per progetti", @@ -7366,18 +6993,16 @@ "publication.page.publisher": "Editore", // "publication.page.titleprefix": "Publication: ", - // TODO New key - Add a translation - "publication.page.titleprefix": "Publication: ", + "publication.page.titleprefix": "Pubblicazione: ", // "publication.page.volume-title": "Volume Title", "publication.page.volume-title": "Titolo volume", // "publication.search.results.head": "Publication Search Results", - "publication.search.results.head": "Risultati della ricerca di pubblicazioni", + "publication.search.results.head": "Risultati della ricerca per pubblicazioni", // "publication-relationships.search.results.head": "Publication Search Results", - // TODO New key - Add a translation - "publication-relationships.search.results.head": "Publication Search Results", + "publication-relationships.search.results.head": "Risultati della ricerca per pubblicazioni", // "publication.search.title": "Publication Search", "publication.search.title": "Ricerca pubblicazione", @@ -7436,8 +7061,7 @@ "register-page.create-profile.security.header": "Sicurezza", // "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.", - // TODO Source message changed - Revise the translation - "register-page.create-profile.security.info": "Inserisci una password nella casella qui sotto e confermala digitandola nuovamente nella seconda casella. Dovrebbe essere lungo almeno sei caratteri.", + "register-page.create-profile.security.info": "Inserisci una password nella casella qui sotto e confermala digitandola nuovamente nella seconda casella.", // "register-page.create-profile.security.label.password": "Password *", "register-page.create-profile.security.label.password": "Password *", @@ -7485,12 +7109,10 @@ "register-page.registration.email.error.required": "Inserire un indirizzo e-mail", // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.", - // TODO New key - Add a translation - "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.", + "register-page.registration.email.error.not-email-form": "Inserisci un indirizzo e-mail valido.", // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}", - // TODO New key - Add a translation - "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}", + "register-page.registration.email.error.not-valid-domain": "Utilizza una e-mail con un dominio valido: {{ domains }}", // "register-page.registration.email.hint": "This address will be verified and used as your login name.", "register-page.registration.email.hint": "Questo indirizzo verrà verificato e utilizzato come nome di accesso.", @@ -7508,39 +7130,30 @@ "register-page.registration.error.head": "Errore durante il tentativo di registrazione dell'e-mail", // "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 }}", + "register-page.registration.error.content": "Si è verificato un errore durante la registrazione del seguente indirizzo e-mail: {{ email }}", // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha", - // TODO New key - Add a translation - "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha", + "register-page.registration.error.recaptcha": "Errore durante l'autenticazione con reCaptcha", // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the Registration and Password recovery (Google reCaptcha) cookies.", - // TODO New key - Add a translation - "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the Registration and Password recovery (Google reCaptcha) cookies.", + "register-page.registration.google-recaptcha.must-accept-cookies": "Per registrarsi è obbligatorio accettare i cookie Registration and Password recovery (Google reCaptcha).", // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}", - // TODO New key - Add a translation - "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}", + "register-page.registration.error.maildomain": "Questo indirizzo e-mail non è nella lista dei dominii che possono essere registrati. I domini validi sono {{ domains }}", // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings", - // TODO New key - Add a translation - "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings", + "register-page.registration.google-recaptcha.open-cookie-settings": "Aprire le impostazioni dei cookie", // "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha", - // TODO New key - Add a translation "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha", // "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification", - // TODO New key - Add a translation - "register-page.registration.google-recaptcha.notification.message.error": "An error occurred during reCaptcha verification", + "register-page.registration.google-recaptcha.notification.message.error": "Si è verificato un errore durante la verifica reCaptcha", // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.", - // TODO New key - Add a translation - "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.", + "register-page.registration.google-recaptcha.notification.message.expired": "Verifica scaduta. Si prega di verificare di nuovo.", // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains", - // TODO New key - Add a translation - "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains", + "register-page.registration.info.maildomain": "Gli account possono essere registrati per gli indirizzi e-mail dei dominii", // "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": "Non è stata trovata alcuna corrispondenza adatta per il tipo di relazione {{ type }} tra i due item", @@ -7621,60 +7234,58 @@ "resource-policies.add.button": "Aggiungi", // "resource-policies.add.for.": "Add a new policy", - "resource-policies.add.for.": "Aggiungi un nuovo criterio", + "resource-policies.add.for.": "Aggiungi una nuova policy", // "resource-policies.add.for.bitstream": "Add a new Bitstream policy", - "resource-policies.add.for.bitstream": "Aggiungi un nuovo criterio Bitstream", + "resource-policies.add.for.bitstream": "Aggiungi una nuova policy di Bitstream", // "resource-policies.add.for.bundle": "Add a new Bundle policy", - "resource-policies.add.for.bundle": "Aggiungi un nuovo criterio Bundle", + "resource-policies.add.for.bundle": "Aggiungi una nuova policy di Bundle", // "resource-policies.add.for.item": "Add a new Item policy", - "resource-policies.add.for.item": "Aggiungi un nuovo criterio item", + "resource-policies.add.for.item": "Aggiungi una nuova policy di Item", // "resource-policies.add.for.community": "Add a new Community policy", - "resource-policies.add.for.community": "Aggiungere un nuovo criterio comunitario", + "resource-policies.add.for.community": "Aggiungi una nuova policy di community", // "resource-policies.add.for.collection": "Add a new Collection policy", - "resource-policies.add.for.collection": "Aggiungere un nuovo criterio di collezione", + "resource-policies.add.for.collection": "Aggiungi una nuova policy di collezione", // "resource-policies.create.page.heading": "Create new resource policy for ", - "resource-policies.create.page.heading": "Creare nuovi criteri di risorsa per ", + "resource-policies.create.page.heading": "Creare una nuova policy di risorsa per ", // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.", - "resource-policies.create.page.failure.content": "Si è verificato un errore durante la creazione del criterio della risorsa.", + "resource-policies.create.page.failure.content": "Si è verificato un errore durante la creazione della policy di risorsa.", // "resource-policies.create.page.success.content": "Operation successful", "resource-policies.create.page.success.content": "Operazione riuscita", // "resource-policies.create.page.title": "Create new resource policy", - "resource-policies.create.page.title": "Creare nuovi criteri risorse", + "resource-policies.create.page.title": "Creare nuove policy di risorsa", // "resource-policies.delete.btn": "Delete selected", "resource-policies.delete.btn": "Elimina selezionato", // "resource-policies.delete.btn.title": "Delete selected resource policies", - "resource-policies.delete.btn.title": "Elimina criteri risorse selezionati", + "resource-policies.delete.btn.title": "Elimina le policy di risorsa selezionate", // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.", - "resource-policies.delete.failure.content": "Si è verificato un errore durante l'eliminazione dei criteri delle risorse selezionati.", + "resource-policies.delete.failure.content": "Si è verificato un errore durante l'eliminazione delle policy di risorsa selezionate.", // "resource-policies.delete.success.content": "Operation successful", "resource-policies.delete.success.content": "Operazione riuscita", // "resource-policies.edit.page.heading": "Edit resource policy ", - "resource-policies.edit.page.heading": "Modifica criterio risorse", + "resource-policies.edit.page.heading": "Modifica policy di risorsa", // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.", - "resource-policies.edit.page.failure.content": "Si è verificato un errore durante la modifica del criterio delle risorse.", + "resource-policies.edit.page.failure.content": "Si è verificato un errore durante la modifica della policy di risorsa.", // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.", - // TODO New key - Add a translation - "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.", + "resource-policies.edit.page.target-failure.content": "Si è verificato un errore durante la modifica dell'obiettivo (ePerson o gruppo) della policy di risorsa.", // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.", - // TODO New key - Add a translation - "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.", + "resource-policies.edit.page.other-failure.content": "Si è verificato un errore durante la modifica della policy di risorsa. L'obiettio (ePerson o gruppo) è stato aggiornato con successo.", // "resource-policies.edit.page.success.content": "Operation successful", "resource-policies.edit.page.success.content": "Operazione riuscita", @@ -7710,20 +7321,16 @@ "resource-policies.form.eperson-group-list.table.headers.name": "Nome", // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.header": "Cannot change type", + "resource-policies.form.eperson-group-list.modal.header": "Impossibile modificare il tipo", // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.", + "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Impossibile sostituire una ePerson con un gruppo.", // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.", + "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Impossibile sostituire un gruppo con una ePerson.", // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.", - // TODO New key - Add a translation - "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.", + "resource-policies.form.eperson-group-list.modal.text2": "Elimina la policy di risorsa corrente e creane una nuova con il tipo desiderato.", // "resource-policies.form.eperson-group-list.modal.close": "Ok", "resource-policies.form.eperson-group-list.modal.close": "Ok", @@ -7825,7 +7432,6 @@ "search.filters.applied.f.dateSubmitted": "Data di invio", // "search.filters.applied.f.discoverable": "Non-discoverable", - // TODO Source message changed - Revise the translation "search.filters.applied.f.discoverable": "Privato", // "search.filters.applied.f.entityType": "Item Type", @@ -7859,23 +7465,22 @@ "search.filters.applied.f.projectorgunits": "Organizzazione", // "search.filters.applied.f.subject": "Subject", - "search.filters.applied.f.subject": "Oggetto", + "search.filters.applied.f.subject": "Soggetto", // "search.filters.applied.f.submitter": "Submitter", - "search.filters.applied.f.submitter": "Mittente", + "search.filters.applied.f.submitter": "Submitter", // "search.filters.applied.f.jobTitle": "Job Title", - "search.filters.applied.f.jobTitle": "Titolo di lavoro", + "search.filters.applied.f.jobTitle": "Ruolo", // "search.filters.applied.f.birthDate.max": "End birth date", - "search.filters.applied.f.birthDate.max": "Data di fine nascita", + "search.filters.applied.f.birthDate.max": "Data di nascita finale", // "search.filters.applied.f.birthDate.min": "Start birth date", "search.filters.applied.f.birthDate.min": "Data di nascita iniziale", // "search.filters.applied.f.supervisedBy": "Supervised by", - // TODO New key - Add a translation - "search.filters.applied.f.supervisedBy": "Supervised by", + "search.filters.applied.f.supervisedBy": "Supervisionato da", // "search.filters.applied.f.withdrawn": "Withdrawn", "search.filters.applied.f.withdrawn": "Ritirato", @@ -7899,32 +7504,25 @@ "search.filters.applied.charts.defaultConfiguration.title": "Output di ricerca", // "search.filters.applied.charts.chart.bar.dateIssued.year.tab" : "Date Issued", - // TODO New key - Add a translation - "search.filters.applied.charts.chart.bar.dateIssued.year.tab" : "Date Issued", + "search.filters.applied.charts.chart.bar.dateIssued.year.tab" : "Data di inserimento", // "search.filters.applied.charts.chart.pie.more-value" : "More", - // TODO New key - Add a translation - "search.filters.applied.charts.chart.pie.more-value" : "More", + "search.filters.applied.charts.chart.pie.more-value" : "Più", // "search.filters.applied.charts.chart.pie.itemtype_filter.tab" : "Item Type", - // TODO New key - Add a translation - "search.filters.applied.charts.chart.pie.itemtype_filter.tab" : "Item Type", + "search.filters.applied.charts.chart.pie.itemtype_filter.tab" : "Tipo di item", // "search.filters.applied.charts.graphitemtype.tab" : "Visualization by Type", - // TODO New key - Add a translation - "search.filters.applied.charts.graphitemtype.tab" : "Visualization by Type", + "search.filters.applied.charts.graphitemtype.tab" : "Visualizzazione per tipo", // "search.filters.applied.charts.graphpubldate.tab" : "Visualization by Date", - // TODO New key - Add a translation - "search.filters.applied.charts.graphpubldate.tab" : "Visualization by Date", + "search.filters.applied.charts.graphpubldate.tab" : "Visualizzazione per data", // "search.filters.applied.charts.graphpubldateltr.tab" : "Visualization Demo LTR", - // TODO New key - Add a translation - "search.filters.applied.charts.graphpubldateltr.tab" : "Visualization Demo LTR", + "search.filters.applied.charts.graphpubldateltr.tab" : "Visualizzazione Demo LTR", // "search.filters.applied.charts.graphpubldatetrl.tab" : "Visualization Demo RTL", - // TODO New key - Add a translation - "search.filters.applied.charts.graphpubldatetrl.tab" : "Visualization Demo RTL", + "search.filters.applied.charts.graphpubldatetrl.tab" : "Visualizzazione Demo RTL", // "search.filters.applied.charts.default.title": "Search Output", "search.filters.applied.charts.default.title": "Risultati della ricerca", @@ -7936,15 +7534,13 @@ "search.filters.applied.charts.RELATION.Project.fundings.title": "Fondi", // "search.filters.applied.charts.RELATION.Project.researchoutputs.title": "Research Output", - // TODO New key - Add a translation - "search.filters.applied.charts.RELATION.Project.researchoutputs.title": "Research Output", + "search.filters.applied.charts.RELATION.Project.researchoutputs.title": "Output della ricerca", // "search.filters.applied.charts.no.data.found": "No data found", "search.filters.applied.charts.no.data.found": "Nessun dato trovato", // "search.filters.applied.charts.show.hide": "Show/Hide", - // TODO New key - Add a translation - "search.filters.applied.charts.show.hide": "Show/Hide", + "search.filters.applied.charts.show.hide": "Mostra/Nascondi", @@ -7965,12 +7561,10 @@ "search.filters.filter.birthDate.placeholder": "Data di nascita", // "search.filters.filter.birthDate.min.label": "From", - // TODO New key - Add a translation - "search.filters.filter.birthDate.min.label": "From", + "search.filters.filter.birthDate.min.label": "Da", // "search.filters.filter.birthDate.max.label": "To", - // TODO New key - Add a translation - "search.filters.filter.birthDate.max.label": "To", + "search.filters.filter.birthDate.max.label": "A", // "search.filters.filter.birthDate.label": "Search birth date", "search.filters.filter.birthDate.label": "Cerca data di nascita", @@ -8039,18 +7633,16 @@ "search.filters.filter.dateSubmitted.label": "Data di ricerca inviata", // "search.filters.filter.discoverable.head": "Non-discoverable", - // TODO Source message changed - Revise the translation "search.filters.filter.discoverable.head": "Privato", // "search.filters.filter.editor.head": "Editor", - "search.filters.filter.editor.head": "Editor", + "search.filters.filter.editor.head": "Editore", // "search.filters.filter.editor.placeholder": "Editor", - "search.filters.filter.editor.placeholder": "Editor", + "search.filters.filter.editor.placeholder": "Editore", // "search.filters.filter.editor.label": "Search editor", - // TODO New key - Add a translation - "search.filters.filter.editor.label": "Search editor", + "search.filters.filter.editor.label": "Cerca editore", // "search.filters.filter.withdrawn.head": "Withdrawn", "search.filters.filter.withdrawn.head": "Ritirato", @@ -8062,7 +7654,7 @@ "search.filters.filter.entityType.placeholder": "Tipo di item", // "search.filters.filter.entityType.label": "Search item type", - "search.filters.filter.entityType.label": "Tipo di item di ricerca", + "search.filters.filter.entityType.label": "Cerca tipo di item", // "search.filters.filter.expand": "Expand filter", "search.filters.filter.expand": "Espandi filtro", @@ -8086,8 +7678,7 @@ "search.filters.filter.funding.placeholder": "Finanziamento", // "search.filters.filter.funding.label": "Search funding", - // TODO New key - Add a translation - "search.filters.filter.funding.label": "Search funding", + "search.filters.filter.funding.label": "Cerca finanziamento", // "search.filters.filter.has_content_in_original_bundle.head": "Has files", "search.filters.filter.has_content_in_original_bundle.head": "Ha file", @@ -8135,33 +7726,28 @@ "search.filters.filter.language.placeholder": "Lingue", // "search.filters.filter.projectOrgUnits.head" : "Organizations", - // TODO New key - Add a translation - "search.filters.filter.projectOrgUnits.head" : "Organizations", + "search.filters.filter.projectOrgUnits.head" : "Strutture", // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", - // TODO New key - Add a translation - "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", + "search.filters.filter.projectOrgUnits.placeholder" : "Strutture", // "search.filters.filter.personOrgUnits.head" : "Organizations", - // TODO New key - Add a translation - "search.filters.filter.personOrgUnits.head" : "Organizations", + "search.filters.filter.personOrgUnits.head" : "Strutture", // "search.filters.filter.personOrgUnits.label" : "Search organizations", - // TODO New key - Add a translation - "search.filters.filter.personOrgUnits.label" : "Search organizations", + "search.filters.filter.personOrgUnits.label" : "Cerca strutture", // "search.filters.filter.personOrgUnits.placeholder" : "Organizations", - // TODO New key - Add a translation - "search.filters.filter.personOrgUnits.placeholder" : "Organizations", + "search.filters.filter.personOrgUnits.placeholder" : "Strutture", // "search.filters.filter.namedresourcetype.head": "Status", - "search.filters.filter.namedresourcetype.head": "Status", + "search.filters.filter.namedresourcetype.head": "Stato", // "search.filters.filter.namedresourcetype.placeholder": "Status", - "search.filters.filter.namedresourcetype.placeholder": "Status", + "search.filters.filter.namedresourcetype.placeholder": "Stato", // "search.filters.filter.namedresourcetype.label": "Search status", - "search.filters.filter.namedresourcetype.label": "Status Ricerca", + "search.filters.filter.namedresourcetype.label": "Cerca stato", // "search.filters.filter.objectpeople.head": "People", "search.filters.filter.objectpeople.head": "Ricercatori", @@ -8179,8 +7765,7 @@ "search.filters.filter.organization.placeholder": "Struttura", // "search.filters.filter.organization.label": "Search organization", - // TODO New key - Add a translation - "search.filters.filter.organization.label": "Search organization", + "search.filters.filter.organization.label": "Cerca struttura", // "search.filters.filter.organizationAddressCountry.head": "Country", "search.filters.filter.organizationAddressCountry.head": "Paese", @@ -8243,20 +7828,16 @@ "search.filters.filter.submitter.label": "Mittente della ricerca", // "search.filters.filter.show-tree": "Browse {{ name }} tree", - // TODO New key - Add a translation - "search.filters.filter.show-tree": "Browse {{ name }} tree", + "search.filters.filter.show-tree": "Sfoglia l'albero di {{ name }}", // "search.filters.filter.supervisedBy.head": "Supervised By", - // TODO New key - Add a translation - "search.filters.filter.supervisedBy.head": "Supervised By", + "search.filters.filter.supervisedBy.head": "Supervisionato da", // "search.filters.filter.supervisedBy.placeholder": "Supervised By", - // TODO New key - Add a translation - "search.filters.filter.supervisedBy.placeholder": "Supervised By", + "search.filters.filter.supervisedBy.placeholder": "Supervisionato da", // "search.filters.filter.supervisedBy.label": "Search Supervised By", - // TODO New key - Add a translation - "search.filters.filter.supervisedBy.label": "Search Supervised By", + "search.filters.filter.supervisedBy.label": "Cerca supervisionato da", // "search.filters.filter.types.head": "Type", "search.filters.filter.types.head": "Tipo", @@ -8325,8 +7906,7 @@ "default.search.results.head": "Risultati della ricerca", // "default-relationships.search.results.head": "Search Results", - // TODO New key - Add a translation - "default-relationships.search.results.head": "Search Results", + "default-relationships.search.results.head": "Risultati della ricerca", // "defaultConfiguration.search.results.head": "Search Results", "defaultConfiguration.search.results.head": "Risultati della ricerca", @@ -8353,12 +7933,10 @@ "search.results.empty": "La tua ricerca non ha prodotto risultati.", // "search.results.view-result": "View", - // TODO New key - Add a translation - "search.results.view-result": "View", + "search.results.view-result": "Vedi", // "search.results.response.500": "An error occurred during query execution, please try again later", - // TODO New key - Add a translation - "search.results.response.500": "An error occurred during query execution, please try again later", + "search.results.response.500": "Si è verificato un errore durante l'esecuzione, si prega di riprovare più tardi", // "search.sidebar.close": "Back to results", @@ -8383,16 +7961,13 @@ "search.sidebar.settings.title": "Impostazioni", // "search.sidebar.show.hide": "Show/Hide", - // TODO New key - Add a translation - "search.sidebar.show.hide": "Show/Hide", + "search.sidebar.show.hide": "Mostra/Nascondi", // "search.sidebar.show.hide.filters.tooltip": "Show/Hide filters sidebar", - // TODO New key - Add a translation - "search.sidebar.show.hide.filters.tooltip": "Show/Hide filters sidebar", + "search.sidebar.show.hide.filters.tooltip": "Mostra/Nascondi i filtri della barra laterale", // "search.sidebar.show.hide.charts.tooltip": "Show/Hide charts", - // TODO New key - Add a translation - "search.sidebar.show.hide.charts.tooltip": "Show/Hide charts", + "search.sidebar.show.hide.charts.tooltip": "Mostra/Nascondi grafici", @@ -8408,40 +7983,34 @@ // "sorting.ASC": "Ascending", - "sorting.ASC": "Ascendente", + "sorting.ASC": "Crescente", // "sorting.DESC": "Descending", - "sorting.DESC": "Discendente", + "sorting.DESC": "Decrescente", // "sorting.dc.title.ASC": "Title Ascending", - "sorting.dc.title.ASC": "Titolo ascendente", + "sorting.dc.title.ASC": "Titolo crescente", // "sorting.dc.title.DESC": "Title Descending", "sorting.dc.title.DESC": "Titolo decrescente", // "sorting.metric.view.ASC" : "Views Ascending", - // TODO New key - Add a translation - "sorting.metric.view.ASC" : "Views Ascending", + "sorting.metric.view.ASC" : "Vista in ordine crescente", // "sorting.metric.view.DESC" : "Views Descending", - // TODO New key - Add a translation - "sorting.metric.view.DESC" : "Views Descending", + "sorting.metric.view.DESC" : "Vista in ordine decrescente", // "sorting.metric.download.ASC" : "Downloads Ascending", - // TODO New key - Add a translation - "sorting.metric.download.ASC" : "Downloads Ascending", + "sorting.metric.download.ASC" : "Download in ordine crescente", // "sorting.metric.download.DESC" : "Downloads Descending", - // TODO New key - Add a translation - "sorting.metric.download.DESC" : "Downloads Descending", + "sorting.metric.download.DESC" : "Download in ordine decrescente", // "sorting.metric.scopus.citation.ASC" : "Citations Ascending", - // TODO New key - Add a translation - "sorting.metric.scopus.citation.ASC" : "Citations Ascending", + "sorting.metric.scopus.citation.ASC" : "Citazioni in ordine crescente", // "sorting.metric.scopus.citation.DESC" : "Citations Descending", - // TODO New key - Add a translation - "sorting.metric.scopus.citation.DESC" : "Citations Descending", + "sorting.metric.scopus.citation.DESC" : "Citazioni in ordine decrescente", // "sorting.score.ASC": "Least Relevant", "sorting.score.ASC": "Minor rilevanza", @@ -8474,36 +8043,28 @@ "sorting.ownerselection.DESC": "Rilevanza del proprietario decrescente", // "sorting.organization.legalName.ASC" : "Legal Name Ascending", - // TODO New key - Add a translation - "sorting.organization.legalName.ASC" : "Legal Name Ascending", + "sorting.organization.legalName.ASC" : "Nome legale in ordine crescente", // "sorting.organization.legalName.DESC" : "Legal Name Descending", - // TODO New key - Add a translation - "sorting.organization.legalName.DESC" : "Legal Name Descending", + "sorting.organization.legalName.DESC" : "Nome legale in ordine decrescente", // "sorting.organisation.address.addressCountry.ASC" : "Country Ascending", - // TODO New key - Add a translation - "sorting.organisation.address.addressCountry.ASC" : "Country Ascending", + "sorting.organisation.address.addressCountry.ASC" : "Paese in ordine crescente", // "sorting.organisation.address.addressCountry.DESC" : "Country Descending", - // TODO New key - Add a translation - "sorting.organisation.address.addressCountry.DESC" : "Country Descending", + "sorting.organisation.address.addressCountry.DESC" : "Paese in ordine decrescente", // "sorting.organisation.address.addressLocality.ASC" : "Locality Ascending", - // TODO New key - Add a translation - "sorting.organisation.address.addressLocality.ASC" : "Locality Ascending", + "sorting.organisation.address.addressLocality.ASC" : "Località in ordine crescente", // "sorting.organisation.address.addressLocality.DESC" : "Locality Descending", - // TODO New key - Add a translation - "sorting.organisation.address.addressLocality.DESC" : "Locality Descending", + "sorting.organisation.address.addressLocality.DESC" : "Località in ordine decrescente", // "sorting.organisation.address.foundingDate.ASC" : "Founding Date Ascending", - // TODO New key - Add a translation - "sorting.organisation.address.foundingDate.ASC" : "Founding Date Ascending", + "sorting.organisation.address.foundingDate.ASC" : "Data di fondazione in ordine crescente", // "sorting.organisation.address.foundingDate.DESC" : "Founding Date Descending", - // TODO New key - Add a translation - "sorting.organisation.address.foundingDate.DESC" : "Founding Date Descending", + "sorting.organisation.address.foundingDate.DESC" : "Data di fondazione in ordine decrescente", // "statistics.export.csv": "Export CSV", @@ -8534,39 +8095,31 @@ "statistics.table.no-data": "Nessun dato disponibile", // "statistics.table.mainReports.title.TotalVisits": "Total visits", - // TODO Source message changed - Revise the translation "statistics.table.mainReports.title.TotalVisits": "Visite totali", // "statistics.table.mainReports.title.TopItems": "Most viewed", - // TODO Source message changed - Revise the translation "statistics.table.mainReports.title.TopItems": "I più visti", // "statistics.table.mainReports.title.TotalVisitsPerMonth": "Total visits per month", - // TODO Source message changed - Revise the translation "statistics.table.mainReports.title.TotalVisitsPerMonth": "Visite mensili totali", // "statistics.table.mainReports.title.TotalDownloads": "File visits", - // TODO Source message changed - Revise the translation "statistics.table.mainReports.title.TotalDownloads": "Visite ai file", // "statistics.table.mainReports.title.TotalVisitsAndDownloads": "Items and file visits", - // TODO Source message changed - Revise the translation - "statistics.table.mainReports.title.TotalVisitsAndDownloads": "Visite di item e file", + "statistics.table.mainReports.title.TotalVisitsAndDownloads": "Visite ad item e file", // "statistics.table.mainReports.title.TopCountries": "Top country views", - // TODO Source message changed - Revise the translation - "statistics.table.mainReports.title.TopCountries": "Top Country Views", + "statistics.table.mainReports.title.TopCountries": "Paesi con più visite", // "statistics.table.mainReports.title.TopContinents": "Top region views", - // TODO Source message changed - Revise the translation - "statistics.table.mainReports.title.TopContinents": "Top Region Views", + "statistics.table.mainReports.title.TopContinents": "Regioni con più visite", // "statistics.table.mainReports.title.TopCategories": "Categories", "statistics.table.mainReports.title.TopCategories": "Categorie", // "statistics.table.mainReports.title.TopCities": "Top city views", - // TODO Source message changed - Revise the translation - "statistics.table.mainReports.title.TopCities": "Top City Views", + "statistics.table.mainReports.title.TopCities": "Città con più visite", // "statistics.table.downloadReports.title.TotalVisits": "Most downloaded", "statistics.table.downloadReports.title.TotalVisits": "I più scaricati", @@ -8575,15 +8128,12 @@ "statistics.table.downloadReports.title.TopItems": "I più scaricati", // "statistics.table.downloadReports.title.TotalVisitsPerMonth": "Total downloads per month", - // TODO Source message changed - Revise the translation "statistics.table.downloadReports.title.TotalVisitsPerMonth": "Download totali al mese", // "statistics.table.downloadReports.title.TotalDownloads": "Most downloaded", - // TODO Source message changed - Revise the translation "statistics.table.downloadReports.title.TotalDownloads": "I più scaricati", // "statistics.table.downloadReports.title.TotalDownloadsPerMonth": "Total downloads per month", - // TODO Source message changed - Revise the translation "statistics.table.downloadReports.title.TotalDownloadsPerMonth": "Download totali al mese", // "statistics.table.downloadReports.title.TopCountries": "Top country downloads", @@ -8599,186 +8149,145 @@ "statistics.table.downloadReports.title.TopCities": "Top city downloads", // "statistics.table.mainReports.header.views": "Views", - // TODO New key - Add a translation - "statistics.table.mainReports.header.views": "Views", + "statistics.table.mainReports.header.views": "Visualizzazioni", // "statistics.table.mainReports.header.bitstream": "File Visits", - // TODO New key - Add a translation - "statistics.table.mainReports.header.bitstream": "File Visits", + "statistics.table.mainReports.header.bitstream": "Visite al file", // "statistics.table.mainReports.header.continent": "Continent", - // TODO New key - Add a translation - "statistics.table.mainReports.header.continent": "Continent", + "statistics.table.mainReports.header.continent": "Continente", // "statistics.table.mainReports.header.country": "Country", - // TODO New key - Add a translation - "statistics.table.mainReports.header.country": "Country", + "statistics.table.mainReports.header.country": "Paese", // "statistics.table.mainReports.header.city": "City", - // TODO New key - Add a translation - "statistics.table.mainReports.header.city": "City", + "statistics.table.mainReports.header.city": "Città", // "statistics.table.mainReports.header.item": "Item", - // TODO New key - Add a translation "statistics.table.mainReports.header.item": "Item", // "statistics.table.downloadReports.header.views": "Downloads", - // TODO New key - Add a translation - "statistics.table.downloadReports.header.views": "Downloads", + "statistics.table.downloadReports.header.views": "Download", // "statistics.table.downloadReports.header.continent": "Continent", - // TODO New key - Add a translation - "statistics.table.downloadReports.header.continent": "Continent", + "statistics.table.downloadReports.header.continent": "Continente", // "statistics.table.downloadReports.header.country": "Country", - // TODO New key - Add a translation - "statistics.table.downloadReports.header.country": "Country", + "statistics.table.downloadReports.header.country": "Paese", // "statistics.table.downloadReports.header.city": "City", - // TODO New key - Add a translation - "statistics.table.downloadReports.header.city": "City", + "statistics.table.downloadReports.header.city": "Città", // "statistics.table.downloadReports.header.item": "Item", - // TODO New key - Add a translation "statistics.table.downloadReports.header.item": "Item", // "statistics.table.publicationsReports.title.TotalVisits": "Total visits", - // TODO Source message changed - Revise the translation "statistics.table.publicationsReports.title.TotalVisits": "Visite totali", // "statistics.table.publicationsReports.title.TopItems": "Most viewed", - // TODO Source message changed - Revise the translation "statistics.table.publicationsReports.title.TopItems": "I più visti", // "statistics.table.publicationsReports.title.TopCities": "Top cities", - // TODO Source message changed - Revise the translation - "statistics.table.publicationsReports.title.TopCities": "Migliori città", + "statistics.table.publicationsReports.title.TopCities": "Città con più visite", // "statistics.table.publicationsReports.title.TopCountries": "Top countries", - // TODO Source message changed - Revise the translation - "statistics.table.publicationsReports.title.TopCountries": "Migliori paesi", + "statistics.table.publicationsReports.title.TopCountries": "Paesi con più visite", // "statistics.table.publicationsReports.title.TotalVisitsPerMonth": "Total visits per month", - // TODO Source message changed - Revise the translation "statistics.table.publicationsReports.title.TotalVisitsPerMonth": "Visite totali al mese", // "statistics.table.publicationsReports.title.TotalDownloads": "Downloads", "statistics.table.publicationsReports.title.TotalDownloads": "Download", // "statistics.table.publicationsReports.title.TotalVisitsAndDownloads": "Items and file visits", - // TODO Source message changed - Revise the translation - "statistics.table.publicationsReports.title.TotalVisitsAndDownloads": "Visite di item e file", + "statistics.table.publicationsReports.title.TotalVisitsAndDownloads": "Visite ad item e file", // "statistics.table.projectsReports.title.TotalVisits": "Total visits", - // TODO Source message changed - Revise the translation "statistics.table.projectsReports.title.TotalVisits": "Visite totali", // "statistics.table.projectsReports.title.TopItems": "Most viewed", - // TODO Source message changed - Revise the translation "statistics.table.projectsReports.title.TopItems": "I più visti", // "statistics.table.projectsReports.title.TotalVisitsPerMonth": "Total visits per month", - // TODO Source message changed - Revise the translation "statistics.table.projectsReports.title.TotalVisitsPerMonth": "Visite totali al mese", // "statistics.table.projectsReports.title.TopCities": "Top cities", - // TODO Source message changed - Revise the translation "statistics.table.projectsReports.title.TopCities": "Migliori città", // "statistics.table.projectsReports.title.TopCountries": "Top countries", - // TODO Source message changed - Revise the translation "statistics.table.projectsReports.title.TopCountries": "Migliori paesi", // "statistics.table.projectsReports.title.TotalDownloads": "Downloads", "statistics.table.projectsReports.title.TotalDownloads": "Download", // "statistics.table.projectsReports.title.TotalVisitsAndDownloads": "Items and file visits", - // TODO Source message changed - Revise the translation - "statistics.table.projectsReports.title.TotalVisitsAndDownloads": "Visite di item e file", + "statistics.table.projectsReports.title.TotalVisitsAndDownloads": "Visite ad item e file", // "statistics.table.rppublicationsReports.title.TotalVisits": "Total visits", - // TODO Source message changed - Revise the translation "statistics.table.rppublicationsReports.title.TotalVisits": "Visite totali", // "statistics.table.rppublicationsReports.title.TopItems": "Most viewed", - // TODO Source message changed - Revise the translation "statistics.table.rppublicationsReports.title.TopItems": "I più visti", // "statistics.table.rppublicationsReports.title.TopCities": "Top cities", - // TODO Source message changed - Revise the translation "statistics.table.rppublicationsReports.title.TopCities": "Migliori città", // "statistics.table.rppublicationsReports.title.TopCountries": "Top countries", - // TODO Source message changed - Revise the translation "statistics.table.rppublicationsReports.title.TopCountries": "Migliori paesi", // "statistics.table.rppublicationsReports.title.TotalVisitsPerMonth": "Total visits per month", - // TODO Source message changed - Revise the translation "statistics.table.rppublicationsReports.title.TotalVisitsPerMonth": "Visite totali al mese", // "statistics.table.rppublicationsReports.title.TotalDownloads": "Downloads", "statistics.table.rppublicationsReports.title.TotalDownloads": "Download", // "statistics.table.rppublicationsReports.title.TotalVisitsAndDownloads": "Items and file visits", - // TODO Source message changed - Revise the translation - "statistics.table.rppublicationsReports.title.TotalVisitsAndDownloads": "Visite di item e file", + "statistics.table.rppublicationsReports.title.TotalVisitsAndDownloads": "Visite ad item e file", // "statistics.table.rpprojectsReports.title.TotalVisits": "Total visits", - // TODO Source message changed - Revise the translation "statistics.table.rpprojectsReports.title.TotalVisits": "Visite totali", // "statistics.table.rpprojectsReports.title.TopItems": "Most viewed", - // TODO Source message changed - Revise the translation "statistics.table.rpprojectsReports.title.TopItems": "I più visti", // "statistics.table.rpprojectsReports.title.TopCities": "Top cities", - // TODO Source message changed - Revise the translation "statistics.table.rpprojectsReports.title.TopCities": "Migliori città", // "statistics.table.rpprojectsReports.title.TopCountries": "Top countries", - // TODO Source message changed - Revise the translation "statistics.table.rpprojectsReports.title.TopCountries": "Migliori paesi", // "statistics.table.rpprojectsReports.title.TotalVisitsPerMonth": "Total visits per month", - // TODO Source message changed - Revise the translation "statistics.table.rpprojectsReports.title.TotalVisitsPerMonth": "Visite totali al mese", // "statistics.table.rpprojectsReports.title.TotalDownloads": "Downloads", "statistics.table.rpprojectsReports.title.TotalDownloads": "Download", // "statistics.table.rpprojectsReports.title.TotalVisitsAndDownloads": "Items and file Visits", - "statistics.table.rpprojectsReports.title.TotalVisitsAndDownloads": "Visite di item e file", + "statistics.table.rpprojectsReports.title.TotalVisitsAndDownloads": "Visite ad item e file", // "statistics.categories.title": "Statistics by category", - // TODO Source message changed - Revise the translation "statistics.categories.title": "Statistiche per categoria", // "statistics.categories.mainReports.tab": "Views reports", - // TODO Source message changed - Revise the translation "statistics.categories.mainReports.tab": "Visualizza report", // "statistics.categories.projectsReports.tab": "Project reports", - // TODO Source message changed - Revise the translation - "statistics.categories.projectsReports.tab": "Rapporti di progetto", + "statistics.categories.projectsReports.tab": "Report di progetto", // "statistics.categories.rpprojectsReports.tab": "Researchers projects reports", - // TODO Source message changed - Revise the translation - "statistics.categories.rpprojectsReports.tab": "Rapporti sui progetti dei ricercatori", + "statistics.categories.rpprojectsReports.tab": "Report sui progetti dei ricercatori", // "statistics.categories.publicationsReports.tab": "Publications reports", - // TODO Source message changed - Revise the translation - "statistics.categories.publicationsReports.tab": "Rapporti sulle pubblicazioni", + "statistics.categories.publicationsReports.tab": "Report sulle pubblicazioni", // "statistics.categories.rppublicationsReports.tab": "Researchers publication reports", - // TODO Source message changed - Revise the translation - "statistics.categories.rppublicationsReports.tab": "Rapporti di pubblicazione dei ricercatori", + "statistics.categories.rppublicationsReports.tab": "Report sulle pubblicazione dei ricercatori", // "statistics.categories.downloadReports.tab": "Downloads reports", - // TODO Source message changed - Revise the translation - "statistics.categories.downloadReports.tab": "Rapporti sui download", + "statistics.categories.downloadReports.tab": "Report sui download", // "statistics.reports.title": "Reports", - "statistics.reports.title": "Rapporti", + "statistics.reports.title": "Report", // "submission.edit.breadcrumbs": "Edit Submission", "submission.edit.breadcrumbs": "Modifica immissione", @@ -8904,7 +8413,6 @@ "submission.import-external.source.crossref": "CrossRef", // "submission.import-external.source.datacite": "DataCite", - // TODO New key - Add a translation "submission.import-external.source.datacite": "DataCite", // "submission.import-external.source.scielo": "SciELO", @@ -8980,15 +8488,13 @@ "submission.import-external.preview.title.Publication": "Anteprima pubblicazione", // "submission.import-external.preview.title.none": "Item Preview", - // TODO New key - Add a translation - "submission.import-external.preview.title.none": "Item Preview", + "submission.import-external.preview.title.none": "Anteprima item", // "submission.import-external.preview.title.Journal": "Journal Preview", "submission.import-external.preview.title.Journal": "Anteprima journal", // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview", - // TODO Source message changed - Revise the translation - "submission.import-external.preview.title.OrgUnit": "Anteprima editore", + "submission.import-external.preview.title.OrgUnit": "Anteprima struttura", // "submission.import-external.preview.title.Person": "Person Preview", "submission.import-external.preview.title.Person": "Anteprima persona", @@ -9011,48 +8517,37 @@ // "submission.sections.correction.bitstream.operation.add": "Bitstream added", - // TODO New key - Add a translation - "submission.sections.correction.bitstream.operation.add": "Bitstream added", + "submission.sections.correction.bitstream.operation.add": "Bitstream aggiunto", // "submission.sections.correction.bitstream.operation.modify": "Bitstream modified", - // TODO New key - Add a translation - "submission.sections.correction.bitstream.operation.modify": "Bitstream modified", + "submission.sections.correction.bitstream.operation.modify": "Bitstream modificato", // "submission.sections.correction.bitstream.operation.remove": "Bitstream removed", - // TODO New key - Add a translation - "submission.sections.correction.bitstream.operation.remove": "Bitstream removed", + "submission.sections.correction.bitstream.operation.remove": "Bitstream rimosso", // "submission.sections.correction.column.current-value": "Current value", - // TODO New key - Add a translation - "submission.sections.correction.column.current-value": "Current value", + "submission.sections.correction.column.current-value": "Valore corrente", // "submission.sections.correction.column.file": "File", - // TODO New key - Add a translation "submission.sections.correction.column.file": "File", // "submission.sections.correction.column.file.info": "Here are the changes related the item's bitstream", - // TODO New key - Add a translation - "submission.sections.correction.column.file.info": "Here are the changes related the item's bitstream", + "submission.sections.correction.column.file.info": "Ecco le modifiche relative al bistream dell'item", // "submission.sections.correction.column.metadata": "Metadata", - // TODO New key - Add a translation - "submission.sections.correction.column.metadata": "Metadata", + "submission.sections.correction.column.metadata": "Metadati", // "submission.sections.correction.column.metadata.info": "Here are the changes related the item's metadata", - // TODO New key - Add a translation - "submission.sections.correction.column.metadata.info": "Here are the changes related the item's metadata", + "submission.sections.correction.column.metadata.info": "Ecco le modifiche relative ai metadati dell'item", // "submission.sections.correction.column.previous-value": "Previous value", - // TODO New key - Add a translation - "submission.sections.correction.column.previous-value": "Previous value", + "submission.sections.correction.column.previous-value": "Valore precedente", // "submission.sections.correction.column.policy": "Policy", - // TODO New key - Add a translation "submission.sections.correction.column.policy": "Policy", // "submission.sections.submit.progressbar.correction": "Correction details", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.correction": "Correction details", + "submission.sections.submit.progressbar.correction": "Correzione dei dettagli", @@ -9108,12 +8603,10 @@ "submission.sections.detect-duplicate.not-duplicate-help": "Clicca qui se questo non è un duplicato del tuo articolo", // "submission.sections.detect-duplicate.submitter-decision": "Submitter decision:", - // TODO New key - Add a translation - "submission.sections.detect-duplicate.submitter-decision": "Submitter decision:", + "submission.sections.detect-duplicate.submitter-decision": "Decisione del submitter:", // "submission.sections.detect-duplicate.submitter-note": "Submitter note:", - // TODO New key - Add a translation - "submission.sections.detect-duplicate.submitter-note": "Submitter note:", + "submission.sections.detect-duplicate.submitter-note": "Nota del submitter:", @@ -9139,8 +8632,7 @@ "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Progetto", // "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import remote item", + "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importa item remoti", // "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": "Nuova entità aggiunta!", @@ -9260,8 +8752,7 @@ "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Importato e aggiunto con successo volume di journal esterno alla selezione", // "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.external-source.import-modal.select": "Seleziona una corrispondenza locale:", // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleziona tutto", @@ -9366,8 +8857,7 @@ "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Finanziatore del progetto", // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author", + "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Pubblicazioni dell'autore", // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API", "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Finanziamento dell'API OpenAIRE", @@ -9436,11 +8926,10 @@ "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unità organizzativa padre", // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication", - // TODO New key - Add a translation - "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication", + "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Pubblicazioni", // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown", - "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown", + "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Attiva dropdown", // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings", "submission.sections.describe.relationship-lookup.selection-tab.settings": "Impostazioni", @@ -9560,8 +9049,7 @@ "submission.sections.ccLicense.option.select": "Seleziona un'opzione...", // "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.link": "Hai selezionato la seguente licenza:", // "submission.sections.ccLicense.confirmation": "I grant the license above", "submission.sections.ccLicense.confirmation": "Concedo la licenza di cui sopra", @@ -9570,14 +9058,13 @@ "submission.sections.general.add-more": "Aggiungi altro", // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.
Please fill out all required fields to complete the deposit.", - // TODO New key - Add a translation - "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.
Please fill out all required fields to complete the deposit.", + "submission.sections.general.cannot_deposit": "L'immissione non può essere competata a causa di errori nel modulo.
Si prega di compilare tutti i campi obbligatori.", // "submission.sections.general.collection": "Collection", - "submission.sections.general.collection": "collezione", + "submission.sections.general.collection": "Collezione", // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.", - "submission.sections.general.deposit_error_notice": "Si è verificato un problema durante l'immissione dell'articolo, riprova più tardi.", + "submission.sections.general.deposit_error_notice": "Si è verificato un problema durante l'immissione dell'item, riprova più tardi.", // "submission.sections.general.invalid_state_error": "Cannot save current changes, mandatory fields are missing. Please resolve problems and save again later.", "submission.sections.general.invalid_state_error": "Impossibile salvare le modifiche correnti, mancano campi obbligatori. Risolvi i problemi e salva di nuovo in un secondo momento.", @@ -9619,28 +9106,22 @@ "submission.sections.general.sections_not_valid": "Ci sono sezioni incomplete.", // "submission.sections.identifiers.info": "The following identifiers will be created for your item:", - // TODO New key - Add a translation - "submission.sections.identifiers.info": "The following identifiers will be created for your item:", + "submission.sections.identifiers.info": "Per questo item saranno generati i seguenti identificativi:", // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.", - // TODO New key - Add a translation - "submission.sections.identifiers.no_handle": "No handles have been minted for this item.", + "submission.sections.identifiers.no_handle": "Non sono stati generati handle per questo item.", // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.", - // TODO New key - Add a translation - "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.", + "submission.sections.identifiers.no_doi": "Non sono stati generati DOI per questo item.", // "submission.sections.identifiers.handle_label": "Handle: ", - // TODO New key - Add a translation "submission.sections.identifiers.handle_label": "Handle: ", // "submission.sections.identifiers.doi_label": "DOI: ", - // TODO New key - Add a translation "submission.sections.identifiers.doi_label": "DOI: ", // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ", - // TODO New key - Add a translation - "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ", + "submission.sections.identifiers.otherIdentifiers_label": "Altri identificativi: ", // "submission.sections.submit.progressbar.accessCondition": "Item access conditions", "submission.sections.submit.progressbar.accessCondition": "Condizioni di accesso all'item", @@ -9724,32 +9205,27 @@ "submission.sections.submit.progressbar.detect-duplicate": "Potenziali duplicati", // "submission.sections.submit.progressbar.identifiers": "Identifiers", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.identifiers": "Identifiers", + "submission.sections.submit.progressbar.identifiers": "Identificativi", // "submission.sections.submit.progressbar.license": "Deposit license", "submission.sections.submit.progressbar.license": "Licenza di deposito", // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies", + "submission.sections.submit.progressbar.sherpapolicy": "Policy di Sherpa", // "submission.sections.submit.progressbar.upload": "Upload files", "submission.sections.submit.progressbar.upload": "Carica file", // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information", + "submission.sections.submit.progressbar.sherpaPolicies": "Informazioni sulla policy di open access dell'editore", // "submission.sections.submit.progressbar.correction-step": "Corrections", - // TODO New key - Add a translation - "submission.sections.submit.progressbar.correction-step": "Corrections", + "submission.sections.submit.progressbar.correction-step": "Correzioni", // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.", - // TODO New key - Add a translation - "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.", + "submission.sections.sherpa-policy.title-empty": "Non sono disponibili informazioni sulle policy dell'editore. Se il lavoro ha un ISSN associato, si prega di inserirlo qui sopra per vedere le policy di open access dell'editore.", // "submission.sections.status.errors.title": "Errors", "submission.sections.status.errors.title": "Errori", @@ -9770,12 +9246,10 @@ "submission.sections.status.warnings.aria": "ha avvisi", // "submission.sections.status.info.title": "Additional Information", - // TODO New key - Add a translation - "submission.sections.status.info.title": "Additional Information", + "submission.sections.status.info.title": "Informazioni aggiuntive", // "submission.sections.status.info.aria": "Additional Information", - // TODO New key - Add a translation - "submission.sections.status.info.aria": "Additional Information", + "submission.sections.status.info.aria": "Informazioni aggiuntive", // "submission.sections.toggle.open": "Open section", "submission.sections.toggle.open": "Apri sezione", @@ -9790,7 +9264,6 @@ "submission.sections.toggle.aria.close": "Comprimi la sezione {{sectionHeader}}", // "submission.sections.upload.checksum": "Checksum", - // TODO New key - Add a translation "submission.sections.upload.checksum": "Checksum", // "submission.sections.upload.delete.confirm.cancel": "Cancel", @@ -9857,16 +9330,13 @@ "submission.sections.upload.form.until-placeholder": "Fino a quando", // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):", - // TODO New key - Add a translation - "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": "I file caricati nella collection {{collectionName}} saranno accessibili in base ai seguenti gruppi:", // "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):", - // TODO New key - Add a translation - "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": "Si prega di notare che i file caricati nella collection {{collectionName}} saranno accessibili, in aggiunta a quanto esplicitamente deciso per il singolo file, con i seguenti gruppi:", // "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 by dragging & dropping them anywhere on the page.", - // TODO Source message changed - Revise the translation - "submission.sections.upload.info": "Qui troverai tutti i file attualmente presenti nell'articolo. È possibile aggiornare i metadati dei file e le condizioni di accesso o upload di file aggiuntivi semplicemente trascinandoli e rilasciandoli ovunque nella pagina", + "submission.sections.upload.info": "Qui troverai tutti i file attualmente presenti nell'item. È possibile aggiornare i metadati dei file e le condizioni di accesso o caricare file aggiuntivi semplicemente trascinandoli e rilasciandoli ovunque nella pagina", // "submission.sections.upload.no-entry": "No", "submission.sections.upload.no-entry": "No", @@ -9938,121 +9408,92 @@ "submission.sections.accesses.form.until-placeholder": "Fino a quando", // "submission.sections.license.granted-label": "I confirm the license above", - // TODO New key - Add a translation - "submission.sections.license.granted-label": "I confirm the license above", + "submission.sections.license.granted-label": "Confermo la licenza di cui sopra", // "submission.sections.license.required": "You must accept the license", - // TODO New key - Add a translation - "submission.sections.license.required": "You must accept the license", + "submission.sections.license.required": "È necessario accettare la licenza", // "submission.sections.license.notgranted": "You must accept the license", - // TODO New key - Add a translation - "submission.sections.license.notgranted": "You must accept the license", + "submission.sections.license.notgranted": "È necessario accettare la licenza", // "submission.sections.sherpa.publication.information": "Publication information", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information": "Publication information", + "submission.sections.sherpa.publication.information": "Informazioni sulla pubblicazione", // "submission.sections.sherpa.publication.information.title": "Title", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information.title": "Title", + "submission.sections.sherpa.publication.information.title": "Titolo", // "submission.sections.sherpa.publication.information.issns": "ISSNs", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information.issns": "ISSNs", + "submission.sections.sherpa.publication.information.issns": "ISSN", // "submission.sections.sherpa.publication.information.url": "URL", - // TODO New key - Add a translation "submission.sections.sherpa.publication.information.url": "URL", // "submission.sections.sherpa.publication.information.publishers": "Publisher", - // TODO New key - Add a translation - "submission.sections.sherpa.publication.information.publishers": "Publisher", + "submission.sections.sherpa.publication.information.publishers": "Editore", // "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub", - // TODO New key - Add a translation "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub", // "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub", - // TODO New key - Add a translation "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub", // "submission.sections.sherpa.publisher.policy": "Publisher Policy", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy": "Publisher Policy", + "submission.sections.sherpa.publisher.policy": "Policy dell'editore", // "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.description": "The below information was found via Sherpa Romeo. Based on the policies of your publisher, it provides advice regarding whether an embargo may be necessary and/or which files you are allowed to upload. If you have questions, please contact your site administrator via the feedback form in the footer.", + "submission.sections.sherpa.publisher.policy.description": "Le informazioni riportate di seguito sono state reperite tramite Sherpa Romeo. In base alle policy del vostro editore, fornisce consigli sull'eventuale necessità di un embargo e/o su quali file è possibile caricare. In caso di domande, contattare l'amministratore del sito tramite il modulo di feedback nel piè di pagina.", // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view", + "submission.sections.sherpa.publisher.policy.openaccess": "I percorsi open access consentiti dalle policy di questa rivista sono elencati di seguito per versione dell'articolo. Clicca su un percorso per vederlo nel dettaglio", // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:", + "submission.sections.sherpa.publisher.policy.more.information": "Per maggiori informazioni si prega di consultare il seguente link:", // "submission.sections.sherpa.publisher.policy.version": "Version", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.version": "Version", + "submission.sections.sherpa.publisher.policy.version": "Versione", // "submission.sections.sherpa.publisher.policy.embargo": "Embargo", - // TODO New key - Add a translation "submission.sections.sherpa.publisher.policy.embargo": "Embargo", // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo", + "submission.sections.sherpa.publisher.policy.noembargo": "Nessun embargo", // "submission.sections.sherpa.publisher.policy.nolocation": "None", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.nolocation": "None", + "submission.sections.sherpa.publisher.policy.nolocation": "Nessuno", // "submission.sections.sherpa.publisher.policy.license": "License", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.license": "License", + "submission.sections.sherpa.publisher.policy.license": "Licenza", // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites", + "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisiti", // "submission.sections.sherpa.publisher.policy.location": "Location", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.location": "Location", + "submission.sections.sherpa.publisher.policy.location": "Località", // "submission.sections.sherpa.publisher.policy.conditions": "Conditions", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.conditions": "Conditions", + "submission.sections.sherpa.publisher.policy.conditions": "Condizioni", // "submission.sections.sherpa.publisher.policy.refresh": "Refresh", - // TODO New key - Add a translation - "submission.sections.sherpa.publisher.policy.refresh": "Refresh", + "submission.sections.sherpa.publisher.policy.refresh": "Ricarica", // "submission.sections.sherpa.record.information": "Record Information", - // TODO New key - Add a translation - "submission.sections.sherpa.record.information": "Record Information", + "submission.sections.sherpa.record.information": "Informazioni sulla registrazione", // "submission.sections.sherpa.record.information.id": "ID", - // TODO New key - Add a translation "submission.sections.sherpa.record.information.id": "ID", // "submission.sections.sherpa.record.information.date.created": "Date Created", - // TODO New key - Add a translation - "submission.sections.sherpa.record.information.date.created": "Date Created", + "submission.sections.sherpa.record.information.date.created": "Data di creazione", // "submission.sections.sherpa.record.information.date.modified": "Last Modified", - // TODO New key - Add a translation - "submission.sections.sherpa.record.information.date.modified": "Last Modified", + "submission.sections.sherpa.record.information.date.modified": "Ultima modifica", // "submission.sections.sherpa.record.information.uri": "URI", - // TODO New key - Add a translation "submission.sections.sherpa.record.information.uri": "URI", // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations", - // TODO New key - Add a translation - "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations", + "submission.sections.sherpa.error.message": "Si è verificato un errore nel recuperare le informazioni da Sherpa", @@ -10084,20 +9525,16 @@ // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer", - // TODO New key - Add a translation - "submission.workflow.generic.submit_select_reviewer": "Select Reviewer", + "submission.workflow.generic.submit_select_reviewer": "Seleziona revisore", // "submission.workflow.generic.submit_select_reviewer-help": "", - // TODO New key - Add a translation "submission.workflow.generic.submit_select_reviewer-help": "", // "submission.workflow.generic.submit_score": "Rate", - // TODO New key - Add a translation - "submission.workflow.generic.submit_score": "Rate", + "submission.workflow.generic.submit_score": "Valuta", // "submission.workflow.generic.submit_score-help": "", - // TODO New key - Add a translation "submission.workflow.generic.submit_score-help": "", @@ -10114,11 +9551,9 @@ "submission.workflow.tasks.claimed.edit_help": "Selezionare questa opzione per modificare i metadati dell'item.", // "submission.workflow.tasks.claimed.decline": "Decline", - // TODO New key - Add a translation - "submission.workflow.tasks.claimed.decline": "Decline", + "submission.workflow.tasks.claimed.decline": "Rifiuta", // "submission.workflow.tasks.claimed.decline_help": "", - // TODO New key - Add a translation "submission.workflow.tasks.claimed.decline_help": "", // "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.", @@ -10208,80 +9643,61 @@ "subscriptions.frequency.W": "Settimanale", // "subscriptions.tooltip": "Subscribe", - // TODO New key - Add a translation - "subscriptions.tooltip": "Subscribe", + "subscriptions.tooltip": "Sottoscrivi", // "subscriptions.modal.title": "Subscriptions", - // TODO New key - Add a translation - "subscriptions.modal.title": "Subscriptions", + "subscriptions.modal.title": "Sottoscrizioni", // "subscriptions.modal.type-frequency": "Type and frequency", - // TODO New key - Add a translation - "subscriptions.modal.type-frequency": "Type and frequency", + "subscriptions.modal.type-frequency": "Tipo e frequenza", // "subscriptions.modal.close": "Close", - // TODO New key - Add a translation - "subscriptions.modal.close": "Close", + "subscriptions.modal.close": "Chiudi", // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile", - // TODO New key - Add a translation - "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile", + "subscriptions.modal.delete-info": "Per rimuovere questa sottoscrizione si prega di visitare la pagina \"Sottoscrizioni\" nel proprio profilo utente", // "subscriptions.modal.new-subscription-form.type.content": "Content", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.type.content": "Content", + "subscriptions.modal.new-subscription-form.type.content": "Contenuto", // "subscriptions.modal.new-subscription-form.type.content+statistics": "Content and Statistics", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.type.content+statistics": "Content and Statistics", + "subscriptions.modal.new-subscription-form.type.content+statistics": "Contenuto e statistiche", // "subscriptions.modal.new-subscription-form.type.statistics": "Statistics", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.type.statistics": "Statistics", + "subscriptions.modal.new-subscription-form.type.statistics": "Statistiche", // "subscriptions.modal.new-subscription-form.frequency.D": "Daily", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.frequency.D": "Daily", + "subscriptions.modal.new-subscription-form.frequency.D": "Giornaliero", // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.frequency.W": "Weekly", + "subscriptions.modal.new-subscription-form.frequency.W": "Settimanale", // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.frequency.M": "Monthly", + "subscriptions.modal.new-subscription-form.frequency.M": "Mensile", // "subscriptions.modal.new-subscription-form.submit": "Submit", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.submit": "Submit", + "subscriptions.modal.new-subscription-form.submit": "Invia", // "subscriptions.modal.new-subscription-form.processing": "Processing...", - // TODO New key - Add a translation - "subscriptions.modal.new-subscription-form.processing": "Processing...", + "subscriptions.modal.new-subscription-form.processing": "Elaborazione...", // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.", - // TODO New key - Add a translation - "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.", + "subscriptions.modal.create.success": "Sottoscrzione a {{ type }} avvenuta con successo.", // "subscriptions.modal.delete.success": "Subscription deleted successfully", - // TODO New key - Add a translation - "subscriptions.modal.delete.success": "Subscription deleted successfully", + "subscriptions.modal.delete.success": "Sottoscrizione eliminata con successo", // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully", - // TODO New key - Add a translation - "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully", + "subscriptions.modal.update.success": "Sottoscrizione a {{ type }} aggiornata con successo", // "subscriptions.modal.create.error": "An error occurs during the subscription creation", - // TODO New key - Add a translation - "subscriptions.modal.create.error": "An error occurs during the subscription creation", + "subscriptions.modal.create.error": "Si è verificato un errore durante la creazione della sottoscrizione", // "subscriptions.modal.delete.error": "An error occurs during the subscription delete", - // TODO New key - Add a translation - "subscriptions.modal.delete.error": "An error occurs during the subscription delete", + "subscriptions.modal.delete.error": "Si è verificato un errore durante l'eliminazione della sottoscrizione", // "subscriptions.modal.update.error": "An error occurs during the subscription update", - // TODO New key - Add a translation - "subscriptions.modal.update.error": "An error occurs during the subscription update", + "subscriptions.modal.update.error": "Si è verificato un errore durante l'aggiornamento della sottoscrizione", // "subscriptions.table.dso": "Subject", "subscriptions.table.dso": "Oggetto", @@ -10296,24 +9712,19 @@ "subscriptions.table.action": "Azione", // "subscriptions.table.edit": "Edit", - // TODO New key - Add a translation - "subscriptions.table.edit": "Edit", + "subscriptions.table.edit": "Modifica", // "subscriptions.table.delete": "Delete", - // TODO New key - Add a translation - "subscriptions.table.delete": "Delete", + "subscriptions.table.delete": "Elimina", // "subscriptions.table.not-available": "Not available", - // TODO New key - Add a translation - "subscriptions.table.not-available": "Not available", + "subscriptions.table.not-available": "Non disponibile", // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it", - // TODO New key - Add a translation - "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it", + "subscriptions.table.not-available-message": "L'elemento sottoscritto è stato cancellato o non si ha l'autorizzazione per visualizzarlo.", // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.", - // TODO Source message changed - Revise the translation - "subscriptions.table.empty.message": "Non hai ancora sottoscritto alcuna notifica. Per sottoscrivere la notifica relativa a un oggetto, usa il menu contestuale nella pagina di dettaglio dell'oggetto", + "subscriptions.table.empty.message": "Al momento non ci sono sottoscrizioni. Per ricevere aggiornamenti via e-mail di una Community o di una Collection, utilizzare il pulsante di sottoscrizione sulla pagina dell'oggetto", // "thumbnail.default.alt": "Thumbnail Image", @@ -10443,8 +9854,7 @@ "vocabulary-treeview.tree.description.srsc": "Categorie di argomenti di ricerca", // "vocabulary-treeview.info": "Select a subject to add as search filter", - // TODO New key - Add a translation - "vocabulary-treeview.info": "Select a subject to add as search filter", + "vocabulary-treeview.info": "Seleziona un soggetto da aggiungere come filtro di ricerca", // "uploader.browse": "browse", "uploader.browse": "sfoglia", @@ -10459,8 +9869,7 @@ "uploader.or": ", oppure ", // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)", - // TODO Source message changed - Revise the translation - "uploader.processing": "Elaborazione", + "uploader.processing": "Elaborazione dei file caricati... (è ora possibile chiudere questa pagina)", // "uploader.queue-length": "Queue length", "uploader.queue-length": "Lunghezza coda", @@ -10477,12 +9886,10 @@ // "otherworkspace.search.results.head": "Workspace submissions", - // TODO New key - Add a translation - "otherworkspace.search.results.head": "Workspace submissions", + "otherworkspace.search.results.head": "Inserimenti in workspace", // "supervisedWorkspace.search.results.head": "Supervised Items", - // TODO New key - Add a translation - "supervisedWorkspace.search.results.head": "Supervised Items", + "supervisedWorkspace.search.results.head": "Item supervisionati", // "workspace.search.results.head": "Your submissions", "workspace.search.results.head": "I tuoi invii", @@ -10494,8 +9901,7 @@ "workflow.search.results.head": "Task del workflow", // "supervision.search.results.head": "Workflow and Workspace tasks", - // TODO New key - Add a translation - "supervision.search.results.head": "Workflow and Workspace tasks", + "supervision.search.results.head": "Task del workflow e del workspace", @@ -10565,74 +9971,57 @@ // "workflow-item.advanced.title": "Advanced workflow", - // TODO New key - Add a translation - "workflow-item.advanced.title": "Advanced workflow", + "workflow-item.advanced.title": "Workflow avanzato", // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", + "workflow-item.selectrevieweraction.notification.success.title": "Revisore selezionato", // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected", + "workflow-item.selectrevieweraction.notification.success.content": "Il revisore per questo item nel workflow è stato selezionato con successo", // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong", + "workflow-item.selectrevieweraction.notification.error.title": "Qualcosa è andato storto", // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item", + "workflow-item.selectrevieweraction.notification.error.content": "Non è stato possibile selezionare il revisore per questo item nel workflow", // "workflow-item.selectrevieweraction.title": "Select Reviewer", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.title": "Select Reviewer", + "workflow-item.selectrevieweraction.title": "Seleziona revisore", // "workflow-item.selectrevieweraction.header": "Select Reviewer", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.header": "Select Reviewer", + "workflow-item.selectrevieweraction.header": "Seleziona revisore", // "workflow-item.selectrevieweraction.button.cancel": "Cancel", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.button.cancel": "Cancel", + "workflow-item.selectrevieweraction.button.cancel": "Annulla", // "workflow-item.selectrevieweraction.button.confirm": "Confirm", - // TODO New key - Add a translation - "workflow-item.selectrevieweraction.button.confirm": "Confirm", + "workflow-item.selectrevieweraction.button.confirm": "Conferma", // "workflow-item.scorereviewaction.notification.success.title": "Rating review", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.notification.success.title": "Rating review", + "workflow-item.scorereviewaction.notification.success.title": "Valuta revisione", // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted", + "workflow-item.scorereviewaction.notification.success.content": "La valutazione per il workflow di questo item è stata inserita con successo", // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.notification.error.title": "Something went wrong", + "workflow-item.scorereviewaction.notification.error.title": "Qualcosa è andato storto", // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item", + "workflow-item.scorereviewaction.notification.error.content": "Non è stato possibile valutare questo item", // "workflow-item.scorereviewaction.title": "Rate this item", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.title": "Rate this item", + "workflow-item.scorereviewaction.title": "Valuta questo item", // "workflow-item.scorereviewaction.header": "Rate this item", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.header": "Rate this item", + "workflow-item.scorereviewaction.header": "Valuta questo item", // "workflow-item.scorereviewaction.button.cancel": "Cancel", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.button.cancel": "Cancel", + "workflow-item.scorereviewaction.button.cancel": "Annulla", // "workflow-item.scorereviewaction.button.confirm": "Confirm", - // TODO New key - Add a translation - "workflow-item.scorereviewaction.button.confirm": "Confirm", + "workflow-item.scorereviewaction.button.confirm": "Conferma", // "idle-modal.header": "Session will expire soon", "idle-modal.header": "La sessione scadrà presto", @@ -10914,7 +10303,6 @@ "person.page.orcid.sync-queue.send.validation-error.title.required": "Il titolo è obbligatorio", // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required", - // TODO Source message changed - Revise the translation "person.page.orcid.sync-queue.send.validation-error.type.required": "Il tipo è obbligatorio", // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required", @@ -10942,7 +10330,6 @@ "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "L'indirizzo dell'organizzazione da inviare richiede una città", // "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country", - // TODO Source message changed - Revise the translation "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "L'indirizzo dell'organizzazione da inviare richiede un paese (inserire 2 cifre secondo l'ISO 3166)", // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers", @@ -10967,8 +10354,7 @@ "person.page.orcid.synchronization-mode.label": "Sincronizzazione", // "person.page.orcid.synchronization-mode-message": "Please select how you would like synchronization to ORCID to occur. The options include \"Manual\" (you must send your data to ORCID manually), or \"Batch\" (the system will send your data to ORCID via a scheduled script).", - // TODO Source message changed - Revise the translation - "person.page.orcid.synchronization-mode-message": "Abilitare la modalità di sincronizzazione \"manuale\" per disabilitare la sincronizzazione batch in modo da dover inviare manualmente i dati al Registro ORCID", + "person.page.orcid.synchronization-mode-message": "Selezionare la modalità di sincronizzazione con ORCID. Le opzioni includono 'Manuale' (sarà necessario inviare i dati a ORCID manualmente) o 'Batch' (il sistema invierà i dati a ORCID tramite uno script programmato).", // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.", "person.page.orcid.synchronization-mode-funding-message": "Scegli se sincronizzare i tuoi Progetti con la lista delle informazioni dei progetti sul profilo ORCID.", @@ -11015,8 +10401,7 @@ // "person.orcid.registry.auth": "ORCID Authorizations", "person.orcid.registry.auth": "Autorizzazioni ORCID", // "home.recent-submissions.head": "Recent Submissions", - // TODO New key - Add a translation - "home.recent-submissions.head": "Recent Submissions", + "home.recent-submissions.head": "Immissioni recenti", // "relation.rp.researchoutputs.search.results.head": "Related Publications", "relation.rp.researchoutputs.search.results.head": "Pubblicazioni correlate", @@ -11049,173 +10434,134 @@ "invitation.ignore-btn": "Ignora", // "authority-confidence.search-label":"Search", - // TODO Source message changed - Revise the translation "authority-confidence.search-label": "Cerca", // "curation-task.task.hocr.label": "Extract text (HOCR) from images", - "curation-task.task.hocr.label": "Estrai testo (HOCR) dalle immagini", + "curation-task.task.hocr.label": "Estrarre testo (HOCR) dalle immagini", // "curation-task.task.ocrfilter.label": "Consolidate hOCR for fulltext indexing", - "curation-task.task.ocrfilter.label": "Consolida hOCR per l'indicizzazione fulltext", + "curation-task.task.ocrfilter.label": "Consolidare hOCR per l'indicizzazione fulltext", // "curation-task.task.pushocr.label": "Send OCR to the Annotation Server", - "curation-task.task.pushocr.label": "Invia OCR all'Annotation Server", + "curation-task.task.pushocr.label": "Inviare OCR all'Annotation Server", // "curation-task.task.ocrclean.label": "Remove all metadata bundles and uploaded ocr created by a previous upload to the ocr server", - // TODO Source message changed - Revise the translation - "curation-task.task.ocrclean.label": "Rimuovi tutti i metadata bundles and tutti gli OCR caricati in precedenza sul server OCR", + "curation-task.task.ocrclean.label": "Rimuovi tutti i bundles dei metadati e tutti gli OCR generati da precedenti caricamenti sul server OCR", // "curation-task.task.pushocr.force.label": "Clean OCR from the Annotation Server and send again", - // TODO New key - Add a translation - "curation-task.task.pushocr.force.label": "Clean OCR from the Annotation Server and send again", + "curation-task.task.pushocr.force.label": "Ripulisci l'OCR dall'Annotation Server e invia di nuovo", // "curation-task.task.iiifuploader.label": "Upload images to the IIIF Image Server (photo gallery)", - // TODO New key - Add a translation - "curation-task.task.iiifuploader.label": "Upload images to the IIIF Image Server (photo gallery)", + "curation-task.task.iiifuploader.label": "Caricare le immagini sull'Image Server IIIF (galleria di foto)", // "curation-task.task.iiifuploader.primary.label": "Upload images to the IIIF Image Server (digitized book)", - // TODO New key - Add a translation - "curation-task.task.iiifuploader.primary.label": "Upload images to the IIIF Image Server (digitized book)", + "curation-task.task.iiifuploader.primary.label": "Caricare le immagini sull'Image Server IIIF (libro digitalizzato)", // "curation-task.task.iiifforbidfiledownload.label": "Forbid file download for files uploaded on image server", - // TODO New key - Add a translation - "curation-task.task.iiifforbidfiledownload.label": "Forbid file download for files uploaded on image server", + "curation-task.task.iiifforbidfiledownload.label": "Impedire il download dei file caricati sull'Image Server", // "curation-task.task.iiifallowfiledownload.label": "Allow file download for files uploaded on image server", - // TODO New key - Add a translation - "curation-task.task.iiifallowfiledownload.label": "Allow file download for files uploaded on image server", + "curation-task.task.iiifallowfiledownload.label": "Consentire il download dei file caricati sull'Image Server", // "curation-task.task.rawtoaccess.label": "Create access image for RAW Types", "curation-task.task.rawtoaccess.label": "Creare un'immagine di accesso per i tipi RAW", // "curation-task.task.iiifpdfmultipages.label": "Create multipages PDF from IIIF images", - // TODO New key - Add a translation - "curation-task.task.iiifpdfmultipages.label": "Create multipages PDF from IIIF images", + "curation-task.task.iiifpdfmultipages.label": "Creare un PDF multipagina dalle immagini IIIF", // "curation-task.task.iiifclean.label": "Remove all metadata bundles created by a previous upload to the image server", - // TODO New key - Add a translation - "curation-task.task.iiifclean.label": "Remove all metadata bundles created by a previous upload to the image server", + "curation-task.task.iiifclean.label": "Rimuovere tutti i bundle di metadati generati da precedenti caricamenti sull'Image Server", // "curation-task.task.pdftoimagecmyk.label": "Extract images from PDF (CMYK)", - // TODO New key - Add a translation - "curation-task.task.pdftoimagecmyk.label": "Extract images from PDF (CMYK)", + "curation-task.task.pdftoimagecmyk.label": "Estrarre le immagini da PDF (CMYK)", // "curation-task.task.pdftoimagergb.label": "Extract images from PDF (RGB)", - // TODO New key - Add a translation - "curation-task.task.pdftoimagergb.label": "Extract images from PDF (RGB)", + "curation-task.task.pdftoimagergb.label": "Estrarre le immagini da PDF (RGB)", // "curation-task.task.scannedpdf.label": "Extract images from a Scanned PDF", - // TODO New key - Add a translation - "curation-task.task.scannedpdf.label": "Extract images from a Scanned PDF", + "curation-task.task.scannedpdf.label": "Estrarre le immagini da un PDF scannerizzato", // "curation-task.task.rawimagesinpdf.label": "Extract raw images inside the PDF (no OCR)", - // TODO New key - Add a translation - "curation-task.task.rawimagesinpdf.label": "Extract raw images inside the PDF (no OCR)", + "curation-task.task.rawimagesinpdf.label": "Estrarre le immagini grezze dal PDF (no OCR)", // "curation-task.task.undopdfiiif.label": "Undo PDF 2 IIIF Images", - // TODO New key - Add a translation - "curation-task.task.undopdfiiif.label": "Undo PDF 2 IIIF Images", + "curation-task.task.undopdfiiif.label": "Annullare PDF 2 IIIF Images", // "curation-task.task.rebuildpdftoc.label": "Rebuild the PDF ToC", - // TODO New key - Add a translation - "curation-task.task.rebuildpdftoc.label": "Rebuild the PDF ToC", + "curation-task.task.rebuildpdftoc.label": "Ricostruire il PDF ToC", // "listable-notification-object.default-message": "This object couldn't be retrieved", - // TODO New key - Add a translation - "listable-notification-object.default-message": "This object couldn't be retrieved", + "listable-notification-object.default-message": "Questo oggetto non può essere recuperato", // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner", - // TODO New key - Add a translation - "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner", + "system-wide-alert-banner.retrieval.error": "Qualcosa è andato storto nel recupero del banner di allarme di sistema", // "system-wide-alert-banner.countdown.prefix": "In", - // TODO New key - Add a translation - "system-wide-alert-banner.countdown.prefix": "In", + "system-wide-alert-banner.countdown.prefix": "Tra", // "system-wide-alert-banner.countdown.days": "{{days}} day(s),", - // TODO New key - Add a translation - "system-wide-alert-banner.countdown.days": "{{days}} day(s),", + "system-wide-alert-banner.countdown.days": "{{days}} giorni,", // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and", - // TODO New key - Add a translation - "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and", + "system-wide-alert-banner.countdown.hours": "{{hours}} ore e", // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):", - // TODO New key - Add a translation - "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):", + "system-wide-alert-banner.countdown.minutes": "{{minutes}} minuti:", // "menu.section.system-wide-alert": "System-wide Alert", - // TODO New key - Add a translation - "menu.section.system-wide-alert": "System-wide Alert", + "menu.section.system-wide-alert": "Allarme di sistema", // "system-wide-alert.form.header": "System-wide Alert", - // TODO New key - Add a translation - "system-wide-alert.form.header": "System-wide Alert", + "system-wide-alert.form.header": "Allarme di sistema", // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert", - // TODO New key - Add a translation - "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert", + "system-wide-alert-form.retrieval.error": "Qualcosa è andato storto nel recupero dell'allarme di sistema", // "system-wide-alert.form.cancel": "Cancel", - // TODO New key - Add a translation - "system-wide-alert.form.cancel": "Cancel", + "system-wide-alert.form.cancel": "Annulla", // "system-wide-alert.form.save": "Save", - // TODO New key - Add a translation - "system-wide-alert.form.save": "Save", + "system-wide-alert.form.save": "Salva", // "system-wide-alert.form.label.active": "ACTIVE", - // TODO New key - Add a translation - "system-wide-alert.form.label.active": "ACTIVE", + "system-wide-alert.form.label.active": "ATTIVO", // "system-wide-alert.form.label.inactive": "INACTIVE", - // TODO New key - Add a translation - "system-wide-alert.form.label.inactive": "INACTIVE", + "system-wide-alert.form.label.inactive": "DISATTIVO", // "system-wide-alert.form.error.message": "The system wide alert must have a message", - // TODO New key - Add a translation - "system-wide-alert.form.error.message": "The system wide alert must have a message", + "system-wide-alert.form.error.message": "L'allarme di sistema deve avere un messaggio", // "system-wide-alert.form.label.message": "Alert message", - // TODO New key - Add a translation - "system-wide-alert.form.label.message": "Alert message", + "system-wide-alert.form.label.message": "Messaggio di allarme", // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer", - // TODO New key - Add a translation - "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer", + "system-wide-alert.form.label.countdownTo.enable": "Attiva un conto alla rovescia", // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.", - // TODO New key - Add a translation - "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.", + "system-wide-alert.form.label.countdownTo.hint": "Suggerimento: Imposta un conto alla rovescia. Se abilitato, è possibile impostare una data futura e il banner di allarme di sistema eseguirà un conto alla rovescia fino alla data impostata. Quando il timer terminerà, l'avviso scomparirà. Il server NON verrà arrestato automaticamente.", // "system-wide-alert.form.label.preview": "System-wide alert preview", - // TODO New key - Add a translation - "system-wide-alert.form.label.preview": "System-wide alert preview", + "system-wide-alert.form.label.preview": "Anteprima dell'allarme di sistema", // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated", - // TODO New key - Add a translation - "system-wide-alert.form.update.success": "The system-wide alert was successfully updated", + "system-wide-alert.form.update.success": "L'allarme di sistema è stato aggiornato con successo", // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert", - // TODO New key - Add a translation - "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert", + "system-wide-alert.form.update.error": "Qualcosa è andato storto durante l'aggiornamento dell'allarme di sistema", // "system-wide-alert.form.create.success": "The system-wide alert was successfully created", - // TODO New key - Add a translation - "system-wide-alert.form.create.success": "The system-wide alert was successfully created", + "system-wide-alert.form.create.success": "L'allarme di sistema è stato creato con successo", // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert", - // TODO New key - Add a translation - "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert", + "system-wide-alert.form.create.error": "Qualcosa è andato storto nella creazione dell'allarme di sistema", // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // TODO New key - Add a translation - "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", + "admin.system-wide-alert.breadcrumbs": "Allarmi di sistema", // "admin.system-wide-alert.title": "System-wide Alerts", - // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "Allarmi di sistema", } From 5d704c610d8f009b3e5e0ff0efcc1e478bc6bb43 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 25 Sep 2023 18:10:26 +0200 Subject: [PATCH 681/758] [CST-10703] initial commit (views & unit tests) --- src/app/app-routing.module.ts | 5 + src/app/core/core.module.ts | 4 +- .../core/data/eperson-registration.service.ts | 55 ++++++++++- .../external-login-page-routing.module.ts | 25 +++++ .../external-login-page.component.html | 3 + .../external-login-page.component.scss | 0 .../external-login-page.component.spec.ts | 25 +++++ .../external-login-page.component.ts | 43 +++++++++ .../external-login-page.module.ts | 24 +++++ .../themed-external-login-page.component.ts | 25 +++++ .../confirm-email.component.html | 37 ++++++++ .../confirm-email.component.scss | 0 .../confirm-email.component.spec.ts | 25 +++++ .../confirm-email/confirm-email.component.ts | 41 +++++++++ .../confirmation-sent.component.html | 5 + .../confirmation-sent.component.scss | 0 .../confirmation-sent.component.spec.ts | 55 +++++++++++ .../confirmation-sent.component.ts | 9 ++ .../email-validated.component.html | 9 ++ .../email-validated.component.scss | 0 .../email-validated.component.spec.ts | 79 ++++++++++++++++ .../email-validated.component.ts | 11 +++ .../provide-email.component.html | 38 ++++++++ .../provide-email.component.scss | 0 .../provide-email.component.spec.ts | 43 +++++++++ .../provide-email/provide-email.component.ts | 47 ++++++++++ .../external-log-in.methods-decorator.ts | 29 ++++++ .../external-log-in.component.html | 29 ++++++ .../external-log-in.component.scss | 0 .../external-log-in.component.spec.ts | 89 ++++++++++++++++++ .../external-log-in.component.ts | 91 +++++++++++++++++++ .../external-login-method-entry.component.ts | 22 +++++ .../models/registration-data.mock.model.ts | 31 +++++++ .../models/registration-data.model.ts | 70 ++++++++++++++ .../models/registration-data.resource-type.ts | 9 ++ .../orcid-confirmation.component.html | 35 +++++++ .../orcid-confirmation.component.scss | 0 .../orcid-confirmation.component.spec.ts | 74 +++++++++++++++ .../orcid-confirmation.component.ts | 60 ++++++++++++ .../container/log-in-container.component.html | 1 - src/app/shared/log-in/log-in.component.html | 8 +- src/app/shared/log-in/log-in.component.ts | 11 ++- src/app/shared/shared.module.ts | 16 +++- src/assets/i18n/en.json5 | 28 +++++- 44 files changed, 1198 insertions(+), 13 deletions(-) create mode 100644 src/app/external-login-page/external-login-page-routing.module.ts create mode 100644 src/app/external-login-page/external-login-page.component.html create mode 100644 src/app/external-login-page/external-login-page.component.scss create mode 100644 src/app/external-login-page/external-login-page.component.spec.ts create mode 100644 src/app/external-login-page/external-login-page.component.ts create mode 100644 src/app/external-login-page/external-login-page.module.ts create mode 100644 src/app/external-login-page/themed-external-login-page.component.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.html create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.scss create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.spec.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts create mode 100644 src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts create mode 100644 src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts create mode 100644 src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html create mode 100644 src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.scss create mode 100644 src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts create mode 100644 src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts create mode 100644 src/app/shared/external-log-in-complete/external-login-method-entry.component.ts create mode 100644 src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts create mode 100644 src/app/shared/external-log-in-complete/models/registration-data.model.ts create mode 100644 src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts create mode 100644 src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html create mode 100644 src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.scss create mode 100644 src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts create mode 100644 src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d585d737437..82af5149d06 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -171,6 +171,11 @@ import { RedirectService } from './redirect/redirect.service'; loadChildren: () => import('./login-page/login-page.module') .then((m) => m.LoginPageModule) }, + { + path: 'external-login', + loadChildren: () => import('./external-login-page/external-login-page.module') + .then((m) => m.ExternalLoginPageModule) + }, { path: 'logout', loadChildren: () => import('./logout-page/logout-page.module') diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index f57eb72e9c5..d22aadc8a55 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -232,6 +232,7 @@ import { import { ProductDatasetSchemaType } from './metadata/schema-json-ld/schema-types/product/product-dataset-schema-type'; import { PersonSchemaType } from './metadata/schema-json-ld/schema-types/Person/person-schema-type'; import {ItemRequest} from './shared/item-request.model'; +import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; /** * When not in production, endpoint responses can be mocked for testing purposes @@ -470,7 +471,8 @@ export const models = WorkflowOwnerStatistics, LoginStatistics, Metric, - ItemRequest + ItemRequest, + RegistrationData ]; @NgModule({ diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts index 1ec6f7eb299..e1b77977d6a 100644 --- a/src/app/core/data/eperson-registration.service.ts +++ b/src/app/core/data/eperson-registration.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { RequestService } from './request.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { GetRequest, PostRequest } from './request.models'; +import { GetRequest, PatchRequest, PostRequest } from './request.models'; import { Observable } from 'rxjs'; import { filter, find, map } from 'rxjs/operators'; import { hasValue, isNotEmpty } from '../../shared/empty.util'; @@ -15,14 +15,14 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv import { HttpOptions } from '../dspace-rest/dspace-rest.service'; import { HttpHeaders } from '@angular/common/http'; import { HttpParams } from '@angular/common/http'; - +import { Operation } from 'fast-json-patch'; @Injectable({ providedIn: 'root', }) /** * Service that will register a new email address and request a token */ -export class EpersonRegistrationService { +export class EpersonRegistrationService{ protected linkPath = 'registrations'; protected searchByTokenPath = '/search/findByToken?token='; @@ -32,7 +32,6 @@ export class EpersonRegistrationService { protected rdbService: RemoteDataBuildService, protected halService: HALEndpointService, ) { - } /** @@ -142,4 +141,52 @@ export class EpersonRegistrationService { }); return this.rdbService.buildSingle(href$); } + + /** + * Patch the registration object to update the email address + * @param value provided by the user during the registration confirmation process + * @param registrationId The id of the registration object + * @param token The token of the registration object + * @param updateValue Flag to indicate if the email should be updated or added + * @returns Remote Data state of the patch request + */ + patchUpdateRegistration(value: string, field: string, registrationId: string, token: string, updateValue: boolean) { + const requestId = this.requestService.generateRequestId(); + + const href$ = this.getRegistrationEndpoint().pipe( + find((href: string) => hasValue(href)), + map((href: string) => `${href}/${registrationId}?token=${token}`), + ); + + href$.subscribe((href: string) => { + const operations = this.generateOperations(value, field, updateValue); + const patchRequest = new PatchRequest(requestId, href, operations); + this.requestService.send(patchRequest); + }); + + return this.rdbService.buildFromRequestUUID(requestId); + } + + /** + * Custom method to generate the operations to be performed on the registration object + * @param value provided by the user during the registration confirmation process + * @param updateValue Flag to indicate if the email should be updated or added + * @returns Operations to be performed on the registration object + */ + private generateOperations(value: string, field: string, updateValue: boolean): Operation[] { + let operations = []; + if (hasValue(value) && updateValue) { + operations = [...operations, { + op: 'replace', path: `/${field}`, value: value + }]; + } + + if (hasValue(value) && !updateValue) { + operations = [...operations, { + op: 'add', path: `/${field}`, value: value + }]; + } + + return operations; + } } diff --git a/src/app/external-login-page/external-login-page-routing.module.ts b/src/app/external-login-page/external-login-page-routing.module.ts new file mode 100644 index 00000000000..4e64d267de8 --- /dev/null +++ b/src/app/external-login-page/external-login-page-routing.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; +import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; + +const routes: Routes = [ + { + path: '', + pathMatch: 'full', + component: ThemedExternalLoginPageComponent, + // resolve: { breadcrumb: I18nBreadcrumbResolver }, + // data: { breadcrumbKey: 'external-login', title: 'login.title' }, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], + providers: [ + I18nBreadcrumbResolver, + I18nBreadcrumbsService + ] +}) +export class ExternalLoginPageRoutingModule { } diff --git a/src/app/external-login-page/external-login-page.component.html b/src/app/external-login-page/external-login-page.component.html new file mode 100644 index 00000000000..d2daa24a561 --- /dev/null +++ b/src/app/external-login-page/external-login-page.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/app/external-login-page/external-login-page.component.scss b/src/app/external-login-page/external-login-page.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/external-login-page/external-login-page.component.spec.ts b/src/app/external-login-page/external-login-page.component.spec.ts new file mode 100644 index 00000000000..56f0d81d189 --- /dev/null +++ b/src/app/external-login-page/external-login-page.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExternalLoginPageComponent } from './external-login-page.component'; + +describe('ExternalLoginPageComponent', () => { + let component: ExternalLoginPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ExternalLoginPageComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ExternalLoginPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts new file mode 100644 index 00000000000..94ab4424b86 --- /dev/null +++ b/src/app/external-login-page/external-login-page.component.ts @@ -0,0 +1,43 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { hasValue } from '../shared/empty.util'; +import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; +import { RemoteData } from '../core/data/remote-data'; +import { Registration } from '../core/shared/registration.model'; +import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; +import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; + +@Component({ + templateUrl: './external-login-page.component.html', + styleUrls: ['./external-login-page.component.scss'] +}) +export class ExternalLoginPageComponent implements OnInit { + + public token: string; + + public registrationData: RegistrationData = mockRegistrationDataModel; + + constructor( + private epersonRegistrationService: EpersonRegistrationService, + private router: Router, + ) { + this.token = this.router.parseUrl(this.router.url).queryParams.token; + } + + ngOnInit(): void { + // TODO: call the method getTokenSearchEndpoint (eperson-registration.service.ts ) protected searchByTokenPath = '/search/findByToken?token='; + // token will be provided by the url (returned by REST API) + console.log('ExternalLoginPageComponent ngOnInit'); + if (hasValue(this.token)) { + this.epersonRegistrationService.searchByToken(this.token).subscribe((registration: RemoteData + ) => { + console.log('ExternalLoginPageComponent ngOnInit registration', registration); + if (registration.hasSucceeded) { + this.registrationData = Object.assign(new RegistrationData(), registration.payload); + console.log('ExternalLoginPageComponent ngOnInit registrationData', this.registrationData); + } + }); + } + } + +} diff --git a/src/app/external-login-page/external-login-page.module.ts b/src/app/external-login-page/external-login-page.module.ts new file mode 100644 index 00000000000..697ae7e1a8e --- /dev/null +++ b/src/app/external-login-page/external-login-page.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { ExternalLoginPageRoutingModule } from './external-login-page-routing.module'; +import { ExternalLoginPageComponent } from './external-login-page.component'; +import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; +import { SharedModule } from '../shared/shared.module'; + +const COMPONENTS = [ + ExternalLoginPageComponent, + ThemedExternalLoginPageComponent, +]; + +@NgModule({ + declarations: [ + ...COMPONENTS + ], + imports: [ + CommonModule, + ExternalLoginPageRoutingModule, + SharedModule + ] +}) +export class ExternalLoginPageModule { } diff --git a/src/app/external-login-page/themed-external-login-page.component.ts b/src/app/external-login-page/themed-external-login-page.component.ts new file mode 100644 index 00000000000..975b9a2f55e --- /dev/null +++ b/src/app/external-login-page/themed-external-login-page.component.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { ThemedComponent } from '../shared/theme-support/themed.component'; +import { ExternalLoginPageComponent } from './external-login-page.component'; + +/** + * Themed wrapper for ExternalLoginPageComponent + */ +@Component({ + selector: 'ds-themed-external-login-page', + styleUrls: [], + templateUrl: './../shared/theme-support/themed.component.html' +}) +export class ThemedExternalLoginPageComponent extends ThemedComponent { + protected getComponentName(): string { + return 'ExternalLoginPageComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../themes/${themeName}/app/external-login-page/external-login-page.component`); + } + + protected importUnthemedComponent(): Promise { + return import(`./external-login-page.component`); + } +} diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html new file mode 100644 index 00000000000..97d9869f411 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html @@ -0,0 +1,37 @@ +

+ {{ "external-login.confirm-email.header" | translate }} +

+ +
+
+ +
+ {{ "external-login.confirmation.email-required" | translate }} +
+
+ {{ "external-login.confirmation.email-invalid" | translate }} +
+
+ + +
diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts new file mode 100644 index 00000000000..8e426f27fc0 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ConfirmEmailComponent } from './confirm-email.component'; + +describe('ConfirmEmailComponent', () => { + let component: ConfirmEmailComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ConfirmEmailComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ConfirmEmailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts new file mode 100644 index 00000000000..0b177db851d --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -0,0 +1,41 @@ +import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; +import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; + +@Component({ + selector: 'ds-confirm-email', + templateUrl: './confirm-email.component.html', + styleUrls: ['./confirm-email.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ConfirmEmailComponent { + + emailForm: FormGroup; + + @Input() registrationId: string; + + @Input() token: string; + + constructor( + private formBuilder: FormBuilder, + private epersonRegistrationService: EpersonRegistrationService, + ) { + this.emailForm = this.formBuilder.group({ + email: ['', [Validators.required, Validators.email]] + }); + } + + submitForm() { + this.emailForm.markAllAsTouched(); + if (this.emailForm.valid) { + const email = this.emailForm.get('email').value; + console.log('Email submitted:', email); + this.epersonRegistrationService.patchUpdateRegistration(email, 'email', this.registrationId, this.token, true).pipe( + getFirstCompletedRemoteData() + ).subscribe((update) => { + console.log('Email update:', update); + }); + } + } +} diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html new file mode 100644 index 00000000000..f81ebf1a170 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html @@ -0,0 +1,5 @@ +

+ {{ "external-login.confirm-email-sent.header" | translate }} +

+ +

diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts new file mode 100644 index 00000000000..5106220db62 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts @@ -0,0 +1,55 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ConfirmationSentComponent } from './confirmation-sent.component'; +import { CommonModule } from '@angular/common'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { TranslateService, TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; + +describe('ConfirmationSentComponent', () => { + let component: ConfirmationSentComponent; + let fixture: ComponentFixture; + let compiledTemplate: HTMLElement; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ConfirmationSentComponent ], + providers: [ + { provide: TranslateService, useClass: {} }, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ConfirmationSentComponent); + component = fixture.componentInstance; + compiledTemplate = fixture.nativeElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should render translated header', () => { + const headerElement = compiledTemplate.querySelector('h4'); + expect(headerElement.textContent).toContain('Mocked Header Translation'); + }); + + it('should render translated info paragraph', () => { + const infoParagraphElement = compiledTemplate.querySelector('p'); + expect(infoParagraphElement.innerHTML).toContain('Mocked Info Translation'); + }); + +}); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts new file mode 100644 index 00000000000..78a0ef81fed --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts @@ -0,0 +1,9 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; + +@Component({ + selector: 'ds-confirmation-sent', + templateUrl: './confirmation-sent.component.html', + styleUrls: ['./confirmation-sent.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ConfirmationSentComponent { } diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.html b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.html new file mode 100644 index 00000000000..3fa31b0bd53 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.html @@ -0,0 +1,9 @@ +

+ {{ "external-login.validated-email.header" | translate }} +

+ +

+ +
+ +
diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.scss b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.spec.ts new file mode 100644 index 00000000000..e961e6fb913 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.spec.ts @@ -0,0 +1,79 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EmailValidatedComponent } from './email-validated.component'; +import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; +import { BehaviorSubject } from 'rxjs'; +import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; + +describe('EmailValidatedComponent', () => { + let component: EmailValidatedComponent; + let fixture: ComponentFixture; + let compiledTemplate: HTMLElement; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ EmailValidatedComponent ], + providers: [ + { provide: TranslateService, useValue: getMockTranslateService() }, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(EmailValidatedComponent); + component = fixture.componentInstance; + compiledTemplate = fixture.nativeElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should render translated header', () => { + const headerElement = compiledTemplate.querySelector('h4'); + expect(headerElement.textContent).toContain('Mocked Header Translation'); + }); + + it('should render translated info paragraph', () => { + const infoParagraphElement = compiledTemplate.querySelector('p'); + expect(infoParagraphElement.innerHTML).toContain('Mocked Info Translation'); + }); + + it('should render ds-log-in component', () => { + const dsLogInComponent = compiledTemplate.querySelector('ds-log-in'); + expect(dsLogInComponent).toBeTruthy(); + }); + +}); + +// Mock the TranslateService +class MockTranslateService { + private translationSubject = new BehaviorSubject({}); + + get(key: string) { + const translations = { + 'external-login.validated-email.header': 'Mocked Header Translation', + 'external-login.validated-email.info': 'Mocked Info Translation', + }; + + this.translationSubject.next(translations); + + // Return an Observable that mimics TranslateService's behavior + return this.translationSubject.asObservable(); + } +} diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts new file mode 100644 index 00000000000..c74cbcfd489 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts @@ -0,0 +1,11 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; + +@Component({ + selector: 'ds-email-validated', + templateUrl: './email-validated.component.html', + styleUrls: ['./email-validated.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class EmailValidatedComponent { + +} diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html new file mode 100644 index 00000000000..72c8eb7c88c --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html @@ -0,0 +1,38 @@ +

+ {{ "external-login.provide-email.header" | translate }} +

+ +
+
+ + +
+ {{ "external-login.confirmation.email-required" | translate }} +
+
+ {{ "external-login.confirmation.email-invalid" | translate }} +
+
+ + +
diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts new file mode 100644 index 00000000000..03e28c687d3 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts @@ -0,0 +1,43 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProvideEmailComponent } from './provide-email.component'; +import { FormBuilder } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; + +describe('ProvideEmailComponent', () => { + let component: ProvideEmailComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ProvideEmailComponent ], + providers: [ + FormBuilder, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ProvideEmailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts new file mode 100644 index 00000000000..1d504c869f4 --- /dev/null +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts @@ -0,0 +1,47 @@ +import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; + +@Component({ + selector: 'ds-provide-email', + templateUrl: './provide-email.component.html', + styleUrls: ['./provide-email.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ProvideEmailComponent { + emailForm: FormGroup; + + @Input() registrationId: string; + + @Input() token: string; + + constructor( + private formBuilder: FormBuilder, + private epersonRegistrationService: EpersonRegistrationService + ) { + this.emailForm = this.formBuilder.group({ + email: ['', [Validators.required, Validators.email]], + }); + } + + submitForm() { + this.emailForm.markAllAsTouched(); + if (this.emailForm.valid) { + const email = this.emailForm.get('email').value; + console.log('Email submitted:', email); + this.epersonRegistrationService + .patchUpdateRegistration( + email, + 'email', + this.registrationId, + this.token, + true + ) + .pipe(getFirstCompletedRemoteData()) + .subscribe((update) => { + console.log('Email update:', update); + }); + } + } +} diff --git a/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts b/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts new file mode 100644 index 00000000000..933edf24640 --- /dev/null +++ b/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts @@ -0,0 +1,29 @@ +import { AuthMethodType } from '../../core/auth/models/auth.method-type'; + +/** + * Map to store the external login confirmation component for the given auth method type + */ +const authMethodsMap = new Map(); +/** + * Decorator to register the external login confirmation component for the given auth method type + * @param authMethodType the type of the external login method + */ +export function renderExternalLoginConfirmationFor( + authMethodType: AuthMethodType +) { + return function decorator(objectElement: any) { + if (!objectElement) { + return; + } + authMethodsMap.set(authMethodType, objectElement); + }; +} +/** + * Get the external login confirmation component for the given auth method type + * @param authMethodType the type of the external login method + */ +export function getExternalLoginConfirmationType( + authMethodType: AuthMethodType +) { + return authMethodsMap.get(authMethodType); +} diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html new file mode 100644 index 00000000000..e9b5f27f572 --- /dev/null +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html @@ -0,0 +1,29 @@ +
+

{{ 'external-login.confirmation.header' | translate}}

+
+
+ + +
+
+ {{ informationText }} +
+
+
+ + + + + + +
+
+

or

+
+
+ +
+
diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.scss b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts new file mode 100644 index 00000000000..9268ebeb817 --- /dev/null +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts @@ -0,0 +1,89 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExternalLogInComponent } from './external-log-in.component'; +import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; +import { CommonModule } from '@angular/common'; +import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; +import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter, Injector } from '@angular/core'; +import { mockRegistrationDataModel } from '../models/registration-data.mock.model'; +import { By } from '@angular/platform-browser'; +import { of as observableOf } from 'rxjs'; +import { FormBuilder } from '@angular/forms'; + +describe('ExternalLogInComponent', () => { + let component: ExternalLogInComponent; + let fixture: ComponentFixture; + let compiledTemplate: HTMLElement; + const translateServiceStub = { + get: () => observableOf('Mocked Translation Text'), + instant: (key: any) => 'Mocked Translation Text', + onLangChange: new EventEmitter(), + onTranslationChange: new EventEmitter(), + onDefaultLangChange: new EventEmitter() + }; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ExternalLogInComponent], + providers: [ + { provide: TranslateService, useValue: translateServiceStub }, + { provide: Injector, useValue: {} }, + FormBuilder + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ExternalLogInComponent); + component = fixture.componentInstance; + component.registrationData = mockRegistrationDataModel; + compiledTemplate = fixture.nativeElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set registrationType and informationText correctly when email is present', () => { + expect(component.registrationType).toBe('orcid'); + expect(component.informationText).toContain('orcid'); + }); + + it('should render the template to confirm email when registrationData has email', () => { + const selector = compiledTemplate.querySelector('ds-confirm-email'); + expect(selector).toBeTruthy(); + }); + + it('should render the template with provide email component when registrationData email is null', () => { + component.registrationData.email = null; + fixture.detectChanges(); + const provideEmailComponent = compiledTemplate.querySelector('ds-provide-email'); + expect(provideEmailComponent).toBeTruthy(); + }); + + it('should render the template with log-in component', () => { + const logInComponent = compiledTemplate.querySelector('ds-log-in'); + expect(logInComponent).toBeTruthy(); + }); + + it('should render the template with the translated informationText', () => { + component.informationText = 'Mocked Translation Text'; + fixture.detectChanges(); + const infoText = fixture.debugElement.query(By.css('[data-test="info-text"]')); + expect(infoText.nativeElement.innerHTML).toContain('Mocked Translation Text'); + }); +}); + + diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts new file mode 100644 index 00000000000..091f3750398 --- /dev/null +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts @@ -0,0 +1,91 @@ +import { Component, OnInit, ChangeDetectionStrategy, Input, Injector } from '@angular/core'; +import { getExternalLoginConfirmationType } from '../external-log-in.methods-decorator'; +import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; +import { RegistrationData } from '../models/registration-data.model'; +import { hasValue } from '../../empty.util'; +import { TranslateService } from '@ngx-translate/core'; + +@Component({ + selector: 'ds-external-log-in', + templateUrl: './external-log-in.component.html', + styleUrls: ['./external-log-in.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ExternalLogInComponent implements OnInit { + /** + * The type of registration type to be confirmed + */ + registrationType: AuthMethodType = AuthMethodType.Orcid; + /** + * The registration data object + */ + @Input() registrationData: RegistrationData; + /** + * The token to be used to confirm the registration + * @memberof ExternalLogInComponent + */ + @Input() token: string; + /** + * The information text to be displayed, + * depending on the registration type and the presence of an email + * @memberof ExternalLogInComponent + */ + public informationText = ''; + /** + * Injector to inject a registration data to the component with the @Input registrationType + * @type {Injector} + */ + public objectInjector: Injector; + + constructor( + private injector: Injector, + private translate: TranslateService, + ) { + } + + /** + * Provide the registration data object to the objectInjector. + * Generate the information text to be displayed. + */ + ngOnInit(): void { + this.objectInjector = Injector.create({ + providers: [ + { provide: 'registrationDataProvider', useFactory: () => (this.registrationData), deps: [] }, + ], + parent: this.injector + }); + this.registrationType = this.registrationData?.registrationType ?? null; + this.informationText = hasValue(this.registrationData?.email) + ? this.generateInformationTextWhenEmail(this.registrationType) + : this.generateInformationTextWhenNOEmail(this.registrationType); + } + + /** + * Generate the information text to be displayed when the user has no email + * @param authMethod the registration type + */ + private generateInformationTextWhenNOEmail(authMethod: string): string { + if (authMethod) { + const authMethodUppercase = authMethod.toUpperCase(); + return this.translate.instant('external-login.noEmail.informationText', { authMethod: authMethodUppercase }); + } + } + + /** + * Generate the information text to be displayed when the user has an email + * @param authMethod the registration type + */ + private generateInformationTextWhenEmail(authMethod: string): string { + if (authMethod) { + const authMethodUppercase = authMethod.toUpperCase(); + return this.translate.instant('external-login.haveEmail.informationText', { authMethod: authMethodUppercase }); + } + } + + /** + * Get the registration type to be rendered + */ + getExternalLoginConfirmationType() { + return getExternalLoginConfirmationType(this.registrationType); + } +} diff --git a/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts b/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts new file mode 100644 index 00000000000..5d03342e0f4 --- /dev/null +++ b/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts @@ -0,0 +1,22 @@ +import { Component, Inject } from '@angular/core'; +import { RegistrationData } from './models/registration-data.model'; + +/** + * This component renders a form to complete the registration process + */ +@Component({ + template: '' +}) +export abstract class ExternalLoginMethodEntryComponent { + + /** + * The registration data object + */ + public registratioData: RegistrationData; + + constructor( + @Inject('registrationDataProvider') protected injectedRegistrationDataObject: RegistrationData, + ) { + this.registratioData = injectedRegistrationDataObject; + } +} diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts new file mode 100644 index 00000000000..3fdf739e27e --- /dev/null +++ b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts @@ -0,0 +1,31 @@ +import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; +import { RegistrationData } from './registration-data.model'; +import { MetadataValue } from 'src/app/core/shared/metadata.models'; + +export const mockRegistrationDataModel: RegistrationData = Object.assign( new RegistrationData(), { + id: '3', + email: 'user@institution.edu', + user: '028dcbb8-0da2-4122-a0ea-254be49ca107', + registrationType: AuthMethodType.Orcid, + netId: '<:orcid>', + registrationMetadata: { + 'eperson.firstname': [ + Object.assign(new MetadataValue(), { + value: 'Power', + language: null, + authority: '', + confidence: -1, + place: -1, + }) + ], + 'eperson.lastname': [ + Object.assign(new MetadataValue(), { + value: 'User', + language: null, + authority: '', + confidence: -1, + place: -1 + }) + ] + } +}); diff --git a/src/app/shared/external-log-in-complete/models/registration-data.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.model.ts new file mode 100644 index 00000000000..4d58c2a13bc --- /dev/null +++ b/src/app/shared/external-log-in-complete/models/registration-data.model.ts @@ -0,0 +1,70 @@ +import { CacheableObject } from '../../../core/cache/cacheable-object.model'; +import { typedObject } from '../../../core/cache/builders/build-decorators'; +import { REGISTRATION_DATA } from './registration-data.resource-type'; +import { autoserialize, deserialize } from 'cerialize'; +import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; +import { ResourceType } from '../../../core/shared/resource-type'; +import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; +import { MetadataMap } from '../../../core/shared/metadata.models'; +import { HALLink } from '../../../core/shared/hal-link.model'; + +/** + * Object that represents the authenticated status of a user + */ +@typedObject +export class RegistrationData implements CacheableObject { + + static type = REGISTRATION_DATA; + + /** + * The unique identifier of this registration data + */ + @autoserialize + id: string; + + /** + * The type for this RegistrationData + */ + @excludeFromEquals + @autoserialize + type: ResourceType; + + /** + * The registered email address + */ + @autoserialize + email: string; + + /** + * The registered user identifier + */ + @autoserialize + user: string; + + /** + * The registration type (e.g. orcid, shibboleth, etc.) + */ + @autoserialize + registrationType?: AuthMethodType; + + /** + * The netId of the user (e.g. for ORCID - <:orcid>) + */ + @autoserialize + netId?: string; + + + /** + * The metadata involved during the registration process + */ + @autoserialize + registrationMetadata?: MetadataMap; + + /** + * The {@link HALLink}s for this RegistrationData + */ + @deserialize + _links: { + self: HALLink; + }; +} diff --git a/src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts b/src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts new file mode 100644 index 00000000000..2a387c3ca38 --- /dev/null +++ b/src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts @@ -0,0 +1,9 @@ +import { ResourceType } from '../../../core/shared/resource-type'; + +/** + * The resource type for RegistrationData + * + * Needs to be in a separate file to prevent circular + * dependencies in webpack. + */ +export const REGISTRATION_DATA = new ResourceType('registration'); diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html new file mode 100644 index 00000000000..4c81c7fdb15 --- /dev/null +++ b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html @@ -0,0 +1,35 @@ + diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.scss b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts new file mode 100644 index 00000000000..3c856e6f283 --- /dev/null +++ b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts @@ -0,0 +1,74 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OrcidConfirmationComponent } from './orcid-confirmation.component'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { mockRegistrationDataModel } from '../../models/registration-data.mock.model'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe'; + +describe('OrcidConfirmationComponent', () => { + let component: OrcidConfirmationComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ + OrcidConfirmationComponent, + BrowserOnlyMockPipe, + ], + providers: [ + FormBuilder, + { provide: 'registrationDataProvider', useValue: mockRegistrationDataModel }, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(OrcidConfirmationComponent); + component = fixture.componentInstance; + component.registratioData = mockRegistrationDataModel; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should initialize the form with disabled fields', () => { + expect(component.form).toBeInstanceOf(FormGroup); + expect(component.form.controls.netId.disabled).toBeTrue(); + expect(component.form.controls.firstname.disabled).toBeTrue(); + expect(component.form.controls.lastname.disabled).toBeTrue(); + expect(component.form.controls.email.disabled).toBeTrue(); + }); + + + it('should initialize the form with null email as an empty string', () => { + component.registratioData.email = null; + fixture.detectChanges(); + component.ngOnInit(); + const emailFormControl = component.form.get('email'); + expect(emailFormControl.value).toBe(''); + }); + + it('should not render email input when email is null', () => { + component.registratioData.email = null; + fixture.detectChanges(); + const emailInput = fixture.nativeElement.querySelector('input[type="email"]'); + expect(emailInput).toBeFalsy(); + }); +}); diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts new file mode 100644 index 00000000000..0c93b668ec7 --- /dev/null +++ b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts @@ -0,0 +1,60 @@ +import { Component, OnInit, ChangeDetectionStrategy, Inject } from '@angular/core'; +import { renderExternalLoginConfirmationFor } from '../../external-log-in.methods-decorator'; +import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; +import { FormBuilder, FormGroup } from '@angular/forms'; +import { RegistrationData } from '../../models/registration-data.model'; +import { ExternalLoginMethodEntryComponent } from '../../external-login-method-entry.component'; + +@Component({ + selector: 'ds-orcid-confirmation', + templateUrl: './orcid-confirmation.component.html', + styleUrls: ['./orcid-confirmation.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +@renderExternalLoginConfirmationFor(AuthMethodType.Orcid) +export class OrcidConfirmationComponent extends ExternalLoginMethodEntryComponent implements OnInit { + + /** + * The form containing the user's data + */ + public form: FormGroup; + + /** + * @param injectedRegistrationDataObject RegistrationData object provided + * @param formBuilder To build the form + */ + constructor( + @Inject('registrationDataProvider') protected injectedRegistrationDataObject: RegistrationData, + private formBuilder: FormBuilder + ) { + super(injectedRegistrationDataObject); + } + + /** + * Initialize the form with disabled fields + */ + ngOnInit(): void { + this.form = this.formBuilder.group({ + netId: [{ value: this.registratioData.netId, disabled: true }], + firstname: [{ value: this.getFirstname(), disabled: true }], + lastname: [{ value: this.getLastname(), disabled: true }], + email: [{ value: this.registratioData?.email || '', disabled: true }], // email can be null + }); + } + + /** + * Get the firstname of the user from the registration metadata + * @returns the firstname of the user + */ + private getFirstname(): string { + return this.registratioData.registrationMetadata?.['eperson.firstname']?.[0]?.value || ''; + } + + /** + * Get the lastname of the user from the registration metadata + * @returns the lastname of the user + */ + private getLastname(): string { + return this.registratioData.registrationMetadata?.['eperson.lastname']?.[0]?.value || ''; + } +} diff --git a/src/app/shared/log-in/container/log-in-container.component.html b/src/app/shared/log-in/container/log-in-container.component.html index bef6f43b667..3b6ea5d054c 100644 --- a/src/app/shared/log-in/container/log-in-container.component.html +++ b/src/app/shared/log-in/container/log-in-container.component.html @@ -2,4 +2,3 @@ *ngComponentOutlet="getAuthMethodContent(); injector: objectInjector;"> - diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 36f7034f4d7..11d306c1bc4 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -7,7 +7,9 @@ -
- {{"login.form.new-user" | translate}} - {{"login.form.forgot-password" | translate}} + +
+ {{"login.form.new-user" | translate}} + {{"login.form.forgot-password" | translate}} +
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index 94175f0f6c3..1fe595c1ed2 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; +import { Observable, Subscription, take } from 'rxjs'; import { select, Store } from '@ngrx/store'; import uniqBy from 'lodash/uniqBy'; @@ -18,6 +18,7 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/ import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { CoreState } from '../../core/core-state.model'; import { AuthMethodType } from '../../core/auth/models/auth.method-type'; +import de from 'date-fns/esm/locale/de/index.js'; /** * /users/sign-in @@ -36,6 +37,10 @@ export class LogInComponent implements OnInit, OnDestroy { */ @Input() isStandalonePage: boolean; + @Input() excludedAuthMethod: AuthMethodType; + + @Input() showRegisterLink = true; + /** * The list of authentication methods available * @type {AuthMethod[]} @@ -77,6 +82,10 @@ export class LogInComponent implements OnInit, OnDestroy { ).subscribe(methods => { // ignore the ip authentication method when it's returned by the backend this.authMethods = uniqBy(methods.filter(a => a.authMethodType !== AuthMethodType.Ip), 'authMethodType'); + // exclude the given auth method in case there is one + if (hasValue(this.excludedAuthMethod)) { + this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType !== this.excludedAuthMethod); + } }); // set loading diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 4f07cfdeefd..3ad876a114e 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -332,6 +332,12 @@ import { EntityIconDirective } from './entity-icon/entity-icon.directive'; import { AdditionalMetadataComponent } from './object-list/search-result-list-element/additional-metadata/additional-metadata.component'; +import { ExternalLogInComponent } from './external-log-in-complete/external-log-in/external-log-in.component'; +import { OrcidConfirmationComponent } from './external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component'; +import { ProvideEmailComponent } from './external-log-in-complete/email-confirmation/provide-email/provide-email.component'; +import { ConfirmEmailComponent } from './external-log-in-complete/email-confirmation/confirm-email/confirm-email.component'; +import { ConfirmationSentComponent } from './external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component'; +import { EmailValidatedComponent } from './external-log-in-complete/email-confirmation/email-validated/email-validated.component'; const MODULES = [ CommonModule, @@ -469,7 +475,8 @@ const COMPONENTS = [ MetadataLinkViewComponent, ExportExcelSelectorComponent, ThemedBrowseMostElementsComponent, - SearchChartBarHorizontalComponent + SearchChartBarHorizontalComponent, + ExternalLogInComponent, ]; const ENTRY_COMPONENTS = [ @@ -543,7 +550,8 @@ const ENTRY_COMPONENTS = [ ThemedBrowseMostElementsComponent, SearchChartBarHorizontalComponent, RelationshipsListComponent, - AdditionalMetadataComponent + AdditionalMetadataComponent, + OrcidConfirmationComponent, ]; const PROVIDERS = [ @@ -583,6 +591,10 @@ const DIRECTIVES = [ ...COMPONENTS, ...ENTRY_COMPONENTS, ...DIRECTIVES, + ProvideEmailComponent, + ConfirmEmailComponent, + ConfirmationSentComponent, + EmailValidatedComponent, ], providers: [ ...PROVIDERS diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 0b4dcd84bd4..faddb3a2b0e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7167,5 +7167,31 @@ "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - "admin.system-wide-alert.title": "System-wide Alerts" + "admin.system-wide-alert.title": "System-wide Alerts", + + "external-login.confirmation.header": "Information needed to complete the login process", + + "external-login.noEmail.informationText": "The information received from {{authMethod}} are not sufficient to complete the login process. Please provide the missing information below, or login via a different method to associate your {{authMethod}} to an existing account.", + + "external-login.haveEmail.informationText": "It seems that you have not yet an account in this system. If this is the case, please confirm the data received from {{authMethod}} and a new account will be created for you. Otherwise, if you already have an account in the system, please update the email address to match the one already in use in the system or login via a different method to associate your {{authMethod}} to your existing account.", + + "external-login.confirm-email.header": "Confirm or update email", + + "external-login.confirmation.email-required": "Email is required.", + + "external-login.confirmation.email-invalid": "Invalid email format.", + + "external-login.confirm.button.label": "Confirm this email", + + "external-login.confirm-email-sent.header": "Confirmation email sent", + + "external-login.confirm-email-sent.info": " We have sent an emait to the provided address to validate your input.
Please follow the instructions in the email to complete the login process.", + + "external-login.validated-email.header": "Email validated", + + "external-login.validated-email.info": "Your email has been validated.
You can now login in the system with your prefered authentication method.", + + "external-login.provide-email.header": "Provide email", + + "external-login.provide-email.button.label": "Send Verification link", } From c754c35870cb807c10cf604f86b5b24a3a46f5f2 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 25 Sep 2023 23:51:48 +0200 Subject: [PATCH 682/758] [DURACOM-185] Fix pointer on language dropdown menu --- src/app/shared/lang-switch/lang-switch.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/shared/lang-switch/lang-switch.component.scss b/src/app/shared/lang-switch/lang-switch.component.scss index 7b593a9bb59..ea099435a8e 100644 --- a/src/app/shared/lang-switch/lang-switch.component.scss +++ b/src/app/shared/lang-switch/lang-switch.component.scss @@ -9,3 +9,7 @@ color: var(--ds-header-icon-color-hover); } } + +.dropdown-item { + cursor: pointer; +} From 87296bf7bbdb1f1e9a7be8595538c5ff8c5ba5c6 Mon Sep 17 00:00:00 2001 From: Nikita Krivonosov Date: Mon, 25 Sep 2023 19:21:51 +0200 Subject: [PATCH 683/758] [DSC-1079] Pagination on item edit page uses the same page number for each bundle --- .../epeople-registry.component.spec.ts | 5 ++++- .../epeople-registry/epeople-registry.component.ts | 4 +++- .../eperson-form/eperson-form.component.spec.ts | 3 +++ .../eperson-form/eperson-form.component.ts | 4 +++- .../members-list/members-list.component.spec.ts | 3 +++ .../group-form/members-list/members-list.component.ts | 8 +++++--- .../subgroup-list/subgroups-list.component.spec.ts | 3 +++ .../subgroup-list/subgroups-list.component.ts | 8 +++++--- .../group-registry/groups-registry.component.spec.ts | 5 ++++- .../group-registry/groups-registry.component.ts | 4 +++- .../bitstream-formats.component.spec.ts | 11 ++++++++--- .../bitstream-formats/bitstream-formats.component.ts | 4 +++- .../metadata-registry.component.spec.ts | 3 +++ .../metadata-registry/metadata-registry.component.ts | 4 +++- .../metadata-schema/metadata-schema.component.spec.ts | 5 ++++- .../metadata-schema/metadata-schema.component.ts | 4 +++- .../object-audit-overview.component.ts | 6 ++++-- src/app/core/data/lookup-relation.service.spec.ts | 6 +++++- src/app/core/data/lookup-relation.service.ts | 6 ++++-- .../core/data/version-history-data.service.spec.ts | 5 +++++ src/app/core/data/version-history-data.service.ts | 4 +++- src/app/core/shared/search/search.service.spec.ts | 3 +++ .../recent-item-list.component.spec.ts | 3 +++ .../recent-item-list/recent-item-list.component.ts | 4 +++- ...ted-drag-and-drop-bitstream-list.component.spec.ts | 5 ++++- ...aginated-drag-and-drop-bitstream-list.component.ts | 6 ++++-- .../file-section/full-file-section.component.spec.ts | 3 +++ .../file-section/full-file-section.component.ts | 6 ++++-- .../orcid-queue/orcid-queue.component.spec.ts | 3 +++ .../orcid-page/orcid-queue/orcid-queue.component.ts | 4 +++- .../versions/item-versions.component.spec.ts | 3 +++ src/app/item-page/versions/item-versions.component.ts | 4 +++- .../my-dspace-configuration.service.spec.ts | 4 +++- .../my-dspace-page/my-dspace-configuration.service.ts | 6 ++++-- .../events/openaire-broker-events.component.spec.ts | 3 +++ .../broker/events/openaire-broker-events.component.ts | 6 ++++-- .../topics/openaire-broker-topics.component.spec.ts | 3 +++ .../broker/topics/openaire-broker-topics.component.ts | 5 ++++- .../suggestion-targets.component.ts | 7 +++++-- .../overview/process-overview.component.spec.ts | 5 ++++- .../overview/process-overview.component.ts | 6 ++++-- .../counters-section/counters-section.component.ts | 7 +++++-- ...ternal-source-entry-import-modal.component.spec.ts | 5 ++++- .../external-source-entry-import-modal.component.ts | 6 ++++-- ...act-paginated-drag-and-drop-list.component.spec.ts | 11 ++++++++--- ...abstract-paginated-drag-and-drop-list.component.ts | 6 ++++-- .../item-export-list.component.spec.ts | 3 +++ .../item-export-list/item-export-list.component.ts | 6 ++++-- .../item-export/item-export.component.spec.ts | 5 ++++- .../item-export/item-export/item-export.component.ts | 6 ++++-- .../submission-import-external.component.spec.ts | 3 +++ .../submission-import-external.component.ts | 4 +++- .../subscriptions-page.component.spec.ts | 5 ++++- .../subscriptions-page.component.ts | 6 ++++-- .../suggestions-page.component.spec.ts | 3 +++ .../suggestions-page/suggestions-page.component.ts | 6 ++++-- .../reviewers-list/reviewers-list.component.spec.ts | 3 +++ .../reviewers-list/reviewers-list.component.ts | 6 ++++-- 58 files changed, 219 insertions(+), 66 deletions(-) diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts index c0d70fd0b25..c3a6fc8bbce 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts @@ -27,6 +27,8 @@ import { RequestService } from '../../core/data/request.service'; import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; import { FindListOptions } from '../../core/data/find-list-options.model'; +import { UUIDService } from '../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; describe('EPeopleRegistryComponent', () => { let component: EPeopleRegistryComponent; @@ -138,7 +140,8 @@ describe('EPeopleRegistryComponent', () => { { provide: FormBuilderService, useValue: builderService }, { provide: Router, useValue: new RouterStub() }, { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts index 55233d8173d..f600fef0b23 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts @@ -21,6 +21,7 @@ import { RequestService } from '../../core/data/request.service'; import { PageInfo } from '../../core/shared/page-info.model'; import { NoContent } from '../../core/shared/NoContent.model'; import { PaginationService } from '../../core/pagination/pagination.service'; +import { UUIDService } from '../../core/shared/uuid.service'; @Component({ selector: 'ds-epeople-registry', @@ -58,7 +59,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy { * Pagination config used to display the list of epeople */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'elp', + id: this.uuidService.generate(), pageSize: 5, currentPage: 1 }); @@ -93,6 +94,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy { private router: Router, private modalService: NgbModal, private paginationService: PaginationService, + private uuidService: UUIDService, public requestService: RequestService) { this.currentSearchQuery = ''; this.currentSearchScope = 'metadata'; 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 bd87d924772..64217b1410f 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 @@ -31,6 +31,8 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic import { FindListOptions } from '../../../core/data/find-list-options.model'; import { ValidateEmailNotTaken } from './validators/email-taken.validator'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock'; describe('EPersonFormComponent', () => { let component: EPersonFormComponent; @@ -207,6 +209,7 @@ describe('EPersonFormComponent', () => { { provide: PaginationService, useValue: paginationService }, { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])}, { provide: EpersonRegistrationService, useValue: epersonRegistrationService }, + { provide: UUIDService, useValue: getMockUUIDService() }, EPeopleRegistryComponent ], schemas: [NO_ERRORS_SCHEMA] 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 c4194473c3d..7e24d76d82b 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 @@ -37,6 +37,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator'; import { Registration } from '../../../core/shared/registration.model'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component'; +import { UUIDService } from '../../../core/shared/uuid.service'; @Component({ selector: 'ds-eperson-form', @@ -150,7 +151,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { * Pagination config used to display the list of groups */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'gem', + id: this.uuidService.generate(), pageSize: 5, currentPage: 1 }); @@ -183,6 +184,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy { private paginationService: PaginationService, public requestService: RequestService, private epersonRegistrationService: EpersonRegistrationService, + private uuidService: UUIDService ) { this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => { this.epersonInitial = eperson; diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts index b7536177cdf..e2ecd2e4548 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts @@ -28,6 +28,8 @@ import { NotificationsServiceStub } from '../../../../shared/testing/notificatio import { RouterMock } from '../../../../shared/mocks/router.mock'; import { PaginationService } from '../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; +import { UUIDService } from '../../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock'; describe('MembersListComponent', () => { let component: MembersListComponent; @@ -135,6 +137,7 @@ describe('MembersListComponent', () => { { provide: FormBuilderService, useValue: builderService }, { provide: Router, useValue: new RouterMock() }, { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts index 58d252f0b4a..81fd511d4a6 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts @@ -27,6 +27,7 @@ import { NotificationsService } from '../../../../shared/notifications/notificat import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model'; import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; import { PaginationService } from '../../../../core/pagination/pagination.service'; +import { UUIDService } from '../../../../core/shared/uuid.service'; /** * Keys to keep track of specific subscriptions @@ -105,7 +106,7 @@ export class MembersListComponent implements OnInit, OnDestroy { * Pagination config used to display the list of EPeople that are result of EPeople search */ configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'sml', + id: this.uuidService.generate(), pageSize: 5, currentPage: 1 }); @@ -113,7 +114,7 @@ export class MembersListComponent implements OnInit, OnDestroy { * Pagination config used to display the list of EPerson Membes of active group being edited */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'ml', + id: this.uuidService.generate(), pageSize: 5, currentPage: 1 }); @@ -143,7 +144,8 @@ export class MembersListComponent implements OnInit, OnDestroy { protected notificationsService: NotificationsService, protected formBuilder: FormBuilder, protected paginationService: PaginationService, - private router: Router + private router: Router, + protected uuidService: UUIDService ) { this.currentSearchQuery = ''; this.currentSearchScope = 'metadata'; diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts index 1ca6c88c5f7..bd7e543a218 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts @@ -37,6 +37,8 @@ import { NotificationsServiceStub } from '../../../../shared/testing/notificatio import { map } from 'rxjs/operators'; import { PaginationService } from '../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; +import { UUIDService } from '../../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock'; describe('SubgroupsListComponent', () => { let component: SubgroupsListComponent; @@ -121,6 +123,7 @@ describe('SubgroupsListComponent', () => { { provide: FormBuilderService, useValue: builderService }, { provide: Router, useValue: routerStub }, { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts index 5f1700e07d5..cbe230c2676 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts @@ -18,6 +18,7 @@ import { PaginationComponentOptions } from '../../../../shared/pagination/pagina import { NoContent } from '../../../../core/shared/NoContent.model'; import { PaginationService } from '../../../../core/pagination/pagination.service'; import { followLink } from '../../../../shared/utils/follow-link-config.model'; +import { UUIDService } from '../../../../core/shared/uuid.service'; /** * Keys to keep track of specific subscriptions @@ -58,7 +59,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy { * Pagination config used to display the list of groups that are result of groups search */ configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'ssgl', + id: this.uuidService.generate(), pageSize: 5, currentPage: 1 }); @@ -66,7 +67,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy { * Pagination config used to display the list of subgroups of currently active group being edited */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'sgl', + id: this.uuidService.generate(), pageSize: 5, currentPage: 1 }); @@ -88,7 +89,8 @@ export class SubgroupsListComponent implements OnInit, OnDestroy { private notificationsService: NotificationsService, private formBuilder: FormBuilder, private paginationService: PaginationService, - private router: Router) { + private router: Router, + private uuidService: UUIDService) { this.currentSearchQuery = ''; } diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts index 239939e70d8..b421d950e1f 100644 --- a/src/app/access-control/group-registry/groups-registry.component.spec.ts +++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts @@ -32,6 +32,8 @@ import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { NoContent } from '../../core/shared/NoContent.model'; +import { UUIDService } from '../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; describe('GroupRegistryComponent', () => { let component: GroupsRegistryComponent; @@ -179,7 +181,8 @@ describe('GroupRegistryComponent', () => { { provide: Router, useValue: new RouterMock() }, { provide: AuthorizationDataService, useValue: authorizationService }, { provide: PaginationService, useValue: paginationService }, - { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) } + { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts index 70c9b22852f..62c14309366 100644 --- a/src/app/access-control/group-registry/groups-registry.component.ts +++ b/src/app/access-control/group-registry/groups-registry.component.ts @@ -37,6 +37,7 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c import { NoContent } from '../../core/shared/NoContent.model'; import { PaginationService } from '../../core/pagination/pagination.service'; import { followLink } from '../../shared/utils/follow-link-config.model'; +import { UUIDService } from '../../core/shared/uuid.service'; @Component({ selector: 'ds-groups-registry', @@ -54,7 +55,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy { * Pagination config used to display the list of groups */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'gl', + id: this.uuidService.generate(), pageSize: 5, currentPage: 1 }); @@ -104,6 +105,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy { private router: Router, private authorizationService: AuthorizationDataService, private paginationService: PaginationService, + private uuidService: UUIDService, public requestService: RequestService) { this.currentSearchQuery = ''; this.searchForm = this.formBuilder.group(({ diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts index 8a44240b7e2..cda9a67fc47 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -26,6 +26,8 @@ import { import { createPaginatedList } from '../../../shared/testing/utils.test'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock'; describe('BitstreamFormatsComponent', () => { let comp: BitstreamFormatsComponent; @@ -108,7 +110,8 @@ describe('BitstreamFormatsComponent', () => { { provide: BitstreamFormatDataService, useValue: bitstreamFormatService }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: NotificationsService, useValue: notificationsServiceStub }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ] }).compileComponents(); }; @@ -236,7 +239,8 @@ describe('BitstreamFormatsComponent', () => { { provide: BitstreamFormatDataService, useValue: bitstreamFormatService }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: NotificationsService, useValue: notificationsServiceStub }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ] }).compileComponents(); } @@ -285,7 +289,8 @@ describe('BitstreamFormatsComponent', () => { { provide: BitstreamFormatDataService, useValue: bitstreamFormatService }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: NotificationsService, useValue: notificationsServiceStub }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ] }).compileComponents(); } diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 162bf2bdb28..022193cdbee 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -13,6 +13,7 @@ import { NoContent } from '../../../core/shared/NoContent.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { FindListOptions } from '../../../core/data/find-list-options.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { UUIDService } from '../../../core/shared/uuid.service'; /** * This component renders a list of bitstream formats @@ -33,7 +34,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { * Currently simply renders all bitstream formats */ pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'rbp', + id: this.uuidService.generate(), pageSize: 20, pageSizeOptions: [20, 40, 60, 80, 100] }); @@ -43,6 +44,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { private translateService: TranslateService, private bitstreamFormatService: BitstreamFormatDataService, private paginationService: PaginationService, + private uuidService: UUIDService ) { } diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index 36ecdaf3162..fecd0644988 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -23,6 +23,8 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic import { MetadataSchemaExportService } from '../../../shared/metadata-export/metadata-schema-export/metadata-schema-export.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock'; describe('MetadataRegistryComponent', () => { let comp: MetadataRegistryComponent; @@ -79,6 +81,7 @@ describe('MetadataRegistryComponent', () => { { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: PaginationService, useValue: paginationService }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: UUIDService, useValue: getMockUUIDService() }, { provide: MetadataSchemaExportService, useValue: jasmine.createSpyObj('metadataSchemaExportService', { diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts index 0f052ba25ef..ab47a45a5ea 100644 --- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts +++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts @@ -16,6 +16,7 @@ import { PaginationService } from '../../../core/pagination/pagination.service'; import { MetadataSchemaExportService } from '../../../shared/metadata-export/metadata-schema-export/metadata-schema-export.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; @Component({ selector: 'ds-metadata-registry', @@ -37,7 +38,7 @@ export class MetadataRegistryComponent { * Pagination config used to display the list of metadata schemas */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'rm', + id: this.uuidService.generate(), pageSize: 25 }); @@ -50,6 +51,7 @@ export class MetadataRegistryComponent { private notificationsService: NotificationsService, private paginationService: PaginationService, private translateService: TranslateService, + private uuidService: UUIDService, private readonly metadataSchemaExportService: MetadataSchemaExportService) { this.updateSchemas(); } diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index 2b660a63634..c11ca6c7bb7 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -25,6 +25,8 @@ import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.u import { VarDirective } from '../../../shared/utils/var.directive'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock'; describe('MetadataSchemaComponent', () => { let comp: MetadataSchemaComponent; @@ -139,7 +141,8 @@ describe('MetadataSchemaComponent', () => { { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: Router, useValue: new RouterStub() }, { provide: PaginationService, useValue: paginationService }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() } + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts index d0827e6e4d5..0f4f4244b54 100644 --- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -22,6 +22,7 @@ import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from import { toFindListOptions } from '../../../shared/pagination/pagination.utils'; import { NoContent } from '../../../core/shared/NoContent.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; @Component({ selector: 'ds-metadata-schema', @@ -47,7 +48,7 @@ export class MetadataSchemaComponent implements OnInit { * Pagination config used to display the list of metadata fields */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'rm', + id: this.uuidService.generate(), pageSize: 25, pageSizeOptions: [25, 50, 100, 200] }); @@ -62,6 +63,7 @@ export class MetadataSchemaComponent implements OnInit { private notificationsService: NotificationsService, private router: Router, private paginationService: PaginationService, + private uuidService: UUIDService, private translateService: TranslateService) { } diff --git a/src/app/audit-page/object-audit-overview/object-audit-overview.component.ts b/src/app/audit-page/object-audit-overview/object-audit-overview.component.ts index 58fd9615d07..c9512d3a804 100644 --- a/src/app/audit-page/object-audit-overview/object-audit-overview.component.ts +++ b/src/app/audit-page/object-audit-overview/object-audit-overview.component.ts @@ -18,6 +18,7 @@ import { AuthService } from '../../core/auth/auth.service'; import { PaginatedList } from '../../core/data/paginated-list.model'; import { PaginationService } from '../../core/pagination/pagination.service'; import { redirectOn4xx } from '../../core/shared/authorized.operators'; +import { UUIDService } from '../../core/shared/uuid.service'; /** * Component displaying a list of all audit about a object in a paginated table @@ -53,7 +54,7 @@ export class ObjectAuditOverviewComponent implements OnInit { * The current pagination configuration for the page */ pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'oop', + id: this.uuidService.generate(), pageSize: 10 }); @@ -68,7 +69,8 @@ export class ObjectAuditOverviewComponent implements OnInit { protected auditService: AuditDataService, protected itemService: ItemDataService, protected authorizationService: AuthorizationDataService, - protected paginationService: PaginationService) { + protected paginationService: PaginationService, + protected uuidService: UUIDService) { } ngOnInit(): void { diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts index 58598b9870d..8dd99118c49 100644 --- a/src/app/core/data/lookup-relation.service.spec.ts +++ b/src/app/core/data/lookup-relation.service.spec.ts @@ -13,12 +13,15 @@ import { skip, take } from 'rxjs/operators'; import { ExternalSource } from '../shared/external-source.model'; import { RequestService } from './request.service'; import { of as observableOf } from 'rxjs'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; +import { UUIDService } from '../shared/uuid.service'; describe('LookupRelationService', () => { let service: LookupRelationService; let externalSourceService: ExternalSourceDataService; let searchService: SearchService; let requestService: RequestService; + let uuidService: UUIDService; const totalExternal = 8; const optionsWithQuery = new PaginatedSearchOptions({ query: 'test-query' }); @@ -55,7 +58,8 @@ describe('LookupRelationService', () => { getEndpoint: observableOf(searchServiceEndpoint) }); requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring']); - service = new LookupRelationService(externalSourceService, searchService, requestService); + uuidService = getMockUUIDService(); + service = new LookupRelationService(externalSourceService, searchService, requestService, uuidService); } beforeEach(() => { diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts index 7a6bc2358b5..b35d8b26806 100644 --- a/src/app/core/data/lookup-relation.service.ts +++ b/src/app/core/data/lookup-relation.service.ts @@ -15,6 +15,7 @@ import { Injectable } from '@angular/core'; import { ExternalSource } from '../shared/external-source.model'; import { ExternalSourceEntry } from '../shared/external-source-entry.model'; import { RequestService } from './request.service'; +import { UUIDService } from '../shared/uuid.service'; /** * A service for retrieving local and external entries information during a relation lookup @@ -30,13 +31,14 @@ export class LookupRelationService { * Pagination options for retrieving exactly one result */ private singleResultOptions = Object.assign(new PaginationComponentOptions(), { - id: 'single-result-options', + id: this.uuidService.generate(), pageSize: 1 }); constructor(protected externalSourceService: ExternalSourceDataService, protected searchService: SearchService, - protected requestService: RequestService) { + protected requestService: RequestService, + protected uuidService: UUIDService) { } /** diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts index 03bf6c8bcb7..afdc5de728c 100644 --- a/src/app/core/data/version-history-data.service.spec.ts +++ b/src/app/core/data/version-history-data.service.spec.ts @@ -14,6 +14,8 @@ import { createPaginatedList } from '../../shared/testing/utils.test'; import { Item } from '../shared/item.model'; import { of } from 'rxjs'; import SpyObj = jasmine.SpyObj; +import { UUIDService } from '../shared/uuid.service'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; const url = 'fake-url'; @@ -25,6 +27,7 @@ describe('VersionHistoryDataService', () => { let rdbService: RemoteDataBuildService; let objectCache: ObjectCacheService; let versionService: SpyObj; + let uuidService: UUIDService; let halService: any; const versionHistoryId = 'version-history-id'; @@ -109,6 +112,7 @@ describe('VersionHistoryDataService', () => { findListByHref: jasmine.createSpy('findListByHref'), getHistoryFromVersion: jasmine.createSpy('getHistoryFromVersion'), }); + uuidService = getMockUUIDService(); halService = new HALEndpointServiceStub(url); notificationsService = new NotificationsServiceStub(); @@ -118,6 +122,7 @@ describe('VersionHistoryDataService', () => { objectCache, halService, versionService, + uuidService ); } diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts index b331c4f2e40..659feb9276d 100644 --- a/src/app/core/data/version-history-data.service.ts +++ b/src/app/core/data/version-history-data.service.ts @@ -25,6 +25,7 @@ import { sendRequest } from '../shared/request.operators'; import { RestRequest } from './rest-request.model'; import { IdentifiableDataService } from './base/identifiable-data.service'; import { dataService } from './base/data-service.decorator'; +import { UUIDService } from '../shared/uuid.service'; /** * Service responsible for handling requests related to the VersionHistory object @@ -40,6 +41,7 @@ export class VersionHistoryDataService extends IdentifiableDataService { { provide: PaginationService, useValue: {} }, { provide: SearchConfigurationService, useValue: searchConfigService }, { provide: Angulartics2, useValue: {} }, + { provide: UUIDService, useValue: getMockUUIDService() }, SearchService ], }); diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts index edcb4f84f83..7070e2f257d 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts +++ b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts @@ -14,6 +14,8 @@ import { of as observableOf } from 'rxjs'; import { APP_CONFIG } from '../../../config/app-config.interface'; import { environment } from '../../../environments/environment'; import { PLATFORM_ID } from '@angular/core'; +import { UUIDService } from '../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; describe('RecentItemListComponent', () => { let component: RecentItemListComponent; @@ -47,6 +49,7 @@ describe('RecentItemListComponent', () => { { provide: SearchConfigurationService, useValue: searchConfigServiceStub }, { provide: APP_CONFIG, useValue: environment }, { provide: PLATFORM_ID, useValue: 'browser' }, + { provide: UUIDService, useValue: getMockUUIDService() } ], }) .compileComponents(); diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts index 9a8535d970a..408b79b79bb 100644 --- a/src/app/home-page/recent-item-list/recent-item-list.component.ts +++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts @@ -18,6 +18,7 @@ import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface'; import { isPlatformBrowser } from '@angular/common'; import { setPlaceHolderAttributes } from '../../shared/utils/object-list-utils'; import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model'; +import { UUIDService } from '../../core/shared/uuid.service'; @Component({ selector: 'ds-recent-item-list', @@ -47,12 +48,13 @@ export class RecentItemListComponent implements OnInit { private paginationService: PaginationService, public searchConfigurationService: SearchConfigurationService, protected elementRef: ElementRef, + protected uuidService: UUIDService, @Inject(APP_CONFIG) private appConfig: AppConfig, @Inject(PLATFORM_ID) private platformId: Object, ) { this.paginationConfig = Object.assign(new PaginationComponentOptions(), { - id: 'hp', + id: this.uuidService.generate(), pageSize: environment.homePage.recentSubmissions.pageSize, currentPage: 1, maxSize: 1 diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts index 7317eb93be0..58248aee56d 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts @@ -18,6 +18,8 @@ import { createPaginatedList } from '../../../../../shared/testing/utils.test'; import { RequestService } from '../../../../../core/data/request.service'; import { PaginationService } from '../../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../../shared/testing/pagination-service.stub'; +import { UUIDService } from '../../../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../../../shared/mocks/uuid.service.mock'; describe('PaginatedDragAndDropBitstreamListComponent', () => { let comp: PaginatedDragAndDropBitstreamListComponent; @@ -122,7 +124,8 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => { { provide: BundleDataService, useValue: bundleService }, { provide: ObjectValuesPipe, useValue: objectValuesPipe }, { provide: RequestService, useValue: requestService }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [ NO_ERRORS_SCHEMA ] diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts index 2c81a4e2cb9..b0eb783dc02 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts @@ -12,6 +12,7 @@ import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe import { RequestService } from '../../../../../core/data/request.service'; import { PaginationService } from '../../../../../core/pagination/pagination.service'; import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model'; +import { UUIDService } from '../../../../../core/shared/uuid.service'; @Component({ selector: 'ds-paginated-drag-and-drop-bitstream-list', @@ -40,8 +41,9 @@ export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginate protected objectValuesPipe: ObjectValuesPipe, protected bundleService: BundleDataService, protected paginationService: PaginationService, - protected requestService: RequestService) { - super(objectUpdatesService, elRef, objectValuesPipe, paginationService); + protected requestService: RequestService, + protected uuidService: UUIDService) { + super(objectUpdatesService, elRef, objectValuesPipe, paginationService, uuidService); } ngOnInit() { diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts index 09ed981358a..b2e956efafb 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts @@ -20,6 +20,8 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; import { APP_CONFIG } from 'src/config/app-config.interface'; import { environment } from 'src/environments/environment'; +import { UUIDService } from '../../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock'; describe('FullFileSectionComponent', () => { let comp: FullFileSectionComponent; @@ -73,6 +75,7 @@ describe('FullFileSectionComponent', () => { { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: PaginationService, useValue: paginationService }, { provide: APP_CONFIG, useValue: environment }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts index 3be0d58c819..0c5a7fda0b9 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts @@ -15,6 +15,7 @@ import { TranslateService } from '@ngx-translate/core'; import { hasValue, isEmpty } from '../../../../shared/empty.util'; import { PaginationService } from '../../../../core/pagination/pagination.service'; import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; +import { UUIDService } from '../../../../core/shared/uuid.service'; /** * This component renders the file section of the item @@ -36,13 +37,13 @@ export class FullFileSectionComponent extends FileSectionComponent implements On licenses$: Observable>>; originalOptions = Object.assign(new PaginationComponentOptions(), { - id: 'obo', + id: this.uuidService.generate(), currentPage: 1, pageSize: this.appConfig.item.bitstream.pageSize }); licenseOptions = Object.assign(new PaginationComponentOptions(), { - id: 'lbo', + id: this.uuidService.generate(), currentPage: 1, pageSize: this.appConfig.item.bitstream.pageSize }); @@ -52,6 +53,7 @@ export class FullFileSectionComponent extends FileSectionComponent implements On protected notificationsService: NotificationsService, protected translateService: TranslateService, protected paginationService: PaginationService, + protected uuidService: UUIDService, @Inject(APP_CONFIG) protected appConfig: AppConfig ) { super(bitstreamDataService, notificationsService, translateService, appConfig); diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts index d0f52531d44..0a12d7ff2b0 100644 --- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts +++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts @@ -17,6 +17,8 @@ import { PaginatedList } from '../../../core/data/paginated-list.model'; import { By } from '@angular/platform-browser'; import { Item } from '../../../core/shared/item.model'; import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock'; describe('OrcidQueueComponent test suite', () => { let component: OrcidQueueComponent; @@ -124,6 +126,7 @@ describe('OrcidQueueComponent test suite', () => { { provide: OrcidHistoryDataService, useValue: {} }, { provide: PaginationService, useValue: new PaginationServiceStub() }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts index 4930e976758..9a52d41a69d 100644 --- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts +++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts @@ -18,6 +18,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio import { AlertType } from '../../../shared/alert/aletr-type'; import { Item } from '../../../core/shared/item.model'; import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; @Component({ selector: 'ds-orcid-queue', @@ -35,7 +36,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy { * Pagination config used to display the list */ public paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'oqp', + id: this.uuidService.generate(), pageSize: 5 }); @@ -67,6 +68,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy { private paginationService: PaginationService, private notificationsService: NotificationsService, private orcidHistoryService: OrcidHistoryDataService, + private uuidService: UUIDService ) { } diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts index 999176d996c..c3eff29f8bf 100644 --- a/src/app/item-page/versions/item-versions.component.spec.ts +++ b/src/app/item-page/versions/item-versions.component.spec.ts @@ -29,6 +29,8 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser import { Router } from '@angular/router'; import { CommonModule } from '@angular/common'; import { ItemSharedModule } from '../item-shared.module'; +import { UUIDService } from '../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; describe('ItemVersionsComponent', () => { let component: ItemVersionsComponent; @@ -151,6 +153,7 @@ describe('ItemVersionsComponent', () => { {provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy}, {provide: ConfigurationDataService, useValue: configurationServiceSpy}, { provide: Router, useValue: routerSpy }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts index e0fc623f493..defe9fe7ddc 100644 --- a/src/app/item-page/versions/item-versions.component.ts +++ b/src/app/item-page/versions/item-versions.component.ts @@ -48,6 +48,7 @@ import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model' import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; import { ConfigurationDataService } from '../../core/data/configuration-data.service'; +import { UUIDService } from '../../core/shared/uuid.service'; @Component({ selector: 'ds-item-versions', @@ -135,7 +136,7 @@ export class ItemVersionsComponent implements OnInit { * Start at page 1 and always use the set page size */ options = Object.assign(new PaginationComponentOptions(), { - id: 'ivo', + id: this.uuidService.generate(), currentPage: 1, pageSize: this.pageSize }); @@ -181,6 +182,7 @@ export class ItemVersionsComponent implements OnInit { private workspaceItemDataService: WorkspaceitemDataService, private workflowItemDataService: WorkflowItemDataService, private configurationService: ConfigurationDataService, + private uuidService: UUIDService ) { } diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts index 8b0608804df..4cacda957f9 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts @@ -13,6 +13,7 @@ import { PaginationServiceStub } from '../shared/testing/pagination-service.stub import { Context } from '../core/shared/context.model'; import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub'; import { getMockRemoteDataBuildService } from '../shared/mocks/remote-data-build.service.mock'; +import { getMockUUIDService } from '../shared/mocks/uuid.service.mock'; describe('MyDSpaceConfigurationService', () => { let service: MyDSpaceConfigurationService; @@ -50,9 +51,10 @@ describe('MyDSpaceConfigurationService', () => { const halService: any = new HALEndpointServiceStub(''); const requestService: any = {}; const rdb: any = getMockRemoteDataBuildService(); + const uuidService = getMockUUIDService(); beforeEach(() => { - service = new MyDSpaceConfigurationService(roleService, spy, paginationService as any, activatedRoute, linkService, halService, requestService, rdb); + service = new MyDSpaceConfigurationService(roleService, spy, paginationService as any, activatedRoute, linkService, halService, requestService, rdb, uuidService); }); describe('when the scope is called', () => { diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts index 5d86b5fdb70..ce8f691a0ec 100644 --- a/src/app/my-dspace-page/my-dspace-configuration.service.ts +++ b/src/app/my-dspace-page/my-dspace-configuration.service.ts @@ -17,6 +17,7 @@ import { HALEndpointService } from '../core/shared/hal-endpoint.service'; import { RequestService } from '../core/data/request.service'; import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service'; import { Context } from '../core/shared/context.model'; +import { UUIDService } from '../core/shared/uuid.service'; export const MyDSpaceConfigurationToContextMap = new Map([ [MyDSpaceConfigurationValueType.Workspace, Context.Workspace], @@ -35,7 +36,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService { * Default pagination settings */ protected defaultPagination = Object.assign(new PaginationComponentOptions(), { - id: 'mydspace-page', + id: this.uuidService.generate(), pageSize: 10, currentPage: 1 }); @@ -83,7 +84,8 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService { protected linkService: LinkService, protected halService: HALEndpointService, protected requestService: RequestService, - protected rdb: RemoteDataBuildService) { + protected rdb: RemoteDataBuildService, + protected uuidService: UUIDService) { super(routeService, paginationService, route, linkService, halService, requestService, rdb); diff --git a/src/app/openaire/broker/events/openaire-broker-events.component.spec.ts b/src/app/openaire/broker/events/openaire-broker-events.component.spec.ts index c863e8e04d5..1aacc38fec6 100644 --- a/src/app/openaire/broker/events/openaire-broker-events.component.spec.ts +++ b/src/app/openaire/broker/events/openaire-broker-events.component.spec.ts @@ -40,6 +40,8 @@ import { FindListOptions } from '../../../core/data/find-list-options.model'; import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock'; describe('OpenaireBrokerEventsComponent test suite', () => { let fixture: ComponentFixture; @@ -116,6 +118,7 @@ describe('OpenaireBrokerEventsComponent test suite', () => { { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: TranslateService, useValue: getMockTranslateService() }, { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() }, OpenaireBrokerEventsComponent ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/openaire/broker/events/openaire-broker-events.component.ts b/src/app/openaire/broker/events/openaire-broker-events.component.ts index 74d0be2f7d1..1785f56fa62 100644 --- a/src/app/openaire/broker/events/openaire-broker-events.component.ts +++ b/src/app/openaire/broker/events/openaire-broker-events.component.ts @@ -29,6 +29,7 @@ import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { combineLatest } from 'rxjs/internal/observable/combineLatest'; import { Item } from '../../../core/shared/item.model'; +import { UUIDService } from '../../../core/shared/uuid.service'; /** * Component to display the OpenAIRE Broker event list. @@ -44,7 +45,7 @@ export class OpenaireBrokerEventsComponent implements OnInit { * @type {PaginationComponentOptions} */ public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'bep', + id: this.uuidService.generate(), currentPage: 1, pageSize: 10, pageSizeOptions: [5, 10, 20, 40, 60] @@ -124,7 +125,8 @@ export class OpenaireBrokerEventsComponent implements OnInit { private notificationsService: NotificationsService, private openaireBrokerEventRestService: OpenaireBrokerEventRestService, private paginationService: PaginationService, - private translateService: TranslateService + private translateService: TranslateService, + private uuidService: UUIDService ) { } diff --git a/src/app/openaire/broker/topics/openaire-broker-topics.component.spec.ts b/src/app/openaire/broker/topics/openaire-broker-topics.component.spec.ts index 00ea772ff9a..ad7d46eca33 100644 --- a/src/app/openaire/broker/topics/openaire-broker-topics.component.spec.ts +++ b/src/app/openaire/broker/topics/openaire-broker-topics.component.spec.ts @@ -15,6 +15,8 @@ import { OpenaireStateService } from '../../openaire-state.service'; import { cold } from 'jasmine-marbles'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; import { PaginationService } from '../../../core/pagination/pagination.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock'; describe('OpenaireBrokerTopicsComponent test suite', () => { let fixture: ComponentFixture; @@ -43,6 +45,7 @@ describe('OpenaireBrokerTopicsComponent test suite', () => { { provide: OpenaireStateService, useValue: mockOpenaireStateService }, { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), params: observableOf({}) } }, { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() }, OpenaireBrokerTopicsComponent ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/openaire/broker/topics/openaire-broker-topics.component.ts b/src/app/openaire/broker/topics/openaire-broker-topics.component.ts index 408e21d946f..90255658d90 100644 --- a/src/app/openaire/broker/topics/openaire-broker-topics.component.ts +++ b/src/app/openaire/broker/topics/openaire-broker-topics.component.ts @@ -10,6 +10,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio import { OpenaireStateService } from '../../openaire-state.service'; import { AdminNotificationsOpenaireTopicsPageParams } from '../../../admin/admin-notifications/admin-notifications-openaire-topics-page/admin-notifications-openaire-topics-page-resolver.service'; import { PaginationService } from '../../../core/pagination/pagination.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; /** * Component to display the OpenAIRE Broker topic list. @@ -25,7 +26,7 @@ export class OpenaireBrokerTopicsComponent implements OnInit { * @type {PaginationComponentOptions} */ public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'btp', + id: this.uuidService.generate(), pageSize: 10, pageSizeOptions: [5, 10, 20, 40, 60] }); @@ -52,10 +53,12 @@ export class OpenaireBrokerTopicsComponent implements OnInit { * Initialize the component variables. * @param {PaginationService} paginationService * @param {OpenaireStateService} openaireStateService + * @param {UuidService} uuidService */ constructor( private paginationService: PaginationService, private openaireStateService: OpenaireStateService, + private uuidService: UUIDService ) { } /** diff --git a/src/app/openaire/reciter-suggestions/suggestion-targets/suggestion-targets.component.ts b/src/app/openaire/reciter-suggestions/suggestion-targets/suggestion-targets.component.ts index b9ed6c4e87b..0e0744bd6d8 100644 --- a/src/app/openaire/reciter-suggestions/suggestion-targets/suggestion-targets.component.ts +++ b/src/app/openaire/reciter-suggestions/suggestion-targets/suggestion-targets.component.ts @@ -11,6 +11,7 @@ import { SuggestionTargetsStateService } from './suggestion-targets.state.servic import { getSuggestionPageRoute } from '../../../suggestions-page/suggestions-page-routing-paths'; import { SuggestionsService } from '../suggestions.service'; import { PaginationService } from '../../../core/pagination/pagination.service'; +import { UUIDService } from '../../../core/shared/uuid.service'; /** * Component to display the Suggestion Target list. @@ -32,7 +33,7 @@ export class SuggestionTargetsComponent implements OnInit { * @type {PaginationComponentOptions} */ public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'stp', + id: this.uuidService.generate(), pageSizeOptions: [5, 10, 20, 40, 60] }); @@ -56,12 +57,14 @@ export class SuggestionTargetsComponent implements OnInit { * @param {SuggestionTargetsStateService} suggestionTargetsStateService * @param {SuggestionsService} suggestionService * @param {Router} router + * @param {uuidService} uuidService */ constructor( private paginationService: PaginationService, private suggestionTargetsStateService: SuggestionTargetsStateService, private suggestionService: SuggestionsService, - private router: Router + private router: Router, + private uuidService: UUIDService ) { } diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts index a06a16474ea..d6a9e0ae0c9 100644 --- a/src/app/process-page/overview/process-overview.component.spec.ts +++ b/src/app/process-page/overview/process-overview.component.spec.ts @@ -21,6 +21,8 @@ import { ProcessBulkDeleteService } from './process-bulk-delete.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ProcessStatus } from '../processes/process-status.model'; import { Process } from '../processes/process.model'; +import { UUIDService } from '../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; describe('ProcessOverviewComponent', () => { let component: ProcessOverviewComponent; @@ -146,7 +148,8 @@ describe('ProcessOverviewComponent', () => { { provide: ProcessBulkDeleteService, useValue: processBulkDeleteService }, { provide: NgbModal, useValue: modalService }, { provide: AuthorizationDataService, useValue: authorizationService }, - { provide: NotificationsService, useValue: new NotificationsServiceStub() } + { provide: NotificationsService, useValue: new NotificationsServiceStub() }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts index 9f2fc4742f9..2bd6da5e5d2 100644 --- a/src/app/process-page/overview/process-overview.component.ts +++ b/src/app/process-page/overview/process-overview.component.ts @@ -18,6 +18,7 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/ import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import { UUIDService } from '../../core/shared/uuid.service'; @Component({ selector: 'ds-process-overview', @@ -44,7 +45,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy { * The current pagination configuration for the page */ pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'po', + id: this.uuidService.generate(), pageSize: 20 }); @@ -65,7 +66,8 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy { protected authorizationService: AuthorizationDataService, protected notificationService: NotificationsService, protected translateService: TranslateService, - public processBulkDeleteService: ProcessBulkDeleteService, + protected uuidService: UUIDService, + public processBulkDeleteService: ProcessBulkDeleteService ) { } diff --git a/src/app/shared/explore/section-component/counters-section/counters-section.component.ts b/src/app/shared/explore/section-component/counters-section/counters-section.component.ts index f4ed8adb04f..db50de91833 100644 --- a/src/app/shared/explore/section-component/counters-section/counters-section.component.ts +++ b/src/app/shared/explore/section-component/counters-section/counters-section.component.ts @@ -12,6 +12,7 @@ import { SectionComponent } from '../../../../core/layout/models/section.model'; import { SearchService } from '../../../../core/shared/search/search.service'; import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model'; import { hasValue } from '../../../empty.util'; +import { UUIDService } from '../../../../core/shared/uuid.service'; @Component({ selector: 'ds-counters-section', @@ -30,13 +31,15 @@ export class CountersSectionComponent implements OnInit { isLoading$ = new BehaviorSubject(true); pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'counters-pagination', + id: this.uuidService.generate(), pageSize: 1, currentPage: 1 }); - constructor(private searchService: SearchService, @Inject(NativeWindowService) protected _window: NativeWindowRef,) { + constructor(private searchService: SearchService, + private uuidService: UUIDService, + @Inject(NativeWindowService) protected _window: NativeWindowRef) { } 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.spec.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.spec.ts index c8711b6b47d..9dd85011bee 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.spec.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.spec.ts @@ -15,6 +15,8 @@ import { ItemDataService } from '../../../../../../../core/data/item-data.servic import { NotificationsService } from '../../../../../../notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../../../../remote-data.utils'; import { createPaginatedList } from '../../../../../../testing/utils.test'; +import { UUIDService } from '../../../../../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../../../../mocks/uuid.service.mock'; describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { let component: ExternalSourceEntryImportModalComponent; @@ -74,7 +76,8 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => { { provide: SelectableListService, useValue: selectService }, { provide: NotificationsService, useValue: notificationsService }, { provide: ItemDataService, useValue: itemService }, - { provide: NgbActiveModal, useValue: modalStub } + { provide: NgbActiveModal, useValue: modalStub }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); 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 bf1f2f7e70c..b0eb0a6ae28 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 @@ -25,6 +25,7 @@ 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'; +import { UUIDService } from '../../../../../../../core/shared/uuid.service'; /** * The possible types of import for the external entry @@ -155,12 +156,13 @@ export class ExternalSourceEntryImportModalComponent implements OnInit { private selectService: SelectableListService, private itemService: ItemDataService, private notificationsService: NotificationsService, - private translateService: TranslateService) { + private translateService: TranslateService, + private uuidService: UUIDService) { } ngOnInit(): void { this.uri = Metadata.first(this.externalSourceEntry.metadata, 'dc.identifier.uri'); - const pagination = Object.assign(new PaginationComponentOptions(), { id: 'external-entry-import', pageSize: 5 }); + const pagination = Object.assign(new PaginationComponentOptions(), { id: this.uuidService.generate(), pageSize: 5 }); this.searchOptions = Object.assign(new PaginatedSearchOptions({ query: this.externalSourceEntry.value, pagination: pagination })); this.localEntitiesRD$ = this.lookupRelationService.getLocalResults(this.relationship, this.searchOptions); } diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts index bac6b89583f..4bfd8670354 100644 --- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts +++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts @@ -13,6 +13,8 @@ import { ObjectValuesPipe } from '../utils/object-values-pipe'; import { PaginationService } from '../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../testing/pagination-service.stub'; import { FieldUpdates } from '../../core/data/object-updates/field-updates.model'; +import { UUIDService } from '../../core/shared/uuid.service'; +import { getMockUUIDService } from '../mocks/uuid.service.mock'; @Component({ selector: 'ds-mock-paginated-drag-drop-abstract', @@ -25,8 +27,9 @@ class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDra protected objectValuesPipe: ObjectValuesPipe, protected mockUrl: string, protected paginationService: PaginationService, - protected mockObjectsRD$: Observable>>) { - super(objectUpdatesService, elRef, objectValuesPipe, paginationService); + protected mockObjectsRD$: Observable>>, + protected uuidService: UUIDService) { + super(objectUpdatesService, elRef, objectValuesPipe, paginationService, uuidService); } initializeObjectsRD(): void { @@ -43,6 +46,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => { let objectUpdatesService: ObjectUpdatesService; let elRef: ElementRef; let objectValuesPipe: ObjectValuesPipe; + let uuidService: UUIDService; const url = 'mock-abstract-paginated-drag-and-drop-list-component'; @@ -76,7 +80,8 @@ describe('AbstractPaginatedDragAndDropListComponent', () => { }); paginationService = new PaginationServiceStub(); objectsRD$ = new BehaviorSubject(objectsRD); - component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, objectValuesPipe, url, paginationService, objectsRD$); + uuidService = getMockUUIDService(); + component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, objectValuesPipe, url, paginationService, objectsRD$, uuidService); component.paginationComponent = paginationComponent; component.ngOnInit(); }); diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts index 8dba47566fa..c785959de5f 100644 --- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts +++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts @@ -19,6 +19,7 @@ import { compareArraysUsing } from '../../item-page/simple/item-types/shared/ite import { PaginationService } from '../../core/pagination/pagination.service'; import { FieldUpdate } from '../../core/data/object-updates/field-update.model'; import { FieldUpdates } from '../../core/data/object-updates/field-updates.model'; +import { UUIDService } from '../../core/shared/uuid.service'; /** * Operator used for comparing {@link FieldUpdate}s by their field's UUID @@ -90,7 +91,7 @@ export abstract class AbstractPaginatedDragAndDropListComponent { let component: ItemExportListComponent; @@ -63,6 +65,7 @@ describe('ItemExportListComponent', () => { providers: [ { provide: PaginationService, useValue: paginationService }, { provide: SearchManager, useValue: mockSearchManager }, + { provide: UUIDService, useValue: getMockUUIDService() } ] }) .compileComponents(); diff --git a/src/app/shared/search/item-export/item-export/item-export-list/item-export-list.component.ts b/src/app/shared/search/item-export/item-export/item-export-list/item-export-list.component.ts index 784c3dccafd..e2d916638f1 100644 --- a/src/app/shared/search/item-export/item-export/item-export-list/item-export-list.component.ts +++ b/src/app/shared/search/item-export/item-export/item-export-list/item-export-list.component.ts @@ -13,6 +13,7 @@ import { Context } from '../../../../../core/shared/context.model'; import { PaginationService } from '../../../../../core/pagination/pagination.service'; import { fadeIn } from '../../../../animations/fade'; import { PaginatedSearchOptions } from '../../../models/paginated-search-options.model'; +import { UUIDService } from '../../../../../core/shared/uuid.service'; @Component({ selector: 'ds-item-export-list', @@ -53,7 +54,7 @@ export class ItemExportListComponent implements OnInit { * The initial pagination options */ initialPagination = Object.assign(new PaginationComponentOptions(), { - id: 'el', + id: this.uuidService.generate(), pageSize: 10 }); @@ -64,7 +65,8 @@ export class ItemExportListComponent implements OnInit { constructor( private paginationService: PaginationService, - private searchManager: SearchManager) { + private searchManager: SearchManager, + private uuidService: UUIDService) { } ngOnInit(): void { diff --git a/src/app/shared/search/item-export/item-export/item-export.component.spec.ts b/src/app/shared/search/item-export/item-export/item-export.component.spec.ts index e6675fba273..e692244147f 100644 --- a/src/app/shared/search/item-export/item-export/item-export.component.spec.ts +++ b/src/app/shared/search/item-export/item-export/item-export.component.spec.ts @@ -24,6 +24,8 @@ import { SearchManager } from '../../../../core/browse/search-manager'; import { SearchObjects } from '../../models/search-objects.model'; import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils'; import { PageInfo } from '../../../../core/shared/page-info.model'; +import { UUIDService } from '../../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../mocks/uuid.service.mock'; describe('ItemExportComponent', () => { let component: ItemExportComponent; @@ -125,7 +127,8 @@ describe('ItemExportComponent', () => { { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: SelectableListService, useValue: selectService }, { provide: Router, useValue: router }, - { provide: SearchManager, useValue: mockSearchManager } + { provide: SearchManager, useValue: mockSearchManager }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [ NO_ERRORS_SCHEMA diff --git a/src/app/shared/search/item-export/item-export/item-export.component.ts b/src/app/shared/search/item-export/item-export/item-export.component.ts index cfe4da4f058..fb44be6b1bf 100644 --- a/src/app/shared/search/item-export/item-export/item-export.component.ts +++ b/src/app/shared/search/item-export/item-export/item-export.component.ts @@ -26,6 +26,7 @@ import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { RemoteData } from '../../../../core/data/remote-data'; import { SearchObjects } from '../../models/search-objects.model'; import { DSpaceObject } from '../../../../core/shared/dspace-object.model'; +import { UUIDService } from '../../../../core/shared/uuid.service'; export enum ExportSelectionMode { All = 'all', @@ -105,7 +106,8 @@ export class ItemExportComponent implements OnInit, OnDestroy { protected translate: TranslateService, public activeModal: NgbActiveModal, private selectableListService: SelectableListService, - private searchManager: SearchManager,) { + private searchManager: SearchManager, + private uuidService: UUIDService) { } ngOnInit() { @@ -260,7 +262,7 @@ export class ItemExportComponent implements OnInit, OnDestroy { Object.assign(new PaginatedSearchOptions({}), this.searchOptions, { fixedFilter: `f.entityType=${this.itemType.label},equals`, pagination: Object.assign(new PaginationComponentOptions(), { - id: 'ex', + id: this.uuidService.generate(), pageSize: 1 }) }) diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index f6e1ceb1f94..fc6c3352c01 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -28,6 +28,8 @@ import { ExternalSourceEntry } from '../../core/shared/external-source-entry.mod import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component'; import { By } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { UUIDService } from '../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock'; describe('SubmissionImportExternalComponent test suite', () => { let comp: SubmissionImportExternalComponent; @@ -64,6 +66,7 @@ describe('SubmissionImportExternalComponent test suite', () => { { provide: RouteService, useValue: routeServiceStub }, { provide: Router, useValue: new RouterStub() }, { provide: NgbModal, useValue: ngbModal }, + { provide: UUIDService, useValue: getMockUUIDService() }, SubmissionImportExternalComponent ], schemas: [NO_ERRORS_SCHEMA] 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 aeabe1eddf2..580b55a2d84 100644 --- a/src/app/submission/import-external/submission-import-external.component.ts +++ b/src/app/submission/import-external/submission-import-external.component.ts @@ -21,6 +21,7 @@ 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'; +import { UUIDService } from '../../core/shared/uuid.service'; /** * This component allows to submit a new workspaceitem importing the data from an external source. @@ -71,7 +72,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy { * The initial pagination options */ public initialPagination = Object.assign(new PaginationComponentOptions(), { - id: 'spc', + id: this.uuidService.generate(), pageSize: 10 }); /** @@ -104,6 +105,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy { private routeService: RouteService, private router: Router, private modalService: NgbModal, + private uuidService: UUIDService ) { } diff --git a/src/app/subscriptions-page/subscriptions-page.component.spec.ts b/src/app/subscriptions-page/subscriptions-page.component.spec.ts index 4f443924281..d8af192eae9 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.spec.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.spec.ts @@ -26,6 +26,8 @@ import { SubscriptionViewComponent } from '../shared/subscriptions/subscription- import { PageInfo } from '../core/shared/page-info.model'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { buildPaginatedList } from '../core/data/paginated-list.model'; +import { UUIDService } from '../core/shared/uuid.service'; +import { getMockUUIDService } from '../shared/mocks/uuid.service.mock'; describe('SubscriptionsPageComponent', () => { let component: SubscriptionsPageComponent; @@ -71,7 +73,8 @@ describe('SubscriptionsPageComponent', () => { { provide: SubscriptionsDataService, useValue: subscriptionServiceStub }, { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, { provide: AuthService, useValue: authServiceStub }, - { provide: PaginationService, useValue: paginationService } + { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }) diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 05c587ba12c..00180230b0e 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -14,6 +14,7 @@ import { EPerson } from '../core/eperson/models/eperson.model'; import { getAllCompletedRemoteData } from '../core/shared/operators'; import { RemoteData } from '../core/data/remote-data'; import { hasValue } from '../shared/empty.util'; +import { UUIDService } from '../core/shared/uuid.service'; @Component({ selector: 'ds-subscriptions-page', @@ -34,7 +35,7 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { * The current pagination configuration for the page */ config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'elp', + id: this.uuidService.generate(), pageSize: 10, currentPage: 1 }); @@ -57,7 +58,8 @@ export class SubscriptionsPageComponent implements OnInit, OnDestroy { constructor( private paginationService: PaginationService, private authService: AuthService, - private subscriptionService: SubscriptionsDataService + private subscriptionService: SubscriptionsDataService, + private uuidService: UUIDService ) { } diff --git a/src/app/suggestions-page/suggestions-page.component.spec.ts b/src/app/suggestions-page/suggestions-page.component.spec.ts index ad518930d98..94f5f82e98c 100644 --- a/src/app/suggestions-page/suggestions-page.component.spec.ts +++ b/src/app/suggestions-page/suggestions-page.component.spec.ts @@ -31,6 +31,8 @@ import { TestScheduler } from 'rxjs/testing'; import { getTestScheduler } from 'jasmine-marbles'; import { PaginationServiceStub } from '../shared/testing/pagination-service.stub'; import { PaginationService } from '../core/pagination/pagination.service'; +import { UUIDService } from '../core/shared/uuid.service'; +import { getMockUUIDService } from '../shared/mocks/uuid.service.mock'; describe('SuggestionPageComponent', () => { let component: SuggestionsPageComponent; @@ -80,6 +82,7 @@ describe('SuggestionPageComponent', () => { { provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: TranslateService, useValue: getMockTranslateService() }, { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() }, SuggestionsPageComponent ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts index cde3a33d005..710b68a9585 100644 --- a/src/app/suggestions-page/suggestions-page.component.ts +++ b/src/app/suggestions-page/suggestions-page.component.ts @@ -26,6 +26,7 @@ import { PaginationService } from '../core/pagination/pagination.service'; import { FindListOptions } from '../core/data/find-list-options.model'; import { WorkspaceItem } from '../core/submission/models/workspaceitem.model'; import { redirectOn4xx } from '../core/shared/authorized.operators'; +import { UUIDService } from '../core/shared/uuid.service'; @Component({ selector: 'ds-suggestion-page', @@ -38,7 +39,7 @@ export class SuggestionsPageComponent implements OnInit { * The pagination configuration */ paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { - id: 'sp', + id: this.uuidService.generate(), pageSizeOptions: [5, 10, 20, 40, 60] }); @@ -83,7 +84,8 @@ export class SuggestionsPageComponent implements OnInit { private suggestionService: SuggestionsService, private suggestionTargetsStateService: SuggestionTargetsStateService, private translateService: TranslateService, - private workspaceItemService: WorkspaceitemDataService + private workspaceItemService: WorkspaceitemDataService, + private uuidService: UUIDService ) { } diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts index 7c8db782ce6..2fe31f6f906 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts @@ -32,6 +32,8 @@ import { RouterMock } from '../../../../shared/mocks/router.mock'; import { PaginationService } from '../../../../core/pagination/pagination.service'; import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub'; import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.model'; +import { UUIDService } from '../../../../core/shared/uuid.service'; +import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock'; describe('ReviewersListComponent', () => { let component: ReviewersListComponent; @@ -152,6 +154,7 @@ describe('ReviewersListComponent', () => { { provide: FormBuilderService, useValue: builderService }, { provide: Router, useValue: new RouterMock() }, { provide: PaginationService, useValue: paginationService }, + { provide: UUIDService, useValue: getMockUUIDService() } ], schemas: [NO_ERRORS_SCHEMA] }).compileComponents(); diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts index 7112a305432..656ade86d79 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts @@ -17,6 +17,7 @@ import { MembersListComponent, EPersonListActionConfig, } from '../../../../access-control/group-registry/group-form/members-list/members-list.component'; +import { UUIDService } from '../../../../core/shared/uuid.service'; /** * Keys to keep track of specific subscriptions @@ -57,8 +58,9 @@ export class ReviewersListComponent extends MembersListComponent implements OnIn notificationsService: NotificationsService, formBuilder: FormBuilder, paginationService: PaginationService, - router: Router) { - super(groupService, ePersonDataService, translateService, notificationsService, formBuilder, paginationService, router); + router: Router, + protected uuidService: UUIDService) { + super(groupService, ePersonDataService, translateService, notificationsService, formBuilder, paginationService, router, uuidService); } ngOnInit() { From d3c8b74b288f9e793b50b85c67bfda80b94254f5 Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Mon, 6 Jun 2022 20:24:45 +0530 Subject: [PATCH 684/758] =?UTF-8?q?[DSC-435]=20Nascondere=20la=20sezione?= =?UTF-8?q?=20filtri=20quando=20=C3=A8=20vuota?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search-filter/search-filter.component.ts | 2 +- .../search-filters.component.html | 12 ++++++---- .../search-filters.component.ts | 23 +++++++++++++++++-- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts index d1d3bd729d4..5a64c043997 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts @@ -180,6 +180,6 @@ export class SearchFilterComponent implements OnInit { )); } }), - startWith(true)); + startWith(false)); } } diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html index e392cd2663e..a0595c5eee7 100644 --- a/src/app/shared/search/search-filters/search-filters.component.html +++ b/src/app/shared/search/search-filters/search-filters.component.html @@ -1,7 +1,9 @@ -

{{"search.filters.head" | translate}}

-
-
- +
+

{{"search.filters.head" | translate}}

+
+
+ +
+ {{"search.filters.reset" | translate}}
- {{"search.filters.reset" | translate}} diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts index 766939226dd..bdd9729c4d0 100644 --- a/src/app/shared/search/search-filters/search-filters.component.ts +++ b/src/app/shared/search/search-filters/search-filters.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core'; +import { AfterViewChecked, Component, Inject, Input, OnDestroy, OnInit, ViewChildren } from '@angular/core'; import { Router } from '@angular/router'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -23,7 +23,7 @@ import { hasValue } from '../../empty.util'; /** * This component represents the part of the search sidebar that contains filters. */ -export class SearchFiltersComponent implements OnInit, OnDestroy { +export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestroy { /** * An observable containing configuration about which filters are shown and how they are shown */ @@ -55,6 +55,16 @@ export class SearchFiltersComponent implements OnInit, OnDestroy { */ @Input() refreshFilters: BehaviorSubject; + /** + * List of element references to all filters + */ + @ViewChildren('searchFilter') searchFilter; + + /** + * counts for the active filters + */ + searchFilterCount = 0; + /** * Link to the search page */ @@ -101,6 +111,15 @@ export class SearchFiltersComponent implements OnInit, OnDestroy { return config ? config.name : undefined; } + ngAfterViewChecked() { + this.searchFilterCount = 0; + this.searchFilter._results.forEach(element => { + if (element.nativeElement?.children[0]?.children.length > 0) { + this.searchFilterCount++; + } + }); + } + ngOnDestroy() { this.subs.forEach((sub) => { if (hasValue(sub)) { From 674d8c8d8e3547d937cc4acb28b6027a08ee36df Mon Sep 17 00:00:00 2001 From: Sufiyan Shaikh Date: Wed, 8 Jun 2022 19:40:34 +0530 Subject: [PATCH 685/758] [DSC-435] test cases --- .../search-filters.component.spec.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts index 310a8f33a8f..c3a876c661b 100644 --- a/src/app/shared/search/search-filters/search-filters.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts @@ -10,6 +10,7 @@ import { SearchService } from '../../../core/shared/search/search.service'; import { of as observableOf } from 'rxjs'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub'; +import { By } from '@angular/platform-browser'; describe('SearchFiltersComponent', () => { let comp: SearchFiltersComponent; @@ -66,4 +67,18 @@ describe('SearchFiltersComponent', () => { }); }); + describe('when there are no filters', () => { + beforeEach(() => { + (comp as any).ngOnInit(); + fixture.detectChanges(); + }); + + it('should not render component', () => { + const menu = fixture.debugElement.query(By.css('div.d-none')); + expect(menu).not.toBeNull(); + expect(comp.searchFilterCount).toEqual(0); + }); + + }); + }); From cfa8e866dbe3deb5bb5d2dccd55af4fd97680c9e Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 26 Sep 2023 12:50:31 +0200 Subject: [PATCH 686/758] [DSC-435] Fixes --- .../search/search-filters/search-filters.component.html | 2 +- .../search-filters/search-filters.component.spec.ts | 2 +- .../search/search-filters/search-filters.component.ts | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html index a0595c5eee7..2909d31766e 100644 --- a/src/app/shared/search/search-filters/search-filters.component.html +++ b/src/app/shared/search/search-filters/search-filters.component.html @@ -1,4 +1,4 @@ -
+

{{"search.filters.head" | translate}}

diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts index c3a876c661b..247df67ee53 100644 --- a/src/app/shared/search/search-filters/search-filters.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts @@ -76,7 +76,7 @@ describe('SearchFiltersComponent', () => { it('should not render component', () => { const menu = fixture.debugElement.query(By.css('div.d-none')); expect(menu).not.toBeNull(); - expect(comp.searchFilterCount).toEqual(0); + expect(comp.availableFilters).toBeFalse(); }); }); diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts index bdd9729c4d0..c20a7e37d0f 100644 --- a/src/app/shared/search/search-filters/search-filters.component.ts +++ b/src/app/shared/search/search-filters/search-filters.component.ts @@ -63,7 +63,7 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr /** * counts for the active filters */ - searchFilterCount = 0; + availableFilters = false; /** * Link to the search page @@ -112,11 +112,9 @@ export class SearchFiltersComponent implements OnInit, AfterViewChecked, OnDestr } ngAfterViewChecked() { - this.searchFilterCount = 0; + this.availableFilters = false; this.searchFilter._results.forEach(element => { - if (element.nativeElement?.children[0]?.children.length > 0) { - this.searchFilterCount++; - } + this.availableFilters = element.nativeElement?.children[0]?.children.length > 0; }); } From 64598f121ab216a863825181588b6dcaa55c3c08 Mon Sep 17 00:00:00 2001 From: "yevhenii.lohatskyi" Date: Tue, 26 Sep 2023 14:36:19 +0300 Subject: [PATCH 687/758] [DSC-1248] add new input 'configuration' to searchFormComponent --- .../shared/search-form/search-form.component.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts index 7ea51e4c1e0..1d29ea8ab37 100644 --- a/src/app/shared/search-form/search-form.component.ts +++ b/src/app/shared/search-form/search-form.component.ts @@ -42,8 +42,12 @@ export class SearchFormComponent implements OnInit { /** * The currently selected scope object's UUID */ - @Input() - scope = ''; + @Input() scope = ''; + + /** + * Discovery configuration to be used in search + */ + @Input() configuration: string; selectedScope: BehaviorSubject = new BehaviorSubject(undefined); @@ -99,8 +103,13 @@ export class SearchFormComponent implements OnInit { */ onSubmit(data: any) { if (isNotEmpty(this.scope)) { - data = Object.assign(data, { scope: this.scope }); + data = { ...data, scope: this.scope }; } + + if (isNotEmpty(this.configuration)) { + data = { ...data, configuration: this.configuration }; + } + this.updateSearch(data); this.submitSearch.emit(data); } From 1e4dcf25a8289980760ba8f81e597fa5ef00b4c9 Mon Sep 17 00:00:00 2001 From: "yevhenii.lohatskyi" Date: Tue, 26 Sep 2023 14:37:09 +0300 Subject: [PATCH 688/758] [DSC-1248] set new input 'configuration' to 'site' in search-section.component.html --- .../search-section/search-section.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/shared/explore/section-component/search-section/search-section.component.html b/src/app/shared/explore/section-component/search-section/search-section.component.html index 187454424f2..57cf6e66447 100644 --- a/src/app/shared/explore/section-component/search-section/search-section.component.html +++ b/src/app/shared/explore/section-component/search-section/search-section.component.html @@ -27,7 +27,9 @@

{{ 'explore.search-section.' + sectionId
- >
From ff59759c1d0ecbcb2af0d4ca28f4ddb9e8b31ffb Mon Sep 17 00:00:00 2001 From: "yevhenii.lohatskyi" Date: Tue, 26 Sep 2023 14:38:53 +0300 Subject: [PATCH 689/758] [DSC-1248] update i18n labels --- src/assets/i18n/en.json5 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 5f5b1797b9a..415f397a872 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -5094,6 +5094,8 @@ "search.filters.applied.charts.default.title": "Search Output", + "search.filters.applied.charts.site.title": "Search Output", + "search.filters.applied.charts.RELATION.Person.researchoutputs.title": "Research Output", "search.filters.applied.charts.RELATION.Project.fundings.title": "Fundings", @@ -5353,6 +5355,8 @@ "default.search.results.head": "Search Results", + "site.search.results.head": "Search Results", + "default-relationships.search.results.head": "Search Results", "defaultConfiguration.search.results.head": "Search Results", From 2dba1c65cb8a5a03dde54b8c9b852c55414be30e Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 26 Sep 2023 17:40:59 +0200 Subject: [PATCH 690/758] [CST-10703] new wireframe implementation & validate email page --- src/app/app-routing.module.ts | 10 +++ ...-email-confirmation-page-routing.module.ts | 17 ++++ ...gin-email-confirmation-page.component.html | 3 + ...in-email-confirmation-page.component.scss} | 0 ...-email-confirmation-page.component.spec.ts | 25 ++++++ ...login-email-confirmation-page.component.ts | 8 ++ ...al-login-email-confirmation-page.module.ts | 19 ++++ .../external-login-page-routing.module.ts | 9 +- .../external-login-page.component.html | 1 + .../external-login-page.component.spec.ts | 9 +- .../email-validated.component.html | 2 +- .../email-validated.component.scss | 0 .../email-validated.component.spec.ts | 38 +++----- .../email-validated.component.ts | 21 +++++ ...al-login-validation-page-routing.module.ts | 17 ++++ ...ernal-login-validation-page.component.html | 8 ++ ...ernal-login-validation-page.component.scss | 0 ...al-login-validation-page.component.spec.ts | 25 ++++++ ...xternal-login-validation-page.component.ts | 21 +++++ .../external-login-validation-page.module.ts | 30 +++++++ .../helpers/compare-values.pipe.ts | 15 ++++ .../review-account-info.component.html | 45 ++++++++++ .../review-account-info.component.scss | 13 +++ .../review-account-info.component.spec.ts | 25 ++++++ .../review-account-info.component.ts | 87 +++++++++++++++++++ ...xternal-login-validation-page.component.ts | 25 ++++++ .../confirm-email.component.html | 2 +- .../confirm-email.component.spec.ts | 22 ++++- .../confirmation-sent.component.html | 2 +- .../confirmation-sent.component.spec.ts | 18 ++-- .../email-validated.component.ts | 11 --- .../provide-email.component.html | 2 +- .../provide-email.component.spec.ts | 2 + .../external-log-in.component.html | 40 ++++++--- .../external-log-in.component.spec.ts | 16 ++-- .../external-log-in.component.ts | 55 ++++++++++-- .../models/registration-data.mock.model.ts | 6 +- .../orcid-confirmation.component.spec.ts | 1 + src/app/shared/log-in/log-in.component.html | 4 +- src/app/shared/log-in/log-in.component.ts | 5 +- src/app/shared/shared.module.ts | 8 +- 41 files changed, 578 insertions(+), 89 deletions(-) create mode 100644 src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts create mode 100644 src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.html rename src/app/{shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.scss => external-login-email-confirmation-page/external-login-email-confirmation-page.component.scss} (100%) create mode 100644 src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts create mode 100644 src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.ts create mode 100644 src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts rename src/app/{shared/external-log-in-complete/email-confirmation => external-login-validation-page}/email-validated/email-validated.component.html (73%) create mode 100644 src/app/external-login-validation-page/email-validated/email-validated.component.scss rename src/app/{shared/external-log-in-complete/email-confirmation => external-login-validation-page}/email-validated/email-validated.component.spec.ts (61%) create mode 100644 src/app/external-login-validation-page/email-validated/email-validated.component.ts create mode 100644 src/app/external-login-validation-page/external-login-validation-page-routing.module.ts create mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.html create mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.scss create mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.spec.ts create mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.ts create mode 100644 src/app/external-login-validation-page/external-login-validation-page.module.ts create mode 100644 src/app/external-login-validation-page/helpers/compare-values.pipe.ts create mode 100644 src/app/external-login-validation-page/review-account-info/review-account-info.component.html create mode 100644 src/app/external-login-validation-page/review-account-info/review-account-info.component.scss create mode 100644 src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts create mode 100644 src/app/external-login-validation-page/review-account-info/review-account-info.component.ts create mode 100644 src/app/external-login-validation-page/themed-external-login-validation-page.component.ts delete mode 100644 src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 82af5149d06..d5f3a5aecdc 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -176,6 +176,16 @@ import { RedirectService } from './redirect/redirect.service'; loadChildren: () => import('./external-login-page/external-login-page.module') .then((m) => m.ExternalLoginPageModule) }, + { + path: 'validate-email', + loadChildren: () => import('./external-login-validation-page/external-login-validation-page.module') + .then((m) => m.ExternalLoginValidationPageModule) + }, + { + path: 'email-confirmation', + loadChildren: () => import('./external-login-email-confirmation-page/external-login-email-confirmation-page.module') + .then((m) => m.ExternalLoginEmailConfirmationPageModule) + }, { path: 'logout', loadChildren: () => import('./logout-page/logout-page.module') diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts new file mode 100644 index 00000000000..e242d9ea1a9 --- /dev/null +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; + +const routes: Routes = [ + { + path: '', + pathMatch: 'full', + component: ExternalLoginEmailConfirmationPageComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ExternalLoginEmailConfirmationPageRoutingModule { } diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.html b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.html new file mode 100644 index 00000000000..c1cf46032b4 --- /dev/null +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.scss b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.scss similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.scss rename to src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.scss diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts new file mode 100644 index 00000000000..cd646f25cf0 --- /dev/null +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; + +describe('ExternalLoginEmailConfirmationPageComponent', () => { + let component: ExternalLoginEmailConfirmationPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ExternalLoginEmailConfirmationPageComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ExternalLoginEmailConfirmationPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.ts new file mode 100644 index 00000000000..615de74ea34 --- /dev/null +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: './external-login-email-confirmation-page.component.html', + styleUrls: ['./external-login-email-confirmation-page.component.scss'] +}) +export class ExternalLoginEmailConfirmationPageComponent { +} diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts new file mode 100644 index 00000000000..36684f2f367 --- /dev/null +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { ExternalLoginEmailConfirmationPageRoutingModule } from './external-login-email-confirmation-page-routing.module'; +import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; +import { SharedModule } from '../shared/shared.module'; + + +@NgModule({ + declarations: [ + ExternalLoginEmailConfirmationPageComponent + ], + imports: [ + CommonModule, + ExternalLoginEmailConfirmationPageRoutingModule, + SharedModule + ] +}) +export class ExternalLoginEmailConfirmationPageModule { } diff --git a/src/app/external-login-page/external-login-page-routing.module.ts b/src/app/external-login-page/external-login-page-routing.module.ts index 4e64d267de8..7adbbb7b034 100644 --- a/src/app/external-login-page/external-login-page-routing.module.ts +++ b/src/app/external-login-page/external-login-page-routing.module.ts @@ -1,7 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; const routes: Routes = [ @@ -9,17 +7,12 @@ const routes: Routes = [ path: '', pathMatch: 'full', component: ThemedExternalLoginPageComponent, - // resolve: { breadcrumb: I18nBreadcrumbResolver }, - // data: { breadcrumbKey: 'external-login', title: 'login.title' }, }, ]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule], - providers: [ - I18nBreadcrumbResolver, - I18nBreadcrumbsService - ] + providers: [] }) export class ExternalLoginPageRoutingModule { } diff --git a/src/app/external-login-page/external-login-page.component.html b/src/app/external-login-page/external-login-page.component.html index d2daa24a561..7aa4ad6e837 100644 --- a/src/app/external-login-page/external-login-page.component.html +++ b/src/app/external-login-page/external-login-page.component.html @@ -1,3 +1,4 @@
+ diff --git a/src/app/external-login-page/external-login-page.component.spec.ts b/src/app/external-login-page/external-login-page.component.spec.ts index 56f0d81d189..20f46ae833c 100644 --- a/src/app/external-login-page/external-login-page.component.spec.ts +++ b/src/app/external-login-page/external-login-page.component.spec.ts @@ -1,6 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginPageComponent } from './external-login-page.component'; +import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; +import { Router } from '@angular/router'; +import { RouterMock } from '../shared/mocks/router.mock'; describe('ExternalLoginPageComponent', () => { let component: ExternalLoginPageComponent; @@ -8,7 +11,11 @@ describe('ExternalLoginPageComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ExternalLoginPageComponent ] + declarations: [ ExternalLoginPageComponent ], + providers: [ + { provide: EpersonRegistrationService, useValue: {} }, + { provide: Router, useValue: new RouterMock() }, + ], }) .compileComponents(); }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.html b/src/app/external-login-validation-page/email-validated/email-validated.component.html similarity index 73% rename from src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.html rename to src/app/external-login-validation-page/email-validated/email-validated.component.html index 3fa31b0bd53..133243853bf 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.html +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.html @@ -5,5 +5,5 @@

- +
diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.scss b/src/app/external-login-validation-page/email-validated/email-validated.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.spec.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts similarity index 61% rename from src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.spec.ts rename to src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts index e961e6fb913..d5d2c2794cc 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.spec.ts +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts @@ -2,22 +2,29 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { EmailValidatedComponent } from './email-validated.component'; import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; -import { BehaviorSubject } from 'rxjs'; -import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock'; +import { of } from 'rxjs'; +import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock'; describe('EmailValidatedComponent', () => { let component: EmailValidatedComponent; let fixture: ComponentFixture; let compiledTemplate: HTMLElement; + const translateServiceStub = { + get: () => of('Mocked Translation Text'), + instant: (key: any) => 'Mocked Translation Text', + onLangChange: new EventEmitter(), + onTranslationChange: new EventEmitter(), + onDefaultLangChange: new EventEmitter() + }; + beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [ EmailValidatedComponent ], providers: [ - { provide: TranslateService, useValue: getMockTranslateService() }, + { provide: TranslateService, useValue: translateServiceStub }, ], imports: [ CommonModule, @@ -46,34 +53,17 @@ describe('EmailValidatedComponent', () => { it('should render translated header', () => { const headerElement = compiledTemplate.querySelector('h4'); - expect(headerElement.textContent).toContain('Mocked Header Translation'); + expect(headerElement.textContent).toContain('Mocked Translation Text'); }); it('should render translated info paragraph', () => { const infoParagraphElement = compiledTemplate.querySelector('p'); - expect(infoParagraphElement.innerHTML).toContain('Mocked Info Translation'); + expect(infoParagraphElement.innerHTML).toBeTruthy(); }); it('should render ds-log-in component', () => { const dsLogInComponent = compiledTemplate.querySelector('ds-log-in'); expect(dsLogInComponent).toBeTruthy(); }); - }); -// Mock the TranslateService -class MockTranslateService { - private translationSubject = new BehaviorSubject({}); - - get(key: string) { - const translations = { - 'external-login.validated-email.header': 'Mocked Header Translation', - 'external-login.validated-email.info': 'Mocked Info Translation', - }; - - this.translationSubject.next(translations); - - // Return an Observable that mimics TranslateService's behavior - return this.translationSubject.asObservable(); - } -} diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.ts new file mode 100644 index 00000000000..0703dbed499 --- /dev/null +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.ts @@ -0,0 +1,21 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Router } from '@angular/router'; +import { AuthService } from '../../core/auth/auth.service'; + +@Component({ + selector: 'ds-email-validated', + templateUrl: './email-validated.component.html', + styleUrls: ['./email-validated.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class EmailValidatedComponent { + constructor(private authService: AuthService, private router: Router) { + // if user is logged in, redirect to home page + // in case user logs in with an existing account + this.authService.isAuthenticated().subscribe((isAuthenticated: boolean) => { + if (isAuthenticated) { + this.router.navigate(['/']); + } + }); + } +} diff --git a/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts b/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts new file mode 100644 index 00000000000..d206eba0fe8 --- /dev/null +++ b/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { ThemedExternalLoginValidationPageComponent } from './themed-external-login-validation-page.component'; + +const routes: Routes = [ + { + path: '', + pathMatch: 'full', + component: ThemedExternalLoginValidationPageComponent, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ExternalLoginValidationPageRoutingModule { } diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.html b/src/app/external-login-validation-page/external-login-validation-page.component.html new file mode 100644 index 00000000000..10e7e99c261 --- /dev/null +++ b/src/app/external-login-validation-page/external-login-validation-page.component.html @@ -0,0 +1,8 @@ +
+ + + + + + +
diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.scss b/src/app/external-login-validation-page/external-login-validation-page.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts b/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts new file mode 100644 index 00000000000..3ec5c77409f --- /dev/null +++ b/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; + +describe('ExternalLoginValidationPageComponent', () => { + let component: ExternalLoginValidationPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ExternalLoginValidationPageComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ExternalLoginValidationPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.ts b/src/app/external-login-validation-page/external-login-validation-page.component.ts new file mode 100644 index 00000000000..4a2ab4ef942 --- /dev/null +++ b/src/app/external-login-validation-page/external-login-validation-page.component.ts @@ -0,0 +1,21 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + templateUrl: './external-login-validation-page.component.html', + styleUrls: ['./external-login-validation-page.component.scss'] +}) +export class ExternalLoginValidationPageComponent implements OnInit { + + // temporary variable to test the component + newEmail = false; + + existingEmail = true; + + ngOnInit(): void { + // GET data from validation link + // -> if email address is not used by other user => Email Validated component + // -> if email address is used by other user => Review account information component + console.log('ExternalLoginValidationPageComponent ngOnInit'); + } + +} diff --git a/src/app/external-login-validation-page/external-login-validation-page.module.ts b/src/app/external-login-validation-page/external-login-validation-page.module.ts new file mode 100644 index 00000000000..ba41cf95a1b --- /dev/null +++ b/src/app/external-login-validation-page/external-login-validation-page.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { ExternalLoginValidationPageRoutingModule } from './external-login-validation-page-routing.module'; +import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; +import { ThemedExternalLoginValidationPageComponent } from './themed-external-login-validation-page.component'; + +import { UiSwitchModule } from 'ngx-ui-switch'; +import { ReviewAccountInfoComponent } from './review-account-info/review-account-info.component'; +import { EmailValidatedComponent } from './email-validated/email-validated.component'; +import { SharedModule } from '../shared/shared.module'; +import { CompareValuesPipe } from './helpers/compare-values.pipe'; + + +@NgModule({ + declarations: [ + ExternalLoginValidationPageComponent, + ThemedExternalLoginValidationPageComponent, + ReviewAccountInfoComponent, + EmailValidatedComponent, + CompareValuesPipe + ], + imports: [ + CommonModule, + ExternalLoginValidationPageRoutingModule, + SharedModule, + UiSwitchModule, + ] +}) +export class ExternalLoginValidationPageModule { } diff --git a/src/app/external-login-validation-page/helpers/compare-values.pipe.ts b/src/app/external-login-validation-page/helpers/compare-values.pipe.ts new file mode 100644 index 00000000000..aefbe9a0ae0 --- /dev/null +++ b/src/app/external-login-validation-page/helpers/compare-values.pipe.ts @@ -0,0 +1,15 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'dsCompareValues' +}) +export class CompareValuesPipe implements PipeTransform { + + transform(receivedValue: string, currentValue: string): unknown { + if (receivedValue === currentValue) { + return ''; + } else { + return currentValue; + } + } +} diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.html b/src/app/external-login-validation-page/review-account-info/review-account-info.component.html new file mode 100644 index 00000000000..23e6282f52c --- /dev/null +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.html @@ -0,0 +1,45 @@ +

Review your account information

+ +

+ The information received from ORCID differs from the one recorded in your + profile.
+ Please review them and decide if you want to update any of them.After saving + you will be redirected to your profile page. +

+
+ + + + + + + + + + + + + + + + + +
+ Information + + Received value + + Current value + Override
{{ data.label }}{{ data.receivedValue }} + + + + +
+
diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.scss b/src/app/external-login-validation-page/review-account-info/review-account-info.component.scss new file mode 100644 index 00000000000..1e531f0d8b9 --- /dev/null +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.scss @@ -0,0 +1,13 @@ +:host { + table { + tbody { + background-color: #f7f8f9; + } + + td, + th { + height: 60px; + vertical-align: middle; + } + } +} diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts new file mode 100644 index 00000000000..7cd24cbeec2 --- /dev/null +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ReviewAccountInfoComponent } from './review-account-info.component'; + +describe('ReviewAccountInfoComponent', () => { + let component: ReviewAccountInfoComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ReviewAccountInfoComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ReviewAccountInfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts b/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts new file mode 100644 index 00000000000..92e8a07239f --- /dev/null +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts @@ -0,0 +1,87 @@ +import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { EPersonMock } from '../../shared/testing/eperson.mock'; +import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; +import { mockRegistrationDataModel } from '../../shared/external-log-in-complete/models/registration-data.mock.model'; +export interface ReviewAccountInfoData { + label: string; + currentValue: string; + receivedValue: string; + overrideValue: boolean; + identifier: string; +} + +@Component({ + selector: 'ds-review-account-info', + templateUrl: './review-account-info.component.html', + styleUrls: ['./review-account-info.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ReviewAccountInfoComponent implements OnInit { + registeredData: RegistrationData = mockRegistrationDataModel; + + epersonData: EPerson = EPersonMock; + + notApplicable = 'N/A'; + + dataToCompare: ReviewAccountInfoData[] = []; + + constructor(private ePersonService: EPersonDataService) { + // GET data from url validation link and display + } + + ngOnInit(): void { + this.dataToCompare = [ + { + label: this.registeredData.registrationType, + receivedValue: this.registeredData.netId, + currentValue: this.notApplicable, + overrideValue: false, + identifier: 'netId', + }, + { + label: 'Last Name', + receivedValue: this.getReceivedValue('eperson.lastname'), + currentValue: this.getCurrentValue('eperson.lastname'), + overrideValue: false, + identifier: 'eperson.lastname', + }, + { + label: 'First Name', + currentValue: this.getCurrentValue('eperson.firstname'), + receivedValue: this.getReceivedValue('eperson.firstname'), + overrideValue: false, + identifier: 'eperson.firstname', + }, + { + label: 'Email', + currentValue: this.epersonData.email, + receivedValue: this.registeredData.email, + overrideValue: false, + identifier: 'email', + }, + ]; + } + + getEPersonData() { + // this.epersonData$ = this.ePersonService.findById() + // .pipe( + // getFirstCompletedRemoteData(), + // getRemoteDataPayload() + // ); + } + + getReceivedValue(metadata: string): string { + return this.registeredData.registrationMetadata[metadata]?.[0]?.value; + } + + getCurrentValue(metadata: string): string { + return this.epersonData.firstMetadataValue(metadata); + } + + test(value: boolean, identifier: string) { + this.dataToCompare.find((data) => data.identifier === identifier).overrideValue = value; + console.log(this.dataToCompare); + } +} diff --git a/src/app/external-login-validation-page/themed-external-login-validation-page.component.ts b/src/app/external-login-validation-page/themed-external-login-validation-page.component.ts new file mode 100644 index 00000000000..a08b2669deb --- /dev/null +++ b/src/app/external-login-validation-page/themed-external-login-validation-page.component.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { ThemedComponent } from '../shared/theme-support/themed.component'; +import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; + +/** + * Themed wrapper for ExternalLoginValidationPageComponent + */ +@Component({ + selector: 'ds-themed-external-login-page', + styleUrls: [], + templateUrl: './../shared/theme-support/themed.component.html' +}) +export class ThemedExternalLoginValidationPageComponent extends ThemedComponent { + protected getComponentName(): string { + return 'ExternalLoginValidationPageComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../themes/${themeName}/app/external-login-validation-page/external-login-validation-page.component`); + } + + protected importUnthemedComponent(): Promise { + return import(`./external-login-validation-page.component`); + } +} diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html index 97d9869f411..2ff2000d41a 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html @@ -31,7 +31,7 @@

- diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts index 8e426f27fc0..58b2b2414cd 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -1,6 +1,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfirmEmailComponent } from './confirm-email.component'; +import { FormBuilder } from '@angular/forms'; +import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; +import { CommonModule } from '@angular/common'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; describe('ConfirmEmailComponent', () => { let component: ConfirmEmailComponent; @@ -8,7 +14,21 @@ describe('ConfirmEmailComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ConfirmEmailComponent ] + declarations: [ ConfirmEmailComponent ], + providers: [ + FormBuilder, + { provide: EpersonRegistrationService, useValue: {} }, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock + } + }), + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) .compileComponents(); }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html index f81ebf1a170..3d79b16a4e2 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html @@ -2,4 +2,4 @@

{{ "external-login.confirm-email-sent.header" | translate }}

-

+

diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts index 5106220db62..3de88d9ba26 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts @@ -2,20 +2,29 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfirmationSentComponent } from './confirmation-sent.component'; import { CommonModule } from '@angular/common'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { TranslateService, TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; +import { of } from 'rxjs'; describe('ConfirmationSentComponent', () => { let component: ConfirmationSentComponent; let fixture: ComponentFixture; let compiledTemplate: HTMLElement; + const translateServiceStub = { + get: () => of('Mocked Translation Text'), + instant: (key: any) => 'Mocked Translation Text', + onLangChange: new EventEmitter(), + onTranslationChange: new EventEmitter(), + onDefaultLangChange: new EventEmitter() + }; + beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [ ConfirmationSentComponent ], providers: [ - { provide: TranslateService, useClass: {} }, + { provide: TranslateService, useValue: translateServiceStub }, ], imports: [ CommonModule, @@ -44,12 +53,11 @@ describe('ConfirmationSentComponent', () => { it('should render translated header', () => { const headerElement = compiledTemplate.querySelector('h4'); - expect(headerElement.textContent).toContain('Mocked Header Translation'); + expect(headerElement.textContent).toContain('Mocked Translation Text'); }); it('should render translated info paragraph', () => { const infoParagraphElement = compiledTemplate.querySelector('p'); - expect(infoParagraphElement.innerHTML).toContain('Mocked Info Translation'); + expect(infoParagraphElement.innerHTML).toBeTruthy(); }); - }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts deleted file mode 100644 index c74cbcfd489..00000000000 --- a/src/app/shared/external-log-in-complete/email-confirmation/email-validated/email-validated.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; - -@Component({ - selector: 'ds-email-validated', - templateUrl: './email-validated.component.html', - styleUrls: ['./email-validated.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class EmailValidatedComponent { - -} diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html index 72c8eb7c88c..b5a2efa7b68 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html @@ -32,7 +32,7 @@

- diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts index 03e28c687d3..63e64830394 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts @@ -6,6 +6,7 @@ import { CommonModule } from '@angular/common'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; describe('ProvideEmailComponent', () => { let component: ProvideEmailComponent; @@ -16,6 +17,7 @@ describe('ProvideEmailComponent', () => { declarations: [ ProvideEmailComponent ], providers: [ FormBuilder, + { provide: EpersonRegistrationService, useValue: {} }, ], imports: [ CommonModule, diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html index e9b5f27f572..59219922470 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html @@ -8,22 +8,42 @@

{{ 'external-login.confirmation.header' | translate}}

{{ informationText }}
-
-
- +
+
+
-
-

or

+
+

or

-
- +
+
+ + +
+

{{'Connect to an existing user' | translate}}

+
+
+
+ +
+
+
+ +
+ diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts index 9268ebeb817..d29ebdb8513 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts @@ -15,8 +15,8 @@ describe('ExternalLogInComponent', () => { let fixture: ComponentFixture; let compiledTemplate: HTMLElement; const translateServiceStub = { - get: () => observableOf('Mocked Translation Text'), - instant: (key: any) => 'Mocked Translation Text', + get: () => observableOf('Info Text'), + instant: (key: any) => 'Info Text', onLangChange: new EventEmitter(), onTranslationChange: new EventEmitter(), onDefaultLangChange: new EventEmitter() @@ -48,6 +48,7 @@ describe('ExternalLogInComponent', () => { fixture = TestBed.createComponent(ExternalLogInComponent); component = fixture.componentInstance; component.registrationData = mockRegistrationDataModel; + component.registrationType = mockRegistrationDataModel.registrationType; compiledTemplate = fixture.nativeElement; fixture.detectChanges(); }); @@ -58,17 +59,20 @@ describe('ExternalLogInComponent', () => { it('should set registrationType and informationText correctly when email is present', () => { expect(component.registrationType).toBe('orcid'); - expect(component.informationText).toContain('orcid'); + expect(component.informationText).toBeDefined(); }); it('should render the template to confirm email when registrationData has email', () => { + component.registrationData = Object.assign({}, mockRegistrationDataModel, { email: 'test@user.com' }); + fixture.detectChanges(); const selector = compiledTemplate.querySelector('ds-confirm-email'); expect(selector).toBeTruthy(); }); it('should render the template with provide email component when registrationData email is null', () => { - component.registrationData.email = null; + component.registrationData = Object.assign({}, mockRegistrationDataModel, { email: null }); fixture.detectChanges(); + component.ngOnInit(); const provideEmailComponent = compiledTemplate.querySelector('ds-provide-email'); expect(provideEmailComponent).toBeTruthy(); }); @@ -79,10 +83,10 @@ describe('ExternalLogInComponent', () => { }); it('should render the template with the translated informationText', () => { - component.informationText = 'Mocked Translation Text'; + component.informationText = 'Info Text'; fixture.detectChanges(); const infoText = fixture.debugElement.query(By.css('[data-test="info-text"]')); - expect(infoText.nativeElement.innerHTML).toContain('Mocked Translation Text'); + expect(infoText.nativeElement.innerHTML).toContain('Info Text'); }); }); diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts index 091f3750398..3b82ab70ca1 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts @@ -1,21 +1,30 @@ -import { Component, OnInit, ChangeDetectionStrategy, Input, Injector } from '@angular/core'; +import { + Component, + OnInit, + ChangeDetectionStrategy, + Input, + Injector, +} from '@angular/core'; import { getExternalLoginConfirmationType } from '../external-log-in.methods-decorator'; import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; import { RegistrationData } from '../models/registration-data.model'; import { hasValue } from '../../empty.util'; import { TranslateService } from '@ngx-translate/core'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { AuthService } from '../../../core/auth/auth.service'; +import { Router } from '@angular/router'; @Component({ selector: 'ds-external-log-in', templateUrl: './external-log-in.component.html', styleUrls: ['./external-log-in.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class ExternalLogInComponent implements OnInit { /** * The type of registration type to be confirmed */ - registrationType: AuthMethodType = AuthMethodType.Orcid; + registrationType: AuthMethodType; /** * The registration data object */ @@ -37,10 +46,25 @@ export class ExternalLogInComponent implements OnInit { */ public objectInjector: Injector; + /** + * Reference to NgbModal + */ + public modalRef: NgbModalRef; + constructor( private injector: Injector, private translate: TranslateService, + private modalService: NgbModal, + private authService: AuthService, + private router: Router ) { + // if user is logged in, redirect to home page + // in case user logs in with an existing account + this.authService.isAuthenticated().subscribe((isAuthenticated: boolean) => { + if (isAuthenticated) { + this.router.navigate(['/']); + } + }); } /** @@ -50,9 +74,13 @@ export class ExternalLogInComponent implements OnInit { ngOnInit(): void { this.objectInjector = Injector.create({ providers: [ - { provide: 'registrationDataProvider', useFactory: () => (this.registrationData), deps: [] }, + { + provide: 'registrationDataProvider', + useFactory: () => this.registrationData, + deps: [], + }, ], - parent: this.injector + parent: this.injector, }); this.registrationType = this.registrationData?.registrationType ?? null; this.informationText = hasValue(this.registrationData?.email) @@ -67,7 +95,9 @@ export class ExternalLogInComponent implements OnInit { private generateInformationTextWhenNOEmail(authMethod: string): string { if (authMethod) { const authMethodUppercase = authMethod.toUpperCase(); - return this.translate.instant('external-login.noEmail.informationText', { authMethod: authMethodUppercase }); + return this.translate.instant('external-login.noEmail.informationText', { + authMethod: authMethodUppercase, + }); } } @@ -78,7 +108,10 @@ export class ExternalLogInComponent implements OnInit { private generateInformationTextWhenEmail(authMethod: string): string { if (authMethod) { const authMethodUppercase = authMethod.toUpperCase(); - return this.translate.instant('external-login.haveEmail.informationText', { authMethod: authMethodUppercase }); + return this.translate.instant( + 'external-login.haveEmail.informationText', + { authMethod: authMethodUppercase } + ); } } @@ -88,4 +121,12 @@ export class ExternalLogInComponent implements OnInit { getExternalLoginConfirmationType() { return getExternalLoginConfirmationType(this.registrationType); } + + openLoginModal(content: any) { + this.modalRef = this.modalService.open(content); + } + + ngOnDestroy(): void { + this.modalRef?.close(); + } } diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts index 3fdf739e27e..30b7b8526bc 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts +++ b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts @@ -1,6 +1,6 @@ import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; import { RegistrationData } from './registration-data.model'; -import { MetadataValue } from 'src/app/core/shared/metadata.models'; +import { MetadataValue } from '../../../core/shared/metadata.models'; export const mockRegistrationDataModel: RegistrationData = Object.assign( new RegistrationData(), { id: '3', @@ -11,7 +11,7 @@ export const mockRegistrationDataModel: RegistrationData = Object.assign( new Re registrationMetadata: { 'eperson.firstname': [ Object.assign(new MetadataValue(), { - value: 'Power', + value: 'User', language: null, authority: '', confidence: -1, @@ -20,7 +20,7 @@ export const mockRegistrationDataModel: RegistrationData = Object.assign( new Re ], 'eperson.lastname': [ Object.assign(new MetadataValue(), { - value: 'User', + value: 'Power', language: null, authority: '', confidence: -1, diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts index 3c856e6f283..e3f84663539 100644 --- a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts +++ b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts @@ -68,6 +68,7 @@ describe('OrcidConfirmationComponent', () => { it('should not render email input when email is null', () => { component.registratioData.email = null; fixture.detectChanges(); + component.ngOnInit(); const emailInput = fixture.nativeElement.querySelector('input[type="email"]'); expect(emailInput).toBeFalsy(); }); diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 11d306c1bc4..7adea60aa1d 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -7,9 +7,9 @@ - +
- {{"login.form.new-user" | translate}} + {{"login.form.new-user" | translate}} {{"login.form.forgot-password" | translate}}
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index 1fe595c1ed2..18a7d6ddf98 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Observable, Subscription, take } from 'rxjs'; +import { Observable, Subscription } from 'rxjs'; import { select, Store } from '@ngrx/store'; import uniqBy from 'lodash/uniqBy'; @@ -18,7 +18,6 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/ import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { CoreState } from '../../core/core-state.model'; import { AuthMethodType } from '../../core/auth/models/auth.method-type'; -import de from 'date-fns/esm/locale/de/index.js'; /** * /users/sign-in @@ -41,6 +40,8 @@ export class LogInComponent implements OnInit, OnDestroy { @Input() showRegisterLink = true; + @Input() hideAllLinks = false; + /** * The list of authentication methods available * @type {AuthMethod[]} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 3ad876a114e..65bcd2dfa3c 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -337,7 +337,6 @@ import { OrcidConfirmationComponent } from './external-log-in-complete/registrat import { ProvideEmailComponent } from './external-log-in-complete/email-confirmation/provide-email/provide-email.component'; import { ConfirmEmailComponent } from './external-log-in-complete/email-confirmation/confirm-email/confirm-email.component'; import { ConfirmationSentComponent } from './external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component'; -import { EmailValidatedComponent } from './external-log-in-complete/email-confirmation/email-validated/email-validated.component'; const MODULES = [ CommonModule, @@ -477,6 +476,9 @@ const COMPONENTS = [ ThemedBrowseMostElementsComponent, SearchChartBarHorizontalComponent, ExternalLogInComponent, + ProvideEmailComponent, + ConfirmEmailComponent, + ConfirmationSentComponent, ]; const ENTRY_COMPONENTS = [ @@ -591,10 +593,6 @@ const DIRECTIVES = [ ...COMPONENTS, ...ENTRY_COMPONENTS, ...DIRECTIVES, - ProvideEmailComponent, - ConfirmEmailComponent, - ConfirmationSentComponent, - EmailValidatedComponent, ], providers: [ ...PROVIDERS From d413423c4582507dff6aa68d7aaf749805a13855 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 27 Sep 2023 17:41:08 +0200 Subject: [PATCH 691/758] [CST-10703] (partial commit) merge account information & validate email --- .../core/data/eperson-registration.service.ts | 18 +-- src/app/core/eperson/eperson-data.service.ts | 21 +++ .../external-login-page.component.ts | 9 +- .../email-validated.component.ts | 6 +- ...ernal-login-validation-page.component.html | 11 +- ...xternal-login-validation-page.component.ts | 51 ++++++- .../review-account-info.component.html | 44 ++++-- .../review-account-info.component.ts | 131 ++++++++++++------ .../confirm-email/confirm-email.component.ts | 17 ++- .../provide-email/provide-email.component.ts | 18 +-- .../models/registration-data.mock.model.ts | 2 +- .../services/external-login.service.spec.ts | 16 +++ .../services/external-login.service.ts | 37 +++++ src/assets/i18n/en.json5 | 19 +++ src/assets/i18n/it.json5 | 89 ++++++++++++ 15 files changed, 378 insertions(+), 111 deletions(-) create mode 100644 src/app/shared/external-log-in-complete/services/external-login.service.spec.ts create mode 100644 src/app/shared/external-log-in-complete/services/external-login.service.ts diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts index e1b77977d6a..3385c520dc5 100644 --- a/src/app/core/data/eperson-registration.service.ts +++ b/src/app/core/data/eperson-registration.service.ts @@ -150,7 +150,7 @@ export class EpersonRegistrationService{ * @param updateValue Flag to indicate if the email should be updated or added * @returns Remote Data state of the patch request */ - patchUpdateRegistration(value: string, field: string, registrationId: string, token: string, updateValue: boolean) { + patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operator: 'add' | 'replace') { const requestId = this.requestService.generateRequestId(); const href$ = this.getRegistrationEndpoint().pipe( @@ -159,7 +159,7 @@ export class EpersonRegistrationService{ ); href$.subscribe((href: string) => { - const operations = this.generateOperations(value, field, updateValue); + const operations = this.generateOperations(values, field, operator); const patchRequest = new PatchRequest(requestId, href, operations); this.requestService.send(patchRequest); }); @@ -173,17 +173,11 @@ export class EpersonRegistrationService{ * @param updateValue Flag to indicate if the email should be updated or added * @returns Operations to be performed on the registration object */ - private generateOperations(value: string, field: string, updateValue: boolean): Operation[] { + private generateOperations(values: string[], field: string, operator: 'add' | 'replace'): Operation[] { let operations = []; - if (hasValue(value) && updateValue) { - operations = [...operations, { - op: 'replace', path: `/${field}`, value: value - }]; - } - - if (hasValue(value) && !updateValue) { - operations = [...operations, { - op: 'add', path: `/${field}`, value: value + if (values.length > 0 && hasValue(field) ) { + operations = [{ + op: operator, path: `/${field}`, value: values }]; } diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts index 87827bcc592..affbe6d045d 100644 --- a/src/app/core/eperson/eperson-data.service.ts +++ b/src/app/core/eperson/eperson-data.service.ts @@ -354,6 +354,27 @@ export class EPersonDataService extends IdentifiableDataService impleme return this.rdbService.buildFromRequestUUID(requestId); } + /** + * Sends a POST request to merge registration data related to the provided registration-token, + * into the eperson related to the provided uuid + * @param uuid the user uuid + * @param token registration-token + * @param metadataKey metadata key of the metadata field that should be overriden + */ + mergeEPersonDataWithToken(uuid: string, token: string, metadataKey: string): Observable> { + const requestId = this.requestService.generateRequestId(); + const hrefObs = this.getBrowseEndpoint().pipe( + map((href: string) => `${href}/${uuid}?token=${token}&override=${metadataKey}`)); + + hrefObs.pipe( + find((href: string) => hasValue(href)), + ).subscribe((href: string) => { + const request = new PostRequest(requestId, href); + this.requestService.send(request); + }); + + return this.rdbService.buildFromRequestUUID(requestId); + } /** * Create a new object on the server, and store the response in the object cache diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index 94ab4424b86..91bd59ed3c9 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { hasValue } from '../shared/empty.util'; import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; import { RemoteData } from '../core/data/remote-data'; @@ -19,15 +19,12 @@ export class ExternalLoginPageComponent implements OnInit { constructor( private epersonRegistrationService: EpersonRegistrationService, - private router: Router, + private arouter: ActivatedRoute, ) { - this.token = this.router.parseUrl(this.router.url).queryParams.token; + this.token = this.arouter.snapshot.queryParams.token; } ngOnInit(): void { - // TODO: call the method getTokenSearchEndpoint (eperson-registration.service.ts ) protected searchByTokenPath = '/search/findByToken?token='; - // token will be provided by the url (returned by REST API) - console.log('ExternalLoginPageComponent ngOnInit'); if (hasValue(this.token)) { this.epersonRegistrationService.searchByToken(this.token).subscribe((registration: RemoteData ) => { diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.ts index 0703dbed499..1ff85244386 100644 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.ts +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.ts @@ -1,7 +1,6 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; import { Router } from '@angular/router'; import { AuthService } from '../../core/auth/auth.service'; - @Component({ selector: 'ds-email-validated', templateUrl: './email-validated.component.html', @@ -9,6 +8,9 @@ import { AuthService } from '../../core/auth/auth.service'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class EmailValidatedComponent { + + @Input() registrationToken: string; + constructor(private authService: AuthService, private router: Router) { // if user is logged in, redirect to home page // in case user logs in with an existing account diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.html b/src/app/external-login-validation-page/external-login-validation-page.component.html index 10e7e99c261..227dc740988 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.html +++ b/src/app/external-login-validation-page/external-login-validation-page.component.html @@ -1,8 +1,11 @@
- - + + - - + +
diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.ts b/src/app/external-login-validation-page/external-login-validation-page.component.ts index 4a2ab4ef942..2f3be1c4e0c 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.ts +++ b/src/app/external-login-validation-page/external-login-validation-page.component.ts @@ -1,21 +1,58 @@ import { Component, OnInit } from '@angular/core'; +import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; +import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; +import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; +import { ActivatedRoute } from '@angular/router'; +import { hasValue } from '../shared/empty.util'; +import { RemoteData } from '../core/data/remote-data'; +import { Registration } from '../core/shared/registration.model'; +import { Observable, map, of, tap } from 'rxjs'; +import { getRemoteDataPayload } from '../core/shared/operators'; @Component({ templateUrl: './external-login-validation-page.component.html', - styleUrls: ['./external-login-validation-page.component.scss'] + styleUrls: ['./external-login-validation-page.component.scss'], }) export class ExternalLoginValidationPageComponent implements OnInit { + /** + * Whether or not the email address is already used by another user + */ + public emailExists: boolean; + /** + * The token used to get the registration data + */ + public token: string; - // temporary variable to test the component - newEmail = false; + /** + * The registration data of the user + */ + public registrationData$: Observable = of( + mockRegistrationDataModel + ); - existingEmail = true; + constructor( + private epersonRegistrationService: EpersonRegistrationService, + private arouter: ActivatedRoute + ) { + this.token = this.arouter.snapshot.queryParams.token; + this.emailExists = true; + } ngOnInit(): void { - // GET data from validation link // -> if email address is not used by other user => Email Validated component // -> if email address is used by other user => Review account information component - console.log('ExternalLoginValidationPageComponent ngOnInit'); + if (hasValue(this.token)) { + this.registrationData$ = this.epersonRegistrationService + .searchByToken(this.token) + .pipe( + tap((registration: RemoteData) => { + this.emailExists = hasValue(registration.payload.email); + }), + getRemoteDataPayload(), + map((registration: Registration) => + Object.assign(new RegistrationData(), registration) + ) + ); + } } - } diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.html b/src/app/external-login-validation-page/review-account-info/review-account-info.component.html index 23e6282f52c..98a01d734ee 100644 --- a/src/app/external-login-validation-page/review-account-info/review-account-info.component.html +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.html @@ -1,45 +1,59 @@ -

Review your account information

+

{{'external-login-validation.review-account-info.header' | translate}}

-

- The information received from ORCID differs from the one recorded in your - profile.
- Please review them and decide if you want to update any of them.After saving - you will be redirected to your profile page. -

+

- + + + + + + + - +
- Information + {{ 'external-login-validation.review-account-info.table.header.information' | translate }} - Received value + {{'external-login-validation.review-account-info.table.header.received-value' | translate }} - Current value + {{'external-login-validation.review-account-info.table.header.current-value' | translate }} Override{{'external-login-validation.review-account-info.table.header.action' | translate }}
{{ registrationData.registrationType | uppercase }}{{ registrationData.netId }} + + {{ notApplicableText }} + +
{{ data.label }}{{ data.label | titlecase }} {{ data.receivedValue }} - +
+
+ +
diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts b/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts index 92e8a07239f..3d244a6294d 100644 --- a/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts @@ -1,9 +1,18 @@ -import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; +import { + Component, + ChangeDetectionStrategy, + OnInit, + Input, +} from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { EPersonMock } from '../../shared/testing/eperson.mock'; import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; -import { mockRegistrationDataModel } from '../../shared/external-log-in-complete/models/registration-data.mock.model'; +import { filter, from, switchMap, take } from 'rxjs'; +import { RemoteData } from 'src/app/core/data/remote-data'; +import { ConfirmationModalComponent } from 'src/app/shared/confirmation-modal/confirmation-modal.component'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; + export interface ReviewAccountInfoData { label: string; currentValue: string; @@ -19,49 +28,48 @@ export interface ReviewAccountInfoData { changeDetection: ChangeDetectionStrategy.OnPush, }) export class ReviewAccountInfoComponent implements OnInit { - registeredData: RegistrationData = mockRegistrationDataModel; + @Input() registrationToken: string; + + @Input() registrationData: RegistrationData; epersonData: EPerson = EPersonMock; - notApplicable = 'N/A'; + notApplicableText = 'N/A'; dataToCompare: ReviewAccountInfoData[] = []; - constructor(private ePersonService: EPersonDataService) { + constructor( + private ePersonService: EPersonDataService, + private modalService: NgbModal + ) { // GET data from url validation link and display + // Based on the URL data we get + // 1. token + // 1. login user + // TODO: https://4science.atlassian.net/browse/CST-11609?focusedCommentId=206748 + // the header in the review page must show that the user is logged in } ngOnInit(): void { - this.dataToCompare = [ - { - label: this.registeredData.registrationType, - receivedValue: this.registeredData.netId, - currentValue: this.notApplicable, - overrideValue: false, - identifier: 'netId', - }, - { - label: 'Last Name', - receivedValue: this.getReceivedValue('eperson.lastname'), - currentValue: this.getCurrentValue('eperson.lastname'), - overrideValue: false, - identifier: 'eperson.lastname', - }, - { - label: 'First Name', - currentValue: this.getCurrentValue('eperson.firstname'), - receivedValue: this.getReceivedValue('eperson.firstname'), - overrideValue: false, - identifier: 'eperson.firstname', - }, - { - label: 'Email', - currentValue: this.epersonData.email, - receivedValue: this.registeredData.email, - overrideValue: false, - identifier: 'email', - }, - ]; + this.dataToCompare = this.prepareDataToCompare(); + } + + private prepareDataToCompare() { + const dataToCompare: ReviewAccountInfoData[] = []; + Object.entries(this.registrationData.registrationMetadata).forEach( + ([key, value]) => { + console.log(key, value); + dataToCompare.push({ + label: key.split('.')?.[1], + currentValue: this.getCurrentValue(key), + receivedValue: value[0].value, + overrideValue: false, + identifier: key, + }); + } + ); + + return dataToCompare; } getEPersonData() { @@ -72,16 +80,55 @@ export class ReviewAccountInfoComponent implements OnInit { // ); } - getReceivedValue(metadata: string): string { - return this.registeredData.registrationMetadata[metadata]?.[0]?.value; + private getCurrentValue(metadata: string): string { + return this.epersonData.firstMetadataValue(metadata); } - getCurrentValue(metadata: string): string { - return this.epersonData.firstMetadataValue(metadata); + public onOverrideChange(value: boolean, identifier: string) { + this.dataToCompare.find( + (data) => data.identifier === identifier + ).overrideValue = value; } - test(value: boolean, identifier: string) { - this.dataToCompare.find((data) => data.identifier === identifier).overrideValue = value; - console.log(this.dataToCompare); + /** + * Merge the data from the registration token with the data from the eperson + */ + public mergeEPersonRegistrationData() { + const modalRef = this.modalService.open(ConfirmationModalComponent); + modalRef.componentInstance.headerLabel = 'confirmation-modal.review-account-info.header'; + modalRef.componentInstance.infoLabel = 'confirmation-modal.review-account-info.info'; + modalRef.componentInstance.cancelLabel = 'confirmation-modal.review-account-info.cancel'; + modalRef.componentInstance.confirmLabel = 'confirmation-modal.review-account-info.confirm'; + modalRef.componentInstance.brandColor = 'primary'; + modalRef.componentInstance.confirmIcon = 'fa fa-check'; + modalRef.componentInstance.response + .pipe(take(1)) + .subscribe((confirm: boolean) => { + if (confirm) { + from(this.dataToCompare) + .pipe( + // what happens when is not overriden? + filter((data: ReviewAccountInfoData) => data.overrideValue), + switchMap((data: ReviewAccountInfoData) => { + return this.ePersonService.mergeEPersonDataWithToken( + this.epersonData.id, + this.registrationToken, + data.identifier + ); + }) + ) + .subscribe((response: RemoteData) => { + // TODO: https://4science.atlassian.net/browse/CST-11609?focusedCommentId=206748 + // redirect to profile page + if (response.hasSucceeded) { + console.log(response.payload); + } + + if (response.hasFailed) { + console.log(response.errorMessage); + } + }); + } + }); } } diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 0b177db851d..244521d2a65 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; -import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; +import { ExternalLoginService } from '../../services/external-login.service'; +import { getRemoteDataPayload } from '../../../../core/shared/operators'; @Component({ selector: 'ds-confirm-email', @@ -19,7 +19,7 @@ export class ConfirmEmailComponent { constructor( private formBuilder: FormBuilder, - private epersonRegistrationService: EpersonRegistrationService, + private externalLoginService: ExternalLoginService, ) { this.emailForm = this.formBuilder.group({ email: ['', [Validators.required, Validators.email]] @@ -30,12 +30,11 @@ export class ConfirmEmailComponent { this.emailForm.markAllAsTouched(); if (this.emailForm.valid) { const email = this.emailForm.get('email').value; - console.log('Email submitted:', email); - this.epersonRegistrationService.patchUpdateRegistration(email, 'email', this.registrationId, this.token, true).pipe( - getFirstCompletedRemoteData() - ).subscribe((update) => { - console.log('Email update:', update); - }); + this.externalLoginService.patchUpdateRegistration([email], 'email', this.registrationId, this.token, 'replace') + .pipe(getRemoteDataPayload()) + .subscribe((update) => { + console.log('Email update:', update); + }); } } } diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts index 1d504c869f4..4b680656392 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; -import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; +import { getRemoteDataPayload } from '../../../../core/shared/operators'; +import { ExternalLoginService } from '../../services/external-login.service'; @Component({ selector: 'ds-provide-email', @@ -18,7 +18,7 @@ export class ProvideEmailComponent { constructor( private formBuilder: FormBuilder, - private epersonRegistrationService: EpersonRegistrationService + private externalLoginService: ExternalLoginService, ) { this.emailForm = this.formBuilder.group({ email: ['', [Validators.required, Validators.email]], @@ -29,16 +29,8 @@ export class ProvideEmailComponent { this.emailForm.markAllAsTouched(); if (this.emailForm.valid) { const email = this.emailForm.get('email').value; - console.log('Email submitted:', email); - this.epersonRegistrationService - .patchUpdateRegistration( - email, - 'email', - this.registrationId, - this.token, - true - ) - .pipe(getFirstCompletedRemoteData()) + this.externalLoginService.patchUpdateRegistration([email], 'email', this.registrationId, this.token, 'add') + .pipe(getRemoteDataPayload()) .subscribe((update) => { console.log('Email update:', update); }); diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts index 30b7b8526bc..8d02f349b05 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts +++ b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts @@ -7,7 +7,7 @@ export const mockRegistrationDataModel: RegistrationData = Object.assign( new Re email: 'user@institution.edu', user: '028dcbb8-0da2-4122-a0ea-254be49ca107', registrationType: AuthMethodType.Orcid, - netId: '<:orcid>', + netId: '0000-1111-2222-3333', registrationMetadata: { 'eperson.firstname': [ Object.assign(new MetadataValue(), { diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts b/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts new file mode 100644 index 00000000000..7d1d8ac6a2c --- /dev/null +++ b/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ExternalLoginService } from './external-login.service'; + +describe('ExternalLoginService', () => { + let service: ExternalLoginService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ExternalLoginService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts new file mode 100644 index 00000000000..f0289eb5b78 --- /dev/null +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -0,0 +1,37 @@ +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; +import { Observable, map } from 'rxjs'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; +import { RemoteData } from '../../../core/data/remote-data'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { NotificationsService } from '../../notifications/notifications.service'; + +@Injectable({ + providedIn: 'root' +}) +export class ExternalLoginService { + + constructor( + private epersonRegistrationService: EpersonRegistrationService, + private router: Router, + private notificationService: NotificationsService + ) { } + + + patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable> { + const updatedValues = values.map((value) => value); + return this.epersonRegistrationService.patchUpdateRegistration(updatedValues, field, registrationId, token, operation).pipe( + getFirstCompletedRemoteData(), + map((rd) => { + if (rd.hasSucceeded) { + this.router.navigate(['/email-confirmation']); + } + if (rd.hasFailed) { + console.log('Email update failed: email address was omitted or the operation is not valid', rd.errorMessage); + this.notificationService.error('Something went wrong.Email address was omitted or the operation is not valid'); + } + return rd; + }) + ); + } +} diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index faddb3a2b0e..328296818c4 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1998,6 +1998,13 @@ "confirmation-modal.pending-changes.confirm": "Leave", + "confirmation-modal.review-account-info.header": "Save the changes", + + "confirmation-modal.review-account-info.info": "Continue to update your profile", + + "confirmation-modal.review-account-info.cancel": "Cancel", + + "confirmation-modal.review-account-info.confirm": "Save", "dataset.listelement.badge" : "Dataset", @@ -7194,4 +7201,16 @@ "external-login.provide-email.header": "Provide email", "external-login.provide-email.button.label": "Send Verification link", + + "external-login-validation.review-account-info.header": "Review your account information", + + "external-login-validation.review-account-info.info": "The information received from ORCID differs from the one recorded in your profile.
Please review them and decide if you want to update any of them.After saving you will be redirected to your profile page.", + + "external-login-validation.review-account-info.table.header.information": "Information", + + "external-login-validation.review-account-info.table.header.received-value": "Received value", + + "external-login-validation.review-account-info.table.header.current-value": "Current value", + + "external-login-validation.review-account-info.table.header.action": "Override", } diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 81336daf11f..c4b8fdaff6e 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -3066,6 +3066,21 @@ // "confirmation-modal.pending-changes.confirm": "Leave", "confirmation-modal.pending-changes.confirm": "Abbandona", + // "confirmation-modal.review-account-info.header": "Save the changes", + // TODO New key - Add a translation + "confirmation-modal.review-account-info.header": "Save the changes", + + // "confirmation-modal.review-account-info.info": "Continue to update your profile", + // TODO New key - Add a translation + "confirmation-modal.review-account-info.info": "Continue to update your profile", + + // "confirmation-modal.review-account-info.cancel": "Cancel", + // TODO New key - Add a translation + "confirmation-modal.review-account-info.cancel": "Cancel", + + // "confirmation-modal.review-account-info.confirm": "Save", + // TODO New key - Add a translation + "confirmation-modal.review-account-info.confirm": "Save", // "dataset.listelement.badge" : "Dataset", "dataset.listelement.badge" : "Dataset", @@ -11217,5 +11232,79 @@ // TODO New key - Add a translation "admin.system-wide-alert.title": "System-wide Alerts", + // "external-login.confirmation.header": "Information needed to complete the login process", + // TODO New key - Add a translation + "external-login.confirmation.header": "Information needed to complete the login process", + + // "external-login.noEmail.informationText": "The information received from {{authMethod}} are not sufficient to complete the login process. Please provide the missing information below, or login via a different method to associate your {{authMethod}} to an existing account.", + // TODO New key - Add a translation + "external-login.noEmail.informationText": "The information received from {{authMethod}} are not sufficient to complete the login process. Please provide the missing information below, or login via a different method to associate your {{authMethod}} to an existing account.", + + // "external-login.haveEmail.informationText": "It seems that you have not yet an account in this system. If this is the case, please confirm the data received from {{authMethod}} and a new account will be created for you. Otherwise, if you already have an account in the system, please update the email address to match the one already in use in the system or login via a different method to associate your {{authMethod}} to your existing account.", + // TODO New key - Add a translation + "external-login.haveEmail.informationText": "It seems that you have not yet an account in this system. If this is the case, please confirm the data received from {{authMethod}} and a new account will be created for you. Otherwise, if you already have an account in the system, please update the email address to match the one already in use in the system or login via a different method to associate your {{authMethod}} to your existing account.", + + // "external-login.confirm-email.header": "Confirm or update email", + // TODO New key - Add a translation + "external-login.confirm-email.header": "Confirm or update email", + + // "external-login.confirmation.email-required": "Email is required.", + // TODO New key - Add a translation + "external-login.confirmation.email-required": "Email is required.", + + // "external-login.confirmation.email-invalid": "Invalid email format.", + // TODO New key - Add a translation + "external-login.confirmation.email-invalid": "Invalid email format.", + + // "external-login.confirm.button.label": "Confirm this email", + // TODO New key - Add a translation + "external-login.confirm.button.label": "Confirm this email", + + // "external-login.confirm-email-sent.header": "Confirmation email sent", + // TODO New key - Add a translation + "external-login.confirm-email-sent.header": "Confirmation email sent", + // "external-login.confirm-email-sent.info": " We have sent an emait to the provided address to validate your input.
Please follow the instructions in the email to complete the login process.", + // TODO New key - Add a translation + "external-login.confirm-email-sent.info": " We have sent an emait to the provided address to validate your input.
Please follow the instructions in the email to complete the login process.", + + // "external-login.validated-email.header": "Email validated", + // TODO New key - Add a translation + "external-login.validated-email.header": "Email validated", + + // "external-login.validated-email.info": "Your email has been validated.
You can now login in the system with your prefered authentication method.", + // TODO New key - Add a translation + "external-login.validated-email.info": "Your email has been validated.
You can now login in the system with your prefered authentication method.", + + // "external-login.provide-email.header": "Provide email", + // TODO New key - Add a translation + "external-login.provide-email.header": "Provide email", + + // "external-login.provide-email.button.label": "Send Verification link", + // TODO New key - Add a translation + "external-login.provide-email.button.label": "Send Verification link", + + // "external-login-validation.review-account-info.header": "Review your account information", + // TODO New key - Add a translation + "external-login-validation.review-account-info.header": "Review your account information", + + // "external-login-validation.review-account-info.info": "The information received from ORCID differs from the one recorded in your profile.
Please review them and decide if you want to update any of them.After saving you will be redirected to your profile page.", + // TODO New key - Add a translation + "external-login-validation.review-account-info.info": "The information received from ORCID differs from the one recorded in your profile.
Please review them and decide if you want to update any of them.After saving you will be redirected to your profile page.", + + // "external-login-validation.review-account-info.table.header.information": "Information", + // TODO New key - Add a translation + "external-login-validation.review-account-info.table.header.information": "Information", + + // "external-login-validation.review-account-info.table.header.received-value": "Received value", + // TODO New key - Add a translation + "external-login-validation.review-account-info.table.header.received-value": "Received value", + + // "external-login-validation.review-account-info.table.header.current-value": "Current value", + // TODO New key - Add a translation + "external-login-validation.review-account-info.table.header.current-value": "Current value", + + // "external-login-validation.review-account-info.table.header.action": "Override", + // TODO New key - Add a translation + "external-login-validation.review-account-info.table.header.action": "Override", } From ade1243f35954aba12f7650e8f6ef7725b179e8f Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 28 Sep 2023 18:30:19 +0200 Subject: [PATCH 692/758] [CST-10703] review account unit tests & other --- src/app/core/eperson/eperson-data.service.ts | 9 +- .../external-login-page.component.html | 11 +- .../external-login-page.component.ts | 53 ++-- .../email-validated.component.spec.ts | 11 +- .../email-validated.component.ts | 2 + ...ernal-login-validation-page.component.html | 13 +- ...al-login-validation-page.component.spec.ts | 105 +++++++- ...xternal-login-validation-page.component.ts | 33 ++- .../helpers/compare-values.pipe.ts | 9 +- .../review-account-info.component.html | 8 +- .../review-account-info.component.spec.ts | 216 +++++++++++++++- .../review-account-info.component.ts | 241 +++++++++++++----- .../models/registration-data.mock.model.ts | 65 +++-- .../services/external-login.service.ts | 16 +- src/assets/i18n/en.json5 | 12 + 15 files changed, 655 insertions(+), 149 deletions(-) diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts index affbe6d045d..7622866833c 100644 --- a/src/app/core/eperson/eperson-data.service.ts +++ b/src/app/core/eperson/eperson-data.service.ts @@ -361,10 +361,15 @@ export class EPersonDataService extends IdentifiableDataService impleme * @param token registration-token * @param metadataKey metadata key of the metadata field that should be overriden */ - mergeEPersonDataWithToken(uuid: string, token: string, metadataKey: string): Observable> { + mergeEPersonDataWithToken(uuid: string, token: string, metadataKey?: string): Observable> { const requestId = this.requestService.generateRequestId(); const hrefObs = this.getBrowseEndpoint().pipe( - map((href: string) => `${href}/${uuid}?token=${token}&override=${metadataKey}`)); + map((href: string) => + hasValue(metadataKey) + ? `${href}/${uuid}?token=${token}&override=${metadataKey}` + : `${href}/${uuid}?token=${token}` + ) + ); hrefObs.pipe( find((href: string) => hasValue(href)), diff --git a/src/app/external-login-page/external-login-page.component.html b/src/app/external-login-page/external-login-page.component.html index 7aa4ad6e837..82c9419930b 100644 --- a/src/app/external-login-page/external-login-page.component.html +++ b/src/app/external-login-page/external-login-page.component.html @@ -1,4 +1,11 @@
- + + + + +
- diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index 91bd59ed3c9..8a41bc4a8ad 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -2,39 +2,62 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { hasValue } from '../shared/empty.util'; import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { RemoteData } from '../core/data/remote-data'; import { Registration } from '../core/shared/registration.model'; import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; +import { AlertType } from '../shared/alert/aletr-type'; +import { Observable, map, of } from 'rxjs'; +import { getRemoteDataPayload } from '../core/shared/operators'; @Component({ templateUrl: './external-login-page.component.html', - styleUrls: ['./external-login-page.component.scss'] + styleUrls: ['./external-login-page.component.scss'], }) export class ExternalLoginPageComponent implements OnInit { - + /** + * The token used to get the registration data, + * retrieved from the url. + * @memberof ExternalLoginPageComponent + */ public token: string; - - public registrationData: RegistrationData = mockRegistrationDataModel; + /** + * The registration data of the user. + */ + public registrationData$: Observable = of( + mockRegistrationDataModel + ); + /** + * The type of alert to show. + */ + public AlertTypeEnum = AlertType; constructor( private epersonRegistrationService: EpersonRegistrationService, - private arouter: ActivatedRoute, + private arouter: ActivatedRoute ) { this.token = this.arouter.snapshot.queryParams.token; } ngOnInit(): void { + this.getRegistrationData(); + // TODO: remove this line (temporary) + // this.token = '1234567890'; + } + + /** + * Get the registration data of the user, + * based on the token. + */ + getRegistrationData() { if (hasValue(this.token)) { - this.epersonRegistrationService.searchByToken(this.token).subscribe((registration: RemoteData - ) => { - console.log('ExternalLoginPageComponent ngOnInit registration', registration); - if (registration.hasSucceeded) { - this.registrationData = Object.assign(new RegistrationData(), registration.payload); - console.log('ExternalLoginPageComponent ngOnInit registrationData', this.registrationData); - } - }); + this.registrationData$ = this.epersonRegistrationService + .searchByToken(this.token) + .pipe( + getRemoteDataPayload(), + map((registration: Registration) => + Object.assign(new RegistrationData(), registration) + ) + ); } } - } diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts index d5d2c2794cc..fee341ad22c 100644 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts @@ -2,10 +2,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { EmailValidatedComponent } from './email-validated.component'; import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; -import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { of } from 'rxjs'; import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock'; +import { AuthService } from 'src/app/core/auth/auth.service'; +import { Router } from '@angular/router'; +import { RouterStub } from 'src/app/shared/testing/router.stub'; +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; +import { of } from 'rxjs'; describe('EmailValidatedComponent', () => { let component: EmailValidatedComponent; @@ -24,6 +27,8 @@ describe('EmailValidatedComponent', () => { await TestBed.configureTestingModule({ declarations: [ EmailValidatedComponent ], providers: [ + { provide: AuthService, useValue: {}}, + { provide: Router, useValue: new RouterStub() }, { provide: TranslateService, useValue: translateServiceStub }, ], imports: [ @@ -35,7 +40,7 @@ describe('EmailValidatedComponent', () => { } }), ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA] }) .compileComponents(); }); diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.ts index 1ff85244386..c469b8ccbc1 100644 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.ts +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.ts @@ -9,6 +9,8 @@ import { AuthService } from '../../core/auth/auth.service'; }) export class EmailValidatedComponent { + // TODO: (temporary) + // evaluate if this is needed @Input() registrationToken: string; constructor(private authService: AuthService, private router: Router) { diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.html b/src/app/external-login-validation-page/external-login-validation-page.component.html index 227dc740988..3c9fa39d0b0 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.html +++ b/src/app/external-login-validation-page/external-login-validation-page.component.html @@ -1,11 +1,16 @@
- - - - + + + + +
diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts b/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts index 3ec5c77409f..155d64fe082 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts +++ b/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts @@ -1,16 +1,68 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; +import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; +import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; +import { Observable, of } from 'rxjs'; +import { RemoteData } from '../core/data/remote-data'; +import { CommonModule } from '@angular/common'; +import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; +import { ActivatedRoute } from '@angular/router'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; +import { AlertType } from '../shared/alert/aletr-type'; describe('ExternalLoginValidationPageComponent', () => { let component: ExternalLoginValidationPageComponent; let fixture: ComponentFixture; + let epersonRegistrationService: any; + + const registrationDataMock = { + registrationType: 'orcid', + email: 'test@test.com', + netId: '0000-0000-0000-0000', + user: 'a44d8c9e-9b1f-4e7f-9b1a-5c9d8a0b1f1a', + registrationMetadata: { + 'email': [{ value: 'test@test.com' }], + 'eperson.lastname': [{ value: 'Doe' }], + 'eperson.firstname': [{ value: 'John' }], + }, + }; + + const tokenMock = 'as552-5a5a5-5a5a5-5a5a5'; + + const routeStub = { + snapshot: { + queryParams: { + token: tokenMock + } + } + }; beforeEach(async () => { + epersonRegistrationService = { + searchByToken: (token: string): Observable> => { return createSuccessfulRemoteDataObject$(registrationDataMock); } + }; + await TestBed.configureTestingModule({ - declarations: [ ExternalLoginValidationPageComponent ] + declarations: [ExternalLoginValidationPageComponent], + providers: [ + { provide: ActivatedRoute, useValue: routeStub }, + { provide: EpersonRegistrationService, useValue: epersonRegistrationService }, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock, + }, + }), + ], + schemas: [NO_ERRORS_SCHEMA], }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { @@ -22,4 +74,53 @@ describe('ExternalLoginValidationPageComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); + + it('should set the token from the query parameters', () => { + expect(component.token).toEqual(tokenMock); + }); + + it('should initialize the registration data', () => { + spyOn(epersonRegistrationService, 'searchByToken').and.callThrough(); + component.ngOnInit(); + expect(epersonRegistrationService.searchByToken).toHaveBeenCalledWith(tokenMock); + expect(component.registrationData$).toBeTruthy(); + }); + + it('should render ds-email-validated component when registrationData$ does not have an email', () => { + component.registrationData$ = of(Object.assign(new RegistrationData(), { registrationDataMock, email: null })); + component.ngOnInit(); + fixture.detectChanges(); + + const emailValidatedComponent = fixture.nativeElement.querySelector('ds-email-validated'); + const reviewAccountInfoComponent = fixture.nativeElement.querySelector('ds-review-account-info'); + + expect(emailValidatedComponent).toBeTruthy(); + expect(reviewAccountInfoComponent).toBeNull(); + }); + + it('should render ds-review-account-info component when registrationData$ has an email', () => { + component.registrationData$ = of(Object.assign(new RegistrationData(), { registrationDataMock, email: 'hey@hello.com' })); + // component.ngOnInit(); + fixture.detectChanges(); + const emailValidatedComponent = fixture.nativeElement.querySelector('ds-email-validated'); + const reviewAccountInfoComponent = fixture.nativeElement.querySelector('ds-review-account-info'); + + expect(emailValidatedComponent).toBeNull(); + expect(reviewAccountInfoComponent).toBeTruthy(); + }); + + it('should render ds-alert component when token is missing', () => { + component.token = null; + component.ngOnInit(); + fixture.detectChanges(); + + const alertComponent = fixture.nativeElement.querySelector('ds-alert'); + + expect(alertComponent).toBeTruthy(); + expect(component.AlertTypeEnum).toEqual(AlertType); + }); + + afterEach(() => { + fixture.destroy(); + }); }); diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.ts b/src/app/external-login-validation-page/external-login-validation-page.component.ts index 2f3be1c4e0c..4146ace1be2 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.ts +++ b/src/app/external-login-validation-page/external-login-validation-page.component.ts @@ -1,53 +1,58 @@ import { Component, OnInit } from '@angular/core'; import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; -import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; import { ActivatedRoute } from '@angular/router'; import { hasValue } from '../shared/empty.util'; -import { RemoteData } from '../core/data/remote-data'; import { Registration } from '../core/shared/registration.model'; -import { Observable, map, of, tap } from 'rxjs'; +import { Observable, map, of } from 'rxjs'; import { getRemoteDataPayload } from '../core/shared/operators'; +import { AlertType } from '../shared/alert/aletr-type'; @Component({ templateUrl: './external-login-validation-page.component.html', styleUrls: ['./external-login-validation-page.component.scss'], }) export class ExternalLoginValidationPageComponent implements OnInit { - /** - * Whether or not the email address is already used by another user - */ - public emailExists: boolean; /** * The token used to get the registration data */ public token: string; + /** + * The type of alert to show + */ + public AlertTypeEnum = AlertType; + /** * The registration data of the user */ - public registrationData$: Observable = of( - mockRegistrationDataModel - ); + public registrationData$: Observable + // = of( + // mockRegistrationDataModel + // ); constructor( private epersonRegistrationService: EpersonRegistrationService, private arouter: ActivatedRoute ) { this.token = this.arouter.snapshot.queryParams.token; - this.emailExists = true; } ngOnInit(): void { // -> if email address is not used by other user => Email Validated component // -> if email address is used by other user => Review account information component + this.getRegistrationData(); + // TODO: remove this line (temporary) + // this.token = '1234567890'; + } + /** + * Get the registration data from the token + */ + getRegistrationData() { if (hasValue(this.token)) { this.registrationData$ = this.epersonRegistrationService .searchByToken(this.token) .pipe( - tap((registration: RemoteData) => { - this.emailExists = hasValue(registration.payload.email); - }), getRemoteDataPayload(), map((registration: Registration) => Object.assign(new RegistrationData(), registration) diff --git a/src/app/external-login-validation-page/helpers/compare-values.pipe.ts b/src/app/external-login-validation-page/helpers/compare-values.pipe.ts index aefbe9a0ae0..ff5fb906b5b 100644 --- a/src/app/external-login-validation-page/helpers/compare-values.pipe.ts +++ b/src/app/external-login-validation-page/helpers/compare-values.pipe.ts @@ -5,7 +5,14 @@ import { Pipe, PipeTransform } from '@angular/core'; }) export class CompareValuesPipe implements PipeTransform { - transform(receivedValue: string, currentValue: string): unknown { + /** + * Returns a string with a checkmark if the received value is equal to the current value, + * or the current value if they are not equal. + * @param receivedValue the value received from the registration data + * @param currentValue the value from the current user + * @returns the value to be displayed in the template + */ + transform(receivedValue: string, currentValue: string): string { if (receivedValue === currentValue) { return ''; } else { diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.html b/src/app/external-login-validation-page/review-account-info/review-account-info.component.html index 98a01d734ee..82aec84441e 100644 --- a/src/app/external-login-validation-page/review-account-info/review-account-info.component.html +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.html @@ -41,9 +41,9 @@

{{'external-login-validation.review-account-info.header' | translate}}

@@ -52,7 +52,7 @@

{{'external-login-validation.review-account-info.header' | translate}}

-
diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts index 7cd24cbeec2..7e1d3f08de3 100644 --- a/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts @@ -1,25 +1,233 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ReviewAccountInfoComponent } from './review-account-info.component'; +import { + TranslateLoader, + TranslateModule, + TranslateService, +} from '@ngx-translate/core'; +import { CommonModule } from '@angular/common'; +import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { Observable, Subscription, of } from 'rxjs'; +import { RemoteData } from '../../core/data/remote-data'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { EPersonMock } from '../../shared/testing/eperson.mock'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import { Router } from '@angular/router'; +import { RouterMock } from '../../shared/mocks/router.mock'; +import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; +import { EventEmitter } from '@angular/core'; +import { CompareValuesPipe } from '../helpers/compare-values.pipe'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; let fixture: ComponentFixture; + let ePersonDataServiceStub: any; + let router: any; + let notificationsService: any; + + const translateServiceStub = { + get: () => of('test-message'), + onLangChange: new EventEmitter(), + onTranslationChange: new EventEmitter(), + onDefaultLangChange: new EventEmitter() + }; + const mockEPerson = EPersonMock; + const modalStub = { + open: () => ({ componentInstance: { response: of(true) }}), + close: () => null, + dismiss: () => null, + }; + const registrationDataMock = { + registrationType: 'orcid', + email: 'test@test.com', + netId: '0000-0000-0000-0000', + user: 'a44d8c9e-9b1f-4e7f-9b1a-5c9d8a0b1f1a', + registrationMetadata: { + 'email': [{ value: 'test@test.com' }], + 'eperson.lastname': [{ value: 'Doe' }], + 'eperson.firstname': [{ value: 'John' }], + }, + }; beforeEach(async () => { + ePersonDataServiceStub = { + findById(uuid: string): Observable> { + return createSuccessfulRemoteDataObject$(mockEPerson); + }, + mergeEPersonDataWithToken( + token: string, + metadata?: string + ): Observable> { + return createSuccessfulRemoteDataObject$(mockEPerson); + }, + }; + router = new RouterMock(); + notificationsService = new NotificationsServiceStub(); await TestBed.configureTestingModule({ - declarations: [ ReviewAccountInfoComponent ] - }) - .compileComponents(); + declarations: [ReviewAccountInfoComponent, CompareValuesPipe], + providers: [ + { provide: EPersonDataService, useValue: ePersonDataServiceStub }, + { provide: NgbModal, useValue: modalStub }, + { + provide: NotificationsService, + useValue: notificationsService, + }, + { provide: TranslateService, useValue: translateServiceStub }, + { provide: Router, useValue: router }, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock, + }, + }), + ], + }).compileComponents(); }); beforeEach(() => { fixture = TestBed.createComponent(ReviewAccountInfoComponent); component = fixture.componentInstance; + component.registrationData = Object.assign( + new RegistrationData(), + registrationDataMock + ); + component.registrationToken = 'test-token'; + spyOn(router, 'navigate'); fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should call getEPersonData when ngOnInit is called', () => { + spyOn(component, 'getEPersonData'); + component.ngOnInit(); + expect(component.getEPersonData).toHaveBeenCalled(); + }); + + it('should prepare data to compare', () => { + component.ngOnInit(); + const dataToCompare = component.dataToCompare; + expect(dataToCompare.length).toBe(3); + expect(dataToCompare[0].label).toBe('email'); + expect(dataToCompare[1].label).toBe('lastname'); + expect(dataToCompare[2].label).toBe('firstname'); + expect(dataToCompare[0].overrideValue).toBe(false); + expect(dataToCompare[0].receivedValue).toBe('test@test.com'); + }); + + it('should get EPerson data', fakeAsync(() => { + spyOn(ePersonDataServiceStub, 'findById').and.returnValue( + of({ payload: mockEPerson } as RemoteData) + ); + component.getEPersonData(); + tick(); + expect(ePersonDataServiceStub.findById).toHaveBeenCalledWith(registrationDataMock.user); + expect(component.epersonCurrentData).toEqual(EPersonMock); + })); + + it('should update dataToCompare when overrideValue is changed', () => { + component.onOverrideChange(true, 'email'); + expect(component.dataToCompare[0].overrideValue).toBe(true); + }); + + it('should open a confirmation modal on onSave and confirm', fakeAsync(() => { + spyOn(modalStub, 'open').and.returnValue({ + componentInstance: { response: of(true) }, + }); + spyOn(component, 'mergeEPersonDataWithToken'); + component.onSave(); + tick(); + expect(modalStub.open).toHaveBeenCalled(); + expect(component.mergeEPersonDataWithToken).toHaveBeenCalled(); + })); + + it('should open a confirmation modal on onSave and cancel', fakeAsync(() => { + spyOn(modalStub, 'open').and.returnValue({ + componentInstance: { response: of(false) }, + }); + spyOn(component, 'mergeEPersonDataWithToken'); + component.onSave(); + tick(); + expect(modalStub.open).toHaveBeenCalled(); + expect(component.mergeEPersonDataWithToken).not.toHaveBeenCalled(); + })); + + it('should merge EPerson data with token when overrideValue is true', fakeAsync(() => { + component.dataToCompare[0].overrideValue = true; + spyOn(ePersonDataServiceStub, 'mergeEPersonDataWithToken').and.returnValue( + of({ hasSucceeded: true }) + ); + component.mergeEPersonDataWithToken(); + tick(); + expect(ePersonDataServiceStub.mergeEPersonDataWithToken).toHaveBeenCalledTimes(1); + expect(router.navigate).toHaveBeenCalledWith(['/profile']); + })); + + it('should merge EPerson data with token when overrideValue is false', fakeAsync(() => { + spyOn(ePersonDataServiceStub, 'mergeEPersonDataWithToken').and.returnValue( + of({ hasSucceeded: true }) + ); + component.mergeEPersonDataWithToken(); + tick(); + expect(ePersonDataServiceStub.mergeEPersonDataWithToken).toHaveBeenCalledTimes(1); + expect(router.navigate).toHaveBeenCalledWith(['/profile']); + })); + + + it('should unsubscribe from subscriptions when ngOnDestroy is called', () => { + const subscription1 = jasmine.createSpyObj('Subscription', [ + 'unsubscribe', + ]); + const subscription2 = jasmine.createSpyObj('Subscription', [ + 'unsubscribe', + ]); + component.subs = [subscription1, subscription2]; + component.ngOnDestroy(); + expect(subscription1.unsubscribe).toHaveBeenCalled(); + expect(subscription2.unsubscribe).toHaveBeenCalled(); + }); + + it('should display registration data', () => { + const registrationTypeElement: HTMLElement = fixture.nativeElement.querySelector('tbody tr:first-child th'); + const netIdElement: HTMLElement = fixture.nativeElement.querySelector('tbody tr:first-child td'); + + expect(registrationTypeElement.textContent.trim()).toBe(registrationDataMock.registrationType.toUpperCase()); + expect(netIdElement.textContent.trim()).toBe(registrationDataMock.netId); + }); + + it('should display dataToCompare rows with translated labels and values', () => { + const dataRows: NodeListOf = fixture.nativeElement.querySelectorAll('tbody tr:not(:first-child)'); + // Assuming there are 3 dataToCompare rows based on the registrationDataMock + expect(dataRows.length).toBe(3); + // Assuming the first row is the email row abd the second row is the lastname row + const firstDataRow = dataRows[1]; + const firstDataLabel: HTMLElement = firstDataRow.querySelector('th'); + const firstDataReceivedValue: HTMLElement = firstDataRow.querySelectorAll('td')[0]; + const firstDataOverrideSwitch: HTMLElement = firstDataRow.querySelector('ui-switch'); + + expect(firstDataLabel.textContent.trim()).toBe('Lastname'); + expect(firstDataReceivedValue.textContent.trim()).toBe('Doe'); + expect(firstDataOverrideSwitch).not.toBeNull(); + }); + + it('should trigger onSave() when the button is clicked', () => { + spyOn(component, 'onSave'); + const saveButton: HTMLButtonElement = fixture.nativeElement.querySelector('button.btn-primary'); + saveButton.click(); + expect(component.onSave).toHaveBeenCalled(); + }); + + afterEach(() => { + fixture.destroy(); + }); }); diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts b/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts index 3d244a6294d..80e9e2a1237 100644 --- a/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts @@ -3,15 +3,24 @@ import { ChangeDetectionStrategy, OnInit, Input, + OnDestroy, } from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { EPersonMock } from '../../shared/testing/eperson.mock'; import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; -import { filter, from, switchMap, take } from 'rxjs'; +import { Observable, Subscription, filter, from, switchMap, take } from 'rxjs'; import { RemoteData } from 'src/app/core/data/remote-data'; import { ConfirmationModalComponent } from 'src/app/shared/confirmation-modal/confirmation-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { hasValue } from 'src/app/shared/empty.util'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from 'src/app/core/shared/operators'; +import { TranslateService } from '@ngx-translate/core'; +import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; +import { Router } from '@angular/router'; export interface ReviewAccountInfoData { label: string; @@ -27,40 +36,180 @@ export interface ReviewAccountInfoData { styleUrls: ['./review-account-info.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class ReviewAccountInfoComponent implements OnInit { +export class ReviewAccountInfoComponent implements OnInit, OnDestroy { + /** + * The registration token sent from validation link + */ @Input() registrationToken: string; - + /** + * User data from the registration token + */ @Input() registrationData: RegistrationData; - epersonData: EPerson = EPersonMock; - + /** + * Text to display when the value is not applicable + */ notApplicableText = 'N/A'; - + /** + * List of data to compare + */ dataToCompare: ReviewAccountInfoData[] = []; + /** + * List of subscriptions + */ + subs: Subscription[] = []; + /** + * Current eperson data from the database, + * so we can compare it with the data from the registration token + */ + epersonCurrentData: EPerson;// = EPersonMock; constructor( private ePersonService: EPersonDataService, - private modalService: NgbModal + private modalService: NgbModal, + private notificationService: NotificationsService, + private translateService: TranslateService, + private router: Router ) { - // GET data from url validation link and display + // GET data from url validation link // Based on the URL data we get // 1. token - // 1. login user + // User should be automatically logged in // TODO: https://4science.atlassian.net/browse/CST-11609?focusedCommentId=206748 - // the header in the review page must show that the user is logged in + // How to handle the case when the email is not part of metadata + // and we have `eperson.orcid` in metadata list } ngOnInit(): void { - this.dataToCompare = this.prepareDataToCompare(); + this.getEPersonData(); + // TODO: remove after having data + // this.dataToCompare = this.prepareDataToCompare(); + } + + /** + * Get the current eperson data from the database. + * If the eperson is found, prepare the data to compare. + */ + getEPersonData() { + if ( + hasValue(this.registrationData) && + hasValue(this.registrationData.user) + ) { + this.ePersonService + .findById(this.registrationData.user) + .pipe(getFirstCompletedRemoteData(), getRemoteDataPayload()) + .subscribe((eperson: EPerson) => { + if (eperson) { + this.epersonCurrentData = eperson; + this.dataToCompare = this.prepareDataToCompare(); + } + }); + } + } + + /** + * Find the data to compare based on the metadata key and update the override value + * @param value value of the override checkbox + * @param identifier the metadata key + */ + public onOverrideChange(value: boolean, identifier: string) { + this.dataToCompare.find( + (data) => data.identifier === identifier + ).overrideValue = value; + } + + /** + * Open a confirmation modal to confirm the override of the data + * If confirmed, merge the data from the registration token with the data from the eperson + */ + public onSave() { + const modalRef = this.modalService.open(ConfirmationModalComponent); + modalRef.componentInstance.headerLabel = + 'confirmation-modal.review-account-info.header'; + modalRef.componentInstance.infoLabel = + 'confirmation-modal.review-account-info.info'; + modalRef.componentInstance.cancelLabel = + 'confirmation-modal.review-account-info.cancel'; + modalRef.componentInstance.confirmLabel = + 'confirmation-modal.review-account-info.confirm'; + modalRef.componentInstance.brandColor = 'primary'; + modalRef.componentInstance.confirmIcon = 'fa fa-check'; + + this.subs.push( + modalRef.componentInstance.response + .pipe(take(1)) + .subscribe((confirm: boolean) => { + if (confirm) { + this.mergeEPersonDataWithToken(); + } + }) + ); + } + + /** + * Merge the data from the registration token with the data from the eperson. + * If any of the metadata is overridden, sent a merge request for each metadata to override. + * If none of the metadata is overridden, sent a merge request with the registration token only. + */ + mergeEPersonDataWithToken() { + let override$: Observable>; + if (this.dataToCompare.some((d) => d.overrideValue)) { + override$ = from(this.dataToCompare).pipe( + filter((data: ReviewAccountInfoData) => data.overrideValue), + switchMap((data: ReviewAccountInfoData) => { + return this.ePersonService.mergeEPersonDataWithToken( + this.epersonCurrentData.id, + this.registrationToken, + data.identifier + ); + }) + ); + } else { + override$ = this.ePersonService.mergeEPersonDataWithToken( + this.epersonCurrentData.id, + this.registrationToken + ); + } + this.subs.push( + override$.subscribe((response: RemoteData) => { + // TODO: https://4science.atlassian.net/browse/CST-11609?focusedCommentId=206748 + // redirect to profile page + if (response.hasSucceeded) { + console.log('mergeEPersonDataWithToken', response.payload); + this.notificationService.success( + this.translateService.get( + 'review-account-info.merge-data.notification.success' + ) + ); + this.router.navigate(['/profile']); + } + + if (response.hasFailed) { + this.notificationService.success( + this.translateService.get( + 'review-account-info.merge-data.notification.error' + ) + ); + } + }) + ); } - private prepareDataToCompare() { + /** + * Prepare the data to compare and display: + * -> For each metadata from the registration token, get the current value from the eperson. + * -> Label is the metadata key without the prefix e.g `eperson.` + * -> Identifier is the metadata key with the prefix e.g `eperson.lastname` + * -> Override value is false by default + * @returns List of data to compare + */ + private prepareDataToCompare(): ReviewAccountInfoData[] { const dataToCompare: ReviewAccountInfoData[] = []; Object.entries(this.registrationData.registrationMetadata).forEach( ([key, value]) => { console.log(key, value); dataToCompare.push({ - label: key.split('.')?.[1], + label: key.split('.')?.[1] ?? key.split('.')?.[0], currentValue: this.getCurrentValue(key), receivedValue: value[0].value, overrideValue: false, @@ -72,63 +221,19 @@ export class ReviewAccountInfoComponent implements OnInit { return dataToCompare; } - getEPersonData() { - // this.epersonData$ = this.ePersonService.findById() - // .pipe( - // getFirstCompletedRemoteData(), - // getRemoteDataPayload() - // ); - } - - private getCurrentValue(metadata: string): string { - return this.epersonData.firstMetadataValue(metadata); - } - - public onOverrideChange(value: boolean, identifier: string) { - this.dataToCompare.find( - (data) => data.identifier === identifier - ).overrideValue = value; - } - /** - * Merge the data from the registration token with the data from the eperson + * Return the current value of the metadata key from the eperson + * @param metadata metadata key + * @returns the current value of the metadata key from the eperson */ - public mergeEPersonRegistrationData() { - const modalRef = this.modalService.open(ConfirmationModalComponent); - modalRef.componentInstance.headerLabel = 'confirmation-modal.review-account-info.header'; - modalRef.componentInstance.infoLabel = 'confirmation-modal.review-account-info.info'; - modalRef.componentInstance.cancelLabel = 'confirmation-modal.review-account-info.cancel'; - modalRef.componentInstance.confirmLabel = 'confirmation-modal.review-account-info.confirm'; - modalRef.componentInstance.brandColor = 'primary'; - modalRef.componentInstance.confirmIcon = 'fa fa-check'; - modalRef.componentInstance.response - .pipe(take(1)) - .subscribe((confirm: boolean) => { - if (confirm) { - from(this.dataToCompare) - .pipe( - // what happens when is not overriden? - filter((data: ReviewAccountInfoData) => data.overrideValue), - switchMap((data: ReviewAccountInfoData) => { - return this.ePersonService.mergeEPersonDataWithToken( - this.epersonData.id, - this.registrationToken, - data.identifier - ); - }) - ) - .subscribe((response: RemoteData) => { - // TODO: https://4science.atlassian.net/browse/CST-11609?focusedCommentId=206748 - // redirect to profile page - if (response.hasSucceeded) { - console.log(response.payload); - } + private getCurrentValue(metadata: string): string { + if (metadata === 'email') { + return this.epersonCurrentData.email; + } + return this.epersonCurrentData.firstMetadataValue(metadata) ?? ''; + } - if (response.hasFailed) { - console.log(response.errorMessage); - } - }); - } - }); + ngOnDestroy(): void { + this.subs.filter((s) => hasValue(s)).forEach((sub) => sub.unsubscribe()); } } diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts index 8d02f349b05..961d443a665 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts +++ b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts @@ -2,30 +2,43 @@ import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; import { RegistrationData } from './registration-data.model'; import { MetadataValue } from '../../../core/shared/metadata.models'; -export const mockRegistrationDataModel: RegistrationData = Object.assign( new RegistrationData(), { - id: '3', - email: 'user@institution.edu', - user: '028dcbb8-0da2-4122-a0ea-254be49ca107', - registrationType: AuthMethodType.Orcid, - netId: '0000-1111-2222-3333', - registrationMetadata: { - 'eperson.firstname': [ - Object.assign(new MetadataValue(), { - value: 'User', - language: null, - authority: '', - confidence: -1, - place: -1, - }) - ], - 'eperson.lastname': [ - Object.assign(new MetadataValue(), { - value: 'Power', - language: null, - authority: '', - confidence: -1, - place: -1 - }) - ] +export const mockRegistrationDataModel: RegistrationData = Object.assign( + new RegistrationData(), + { + id: '3', + email: 'user@institution.edu', + user: '028dcbb8-0da2-4122-a0ea-254be49ca107', + registrationType: AuthMethodType.Orcid, + netId: '0000-1111-2222-3333', + registrationMetadata: { + 'eperson.firstname': [ + Object.assign(new MetadataValue(), { + value: 'User 1', + language: null, + authority: '', + confidence: -1, + place: -1, + }), + ], + 'eperson.lastname': [ + Object.assign(new MetadataValue(), { + value: 'Power', + language: null, + authority: '', + confidence: -1, + place: -1, + }), + ], + 'email': [ + { + value: 'power-user@orcid.org', + language: null, + authority: '', + confidence: -1, + place: -1, + overrides: 'power-user@dspace.org', + }, + ], + }, } -}); +); diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts index f0289eb5b78..f757bb2bdbf 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -5,6 +5,7 @@ import { EpersonRegistrationService } from '../../../core/data/eperson-registrat import { RemoteData } from '../../../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; @Injectable({ providedIn: 'root' @@ -14,10 +15,18 @@ export class ExternalLoginService { constructor( private epersonRegistrationService: EpersonRegistrationService, private router: Router, - private notificationService: NotificationsService + private notificationService: NotificationsService, + private translate: TranslateService ) { } - + /** + * Update the registration data + * @param values the values to update or add + * @param field the filed to be updated + * @param registrationId the registration id + * @param token the registration token + * @param operation operation to be performed + */ patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable> { const updatedValues = values.map((value) => value); return this.epersonRegistrationService.patchUpdateRegistration(updatedValues, field, registrationId, token, operation).pipe( @@ -27,8 +36,7 @@ export class ExternalLoginService { this.router.navigate(['/email-confirmation']); } if (rd.hasFailed) { - console.log('Email update failed: email address was omitted or the operation is not valid', rd.errorMessage); - this.notificationService.error('Something went wrong.Email address was omitted or the operation is not valid'); + this.notificationService.error(this.translate.get('external-login-page.provide-email.notifications.error')); } return rd; }) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 328296818c4..9d3161f0aaf 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7213,4 +7213,16 @@ "external-login-validation.review-account-info.table.header.current-value": "Current value", "external-login-validation.review-account-info.table.header.action": "Override", + + "on-label": "ON", + + "off-label": "OFF", + + "review-account-info.merge-data.notification.success": "Your account information has been updated successfully", + + "review-account-info.merge-data.notification.error": "Something went wrong while updating your account information", + + "external-login.validate-email.no-token": "The validation link is no longer valid. Please try again.", + + "external-login-page.provide-email.notifications.error": "Something went wrong.Email address was omitted or the operation is not valid.", } From dc9a683d51f3e868eee4a2e30b16cda047552068 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 29 Sep 2023 17:32:50 +0200 Subject: [PATCH 693/758] Duplicate labels --- src/assets/i18n/en.json5 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 5f5b1797b9a..406b53e06c6 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3784,8 +3784,6 @@ "menu.section.import_from_excel": "Import from excel", - "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_to_excel": "Export to excel", "menu.section.icon.access_control": "Access Control menu section", @@ -4168,8 +4166,6 @@ "nav.user.description" : "User profile bar", - "nav.subscriptions" : "Subscriptions", - "none.listelement.badge": "Item", "openaire.broker.title": "OpenAIRE Broker", From b1256187e9219257a4025d67104df5e8f766bcf4 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 29 Sep 2023 17:38:27 +0200 Subject: [PATCH 694/758] i18n label cleanup & sync --- src/assets/i18n/ar.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/bn.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/ca.json5 | 122 +++++++++++++++++++++++++++++++---- src/assets/i18n/cs.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/de.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/el.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/es.json5 | 122 +++++++++++++++++++++++++++++++---- src/assets/i18n/fi.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/fr.json5 | 122 +++++++++++++++++++++++++++++++---- src/assets/i18n/gd.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/hi.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/hu.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/it.json5 | 119 ++++++++++++++++++++++++++++++---- src/assets/i18n/ja.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/kk.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/lv.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/nl.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/pl.json5 | 122 +++++++++++++++++++++++++++++++---- src/assets/i18n/pt-BR.json5 | 122 +++++++++++++++++++++++++++++++---- src/assets/i18n/pt-PT.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/sv.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/sw.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/tr.json5 | 123 ++++++++++++++++++++++++++++++++---- src/assets/i18n/uk.json5 | 123 ++++++++++++++++++++++++++++++++---- 24 files changed, 2661 insertions(+), 282 deletions(-) diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5 index e1336f45544..b5a8f0d1aef 100644 --- a/src/assets/i18n/ar.json5 +++ b/src/assets/i18n/ar.json5 @@ -504,6 +504,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", // TODO New key - Add a translation "admin.registries.metadata.schemas.table.namespace": "Namespace", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO New key - Add a translation @@ -3537,6 +3540,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", // TODO New key - Add a translation "curation-task.task.checklinks.label": "Check Links in Metadata", @@ -4374,7 +4393,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -7385,10 +7406,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -8137,10 +8154,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -10188,6 +10201,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -10232,6 +10249,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -10972,6 +10993,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -13205,12 +13274,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -13992,9 +14091,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5 index 557106576fd..6ce88367ad7 100644 --- a/src/assets/i18n/bn.json5 +++ b/src/assets/i18n/bn.json5 @@ -433,6 +433,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "নামস্থান", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "মেটাডেটা রেজিস্ট্রি", @@ -2971,6 +2974,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "মেটাডেটা লিঙ্ক চেক করুন", @@ -3736,7 +3755,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6281,10 +6302,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6938,10 +6955,6 @@ // "nav.user.description" : "User profile bar", "nav.user.description" : "ব্যবহারকারীর প্রোফাইল বার", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "আইটেম", @@ -8712,6 +8725,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8750,6 +8767,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9417,6 +9438,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11329,12 +11398,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12113,9 +12212,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5 index 5cf745a3da5..6adc8d8e91a 100644 --- a/src/assets/i18n/ca.json5 +++ b/src/assets/i18n/ca.json5 @@ -421,6 +421,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Espai de noms", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Registre de metadades", @@ -2915,6 +2918,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Comprovar enllaços a metadades", @@ -3662,7 +3681,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description": "Fil de sindicació", @@ -6142,9 +6163,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_batch": "Exportació per lots (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6790,10 +6808,6 @@ // "nav.user.description" : "User profile bar", "nav.user.description": "Barra de perfil d'usuari", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "Ítem", @@ -8520,6 +8534,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8558,6 +8576,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9221,6 +9243,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11058,12 +11128,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "Vista del flux de treball", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -11717,9 +11817,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5 index 0379221d4a7..d89cc09a003 100644 --- a/src/assets/i18n/cs.json5 +++ b/src/assets/i18n/cs.json5 @@ -493,6 +493,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Jmenný prostor", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3512,6 +3515,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", // TODO New key - Add a translation "curation-task.task.checklinks.label": "Check Links in Metadata", @@ -4338,7 +4357,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -7308,10 +7329,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -8058,10 +8075,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -10095,6 +10108,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -10139,6 +10156,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -10857,6 +10878,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -13090,12 +13159,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -13877,9 +13976,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index 3f50e337315..755b361d325 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -436,6 +436,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namensraum", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Metadatenreferenzliste", @@ -3021,6 +3024,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Links in Metadaten prüfen", @@ -3788,7 +3807,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6423,10 +6444,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7087,10 +7104,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -8876,6 +8889,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8916,6 +8933,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9592,6 +9613,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11563,12 +11632,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12350,9 +12449,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5 index d5432a5cf3b..51b779eebff 100644 --- a/src/assets/i18n/el.json5 +++ b/src/assets/i18n/el.json5 @@ -424,6 +424,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "namespace", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Μητρώο μεταδεδομένων", @@ -2967,6 +2970,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Ελέγξτε τους συνδέσμους στα μεταδεδομένα", @@ -3729,7 +3748,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description": "Συνδικάτο τροφοδοσία", @@ -6276,10 +6297,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6928,10 +6945,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "Τεκμήριο", @@ -8708,6 +8721,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8746,6 +8763,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9411,6 +9432,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11255,12 +11324,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "Προβολή χώρου εργασίας", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -11944,9 +12043,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index 212a270055d..624e6744d61 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -421,6 +421,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Espacio de nombres", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Registro de metadatos", @@ -2915,6 +2918,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Comprobar enlaces en metadatos", @@ -3661,7 +3680,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description": "Hilo de sindicación", @@ -6128,9 +6149,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_batch": "Exportación por lotes (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6776,10 +6794,6 @@ // "nav.user.description" : "User profile bar", "nav.user.description": "Barra de perfil de usuario", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "Ítem", @@ -8506,6 +8520,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8544,6 +8562,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9207,6 +9229,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11044,12 +11114,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "Vista del flujo de trabajo", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -11703,9 +11803,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5 index b427560a400..b4789a9da1e 100644 --- a/src/assets/i18n/fi.json5 +++ b/src/assets/i18n/fi.json5 @@ -437,6 +437,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Nimiavaruus", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3072,6 +3075,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Tarkista metadatan linkit", @@ -3854,7 +3873,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6508,10 +6529,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7172,10 +7189,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -8978,6 +8991,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -9018,6 +9035,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9705,6 +9726,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11694,12 +11763,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12481,9 +12580,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index f83bd44a71e..7a453b92c06 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -427,6 +427,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Espace de nommage", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Registre de métadonnées", @@ -2962,6 +2965,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Vérification des liens dans les métadonnées", @@ -3727,7 +3746,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6283,9 +6304,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_batch": "Exporter en lot (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6940,10 +6958,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "Item", @@ -8724,6 +8738,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8762,6 +8780,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9427,6 +9449,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11297,12 +11367,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "Vue du tableau de suivi", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12081,9 +12181,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5 index 6e6fbf623a8..49bd9047e0c 100644 --- a/src/assets/i18n/gd.json5 +++ b/src/assets/i18n/gd.json5 @@ -435,6 +435,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Ainm-spàs", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Clàr-lann Metadata", @@ -3003,6 +3006,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Dearbh Ceangalan ann am Metadata", @@ -3775,7 +3794,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6347,10 +6368,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7009,10 +7026,6 @@ // "nav.user.description" : "User profile bar", "nav.user.description" : "Bàr-iomraidh neach-cleachdaidh", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "Nì", @@ -8788,6 +8801,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8826,6 +8843,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9493,6 +9514,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11433,12 +11502,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12217,9 +12316,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5 index e0c6403a085..a82be3de927 100644 --- a/src/assets/i18n/hi.json5 +++ b/src/assets/i18n/hi.json5 @@ -423,6 +423,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "नाम स्थान", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "मेटाडेटा रजिस्ट्री", @@ -2963,6 +2966,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "मेटाडेटा में लिंक जांचें", @@ -3726,7 +3745,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description": "सिंडिकेशन फ़ीड", @@ -6272,10 +6293,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6924,10 +6941,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "आइटम", @@ -8705,6 +8718,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8743,6 +8760,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9408,6 +9429,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11251,12 +11320,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "कार्यक्षेत्र दृश्य", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -11940,9 +12039,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index 63d590bb1f1..5f09ec7d28d 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -438,6 +438,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Névhely", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3080,6 +3083,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Hivatkozások ellenőrzése a metaadatokban", @@ -3862,7 +3881,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6519,10 +6540,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7183,10 +7200,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -8992,6 +9005,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -9032,6 +9049,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9719,6 +9740,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11714,12 +11783,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12501,9 +12600,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 92ddf9d6d2d..a65e208e1d5 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -380,8 +380,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namespace", - // "admin.registries.metadata.schemas.table.downloads": "Download", - "admin.registries.metadata.schemas.table.downloads": "Download", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Registro dei metadati", @@ -2672,6 +2673,22 @@ // "cris-layout.attachment.viewMore": "View More", "cris-layout.attachment.viewMore": "Vedi altro", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Controllare i collegamenti nei metadati", @@ -3302,7 +3319,9 @@ // "explore.title": "Explore section", "explore.title": "Sezione esplora", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description": "Syndication feed", @@ -5582,9 +5601,6 @@ // "menu.section.import_from_excel": "Import from excel", "menu.section.import_from_excel": "Importa da Excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", "menu.section.export_to_excel": "Esporta in Excel", @@ -6150,9 +6166,6 @@ // "nav.user.description" : "User profile bar", "nav.user.description" : "Barra del profilo utente", - // "nav.subscriptions" : "Subscriptions", - "nav.subscriptions" : "Subscription", - // "none.listelement.badge": "Item", "none.listelement.badge": "Item", @@ -7695,6 +7708,9 @@ // "search.filters.filter.investigators.head": "Researcher", "search.filters.filter.investigators.head": "Ricercatore", + // "search.filters.filter.investigators.label": "Researcher", + "search.filters.filter.investigators.label": "Ricercatore", + // "search.filters.filter.investigators.placeholder": "Researcher", "search.filters.filter.investigators.placeholder": "Ricercatore", @@ -7728,6 +7744,9 @@ // "search.filters.filter.projectOrgUnits.head" : "Organizations", "search.filters.filter.projectOrgUnits.head" : "Strutture", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + "search.filters.filter.projectOrgUnits.label" : "Strutture", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", "search.filters.filter.projectOrgUnits.placeholder" : "Strutture", @@ -8286,6 +8305,54 @@ // "statistics.categories.downloadReports.tab": "Downloads reports", "statistics.categories.downloadReports.tab": "Report sui download", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", "statistics.reports.title": "Report", @@ -9969,11 +10036,41 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "Vista Workspace", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", "workflow-item.advanced.title": "Workflow avanzato", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", "workflow-item.selectrevieweraction.notification.success.title": "Revisore selezionato", @@ -10560,7 +10657,7 @@ // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", "admin.system-wide-alert.breadcrumbs": "Allarmi di sistema", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" "admin.system-wide-alert.title": "Allarmi di sistema", diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5 index e1336f45544..b5a8f0d1aef 100644 --- a/src/assets/i18n/ja.json5 +++ b/src/assets/i18n/ja.json5 @@ -504,6 +504,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", // TODO New key - Add a translation "admin.registries.metadata.schemas.table.namespace": "Namespace", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO New key - Add a translation @@ -3537,6 +3540,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", // TODO New key - Add a translation "curation-task.task.checklinks.label": "Check Links in Metadata", @@ -4374,7 +4393,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -7385,10 +7406,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -8137,10 +8154,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -10188,6 +10201,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -10232,6 +10249,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -10972,6 +10993,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -13205,12 +13274,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -13992,9 +14091,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index 68a8f79e7e0..01be114b9cf 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -422,6 +422,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Аттар кеңістігі", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Метадеректер тізілімі", @@ -2945,6 +2948,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Метадеректердегі Сілтемелерді Тексеріңіз", @@ -3701,7 +3720,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description": "Синдикация арнасы", @@ -6189,10 +6210,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6840,10 +6857,6 @@ // "nav.user.description" : "User profile bar", "nav.user.description" : "Пайдаланушы профилі тақтасы", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "Элемент", @@ -8584,6 +8597,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8622,6 +8639,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9286,6 +9307,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11128,12 +11197,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "Жұмыс аймағының түрі", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -11789,9 +11888,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5 index 9151b0ada13..129ef019eb9 100644 --- a/src/assets/i18n/lv.json5 +++ b/src/assets/i18n/lv.json5 @@ -450,6 +450,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Nosaukumvieta", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3188,6 +3191,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", // TODO New key - Add a translation "curation-task.task.checklinks.label": "Check Links in Metadata", @@ -3996,7 +4015,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6723,10 +6744,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7394,10 +7411,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -9329,6 +9342,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -9369,6 +9386,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -10063,6 +10084,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -12160,12 +12229,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12947,9 +13046,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5 index d85a89c476d..fffb7ec187a 100644 --- a/src/assets/i18n/nl.json5 +++ b/src/assets/i18n/nl.json5 @@ -451,6 +451,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namespace", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3369,6 +3372,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", // TODO New key - Add a translation "curation-task.task.checklinks.label": "Check Links in Metadata", @@ -4179,7 +4198,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6979,10 +7000,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7653,10 +7670,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -9621,6 +9634,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -9661,6 +9678,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -10365,6 +10386,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -12518,12 +12587,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -13305,9 +13404,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5 index 26f7f43438c..aceae933277 100644 --- a/src/assets/i18n/pl.json5 +++ b/src/assets/i18n/pl.json5 @@ -423,6 +423,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace":"Nazwa schematu", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title":"Rejestr metadanych", @@ -2943,6 +2946,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label":"Sprawdź odnośniki w metadanych", @@ -3700,7 +3719,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description":"Aktualności", @@ -6251,9 +6272,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_batch":"Eksport masowy (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6901,10 +6919,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge":"Pozycja", @@ -8655,6 +8669,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8693,6 +8711,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9357,6 +9379,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11200,12 +11270,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title":"Widok wersji roboczej", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -11888,9 +11988,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index c527dd05941..ca2d7acaaed 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -422,6 +422,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namespace", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Registro de Metadados", @@ -2931,6 +2934,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Verificar links em metadados", @@ -3681,7 +3700,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", "feed.description": "Feed de distribuição", @@ -6172,9 +6193,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_batch": "Exportação em Lote (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6823,10 +6841,6 @@ // "nav.user.description" : "User profile bar", "nav.user.description" : "Barra de perfil do usuário", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", "none.listelement.badge": "Item", @@ -8563,6 +8577,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8601,6 +8619,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9265,6 +9287,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11114,12 +11184,42 @@ // "workspace-item.view.title": "Workspace View", "workspace-item.view.title": "Visualização da Área de Trabalho (Workspace)", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -11775,9 +11875,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5 index 53f7b302502..38155c7e184 100644 --- a/src/assets/i18n/pt-PT.json5 +++ b/src/assets/i18n/pt-PT.json5 @@ -437,6 +437,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namespace", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3064,6 +3067,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Verifica ligações nos metadados", @@ -3846,7 +3865,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6497,10 +6518,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7159,10 +7176,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -8955,6 +8968,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8995,6 +9012,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9673,6 +9694,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11644,12 +11713,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12431,9 +12530,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5 index 8dd9863f04d..656bda5739b 100644 --- a/src/assets/i18n/sv.json5 +++ b/src/assets/i18n/sv.json5 @@ -438,6 +438,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Namnrymd", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", "admin.registries.metadata.title": "Metadata registry", @@ -2982,6 +2985,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Kontrollera länkar i metadata", @@ -3750,7 +3769,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6327,10 +6348,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -6990,10 +7007,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -8851,6 +8864,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -8889,6 +8906,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9561,6 +9582,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11496,12 +11565,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12280,9 +12379,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5 index e1336f45544..b5a8f0d1aef 100644 --- a/src/assets/i18n/sw.json5 +++ b/src/assets/i18n/sw.json5 @@ -504,6 +504,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", // TODO New key - Add a translation "admin.registries.metadata.schemas.table.namespace": "Namespace", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO New key - Add a translation @@ -3537,6 +3540,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", // TODO New key - Add a translation "curation-task.task.checklinks.label": "Check Links in Metadata", @@ -4374,7 +4393,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -7385,10 +7406,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -8137,10 +8154,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -10188,6 +10201,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -10232,6 +10249,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -10972,6 +10993,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -13205,12 +13274,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -13992,9 +14091,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5 index 8ccbcf0dc5a..c714a352b10 100644 --- a/src/assets/i18n/tr.json5 +++ b/src/assets/i18n/tr.json5 @@ -437,6 +437,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Ad Alanı", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3075,6 +3078,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Metadatalardaki Bağlantıları Kontrol Et", @@ -3858,7 +3877,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6511,10 +6532,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7175,10 +7192,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -8982,6 +8995,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -9022,6 +9039,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9709,6 +9730,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11699,12 +11768,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12486,9 +12585,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5 index b9c051b357e..f1808d29c42 100644 --- a/src/assets/i18n/uk.json5 +++ b/src/assets/i18n/uk.json5 @@ -438,6 +438,9 @@ // "admin.registries.metadata.schemas.table.namespace": "Namespace", "admin.registries.metadata.schemas.table.namespace": "Простір", + // "admin.registries.metadata.schemas.table.download": "Download", + // TODO New key - Add a translation + "admin.registries.metadata.schemas.table.download": "Download", // "admin.registries.metadata.title": "Metadata Registry", // TODO Source message changed - Revise the translation @@ -3094,6 +3097,22 @@ // TODO New key - Add a translation "cris-layout.attachment.viewMore": "View More", + // "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + // TODO New key - Add a translation + "cris-layout.rendering.collections.owning-collection.label": "Owning collection", + + // "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + // TODO New key - Add a translation + "cris-layout.rendering.collections.mapped-collection.label": "Mapped collections", + + // "cris-layout.rendering.collections.loading": "Loading...", + // TODO New key - Add a translation + "cris-layout.rendering.collections.loading": "Loading...", + + // "cris-layout.rendering.collections.load-more": "Load more", + // TODO New key - Add a translation + "cris-layout.rendering.collections.load-more": "Load more", + // "curation-task.task.checklinks.label": "Check Links in Metadata", "curation-task.task.checklinks.label": "Перевірте посилання у метаданих", @@ -3878,7 +3897,9 @@ // "explore.title": "Explore section", // TODO New key - Add a translation "explore.title": "Explore section", - + // "export-schema.process.title": "Metadata Schema Export", + // TODO New key - Add a translation + "export-schema.process.title": "Metadata Schema Export", // "feed.description": "Syndication feed", // TODO New key - Add a translation @@ -6539,10 +6560,6 @@ // TODO New key - Add a translation "menu.section.import_from_excel": "Import from excel", - // "menu.section.export_batch": "Batch Export (ZIP)", - // TODO New key - Add a translation - "menu.section.export_batch": "Batch Export (ZIP)", - // "menu.section.export_to_excel": "Export to excel", // TODO New key - Add a translation "menu.section.export_to_excel": "Export to excel", @@ -7203,10 +7220,6 @@ // TODO New key - Add a translation "nav.user.description" : "User profile bar", - // "nav.subscriptions" : "Subscriptions", - // TODO New key - Add a translation - "nav.subscriptions" : "Subscriptions", - // "none.listelement.badge": "Item", // TODO New key - Add a translation "none.listelement.badge": "Item", @@ -9011,6 +9024,10 @@ // TODO New key - Add a translation "search.filters.filter.investigators.head": "Researcher", + // "search.filters.filter.investigators.label": "Researcher", + // TODO New key - Add a translation + "search.filters.filter.investigators.label": "Researcher", + // "search.filters.filter.investigators.placeholder": "Researcher", // TODO New key - Add a translation "search.filters.filter.investigators.placeholder": "Researcher", @@ -9051,6 +9068,10 @@ // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.head" : "Organizations", + // "search.filters.filter.projectOrgUnits.label" : "Organizations", + // TODO New key - Add a translation + "search.filters.filter.projectOrgUnits.label" : "Organizations", + // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", // TODO New key - Add a translation "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", @@ -9738,6 +9759,54 @@ // TODO New key - Add a translation "statistics.categories.downloadReports.tab": "Downloads reports", + // "statistics.categories.itemReports.tab": "Item views reports", + // TODO New key - Add a translation + "statistics.categories.itemReports.tab": "Item views reports", + + // "statistics.table.itemReports.header.continent" : "Continent", + // TODO New key - Add a translation + "statistics.table.itemReports.header.continent" : "Continent", + + // "statistics.table.itemReports.header.views" : "Views", + // TODO New key - Add a translation + "statistics.table.itemReports.header.views" : "Views", + + // "statistics.table.itemReports.header.city" : "City", + // TODO New key - Add a translation + "statistics.table.itemReports.header.city" : "City", + + // "statistics.table.itemReports.header.item" : "Item", + // TODO New key - Add a translation + "statistics.table.itemReports.header.item" : "Item", + + // "statistics.table.mainReports.header.community" : "Community", + // TODO New key - Add a translation + "statistics.table.mainReports.header.community" : "Community", + + // "statistics.table.mainReports.header.collection" : "Collection", + // TODO New key - Add a translation + "statistics.table.mainReports.header.collection" : "Collection", + + // "statistics.table.itemReports.title.TopContinents" : "Top region views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopContinents" : "Top region views", + + // "statistics.table.itemReports.title.TopCities" : "Top cities views", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCities" : "Top cities views", + + // "statistics.table.itemReports.title.TopItems" : "Most viewed", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopItems" : "Most viewed", + + // "statistics.table.itemReports.title.TopCategories" : "Top categories", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TopCategories" : "Top categories", + + // "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // TODO New key - Add a translation + "statistics.table.itemReports.title.TotalVisitsPerMonth" : "Top views per month", + // "statistics.reports.title": "Reports", // TODO New key - Add a translation "statistics.reports.title": "Reports", @@ -11722,12 +11791,42 @@ // TODO New key - Add a translation "workspace-item.view.title": "Workspace View", + // "workspace-item.delete.breadcrumbs": "Workspace Delete", + // TODO New key - Add a translation + "workspace-item.delete.breadcrumbs": "Workspace Delete", + + // "workspace-item.delete.header": "Delete workspace item", + // TODO New key - Add a translation + "workspace-item.delete.header": "Delete workspace item", + + // "workspace-item.delete.button.confirm": "Delete", + // TODO New key - Add a translation + "workspace-item.delete.button.confirm": "Delete", + + // "workspace-item.delete.button.cancel": "Cancel", + // TODO New key - Add a translation + "workspace-item.delete.button.cancel": "Cancel", + + // "workspace-item.delete.notification.success.title": "Deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.success.title": "Deleted", + + // "workspace-item.delete.title": "This workspace item was successfully deleted", + // TODO New key - Add a translation + "workspace-item.delete.title": "This workspace item was successfully deleted", + + // "workspace-item.delete.notification.error.title": "Something went wrong", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.title": "Something went wrong", + + // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", + // TODO New key - Add a translation + "workspace-item.delete.notification.error.content": "The workspace item could not be deleted", // "workflow-item.advanced.title": "Advanced workflow", // TODO New key - Add a translation "workflow-item.advanced.title": "Advanced workflow", - // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", // TODO New key - Add a translation "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer", @@ -12508,9 +12607,9 @@ // TODO New key - Add a translation "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - // "admin.system-wide-alert.title": "System-wide Alerts", + // "admin.system-wide-alert.title": "System-wide Alerts" // TODO New key - Add a translation - "admin.system-wide-alert.title": "System-wide Alerts", + "admin.system-wide-alert.title": "System-wide Alerts" } \ No newline at end of file From 0397f3c3bd602711b701a7ab86ea1dd335f630c2 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Fri, 29 Sep 2023 17:56:11 +0200 Subject: [PATCH 695/758] [CST-10703] component rearrangements & validate email logic --- src/app/app-routing.module.ts | 5 + .../external-login-page.component.ts | 2 +- ...review-account-info-page-routing.module.ts | 16 +++ ...in-review-account-info-page.component.html | 13 +++ ...in-review-account-info-page.component.scss | 0 ...review-account-info-page.component.spec.ts | 25 +++++ ...ogin-review-account-info-page.component.ts | 65 +++++++++++ ...l-login-review-account-info-page.module.ts | 27 +++++ .../helpers/compare-values.pipe.ts | 0 .../review-account-info.component.html | 0 .../review-account-info.component.scss | 0 .../review-account-info.component.spec.ts | 0 .../review-account-info.component.ts | 1 - ...ogin-review-account-info-page.component.ts | 25 +++++ .../email-validated.component.ts | 8 +- ...ernal-login-validation-page.component.html | 12 +- ...xternal-login-validation-page.component.ts | 103 +++++++++++++----- .../external-login-validation-page.module.ts | 8 +- .../provide-email.component.html | 4 +- .../external-log-in.component.html | 6 +- .../external-log-in.component.ts | 19 ++-- .../models/registration-data.mock.model.ts | 2 +- .../services/external-login.service.ts | 1 + src/assets/i18n/en.json5 | 2 +- 24 files changed, 276 insertions(+), 68 deletions(-) create mode 100644 src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts create mode 100644 src/app/external-login-review-account-info/external-login-review-account-info-page.component.html create mode 100644 src/app/external-login-review-account-info/external-login-review-account-info-page.component.scss create mode 100644 src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts create mode 100644 src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts create mode 100644 src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts rename src/app/{external-login-validation-page => external-login-review-account-info}/helpers/compare-values.pipe.ts (100%) rename src/app/{external-login-validation-page => external-login-review-account-info}/review-account-info/review-account-info.component.html (100%) rename src/app/{external-login-validation-page => external-login-review-account-info}/review-account-info/review-account-info.component.scss (100%) rename src/app/{external-login-validation-page => external-login-review-account-info}/review-account-info/review-account-info.component.spec.ts (100%) rename src/app/{external-login-validation-page => external-login-review-account-info}/review-account-info/review-account-info.component.ts (99%) create mode 100644 src/app/external-login-review-account-info/themed-external-login-review-account-info-page.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d5f3a5aecdc..2fd18766af9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -181,6 +181,11 @@ import { RedirectService } from './redirect/redirect.service'; loadChildren: () => import('./external-login-validation-page/external-login-validation-page.module') .then((m) => m.ExternalLoginValidationPageModule) }, + { + path: 'review-account', + loadChildren: () => import('./external-login-review-account-info/external-login-review-account-info-page.module') + .then((m) => m.ExternalLoginReviewAccountInfoModule) + }, { path: 'email-confirmation', loadChildren: () => import('./external-login-email-confirmation-page/external-login-email-confirmation-page.module') diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index 8a41bc4a8ad..b98e823fc90 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -41,7 +41,7 @@ export class ExternalLoginPageComponent implements OnInit { ngOnInit(): void { this.getRegistrationData(); // TODO: remove this line (temporary) - // this.token = '1234567890'; + this.token = '1234567890'; } /** diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts new file mode 100644 index 00000000000..94f2ef42664 --- /dev/null +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; + +const routes: Routes = [ + { + path: '', + pathMatch: 'full', + component: ExternalLoginReviewAccountInfoPageComponent, +},]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class ExternalLoginReviewAccountInfoRoutingModule { } diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html new file mode 100644 index 00000000000..6d5defa2ca4 --- /dev/null +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html @@ -0,0 +1,13 @@ +
+ + + + +
diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.scss b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.scss new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts new file mode 100644 index 00000000000..ef2dfe82017 --- /dev/null +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; + +describe('ExternalLoginReviewAccountInfoPageComponent', () => { + let component: ExternalLoginReviewAccountInfoPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ExternalLoginReviewAccountInfoPageComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(ExternalLoginReviewAccountInfoPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts new file mode 100644 index 00000000000..8b02a347c51 --- /dev/null +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts @@ -0,0 +1,65 @@ +import { Component, OnInit } from '@angular/core'; +import { AlertType } from '../shared/alert/aletr-type'; +import { Observable, map } from 'rxjs'; +import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; +import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; +import { ActivatedRoute } from '@angular/router'; +import { hasValue } from '../shared/empty.util'; +import { getRemoteDataPayload } from '../core/shared/operators'; +import { Registration } from '../core/shared/registration.model'; + +@Component({ + templateUrl: './external-login-review-account-info-page.component.html', + styleUrls: ['./external-login-review-account-info-page.component.scss'] +}) +export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { + /** + * The token used to get the registration data + */ + public token: string; + + /** + * The type of alert to show + */ + public AlertTypeEnum = AlertType; + + /** + * The registration data of the user + */ + public registrationData$: Observable; + // = of( + // mockRegistrationDataModel + // ); + + constructor( + private epersonRegistrationService: EpersonRegistrationService, + private arouter: ActivatedRoute + ) { + this.token = this.arouter.snapshot.queryParams.token; + } + + + ngOnInit(): void { + // -> if email address is not used by other user => Email Validated component + // -> if email address is used by other user => Review account information component + this.getRegistrationData(); + // TODO: remove this line (temporary) + // this.token = '1234567890'; + } + /** + * Get the registration data from the token + */ + getRegistrationData() { + if (hasValue(this.token)) { + this.registrationData$ = this.epersonRegistrationService + .searchByToken(this.token) + .pipe( + getRemoteDataPayload(), + map((registration: Registration) => + Object.assign(new RegistrationData(), registration) + ) + ); + } + } + +} diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts new file mode 100644 index 00000000000..368f988a829 --- /dev/null +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { ExternalLoginReviewAccountInfoRoutingModule } from './external-login-review-account-info-page-routing.module'; +import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; +import { CompareValuesPipe } from './helpers/compare-values.pipe'; +import { ThemedExternalLoginReviewAccountInfoPageComponent } from './themed-external-login-review-account-info-page.component'; +import { ReviewAccountInfoComponent } from './review-account-info/review-account-info.component'; +import { UiSwitchModule } from 'ngx-ui-switch'; +import { SharedModule } from '../shared/shared.module'; + + +@NgModule({ + declarations: [ + ExternalLoginReviewAccountInfoPageComponent, + CompareValuesPipe, + ThemedExternalLoginReviewAccountInfoPageComponent, + ReviewAccountInfoComponent + ], + imports: [ + CommonModule, + ExternalLoginReviewAccountInfoRoutingModule, + SharedModule, + UiSwitchModule, + ] +}) +export class ExternalLoginReviewAccountInfoModule { } diff --git a/src/app/external-login-validation-page/helpers/compare-values.pipe.ts b/src/app/external-login-review-account-info/helpers/compare-values.pipe.ts similarity index 100% rename from src/app/external-login-validation-page/helpers/compare-values.pipe.ts rename to src/app/external-login-review-account-info/helpers/compare-values.pipe.ts diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.html b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html similarity index 100% rename from src/app/external-login-validation-page/review-account-info/review-account-info.component.html rename to src/app/external-login-review-account-info/review-account-info/review-account-info.component.html diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.scss b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.scss similarity index 100% rename from src/app/external-login-validation-page/review-account-info/review-account-info.component.scss rename to src/app/external-login-review-account-info/review-account-info/review-account-info.component.scss diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts similarity index 100% rename from src/app/external-login-validation-page/review-account-info/review-account-info.component.spec.ts rename to src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts diff --git a/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts similarity index 99% rename from src/app/external-login-validation-page/review-account-info/review-account-info.component.ts rename to src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index 80e9e2a1237..93952c2a26f 100644 --- a/src/app/external-login-validation-page/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -7,7 +7,6 @@ import { } from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPersonMock } from '../../shared/testing/eperson.mock'; import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; import { Observable, Subscription, filter, from, switchMap, take } from 'rxjs'; import { RemoteData } from 'src/app/core/data/remote-data'; diff --git a/src/app/external-login-review-account-info/themed-external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info/themed-external-login-review-account-info-page.component.ts new file mode 100644 index 00000000000..53139bb7811 --- /dev/null +++ b/src/app/external-login-review-account-info/themed-external-login-review-account-info-page.component.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { ThemedComponent } from '../shared/theme-support/themed.component'; +import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; + +/** + * Themed wrapper for ExternalLoginReviewAccountInfoPageComponent + */ +@Component({ + selector: 'ds-themed-external-login-page', + styleUrls: [], + templateUrl: './../shared/theme-support/themed.component.html' +}) +export class ThemedExternalLoginReviewAccountInfoPageComponent extends ThemedComponent { + protected getComponentName(): string { + return 'ExternalLoginReviewAccountInfoPageComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../themes/${themeName}/app/external-login-review-account-info/external-login-review-account-info-page.component`); + } + + protected importUnthemedComponent(): Promise { + return import(`./external-login-review-account-info-page.component`); + } +} diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.ts index c469b8ccbc1..4147dd23720 100644 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.ts +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.ts @@ -14,12 +14,6 @@ export class EmailValidatedComponent { @Input() registrationToken: string; constructor(private authService: AuthService, private router: Router) { - // if user is logged in, redirect to home page - // in case user logs in with an existing account - this.authService.isAuthenticated().subscribe((isAuthenticated: boolean) => { - if (isAuthenticated) { - this.router.navigate(['/']); - } - }); + this.authService.setRedirectUrl('/review-account'); } } diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.html b/src/app/external-login-validation-page/external-login-validation-page.component.html index 3c9fa39d0b0..3efd1ce0e38 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.html +++ b/src/app/external-login-validation-page/external-login-validation-page.component.html @@ -1,15 +1,9 @@
- - - - + - + diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.ts b/src/app/external-login-validation-page/external-login-validation-page.component.ts index 4146ace1be2..7a20473ddbe 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.ts +++ b/src/app/external-login-validation-page/external-login-validation-page.component.ts @@ -1,18 +1,25 @@ -import { Component, OnInit } from '@angular/core'; -import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; +import { Component } from '@angular/core'; import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; import { ActivatedRoute } from '@angular/router'; -import { hasValue } from '../shared/empty.util'; -import { Registration } from '../core/shared/registration.model'; -import { Observable, map, of } from 'rxjs'; -import { getRemoteDataPayload } from '../core/shared/operators'; import { AlertType } from '../shared/alert/aletr-type'; +import { hasNoValue, hasValue } from '../shared/empty.util'; +import { getRemoteDataPayload } from '../core/shared/operators'; +import { BehaviorSubject, Observable, map, of, switchMap, tap } from 'rxjs'; +import { Registration } from '../core/shared/registration.model'; +import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; +import { RemoteData } from '../core/data/remote-data'; +import { NotificationsService } from '../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import { EPersonDataService } from '../core/eperson/eperson-data.service'; +import { MetadataValue } from '../core/shared/metadata.models'; +import { EPerson } from '../core/eperson/models/eperson.model'; +import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; @Component({ templateUrl: './external-login-validation-page.component.html', styleUrls: ['./external-login-validation-page.component.scss'], }) -export class ExternalLoginValidationPageComponent implements OnInit { +export class ExternalLoginValidationPageComponent { /** * The token used to get the registration data */ @@ -23,41 +30,81 @@ export class ExternalLoginValidationPageComponent implements OnInit { */ public AlertTypeEnum = AlertType; - /** - * The registration data of the user - */ - public registrationData$: Observable - // = of( - // mockRegistrationDataModel - // ); + private validationFailed: BehaviorSubject = + new BehaviorSubject(false); constructor( private epersonRegistrationService: EpersonRegistrationService, - private arouter: ActivatedRoute + private arouter: ActivatedRoute, + private epersonDataService: EPersonDataService, + private notificationService: NotificationsService, + private translateService: TranslateService ) { this.token = this.arouter.snapshot.queryParams.token; + this.token = '1234567890'; // TODO: remove this line (temporary) } ngOnInit(): void { - // -> if email address is not used by other user => Email Validated component - // -> if email address is used by other user => Review account information component - this.getRegistrationData(); - // TODO: remove this line (temporary) - // this.token = '1234567890'; + // TODO: Uncomment this line later + // this.getRegistrationData(); } + + public hasFailed(): Observable { + return this.validationFailed.asObservable(); + } + /** * Get the registration data from the token */ getRegistrationData() { + this.validationFailed.next(true); + if (hasValue(this.token)) { - this.registrationData$ = this.epersonRegistrationService - .searchByToken(this.token) - .pipe( - getRemoteDataPayload(), - map((registration: Registration) => - Object.assign(new RegistrationData(), registration) - ) - ); + this.fetchRegistrationDataAndCreateUser(this.token); } } + + fetchRegistrationDataAndCreateUser(token: string) { + this.epersonRegistrationService + .searchByToken(token) + .pipe( + switchMap((rd) => { + if (hasValue(rd.payload) && hasNoValue(rd.payload.user)) { + const registrationData = Object.assign( + new RegistrationData(), + rd.payload + ); + return this.createUserFromToken(token, registrationData); + } else { + return of(rd); + } + }) + ) + .subscribe((rd: RemoteData) => { + if (rd.hasFailed) { + this.validationFailed.next(true); + } + }); + } + + createUserFromToken(token: string, registrationData: RegistrationData) { + const metadataValues = Object.entries(registrationData.registrationMetadata) + .filter(([key, value]) => hasValue(value[0]?.value)) + .map(([key, value]) => ({ + key, + value: value[0]?.value, + })); + const eperson = Object.assign(new EPerson(), { + metadata: metadataValues, + canLogIn: true, + requireCertificate: false, + }); + return this.epersonDataService.createEPersonForToken(eperson, token).pipe( + tap((rd: RemoteData) => { + if (rd.hasFailed) { + this.validationFailed.next(true); + } + }) + ); + } } diff --git a/src/app/external-login-validation-page/external-login-validation-page.module.ts b/src/app/external-login-validation-page/external-login-validation-page.module.ts index ba41cf95a1b..3bad614d7e6 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.module.ts +++ b/src/app/external-login-validation-page/external-login-validation-page.module.ts @@ -5,26 +5,20 @@ import { ExternalLoginValidationPageRoutingModule } from './external-login-valid import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; import { ThemedExternalLoginValidationPageComponent } from './themed-external-login-validation-page.component'; -import { UiSwitchModule } from 'ngx-ui-switch'; -import { ReviewAccountInfoComponent } from './review-account-info/review-account-info.component'; import { EmailValidatedComponent } from './email-validated/email-validated.component'; import { SharedModule } from '../shared/shared.module'; -import { CompareValuesPipe } from './helpers/compare-values.pipe'; @NgModule({ declarations: [ ExternalLoginValidationPageComponent, ThemedExternalLoginValidationPageComponent, - ReviewAccountInfoComponent, EmailValidatedComponent, - CompareValuesPipe ], imports: [ CommonModule, ExternalLoginValidationPageRoutingModule, - SharedModule, - UiSwitchModule, + SharedModule ] }) export class ExternalLoginValidationPageModule { } diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html index b5a2efa7b68..46e804e1c2e 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html @@ -17,7 +17,7 @@

emailForm.get('email').hasError('required') && emailForm.get('email').touched " - class="error-message" + class="text-danger" > {{ "external-login.confirmation.email-required" | translate }}

@@ -26,7 +26,7 @@

emailForm.get('email').hasError('email') && emailForm.get('email').touched " - class="error-message" + class="text-danger" > {{ "external-login.confirmation.email-invalid" | translate }}

diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html index 59219922470..47a301501bf 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html @@ -36,14 +36,16 @@

{{'Connect to an existing user' | translate}}<

-
diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts index 3b82ab70ca1..2ef5df0cae1 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts @@ -57,15 +57,7 @@ export class ExternalLogInComponent implements OnInit { private modalService: NgbModal, private authService: AuthService, private router: Router - ) { - // if user is logged in, redirect to home page - // in case user logs in with an existing account - this.authService.isAuthenticated().subscribe((isAuthenticated: boolean) => { - if (isAuthenticated) { - this.router.navigate(['/']); - } - }); - } + ) {} /** * Provide the registration data object to the objectInjector. @@ -124,6 +116,15 @@ export class ExternalLogInComponent implements OnInit { openLoginModal(content: any) { this.modalRef = this.modalService.open(content); + this.authService.setRedirectUrl('/review-account'); + + this.modalRef.dismissed.subscribe(() => { + this.clearRedirectUrl(); + }); + } + + clearRedirectUrl() { + this.authService.clearRedirectUrl(); } ngOnDestroy(): void { diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts index 961d443a665..9ef3d4162c1 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts +++ b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts @@ -6,7 +6,7 @@ export const mockRegistrationDataModel: RegistrationData = Object.assign( new RegistrationData(), { id: '3', - email: 'user@institution.edu', + email: null,//'user@institution.edu', user: '028dcbb8-0da2-4122-a0ea-254be49ca107', registrationType: AuthMethodType.Orcid, netId: '0000-1111-2222-3333', diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts index f757bb2bdbf..4f60d9e5d25 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -29,6 +29,7 @@ export class ExternalLoginService { */ patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable> { const updatedValues = values.map((value) => value); + this.router.navigate(['/email-confirmation']); // TODO: remove this line (temporary) return this.epersonRegistrationService.patchUpdateRegistration(updatedValues, field, registrationId, token, operation).pipe( getFirstCompletedRemoteData(), map((rd) => { diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 9d3161f0aaf..c2be335f99f 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7222,7 +7222,7 @@ "review-account-info.merge-data.notification.error": "Something went wrong while updating your account information", - "external-login.validate-email.no-token": "The validation link is no longer valid. Please try again.", + "external-login.validate-email.no-token": "Something went wrong. Your email address is not validated succesfully.", "external-login-page.provide-email.notifications.error": "Something went wrong.Email address was omitted or the operation is not valid.", } From 95600d75761da5ca5292647227c5a90e51b84371 Mon Sep 17 00:00:00 2001 From: "yevhenii.lohatskyi" Date: Mon, 2 Oct 2023 15:43:37 +0300 Subject: [PATCH 696/758] [DSC-1226] set this.model.metadataValue as currentValue if present on init in dynamic-scrollable-dropdown.component.ts --- .../dynamic-scrollable-dropdown.component.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts index 75a21973590..4be743f2162 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts @@ -77,6 +77,10 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom * Initialize the component, setting up the init form value */ ngOnInit() { + if (this.model.metadataValue) { + this.setCurrentValue(this.model.metadataValue, true); + } + this.updatePageInfo(this.model.maxOptions, 1); this.retrieveEntries(null, true); From 8ab3fc91f239331e447174aa1449b66f501f918c Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Mon, 2 Oct 2023 15:38:45 +0200 Subject: [PATCH 697/758] [DSC-1242] fix explore browsing --- .../shared/dso-page/dso-edit-menu.resolver.ts | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index e7d4695d1c3..cd2aa27fca5 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -1,26 +1,26 @@ -import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; -import { combineLatest, Observable, of as observableOf } from 'rxjs'; -import { FeatureID } from '../../core/data/feature-authorization/feature-id'; -import { MenuService } from '../menu/menu.service'; -import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; -import { Injectable } from '@angular/core'; -import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; -import { Item } from '../../core/shared/item.model'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { map, switchMap } from 'rxjs/operators'; -import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; -import { URLCombiner } from '../../core/url-combiner/url-combiner'; -import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service'; -import { hasNoValue, hasValue, isNotEmpty } from '../empty.util'; -import { MenuID } from '../menu/menu-id.model'; -import { MenuItemType } from '../menu/menu-item-type.model'; -import { MenuSection } from '../menu/menu-section.model'; -import { getDSORoute } from '../../app-routing-paths'; -import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service'; -import { NotificationsService } from '../notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; +import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router'; +import {combineLatest, Observable, of as observableOf} from 'rxjs'; +import {FeatureID} from '../../core/data/feature-authorization/feature-id'; +import {MenuService} from '../menu/menu.service'; +import {AuthorizationDataService} from '../../core/data/feature-authorization/authorization-data.service'; +import {Injectable} from '@angular/core'; +import {LinkMenuItemModel} from '../menu/menu-item/models/link.model'; +import {Item} from '../../core/shared/item.model'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {OnClickMenuItemModel} from '../menu/menu-item/models/onclick.model'; +import {getFirstCompletedRemoteData} from '../../core/shared/operators'; +import {map, switchMap} from 'rxjs/operators'; +import {DSpaceObjectDataService} from '../../core/data/dspace-object-data.service'; +import {URLCombiner} from '../../core/url-combiner/url-combiner'; +import {DsoVersioningModalService} from './dso-versioning-modal-service/dso-versioning-modal.service'; +import {hasNoValue, hasValue, isNotEmpty} from '../empty.util'; +import {MenuID} from '../menu/menu-id.model'; +import {MenuItemType} from '../menu/menu-item-type.model'; +import {MenuSection} from '../menu/menu-section.model'; +import {getDSORoute} from '../../app-routing-paths'; +import {ResearcherProfileDataService} from '../../core/profile/researcher-profile-data.service'; +import {NotificationsService} from '../notifications/notifications.service'; +import {TranslateService} from '@ngx-translate/core'; /** * Creates the menus for the dspace object pages @@ -49,6 +49,8 @@ export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection let id = route.params.id; if (hasNoValue(id) && hasValue(route.queryParams.scope)) { id = route.queryParams.scope; + } else if (hasNoValue(id) && hasNoValue(route.queryParams.scope)) { + return observableOf({}); } return this.dSpaceObjectDataService.findById(id, true, false).pipe( getFirstCompletedRemoteData(), From 5175285b5bc43864b08ba2d0809bbbfbbc26e78d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Mon, 2 Oct 2023 15:55:03 +0200 Subject: [PATCH 698/758] [DSC-1153] Fixes --- .../bitstream-attachment.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html index 038da280b9a..aaa4d4d43ca 100644 --- a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html +++ b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/bitstream-attachment.component.html @@ -1,19 +1,19 @@ -
+
-
+
-
-
+
+
-
+
-
+
From 7e307097d6b3a5949ee4a93bdc5e86ccdba4cf7d Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 3 Oct 2023 12:55:01 +0200 Subject: [PATCH 699/758] [DSC-1277] Fix en.json5 --- src/assets/i18n/en.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 406b53e06c6..1f7250507e1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7171,5 +7171,5 @@ "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", - "admin.system-wide-alert.title": "System-wide Alerts" + "admin.system-wide-alert.title": "System-wide Alerts", } From f3939626d293e025e8f9e1db251fccaf57119888 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 3 Oct 2023 16:08:24 +0200 Subject: [PATCH 700/758] [DSC-1277] New Italian translations --- src/assets/i18n/it.json5 | 77 +++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index a65e208e1d5..8f16730d429 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -422,7 +422,7 @@ "admin.registries.schema.form.element": "Elemento", // "admin.registries.schema.form.qualifier": "Qualifier", - "admin.registries.schema.form.qualifier": "Qualificatore", + "admin.registries.schema.form.qualifier": "Qualifier", // "admin.registries.schema.form.scopenote": "Scope Note", "admin.registries.schema.form.scopenote": "Nota di ambito", @@ -1051,7 +1051,7 @@ "admin.batch-import.page.header": "Batch Import", // "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": "È possibile rilasciare o sfogliare i file CSV che contengono operazioni di metadati batch sui file qui", + "admin.metadata-import.page.help": "È possibile trascinare o ricercare qui i file CSV che contengono le informazioni di import metadata", // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import", "admin.batch-import.page.help": "Selezionare la Collection in cui effettuare l'import. Quindi, rilasciare o sfogliare un file zip Simple Archive Format (SAF) che include gli elementi da importare", @@ -1442,7 +1442,7 @@ "browse.metadata.rpname": "Nome", // "browse.metadata.subject": "Subject", - "browse.metadata.subject": "Subject", + "browse.metadata.subject": "Oggetto", // "browse.metadata.type": "Type", "browse.metadata.type": "Digitare", @@ -3258,7 +3258,7 @@ "explore.index.rpname" : "Nome", // "explore.index.subject" : "Subject", - "explore.index.subject" : "Subject", + "explore.index.subject" : "Oggetto", // "explore.index.title" : "Title", "explore.index.title" : "Titolo", @@ -3291,7 +3291,7 @@ "explore.search-section.search-button": "Ricerca", // "explore.search-section.reset-button": "Reset", - "explore.search-section.reset-button": "Reset", + "explore.search-section.reset-button": "Annulla", // "explore.infrastructure.breadcrumbs": "Infrastructure", "explore.infrastructure.breadcrumbs": "Infrastrutture", @@ -3585,7 +3585,7 @@ "grant-deny-request-copy.email.send": "Invia", // "grant-deny-request-copy.email.subject": "Subject", - "grant-deny-request-copy.email.subject": "Subject", + "grant-deny-request-copy.email.subject": "Oggetto", // "grant-deny-request-copy.email.subject.empty": "Please enter a subject", "grant-deny-request-copy.email.subject.empty": "Inserisci un subject", @@ -4213,7 +4213,7 @@ "item.edit.move.inheritpolicies.checkbox": "Ereditare i criteri", // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection", - "item.edit.move.inheritpolicies.description": "Ereditare i criteri predefiniti dell'insieme di destinazione", + "item.edit.move.inheritpolicies.description": "Eredita le policy di default della collezione di destinazione", // "item.edit.move.move": "Move", "item.edit.move.move": "Sposta", @@ -5567,16 +5567,16 @@ // "menu.section.edit": "Edit", - "menu.section.edit": "Modificare", + "menu.section.edit": "Modifica", // "menu.section.edit_collection": "Collection", - "menu.section.edit_collection": "Collezione", + "menu.section.edit_collection": "Collezioni", // "menu.section.edit_community": "Community", "menu.section.edit_community": "Community", // "menu.section.edit_item": "Item", - "menu.section.edit_item": "Articolo", + "menu.section.edit_item": "Item", @@ -5596,7 +5596,7 @@ "menu.section.export_metadata": "Metadati", // "menu.section.export_batch": "Batch Export (ZIP)", - "menu.section.export_batch": "Batch Export (ZIP)", + "menu.section.export_batch": "Export batch (ZIP)", // "menu.section.import_from_excel": "Import from excel", "menu.section.import_from_excel": "Importa da Excel", @@ -5656,7 +5656,7 @@ "menu.section.icon.user_agreement_edit": "Modifica accordo con l'utente finale", // "menu.section.icon.workflow": "Administer workflow menu section", - "menu.section.icon.workflow": "Amministrare la sezione del menu del flusso di lavoro", + "menu.section.icon.workflow": "Amministra la sezione del menu del workflow", // "menu.section.icon.unpin": "Unpin sidebar", "menu.section.icon.unpin": "Rimuovi la barra laterale", @@ -5664,10 +5664,10 @@ // "menu.section.import": "Import", - "menu.section.import": "Importazione", + "menu.section.import": "Importa", // "menu.section.import_batch": "Batch Import (ZIP)", - "menu.section.import_batch": "Importazione batch (ZIP)", + "menu.section.import_batch": "Import batch (ZIP)", // "menu.section.import_metadata": "Metadata", "menu.section.import_metadata": "Metadata", @@ -5695,10 +5695,10 @@ // "menu.section.pin": "Pin sidebar", - "menu.section.pin": "Pin barra laterale", + "menu.section.pin": "Fissa la barra laterale", // "menu.section.unpin": "Unpin sidebar", - "menu.section.unpin": "Rimuovere la barra laterale", + "menu.section.unpin": "Rimuovi la barra laterale", @@ -5706,7 +5706,7 @@ "menu.section.processes": "Processi", // "menu.section.health": "Health", - "menu.section.health": "Salute", + "menu.section.health": "Stato del sistema", @@ -5768,7 +5768,7 @@ "statistics.workflow.page.step-table.header": "Passaggi del Workflow eseguiti", // "statistics.workflow.page.step-table.step": "Step", - "statistics.workflow.page.step-table.step": "Passo", + "statistics.workflow.page.step-table.step": "Step", // "statistics.workflow.page.step-table.count": "Performed", "statistics.workflow.page.step-table.count": "Eseguito", @@ -5933,7 +5933,7 @@ "menu.section.edit_user_agreement": "Modifica accordo con l'utente finale", // "menu.section.workflow": "Administer Workflow", - "menu.section.workflow": "Amministrare il flusso di lavoro", + "menu.section.workflow": "Amministra il workflow", // "metadata-export-search.tooltip": "Export search results as CSV", @@ -6152,7 +6152,7 @@ "nav.search": "Ricerca", // "nav.statistics.header": "Statistics", - "nav.statistics.header": "Statistica", + "nav.statistics.header": "Statistiche", // "nav.stop-impersonating": "Stop impersonating EPerson", "nav.stop-impersonating": "Smetti di impersonare EPerson", @@ -7478,7 +7478,7 @@ "search.filters.applied.f.projectorgunits": "Organizzazione", // "search.filters.applied.f.subject": "Subject", - "search.filters.applied.f.subject": "Soggetto", + "search.filters.applied.f.subject": "Oggetto", // "search.filters.applied.f.submitter": "Submitter", "search.filters.applied.f.submitter": "Submitter", @@ -8038,22 +8038,22 @@ "sorting.score.DESC": "Maggior rilevanza", // "sorting.dc.date.issued.ASC": "Date Issued Ascending", - "sorting.dc.date.issued.ASC": "Data di pubblicazione Ascendente", + "sorting.dc.date.issued.ASC": "Data di pubblicazione crescente", // "sorting.dc.date.issued.DESC": "Date Issued Descending", - "sorting.dc.date.issued.DESC": "Data di pubblicazione Discendente", + "sorting.dc.date.issued.DESC": "Data di pubblicazione decrescente", // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending", - "sorting.dc.date.accessioned.ASC": "Data di accesso Ascendente", + "sorting.dc.date.accessioned.ASC": "Data di accesso crescente", // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending", - "sorting.dc.date.accessioned.DESC": "Data di accesso Discendente", + "sorting.dc.date.accessioned.DESC": "Data di accesso decrescente", // "sorting.lastModified.ASC": "Last modified Ascending", - "sorting.lastModified.ASC": "Ultima modifica Ascendente", + "sorting.lastModified.ASC": "Ultima modifica crescente", // "sorting.lastModified.DESC": "Last modified Descending", - "sorting.lastModified.DESC": "Ultima modifica Discendente", + "sorting.lastModified.DESC": "Ultima modifica decrescente", // "sorting.ownerselection.ASC": "Owner Relevance Ascending", "sorting.ownerselection.ASC": "Rilevanza del proprietario crescente", @@ -8132,13 +8132,13 @@ "statistics.table.mainReports.title.TopCountries": "Paesi con più visite", // "statistics.table.mainReports.title.TopContinents": "Top region views", - "statistics.table.mainReports.title.TopContinents": "Regioni con più visite", + "statistics.table.mainReports.title.TopContinents": "Più visualizzati per regione", // "statistics.table.mainReports.title.TopCategories": "Categories", "statistics.table.mainReports.title.TopCategories": "Categorie", // "statistics.table.mainReports.title.TopCities": "Top city views", - "statistics.table.mainReports.title.TopCities": "Città con più visite", + "statistics.table.mainReports.title.TopCities": "Più visualizzati per città", // "statistics.table.downloadReports.title.TotalVisits": "Most downloaded", "statistics.table.downloadReports.title.TotalVisits": "I più scaricati", @@ -8156,16 +8156,16 @@ "statistics.table.downloadReports.title.TotalDownloadsPerMonth": "Download totali al mese", // "statistics.table.downloadReports.title.TopCountries": "Top country downloads", - "statistics.table.downloadReports.title.TopCountries": "Top country downloads", + "statistics.table.downloadReports.title.TopCountries": "Più scaricati per nazione", // "statistics.table.downloadReports.title.TopContinents": "Top region downloads", - "statistics.table.downloadReports.title.TopContinents": "Top region downloads", + "statistics.table.downloadReports.title.TopContinents": "Più scaricati per regione", // "statistics.table.downloadReports.title.TopCategories": "Categories", "statistics.table.downloadReports.title.TopCategories": "Categorie", // "statistics.table.downloadReports.title.TopCities": "Top city downloads", - "statistics.table.downloadReports.title.TopCities": "Top city downloads", + "statistics.table.downloadReports.title.TopCities": "Più scaricati per città", // "statistics.table.mainReports.header.views": "Views", "statistics.table.mainReports.header.views": "Visualizzazioni", @@ -8326,24 +8326,19 @@ "statistics.table.itemReports.header.item" : "Item", // "statistics.table.mainReports.header.community" : "Community", - // TODO New key - Add a translation "statistics.table.mainReports.header.community" : "Community", // "statistics.table.mainReports.header.collection" : "Collection", - // TODO New key - Add a translation - "statistics.table.mainReports.header.collection" : "Collection", + "statistics.table.mainReports.header.collection" : "Collezione", // "statistics.table.itemReports.title.TopContinents" : "Top region views", - // TODO New key - Add a translation - "statistics.table.itemReports.title.TopContinents" : "Top region views", + "statistics.table.itemReports.title.TopContinents" : "Più visualizzati per regione", // "statistics.table.itemReports.title.TopCities" : "Top cities views", - // TODO New key - Add a translation - "statistics.table.itemReports.title.TopCities" : "Top cities views", + "statistics.table.itemReports.title.TopCities" : "Più visualizzati per città", // "statistics.table.itemReports.title.TopItems" : "Most viewed", - // TODO New key - Add a translation - "statistics.table.itemReports.title.TopItems" : "Most viewed", + "statistics.table.itemReports.title.TopItems" : "Più visualizzati", // "statistics.table.itemReports.title.TopCategories" : "Top categories", // TODO New key - Add a translation From 173c1a8f79b33d3f6175e591a26d0645d33d4563 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 3 Oct 2023 16:48:42 +0200 Subject: [PATCH 701/758] [DSC-1277] Italian translation fixes --- src/assets/i18n/it.json5 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 8f16730d429..3466ca341ea 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -1442,7 +1442,7 @@ "browse.metadata.rpname": "Nome", // "browse.metadata.subject": "Subject", - "browse.metadata.subject": "Oggetto", + "browse.metadata.subject": "Soggetto", // "browse.metadata.type": "Type", "browse.metadata.type": "Digitare", @@ -3258,7 +3258,7 @@ "explore.index.rpname" : "Nome", // "explore.index.subject" : "Subject", - "explore.index.subject" : "Oggetto", + "explore.index.subject" : "Soggetto", // "explore.index.title" : "Title", "explore.index.title" : "Titolo", @@ -7478,7 +7478,7 @@ "search.filters.applied.f.projectorgunits": "Organizzazione", // "search.filters.applied.f.subject": "Subject", - "search.filters.applied.f.subject": "Oggetto", + "search.filters.applied.f.subject": "Soggetto", // "search.filters.applied.f.submitter": "Submitter", "search.filters.applied.f.submitter": "Submitter", @@ -7604,10 +7604,10 @@ "search.filters.filter.creativeWorkEditor.label": "Editor di ricerca", // "search.filters.filter.creativeWorkKeywords.head": "Subject", - "search.filters.filter.creativeWorkKeywords.head": "Oggetto", + "search.filters.filter.creativeWorkKeywords.head": "Soggetto", // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject", - "search.filters.filter.creativeWorkKeywords.placeholder": "Oggetto", + "search.filters.filter.creativeWorkKeywords.placeholder": "Soggetto", // "search.filters.filter.creativeWorkKeywords.label": "Search subject", "search.filters.filter.creativeWorkKeywords.label": "Oggetto della ricerca", @@ -7829,10 +7829,10 @@ "search.filters.filter.show-more": "Mostra altro", // "search.filters.filter.subject.head": "Subject", - "search.filters.filter.subject.head": "Oggetto", + "search.filters.filter.subject.head": "Soggetto", // "search.filters.filter.subject.placeholder": "Subject", - "search.filters.filter.subject.placeholder": "Oggetto", + "search.filters.filter.subject.placeholder": "Soggetto", // "search.filters.filter.subject.label": "Search subject", "search.filters.filter.subject.label": "Oggetto della ricerca", From 5cc7a44dbac0bfeb567dfea755732d59f95c917c Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 3 Oct 2023 17:40:38 +0200 Subject: [PATCH 702/758] [CST-10703] final workflow implemntation --- src/app/core/auth/models/auth.method-type.ts | 3 +- src/app/core/core.module.ts | 2 +- .../data/eperson-registration.service.spec.ts | 4 +- .../core/data/eperson-registration.service.ts | 17 ++- ...-email-confirmation-page.component.spec.ts | 20 ++- .../external-login-page-routing.module.ts | 4 + .../external-login-page.component.html | 6 +- .../external-login-page.component.spec.ts | 64 ++++++++- .../external-login-page.component.ts | 45 +++--- ...review-account-info-page-routing.module.ts | 4 + ...in-review-account-info-page.component.html | 4 +- ...review-account-info-page.component.spec.ts | 52 ++++++- ...ogin-review-account-info-page.component.ts | 45 +++--- .../helpers/review-account.guard.spec.ts | 79 +++++++++++ .../helpers/review-account.guard.ts | 73 ++++++++++ .../review-account-info.component.html | 2 +- .../review-account-info.component.ts | 75 ++-------- .../email-validated.component.html | 2 +- .../email-validated.component.spec.ts | 3 +- .../email-validated.component.ts | 11 +- ...al-login-validation-page-routing.module.ts | 5 +- ...ernal-login-validation-page.component.html | 6 +- ...al-login-validation-page.component.spec.ts | 62 ++++----- ...xternal-login-validation-page.component.ts | 98 +++---------- ...stration-data-create-user.resolver.spec.ts | 129 ++++++++++++++++++ .../registration-data-create-user.resolver.ts | 93 +++++++++++++ .../invitation-acceptance.component.spec.ts | 2 +- .../invitation-acceptance.component.ts | 2 +- src/app/invitation/valid-token.guard.spec.ts | 4 +- src/app/invitation/valid-token.guard.ts | 2 +- src/app/login-page/login-page.component.html | 1 + src/app/login-page/login-page.component.ts | 4 + .../registration.resolver.spec.ts | 2 +- .../registration.resolver.ts | 2 +- .../register-page/registration.guard.spec.ts | 6 +- src/app/register-page/registration.guard.ts | 2 +- .../confirm-email.component.html | 2 +- .../confirm-email.component.spec.ts | 6 +- .../confirm-email/confirm-email.component.ts | 92 ++++++++++++- .../provide-email.component.spec.ts | 20 ++- .../provide-email/provide-email.component.ts | 36 +++-- .../external-log-in.component.html | 10 +- .../external-log-in.component.spec.ts | 65 ++++++--- .../external-log-in.component.ts | 10 +- .../guards/registration-token.guard.spec.ts | 79 +++++++++++ .../guards/registration-token.guard.ts | 54 ++++++++ .../models/registration-data.mock.model.ts | 5 +- .../models/registration-data.model.ts | 14 +- .../registration-data.resolver.spec.ts | 16 +++ .../resolvers/registration-data.resolver.ts | 50 +++++++ .../services/external-login.service.ts | 7 +- src/app/shared/log-in/log-in.component.html | 9 +- src/app/shared/log-in/log-in.component.ts | 18 ++- src/assets/i18n/en.json5 | 10 ++ src/assets/i18n/it.json5 | 44 ++++++ 55 files changed, 1133 insertions(+), 349 deletions(-) create mode 100644 src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts create mode 100644 src/app/external-login-review-account-info/helpers/review-account.guard.ts create mode 100644 src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts create mode 100644 src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts create mode 100644 src/app/shared/external-log-in-complete/guards/registration-token.guard.spec.ts create mode 100644 src/app/shared/external-log-in-complete/guards/registration-token.guard.ts create mode 100644 src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts create mode 100644 src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts diff --git a/src/app/core/auth/models/auth.method-type.ts b/src/app/core/auth/models/auth.method-type.ts index 600c3c80761..e5b4e0a194c 100644 --- a/src/app/core/auth/models/auth.method-type.ts +++ b/src/app/core/auth/models/auth.method-type.ts @@ -5,5 +5,6 @@ export enum AuthMethodType { Ip = 'ip', X509 = 'x509', Oidc = 'oidc', - Orcid = 'orcid' + Orcid = 'orcid', + Validation = 'validation', } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index d22aadc8a55..c75ce8e65c9 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -472,7 +472,7 @@ export const models = LoginStatistics, Metric, ItemRequest, - RegistrationData + RegistrationData, ]; @NgModule({ diff --git a/src/app/core/data/eperson-registration.service.spec.ts b/src/app/core/data/eperson-registration.service.spec.ts index 74e45591125..5fcfbcbdcd7 100644 --- a/src/app/core/data/eperson-registration.service.spec.ts +++ b/src/app/core/data/eperson-registration.service.spec.ts @@ -104,7 +104,7 @@ describe('EpersonRegistrationService', () => { describe('searchByToken', () => { it('should return a registration corresponding to the provided token', () => { - const expected = service.searchByToken('test-token'); + const expected = service.searchByTokenAndUpdateData('test-token'); expect(expected).toBeObservable(cold('(a|)', { a: jasmine.objectContaining({ @@ -124,7 +124,7 @@ describe('EpersonRegistrationService', () => { testScheduler.run(({ cold, expectObservable }) => { rdbService.buildSingle.and.returnValue(cold('a', { a: rd })); - service.searchByToken('test-token'); + service.searchByTokenAndUpdateData('test-token'); expect(requestService.send).toHaveBeenCalledWith( jasmine.objectContaining({ diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts index 3385c520dc5..259b5f66c50 100644 --- a/src/app/core/data/eperson-registration.service.ts +++ b/src/app/core/data/eperson-registration.service.ts @@ -89,10 +89,11 @@ export class EpersonRegistrationService{ } /** - * Search a registration based on the provided token - * @param token + * Searches for a registration based on the provided token. + * @param token The token to search for. + * @returns An observable of remote data containing the registration. */ - searchByToken(token: string): Observable> { + searchByTokenAndUpdateData(token: string): Observable> { const requestId = this.requestService.generateRequestId(); const href$ = this.getTokenSearchEndpoint(token).pipe( @@ -123,7 +124,13 @@ export class EpersonRegistrationService{ }) ); } - searchByTokenAndHandleError(token: string): Observable> { + + /** + * Searches for a registration by token and handles any errors that may occur. + * @param token The token to search for. + * @returns An observable of remote data containing the registration. + */ + searchRegistrationByToken(token: string): Observable> { const requestId = this.requestService.generateRequestId(); const href$ = this.getTokenSearchEndpoint(token).pipe( @@ -150,7 +157,7 @@ export class EpersonRegistrationService{ * @param updateValue Flag to indicate if the email should be updated or added * @returns Remote Data state of the patch request */ - patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operator: 'add' | 'replace') { + patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operator: 'add' | 'replace'): Observable> { const requestId = this.requestService.generateRequestId(); const href$ = this.getRegistrationEndpoint().pipe( diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts index cd646f25cf0..89a96222d13 100644 --- a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts @@ -1,6 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; +import { ConfirmationSentComponent } from '../shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; describe('ExternalLoginEmailConfirmationPageComponent', () => { let component: ExternalLoginEmailConfirmationPageComponent; @@ -8,7 +11,17 @@ describe('ExternalLoginEmailConfirmationPageComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ExternalLoginEmailConfirmationPageComponent ] + declarations: [ + ExternalLoginEmailConfirmationPageComponent, + ConfirmationSentComponent ], + imports: [ + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock, + }, + }), + ] }) .compileComponents(); }); @@ -22,4 +35,9 @@ describe('ExternalLoginEmailConfirmationPageComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); + + it('should render ConfirmationSentComponent', () => { + const compiled = fixture.nativeElement; + expect(compiled.querySelector('ds-confirmation-sent')).toBeTruthy(); + }); }); diff --git a/src/app/external-login-page/external-login-page-routing.module.ts b/src/app/external-login-page/external-login-page-routing.module.ts index 7adbbb7b034..390db1eaf00 100644 --- a/src/app/external-login-page/external-login-page-routing.module.ts +++ b/src/app/external-login-page/external-login-page-routing.module.ts @@ -1,12 +1,16 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; +import { RegistrationTokenGuard } from '../shared/external-log-in-complete/guards/registration-token.guard'; +import { RegistrationDataResolver } from '../shared/external-log-in-complete/resolvers/registration-data.resolver'; const routes: Routes = [ { path: '', pathMatch: 'full', component: ThemedExternalLoginPageComponent, + // canActivate: [RegistrationTokenGuard], // TODO: uncomment this line to enable the guard later + resolve: { registrationData: RegistrationDataResolver }, }, ]; diff --git a/src/app/external-login-page/external-login-page.component.html b/src/app/external-login-page/external-login-page.component.html index 82c9419930b..755896211de 100644 --- a/src/app/external-login-page/external-login-page.component.html +++ b/src/app/external-login-page/external-login-page.component.html @@ -1,11 +1,11 @@
- +
diff --git a/src/app/external-login-page/external-login-page.component.spec.ts b/src/app/external-login-page/external-login-page.component.spec.ts index 20f46ae833c..c705b131b3e 100644 --- a/src/app/external-login-page/external-login-page.component.spec.ts +++ b/src/app/external-login-page/external-login-page.component.spec.ts @@ -1,20 +1,53 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginPageComponent } from './external-login-page.component'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { Router } from '@angular/router'; -import { RouterMock } from '../shared/mocks/router.mock'; +import { ActivatedRoute } from '@angular/router'; +import { of } from 'rxjs'; +import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; +import { CommonModule } from '@angular/common'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; describe('ExternalLoginPageComponent', () => { let component: ExternalLoginPageComponent; let fixture: ComponentFixture; + const registrationDataMock = { + registrationType: 'orcid', + email: 'test@test.com', + netId: '0000-0000-0000-0000', + user: 'a44d8c9e-9b1f-4e7f-9b1a-5c9d8a0b1f1a', + registrationMetadata: { + 'email': [{ value: 'test@test.com' }], + 'eperson.lastname': [{ value: 'Doe' }], + 'eperson.firstname': [{ value: 'John' }], + }, + }; + beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [ ExternalLoginPageComponent ], providers: [ - { provide: EpersonRegistrationService, useValue: {} }, - { provide: Router, useValue: new RouterMock() }, + { + provide: ActivatedRoute, + useValue: { + snapshot: { + queryParams: { + token: '1234567890', + }, + }, + data: of(registrationDataMock), + }, + }, + ], + imports: [ + CommonModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateLoaderMock, + }, + }), ], }) .compileComponents(); @@ -29,4 +62,25 @@ describe('ExternalLoginPageComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); + + it('should set the token from the query params', () => { + expect(component.token).toEqual('1234567890'); + }); + + it('should set the hasErrors flag if the token is not present', () => { + const activatedRoute = TestBed.inject(ActivatedRoute); + activatedRoute.snapshot.queryParams.token = undefined; + fixture.detectChanges(); + expect(component.hasErrors).toBeTrue(); + }); + + it('should display the DsExternalLogIn component when there are no errors', () => { + const registrationData = Object.assign(new RegistrationData(), registrationDataMock); + component.registrationData$ = of(registrationData); + component.token = '1234567890'; + component.hasErrors = false; + fixture.detectChanges(); + const dsExternalLogInComponent = fixture.nativeElement.querySelector('ds-external-log-in'); + expect(dsExternalLogInComponent).toBeTruthy(); + }); }); diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index b98e823fc90..c8bde7cd0da 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -1,13 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { hasValue } from '../shared/empty.util'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; -import { Registration } from '../core/shared/registration.model'; +import { hasNoValue } from '../shared/empty.util'; import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; import { AlertType } from '../shared/alert/aletr-type'; -import { Observable, map, of } from 'rxjs'; -import { getRemoteDataPayload } from '../core/shared/operators'; +import { Observable, first, map, of, tap } from 'rxjs'; @Component({ templateUrl: './external-login-page.component.html', @@ -23,41 +20,35 @@ export class ExternalLoginPageComponent implements OnInit { /** * The registration data of the user. */ - public registrationData$: Observable = of( - mockRegistrationDataModel - ); + public registrationData$: Observable; /** * The type of alert to show. */ public AlertTypeEnum = AlertType; + /** + * Whether the component has errors. + */ + public hasErrors = false; constructor( - private epersonRegistrationService: EpersonRegistrationService, private arouter: ActivatedRoute ) { this.token = this.arouter.snapshot.queryParams.token; + this.hasErrors = hasNoValue(this.arouter.snapshot.queryParams.token); } ngOnInit(): void { - this.getRegistrationData(); + this.registrationData$ = this.arouter.data.pipe( + first(), + tap((data) => this.hasErrors = hasNoValue(data.registrationData)), + map((data) => data.registrationData)); + + // TODO: remove this line (temporary) + this.registrationData$ = of( + mockRegistrationDataModel + ); + this.hasErrors = false; this.token = '1234567890'; } - - /** - * Get the registration data of the user, - * based on the token. - */ - getRegistrationData() { - if (hasValue(this.token)) { - this.registrationData$ = this.epersonRegistrationService - .searchByToken(this.token) - .pipe( - getRemoteDataPayload(), - map((registration: Registration) => - Object.assign(new RegistrationData(), registration) - ) - ); - } - } } diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts index 94f2ef42664..ffec9928371 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts @@ -1,12 +1,16 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; +import { RegistrationDataResolver } from '../shared/external-log-in-complete/resolvers/registration-data.resolver'; + const routes: Routes = [ { path: '', pathMatch: 'full', component: ExternalLoginReviewAccountInfoPageComponent, + // canActivate: [ReviewAccountGuard],// TODO: Remove comment + resolve: { registrationData: RegistrationDataResolver } },]; @NgModule({ diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html index 6d5defa2ca4..97034110392 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html @@ -1,12 +1,12 @@
- + diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts index ef2dfe82017..7622f081d0d 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts @@ -1,16 +1,33 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - +import { ActivatedRoute } from '@angular/router'; +import { of } from 'rxjs'; +import { AlertType } from '../shared/alert/aletr-type'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; +import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; describe('ExternalLoginReviewAccountInfoPageComponent', () => { let component: ExternalLoginReviewAccountInfoPageComponent; let fixture: ComponentFixture; + const mockActivatedRoute = { + snapshot: { + queryParams: { + token: '1234567890' + } + }, + data: of({ + registrationData: mockRegistrationDataModel + }) + }; + beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ExternalLoginReviewAccountInfoPageComponent ] + declarations: [ExternalLoginReviewAccountInfoPageComponent], + providers: [ + { provide: ActivatedRoute, useValue: mockActivatedRoute } + ] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { @@ -22,4 +39,33 @@ describe('ExternalLoginReviewAccountInfoPageComponent', () => { it('should create', () => { expect(component).toBeTruthy(); }); + + it('should set the token from the query params', () => { + expect(component.token).toEqual('1234567890'); + }); + + it('should set hasErrors to false if registrationData is not empty', () => { + expect(component.hasErrors).toBeFalse(); + }); + + it('should set the registrationData$', () => { + component.registrationData$.subscribe((registrationData) => { + expect(registrationData.email).toEqual(mockRegistrationDataModel.email); + }); + }); + + it('should display review account info component when there are no errors', () => { + component.hasErrors = false; + component.registrationData$ = of(mockRegistrationDataModel); + fixture.detectChanges(); + const reviewAccountInfoComponent = fixture.nativeElement.querySelector('ds-review-account-info'); + expect(reviewAccountInfoComponent).toBeTruthy(); + }); + + it('should display error alert when there are errors', () => { + component.hasErrors = true; + fixture.detectChanges(); + const errorAlertComponent = fixture.nativeElement.querySelector('ds-alert'); + expect(errorAlertComponent).toBeTruthy(); + }); }); diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts index 8b02a347c51..5c984445031 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts @@ -1,12 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { AlertType } from '../shared/alert/aletr-type'; -import { Observable, map } from 'rxjs'; +import { Observable, first, map, of, tap } from 'rxjs'; import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; import { ActivatedRoute } from '@angular/router'; -import { hasValue } from '../shared/empty.util'; -import { getRemoteDataPayload } from '../core/shared/operators'; -import { Registration } from '../core/shared/registration.model'; +import { hasNoValue } from '../shared/empty.util'; +import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; @Component({ templateUrl: './external-login-review-account-info-page.component.html', @@ -27,12 +25,12 @@ export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { * The registration data of the user */ public registrationData$: Observable; - // = of( - // mockRegistrationDataModel - // ); + /** + * Whether the component has errors + */ + public hasErrors = false; constructor( - private epersonRegistrationService: EpersonRegistrationService, private arouter: ActivatedRoute ) { this.token = this.arouter.snapshot.queryParams.token; @@ -40,26 +38,15 @@ export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { ngOnInit(): void { - // -> if email address is not used by other user => Email Validated component - // -> if email address is used by other user => Review account information component - this.getRegistrationData(); + this.registrationData$ = this.arouter.data.pipe(first(), + tap((data) => this.hasErrors = hasNoValue(data?.registrationData)), + map((data) => data.registrationData)); + // TODO: remove this line (temporary) - // this.token = '1234567890'; + this.registrationData$ = of( + mockRegistrationDataModel + ); + this.hasErrors = false; + this.token = '1234567890'; } - /** - * Get the registration data from the token - */ - getRegistrationData() { - if (hasValue(this.token)) { - this.registrationData$ = this.epersonRegistrationService - .searchByToken(this.token) - .pipe( - getRemoteDataPayload(), - map((registration: Registration) => - Object.assign(new RegistrationData(), registration) - ) - ); - } - } - } diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts new file mode 100644 index 00000000000..61cf3f178cc --- /dev/null +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts @@ -0,0 +1,79 @@ +import { TestBed } from '@angular/core/testing'; +import { ReviewAccountGuard } from './review-account.guard'; +import { ActivatedRoute, convertToParamMap, Params, Router } from '@angular/router'; +import { of as observableOf } from 'rxjs'; +import { AuthService } from 'src/app/core/auth/auth.service'; +import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; +import { EPerson } from 'src/app/core/eperson/models/eperson.model'; +import { Registration } from 'src/app/core/shared/registration.model'; +import { RouterMock } from 'src/app/shared/mocks/router.mock'; +import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; + +describe('ReviewAccountGuard', () => { + let guard: ReviewAccountGuard; + const route = new RouterMock(); + const registrationWithGroups = Object.assign(new Registration(), + { + email: 'test@email.org', + token: 'test-token', + }); + const epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { + searchRegistrationByToken: createSuccessfulRemoteDataObject$(registrationWithGroups) + }); + const authService = { + getAuthenticatedUserFromStore: () => observableOf(ePerson), + setRedirectUrl: () => { + return true; + } + } as any; + const ePerson = Object.assign(new EPerson(), { + id: 'test-eperson', + uuid: 'test-eperson' + }); + beforeEach(() => { + const paramObject: Params = {}; + paramObject.token = '1234'; + TestBed.configureTestingModule({ + providers: [{provide: Router, useValue: route}, + { + provide: ActivatedRoute, + useValue: { + queryParamMap: observableOf(convertToParamMap(paramObject)) + }, + }, + {provide: EpersonRegistrationService, useValue: epersonRegistrationService}, + {provide: AuthService, useValue: authService} + ] + }); + guard = TestBed.get(ReviewAccountGuard); + }); + + it('should be created', () => { + expect(guard).toBeTruthy(); + }); + describe('based on the response of "searchByToken have', () => { + it('can activate must return true when registration data includes groups', () => { + (guard.canActivate({ params: { token: '123456789' } } as any, {} as any) as any) + .subscribe( + (canActivate) => { + expect(canActivate).toEqual(true); + } + ); + }); + it('can activate must return false when registration data includes groups', () => { + const registrationWithDifferentUsedFromLoggedInt = Object.assign(new Registration(), + { + email: 't1@email.org', + token: 'test-token', + }); + epersonRegistrationService.searchRegistrationByToken.and.returnValue(observableOf(registrationWithDifferentUsedFromLoggedInt)); + (guard.canActivate({ params: { token: '123456789' } } as any, {} as any) as any) + .subscribe( + (canActivate) => { + expect(canActivate).toEqual(false); + } + ); + }); + + }); +}); diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.ts new file mode 100644 index 00000000000..c979e3bfc2c --- /dev/null +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.ts @@ -0,0 +1,73 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + CanActivate, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import isEqual from 'lodash/isEqual'; +import { Observable, catchError, mergeMap, of, tap } from 'rxjs'; +import { AuthService } from 'src/app/core/auth/auth.service'; +import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; +import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; +import { RemoteData } from 'src/app/core/data/remote-data'; +import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; +import { Registration } from 'src/app/core/shared/registration.model'; +import { hasValue } from 'src/app/shared/empty.util'; +import { RegistrationData } from 'src/app/shared/external-log-in-complete/models/registration-data.model'; + +@Injectable({ + providedIn: 'root', +}) +export class ReviewAccountGuard implements CanActivate { + constructor( + private router: Router, + private epersonRegistrationService: EpersonRegistrationService, + private authService: AuthService + ) { } + + /** + * Determines if a user can activate a route based on the registration token. + * @param route - The activated route snapshot. + * @param state - The router state snapshot. + * @returns A value indicating if the user can activate the route. + */ + canActivate( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Promise | boolean | Observable { + if (route.params.token) { + return this.epersonRegistrationService + .searchRegistrationByToken(route.params.token) + .pipe( + getFirstCompletedRemoteData(), + mergeMap( + (data: RemoteData) => { + if (data.hasSucceeded && hasValue(data)) { + const registrationData = Object.assign(new RegistrationData(), data.payload); + // is the registration type validation (account valid) + if (isEqual(registrationData.registrationType, AuthMethodType.Validation)) { + return of(true); + } else { + return this.authService.isAuthenticated(); + } + } + return of(false); + } + ), + tap((isValid: boolean) => { + if (!isValid) { + this.router.navigate(['/404']); + } + }), + catchError(() => { + this.router.navigate(['/404']); + return of(false); + }) + ); + } else { + this.router.navigate(['/404']); + return of(false); + } + } +} diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html index 82aec84441e..039bc763b28 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html @@ -41,7 +41,7 @@

{{'external-login-validation.review-account-info.header' | translate}}

{ - if (eperson) { - this.epersonCurrentData = eperson; - this.dataToCompare = this.prepareDataToCompare(); - } - }); - } + this.dataToCompare = this.prepareDataToCompare(); } /** @@ -157,7 +117,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { filter((data: ReviewAccountInfoData) => data.overrideValue), switchMap((data: ReviewAccountInfoData) => { return this.ePersonService.mergeEPersonDataWithToken( - this.epersonCurrentData.id, + this.registrationData.user, this.registrationToken, data.identifier ); @@ -165,15 +125,14 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); } else { override$ = this.ePersonService.mergeEPersonDataWithToken( - this.epersonCurrentData.id, + this.registrationData.user, this.registrationToken ); } this.subs.push( override$.subscribe((response: RemoteData) => { - // TODO: https://4science.atlassian.net/browse/CST-11609?focusedCommentId=206748 - // redirect to profile page if (response.hasSucceeded) { + // TODO: remove this line (temporary) console.log('mergeEPersonDataWithToken', response.payload); this.notificationService.success( this.translateService.get( @@ -197,7 +156,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { /** * Prepare the data to compare and display: * -> For each metadata from the registration token, get the current value from the eperson. - * -> Label is the metadata key without the prefix e.g `eperson.` + * -> Label is the metadata key without the prefix e.g `eperson.` but only `email` * -> Identifier is the metadata key with the prefix e.g `eperson.lastname` * -> Override value is false by default * @returns List of data to compare @@ -209,7 +168,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { console.log(key, value); dataToCompare.push({ label: key.split('.')?.[1] ?? key.split('.')?.[0], - currentValue: this.getCurrentValue(key), + currentValue: value[0]?.overrides ?? '', receivedValue: value[0].value, overrideValue: false, identifier: key, @@ -220,18 +179,6 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { return dataToCompare; } - /** - * Return the current value of the metadata key from the eperson - * @param metadata metadata key - * @returns the current value of the metadata key from the eperson - */ - private getCurrentValue(metadata: string): string { - if (metadata === 'email') { - return this.epersonCurrentData.email; - } - return this.epersonCurrentData.firstMetadataValue(metadata) ?? ''; - } - ngOnDestroy(): void { this.subs.filter((s) => hasValue(s)).forEach((sub) => sub.unsubscribe()); } diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.html b/src/app/external-login-validation-page/email-validated/email-validated.component.html index 133243853bf..b58ed085890 100644 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.html +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.html @@ -5,5 +5,5 @@

- +
diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts index fee341ad22c..21c7f5d7d8f 100644 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts @@ -9,6 +9,7 @@ import { Router } from '@angular/router'; import { RouterStub } from 'src/app/shared/testing/router.stub'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { of } from 'rxjs'; +import { AuthServiceMock } from 'src/app/shared/mocks/auth.service.mock'; describe('EmailValidatedComponent', () => { let component: EmailValidatedComponent; @@ -27,7 +28,7 @@ describe('EmailValidatedComponent', () => { await TestBed.configureTestingModule({ declarations: [ EmailValidatedComponent ], providers: [ - { provide: AuthService, useValue: {}}, + { provide: AuthService, useValue: new AuthServiceMock()}, { provide: Router, useValue: new RouterStub() }, { provide: TranslateService, useValue: translateServiceStub }, ], diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.ts index 4147dd23720..8fd45bc4a7f 100644 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.ts +++ b/src/app/external-login-validation-page/email-validated/email-validated.component.ts @@ -1,5 +1,4 @@ -import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; -import { Router } from '@angular/router'; +import { Component, ChangeDetectionStrategy } from '@angular/core'; import { AuthService } from '../../core/auth/auth.service'; @Component({ selector: 'ds-email-validated', @@ -9,11 +8,9 @@ import { AuthService } from '../../core/auth/auth.service'; }) export class EmailValidatedComponent { - // TODO: (temporary) - // evaluate if this is needed - @Input() registrationToken: string; - - constructor(private authService: AuthService, private router: Router) { + constructor(private authService: AuthService) { + // After the user has validated his email, we need to redirect him to the review account page, + // in order to review his account information this.authService.setRedirectUrl('/review-account'); } } diff --git a/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts b/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts index d206eba0fe8..241cebebb2f 100644 --- a/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts +++ b/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts @@ -1,12 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ThemedExternalLoginValidationPageComponent } from './themed-external-login-validation-page.component'; - +import { RegistrationTokenGuard } from '../shared/external-log-in-complete/guards/registration-token.guard'; +import { RegistrationDataCreateUserResolver } from './resolvers/registration-data-create-user.resolver'; const routes: Routes = [ { path: '', pathMatch: 'full', component: ThemedExternalLoginValidationPageComponent, + // canActivate: [RegistrationTokenGuard] // TODO: uncomment this line to enable the guard later + resolve: { createUser: RegistrationDataCreateUserResolver }, }, ]; diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.html b/src/app/external-login-validation-page/external-login-validation-page.component.html index 3efd1ce0e38..cfdaed0d6db 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.html +++ b/src/app/external-login-validation-page/external-login-validation-page.component.html @@ -1,9 +1,9 @@
- - + + diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts b/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts index 155d64fe082..975fca9f81f 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts +++ b/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { Observable, of } from 'rxjs'; import { RemoteData } from '../core/data/remote-data'; @@ -10,11 +9,12 @@ import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { ActivatedRoute } from '@angular/router'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; import { AlertType } from '../shared/alert/aletr-type'; +import { tr } from 'date-fns/locale'; describe('ExternalLoginValidationPageComponent', () => { let component: ExternalLoginValidationPageComponent; + let componentAsAny: any; let fixture: ComponentFixture; let epersonRegistrationService: any; @@ -37,19 +37,21 @@ describe('ExternalLoginValidationPageComponent', () => { queryParams: { token: tokenMock } - } + }, + data: of({ + createUser: true, + }), }; beforeEach(async () => { epersonRegistrationService = { - searchByToken: (token: string): Observable> => { return createSuccessfulRemoteDataObject$(registrationDataMock); } + searchByTokenAndUpdateData: (token: string): Observable> => { return createSuccessfulRemoteDataObject$(registrationDataMock); } }; await TestBed.configureTestingModule({ declarations: [ExternalLoginValidationPageComponent], providers: [ { provide: ActivatedRoute, useValue: routeStub }, - { provide: EpersonRegistrationService, useValue: epersonRegistrationService }, ], imports: [ CommonModule, @@ -68,6 +70,7 @@ describe('ExternalLoginValidationPageComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ExternalLoginValidationPageComponent); component = fixture.componentInstance; + componentAsAny = component; fixture.detectChanges(); }); @@ -75,49 +78,32 @@ describe('ExternalLoginValidationPageComponent', () => { expect(component).toBeTruthy(); }); - it('should set the token from the query parameters', () => { - expect(component.token).toEqual(tokenMock); - }); - - it('should initialize the registration data', () => { - spyOn(epersonRegistrationService, 'searchByToken').and.callThrough(); + it('should set validationFailed to true if createUser is falsy', () => { + const activatedRoute = TestBed.inject(ActivatedRoute); + activatedRoute.data = of({ createUser: false }); component.ngOnInit(); - expect(epersonRegistrationService.searchByToken).toHaveBeenCalledWith(tokenMock); - expect(component.registrationData$).toBeTruthy(); + expect(componentAsAny.validationFailed.value).toBeTrue(); }); - it('should render ds-email-validated component when registrationData$ does not have an email', () => { - component.registrationData$ = of(Object.assign(new RegistrationData(), { registrationDataMock, email: null })); + it('should set validationFailed to false if createUser is truthy', () => { + const activatedRoute = TestBed.inject(ActivatedRoute); + activatedRoute.data = of({ createUser: true }); component.ngOnInit(); - fixture.detectChanges(); - - const emailValidatedComponent = fixture.nativeElement.querySelector('ds-email-validated'); - const reviewAccountInfoComponent = fixture.nativeElement.querySelector('ds-review-account-info'); - - expect(emailValidatedComponent).toBeTruthy(); - expect(reviewAccountInfoComponent).toBeNull(); + expect(componentAsAny.validationFailed.value).toBeFalse(); }); - it('should render ds-review-account-info component when registrationData$ has an email', () => { - component.registrationData$ = of(Object.assign(new RegistrationData(), { registrationDataMock, email: 'hey@hello.com' })); - // component.ngOnInit(); + it('should show DsEmailValidatedComponent when hasFailed() returns false', () => { + spyOn(component, 'hasFailed').and.returnValue(of(false)); fixture.detectChanges(); - const emailValidatedComponent = fixture.nativeElement.querySelector('ds-email-validated'); - const reviewAccountInfoComponent = fixture.nativeElement.querySelector('ds-review-account-info'); - - expect(emailValidatedComponent).toBeNull(); - expect(reviewAccountInfoComponent).toBeTruthy(); + const dsEmailValidated = fixture.nativeElement.querySelector('ds-email-validated'); + expect(dsEmailValidated).toBeTruthy(); }); - it('should render ds-alert component when token is missing', () => { - component.token = null; - component.ngOnInit(); + it('should show DsAlertComponent when hasFailed() returns true', () => { + spyOn(component, 'hasFailed').and.returnValue(of(true)); fixture.detectChanges(); - - const alertComponent = fixture.nativeElement.querySelector('ds-alert'); - - expect(alertComponent).toBeTruthy(); - expect(component.AlertTypeEnum).toEqual(AlertType); + const dsAlert = fixture.nativeElement.querySelector('ds-alert'); + expect(dsAlert).toBeTruthy(); }); afterEach(() => { diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.ts b/src/app/external-login-validation-page/external-login-validation-page.component.ts index 7a20473ddbe..abcd256f8a7 100644 --- a/src/app/external-login-validation-page/external-login-validation-page.component.ts +++ b/src/app/external-login-validation-page/external-login-validation-page.component.ts @@ -1,110 +1,44 @@ -import { Component } from '@angular/core'; -import { EpersonRegistrationService } from '../core/data/eperson-registration.service'; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { AlertType } from '../shared/alert/aletr-type'; -import { hasNoValue, hasValue } from '../shared/empty.util'; -import { getRemoteDataPayload } from '../core/shared/operators'; -import { BehaviorSubject, Observable, map, of, switchMap, tap } from 'rxjs'; -import { Registration } from '../core/shared/registration.model'; -import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; -import { RemoteData } from '../core/data/remote-data'; -import { NotificationsService } from '../shared/notifications/notifications.service'; -import { TranslateService } from '@ngx-translate/core'; -import { EPersonDataService } from '../core/eperson/eperson-data.service'; -import { MetadataValue } from '../core/shared/metadata.models'; -import { EPerson } from '../core/eperson/models/eperson.model'; -import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; +import { BehaviorSubject, Observable } from 'rxjs'; @Component({ templateUrl: './external-login-validation-page.component.html', styleUrls: ['./external-login-validation-page.component.scss'], }) -export class ExternalLoginValidationPageComponent { - /** - * The token used to get the registration data - */ - public token: string; - +export class ExternalLoginValidationPageComponent implements OnInit { /** * The type of alert to show */ public AlertTypeEnum = AlertType; + /** + * Whether the component has errors + */ private validationFailed: BehaviorSubject = new BehaviorSubject(false); constructor( - private epersonRegistrationService: EpersonRegistrationService, private arouter: ActivatedRoute, - private epersonDataService: EPersonDataService, - private notificationService: NotificationsService, - private translateService: TranslateService ) { - this.token = this.arouter.snapshot.queryParams.token; - this.token = '1234567890'; // TODO: remove this line (temporary) } ngOnInit(): void { - // TODO: Uncomment this line later - // this.getRegistrationData(); - } + this.arouter.data.subscribe((data) => { + const resolvedData = data.createUser; + this.validationFailed.next(!resolvedData); + }); - public hasFailed(): Observable { - return this.validationFailed.asObservable(); + // TODO: remove this line (temporary) + this.validationFailed.next(false); } + /** - * Get the registration data from the token + * Check if the validation has failed */ - getRegistrationData() { - this.validationFailed.next(true); - - if (hasValue(this.token)) { - this.fetchRegistrationDataAndCreateUser(this.token); - } - } - - fetchRegistrationDataAndCreateUser(token: string) { - this.epersonRegistrationService - .searchByToken(token) - .pipe( - switchMap((rd) => { - if (hasValue(rd.payload) && hasNoValue(rd.payload.user)) { - const registrationData = Object.assign( - new RegistrationData(), - rd.payload - ); - return this.createUserFromToken(token, registrationData); - } else { - return of(rd); - } - }) - ) - .subscribe((rd: RemoteData) => { - if (rd.hasFailed) { - this.validationFailed.next(true); - } - }); - } - - createUserFromToken(token: string, registrationData: RegistrationData) { - const metadataValues = Object.entries(registrationData.registrationMetadata) - .filter(([key, value]) => hasValue(value[0]?.value)) - .map(([key, value]) => ({ - key, - value: value[0]?.value, - })); - const eperson = Object.assign(new EPerson(), { - metadata: metadataValues, - canLogIn: true, - requireCertificate: false, - }); - return this.epersonDataService.createEPersonForToken(eperson, token).pipe( - tap((rd: RemoteData) => { - if (rd.hasFailed) { - this.validationFailed.next(true); - } - }) - ); + public hasFailed(): Observable { + return this.validationFailed.asObservable(); } } diff --git a/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts b/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts new file mode 100644 index 00000000000..979bdc89491 --- /dev/null +++ b/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts @@ -0,0 +1,129 @@ +import { TestBed } from '@angular/core/testing'; + +import { RegistrationDataCreateUserResolver } from './registration-data-create-user.resolver'; +import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RouterStateSnapshot } from '@angular/router'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; +import { Registration } from '../../core/shared/registration.model'; +import { MetadataValue } from 'src/app/core/shared/metadata.models'; + +describe('RegistrationDataCreateUserResolver', () => { + let resolver: RegistrationDataCreateUserResolver; + let epersonRegistrationService: jasmine.SpyObj; + let epersonDataService: jasmine.SpyObj; + + const registrationDataMock = { + registrationType: 'orcid', + email: 'test@test.com', + netId: '0000-0000-0000-0000', + user: null, + registrationMetadata: { + 'email': [{ value: 'test@test.com' }], + 'eperson.lastname': [{ value: 'Doe' }], + 'eperson.firstname': [{ value: 'John' }], + }, + }; + + const tokenMock = 'as552-5a5a5-5a5a5-5a5a5'; + + + beforeEach(() => { + const spyEpersonRegistrationService = jasmine.createSpyObj('EpersonRegistrationService', [ + 'searchByTokenAndUpdateData' + ]); + const spyEpersonDataService = jasmine.createSpyObj('EPersonDataService', [ + 'createEPersonForToken' + ]); + + TestBed.configureTestingModule({ + providers: [ + RegistrationDataCreateUserResolver, + { provide: EpersonRegistrationService, useValue: spyEpersonRegistrationService }, + { provide: EPersonDataService, useValue: spyEpersonDataService } + ] + }); + resolver = TestBed.inject(RegistrationDataCreateUserResolver); + epersonRegistrationService = TestBed.inject(EpersonRegistrationService) as jasmine.SpyObj; + epersonDataService = TestBed.inject(EPersonDataService) as jasmine.SpyObj; + }); + + it('should be created', () => { + expect(resolver).toBeTruthy(); + }); + + describe('resolve', () => { + const token = tokenMock; + const route = { params: { token: token } } as any; + const state = {} as RouterStateSnapshot; + + it('should create a new user and return true when registration data does not contain a user', (done) => { + const registration = new Registration(); + epersonRegistrationService.searchByTokenAndUpdateData.and.returnValue(createSuccessfulRemoteDataObject$(registration)); + + const createdEPerson = new EPerson(); + createdEPerson.email = registrationDataMock.email; + createdEPerson.metadata = { + 'eperson.lastname': [Object.assign(new MetadataValue(), { value: 'Doe' })], + 'eperson.firstname': [Object.assign(new MetadataValue(), { value: 'John' })], + }; + createdEPerson.canLogIn = true; + createdEPerson.requireCertificate = false; + epersonDataService.createEPersonForToken.and.returnValue(createSuccessfulRemoteDataObject$(createdEPerson)); + + resolver.resolve(route, state).subscribe((result) => { + expect(result).toBeTrue(); + expect(epersonRegistrationService.searchByTokenAndUpdateData).toHaveBeenCalledWith(token); + expect(epersonDataService.createEPersonForToken).toHaveBeenCalledWith(createdEPerson, token); + done(); + }); + }); + + it('should return false when search by token and update data fails', (done) => { + epersonRegistrationService.searchByTokenAndUpdateData.and.returnValue(createFailedRemoteDataObject$()); + + resolver.resolve(route, state).subscribe((result) => { + expect(result).toBeFalse(); + expect(epersonRegistrationService.searchByTokenAndUpdateData).toHaveBeenCalledWith(token); + expect(epersonDataService.createEPersonForToken).not.toHaveBeenCalled(); + done(); + }); + }); + + }); + + describe('createUserFromToken', () => { + const token = tokenMock; + const registrationData: RegistrationData = Object.assign(new RegistrationData(), registrationDataMock); + + it('should create a new user and return true', (done) => { + const createdEPerson = new EPerson(); + createdEPerson.email = registrationData.email; + createdEPerson.metadata = { + 'eperson.lastname': 'Doe', //[{ value: 'Doe' }], + 'eperson.firstname': 'John',// [{ value: 'John' }], + } as any; + createdEPerson.canLogIn = true; + createdEPerson.requireCertificate = false; + epersonDataService.createEPersonForToken.and.returnValue(createSuccessfulRemoteDataObject$(createdEPerson)); + + resolver.createUserFromToken(token, registrationData).subscribe((result) => { + expect(result).toBeTrue(); + expect(epersonDataService.createEPersonForToken).toHaveBeenCalledWith(createdEPerson, token); + done(); + }); + }); + + it('should return false when create EPerson for token fails', (done) => { + epersonDataService.createEPersonForToken.and.returnValue(createFailedRemoteDataObject$()); + + resolver.createUserFromToken(token, registrationData).subscribe((result) => { + expect(result).toBeFalse(); + expect(epersonDataService.createEPersonForToken).toHaveBeenCalledWith(jasmine.any(EPerson), token); + done(); + }); + }); + }); +}); diff --git a/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts b/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts new file mode 100644 index 00000000000..000422f7623 --- /dev/null +++ b/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts @@ -0,0 +1,93 @@ +import { Injectable } from '@angular/core'; +import { + Resolve, + RouterStateSnapshot, + ActivatedRouteSnapshot, +} from '@angular/router'; +import { Observable, map, of, switchMap } from 'rxjs'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { EPersonDataService } from '../../core/eperson/eperson-data.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { hasValue, hasNoValue } from '../../shared/empty.util'; +import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; + +@Injectable({ + providedIn: 'root', +}) +export class RegistrationDataCreateUserResolver implements Resolve { + constructor( + private epersonRegistrationService: EpersonRegistrationService, + private epersonDataService: EPersonDataService + ) {} + + /** + * Resolves the registration data and creates a new user account from the given token. + * The account will be created only when the registration data does NOT contain a user (uuid). + * @param route The activated route snapshot. + * @param state The router state snapshot. + * @returns An observable of a boolean indicating whether the user was created successfully or not. + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable { + const token = route.params.token; + return this.epersonRegistrationService + .searchByTokenAndUpdateData(token) + .pipe( + getFirstCompletedRemoteData(), + switchMap((rd) => { + if ( + rd.hasSucceeded && + hasValue(rd.payload) && + hasNoValue(rd.payload.user) + ) { + const registrationData = Object.assign( + new RegistrationData(), + rd.payload + ); + return this.createUserFromToken(token, registrationData); + } + if (rd.hasFailed) { + return of(false); + } + }) + ); + } + + /** + * Creates a new user from a given token and registration data. + * Based on the registration data, the user will be created with the following properties: + * - email: the email address from the registration data + * - metadata: all metadata values from the registration data, except for the email metadata key (ePerson object does not have an email metadata field) + * - canLogIn: true + * - requireCertificate: false + * @param token The token used to create the user. + * @param registrationData The registration data used to create the user. + * @returns An Observable that emits a boolean indicating whether the user creation was successful. + */ + createUserFromToken( + token: string, + registrationData: RegistrationData + ): Observable { + const metadataValues = {}; + for (const [key, value] of Object.entries(registrationData.registrationMetadata)) { + if (hasValue(value[0]?.value) && key !== 'email') { + metadataValues[key] = value[0]?.value; + } + } + const eperson = new EPerson(); + eperson.email = registrationData.email; + eperson.metadata = metadataValues; + eperson.canLogIn = true; + eperson.requireCertificate = false; + return this.epersonDataService.createEPersonForToken(eperson, token).pipe( + getFirstCompletedRemoteData(), + map((rd: RemoteData) => { + return rd.hasSucceeded; + }) + ); + } +} diff --git a/src/app/invitation/invitation-acceptance/invitation-acceptance.component.spec.ts b/src/app/invitation/invitation-acceptance/invitation-acceptance.component.spec.ts index 31d23e2b073..9d9dcf79c3c 100644 --- a/src/app/invitation/invitation-acceptance/invitation-acceptance.component.spec.ts +++ b/src/app/invitation/invitation-acceptance/invitation-acceptance.component.spec.ts @@ -27,7 +27,7 @@ describe('InvitationAcceptanceComponent', () => { groupNames: ['group1', 'group2'] }); const epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { - searchByToken: createSuccessfulRemoteDataObject$(registrationWithGroups) + searchByTokenAndUpdateData: createSuccessfulRemoteDataObject$(registrationWithGroups) }); const ePersonDataServiceStub = { acceptInvitationToJoinGroups(person: EPerson): Observable> { diff --git a/src/app/invitation/invitation-acceptance/invitation-acceptance.component.ts b/src/app/invitation/invitation-acceptance/invitation-acceptance.component.ts index a019eb855a6..9ba247975ee 100644 --- a/src/app/invitation/invitation-acceptance/invitation-acceptance.component.ts +++ b/src/app/invitation/invitation-acceptance/invitation-acceptance.component.ts @@ -28,7 +28,7 @@ export class InvitationAcceptanceComponent implements OnInit { this.route.paramMap.pipe( switchMap((paramMap: ParamMap) => { const token = paramMap.get('registrationToken'); - return this.epersonRegistrationService.searchByToken(token); + return this.epersonRegistrationService.searchByTokenAndUpdateData(token); }), getFirstCompletedRemoteData(), getRemoteDataPayload() diff --git a/src/app/invitation/valid-token.guard.spec.ts b/src/app/invitation/valid-token.guard.spec.ts index 964942d081f..981f4506e7c 100644 --- a/src/app/invitation/valid-token.guard.spec.ts +++ b/src/app/invitation/valid-token.guard.spec.ts @@ -20,7 +20,7 @@ describe('DirectAccessGuard', () => { groupNames: ['group1', 'group2'] }); const epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { - searchByTokenAndHandleError: createSuccessfulRemoteDataObject$(registrationWithGroups) + searchRegistrationByToken: createSuccessfulRemoteDataObject$(registrationWithGroups) }); const authService = { getAuthenticatedUserFromStore: () => observableOf(ePerson), @@ -70,7 +70,7 @@ describe('DirectAccessGuard', () => { groups: [], groupNames: [] }); - epersonRegistrationService.searchByTokenAndHandleError.and.returnValue(observableOf(registrationWithDifferentUsedFromLoggedInt)); + epersonRegistrationService.searchRegistrationByToken.and.returnValue(observableOf(registrationWithDifferentUsedFromLoggedInt)); (guard.canActivate({ params: { registrationToken: '123456789' } } as any, {} as any) as any) .subscribe( (canActivate) => { diff --git a/src/app/invitation/valid-token.guard.ts b/src/app/invitation/valid-token.guard.ts index 9c26f3d85a8..0a7fe6f5987 100644 --- a/src/app/invitation/valid-token.guard.ts +++ b/src/app/invitation/valid-token.guard.ts @@ -22,7 +22,7 @@ export class ValidTokenGuard implements CanActivate { // get the url if (route.params.registrationToken) { // search by token found - return this.epersonRegistrationService.searchByTokenAndHandleError(route.params.registrationToken).pipe( + return this.epersonRegistrationService.searchRegistrationByToken(route.params.registrationToken).pipe( getFirstCompletedRemoteData(), map((data: RemoteData) => data.hasSucceeded && hasValue('groupNames') && data.payload.groupNames.length > 0), tap((isValid: boolean) => { diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html index 2a95e0ce1c5..067da65739a 100644 --- a/src/app/login-page/login-page.component.html +++ b/src/app/login-page/login-page.component.html @@ -4,6 +4,7 @@

{{"login.form.header" | translate}}

diff --git a/src/app/login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts index d9ecf3e8e6b..62a72ab7907 100644 --- a/src/app/login-page/login-page.component.ts +++ b/src/app/login-page/login-page.component.ts @@ -15,6 +15,7 @@ import { import { hasValue, isNotEmpty } from '../shared/empty.util'; import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model'; import { isAuthenticated } from '../core/auth/selectors'; +import { AuthMethodType } from '../core/auth/models/auth.method-type'; /** * This component represents the login page @@ -33,6 +34,8 @@ export class LoginPageComponent implements OnDestroy, OnInit { */ sub: Subscription; + externalLoginMethod: AuthMethodType; + /** * Initialize instance variables * @@ -48,6 +51,7 @@ export class LoginPageComponent implements OnDestroy, OnInit { ngOnInit() { const queryParamsObs = this.route.queryParams; const authenticated = this.store.select(isAuthenticated); + this.externalLoginMethod = this.route.snapshot.queryParams.authMethod; this.sub = observableCombineLatest(queryParamsObs, authenticated).pipe( filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)), take(1) diff --git a/src/app/register-email-form/registration.resolver.spec.ts b/src/app/register-email-form/registration.resolver.spec.ts index 86b200018d1..066740c126e 100644 --- a/src/app/register-email-form/registration.resolver.spec.ts +++ b/src/app/register-email-form/registration.resolver.spec.ts @@ -13,7 +13,7 @@ describe('RegistrationResolver', () => { beforeEach(() => { epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { - searchByToken: createSuccessfulRemoteDataObject$(registration) + searchByTokenAndUpdateData: createSuccessfulRemoteDataObject$(registration) }); resolver = new RegistrationResolver(epersonRegistrationService); }); diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts index 498d029492b..0d7c3fed13a 100644 --- a/src/app/register-email-form/registration.resolver.ts +++ b/src/app/register-email-form/registration.resolver.ts @@ -17,7 +17,7 @@ export class RegistrationResolver implements Resolve> { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> { const token = route.params.token; - return this.epersonRegistrationService.searchByToken(token).pipe( + return this.epersonRegistrationService.searchByTokenAndUpdateData(token).pipe( getFirstCompletedRemoteData(), ); } diff --git a/src/app/register-page/registration.guard.spec.ts b/src/app/register-page/registration.guard.spec.ts index 9fb8dd3a338..09a6f2432e1 100644 --- a/src/app/register-page/registration.guard.spec.ts +++ b/src/app/register-page/registration.guard.spec.ts @@ -48,7 +48,7 @@ describe('RegistrationGuard', () => { }); epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { - searchByToken: observableOf(registrationRD), + searchByTokenAndUpdateData: observableOf(registrationRD), }); router = jasmine.createSpyObj('router', { navigateByUrl: Promise.resolve(), @@ -66,7 +66,7 @@ describe('RegistrationGuard', () => { describe('canActivate', () => { describe('when searchByToken returns a successful response', () => { beforeEach(() => { - (epersonRegistrationService.searchByToken as jasmine.Spy).and.returnValue(observableOf(registrationRD)); + (epersonRegistrationService.searchByTokenAndUpdateData as jasmine.Spy).and.returnValue(observableOf(registrationRD)); }); it('should return true', (done) => { @@ -93,7 +93,7 @@ describe('RegistrationGuard', () => { describe('when searchByToken returns a 404 response', () => { beforeEach(() => { - (epersonRegistrationService.searchByToken as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Not Found', 404)); + (epersonRegistrationService.searchByTokenAndUpdateData as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Not Found', 404)); }); it('should redirect', () => { diff --git a/src/app/register-page/registration.guard.ts b/src/app/register-page/registration.guard.ts index a0f07d2fbe3..9f156df4737 100644 --- a/src/app/register-page/registration.guard.ts +++ b/src/app/register-page/registration.guard.ts @@ -30,7 +30,7 @@ export class RegistrationGuard implements CanActivate { */ canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { const token = route.params.token; - return this.epersonRegistrationService.searchByToken(token).pipe( + return this.epersonRegistrationService.searchByTokenAndUpdateData(token).pipe( getFirstCompletedRemoteData(), redirectOn4xx(this.router, this.authService), map((rd) => { diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html index 2ff2000d41a..455aaf75e73 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html @@ -8,7 +8,7 @@

type="email" id="email" formControlName="email" - placeholder="orcid.profile.email@example.com" + placeholder="profile.email@example.com" class="form-control form-control-lg position-relative" />
{ let component: ConfirmEmailComponent; @@ -18,6 +19,7 @@ describe('ConfirmEmailComponent', () => { providers: [ FormBuilder, { provide: EpersonRegistrationService, useValue: {} }, + { provide: ExternalLoginService, useValue: {} }, ], imports: [ CommonModule, @@ -28,7 +30,7 @@ describe('ConfirmEmailComponent', () => { } }), ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA] }) .compileComponents(); }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 244521d2a65..d4e470f9e72 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -1,7 +1,18 @@ -import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; +import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; -import { getRemoteDataPayload } from '../../../../core/shared/operators'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators'; +import { RegistrationData } from '../../models/registration-data.model'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { hasValue } from '../../../../shared/empty.util'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { TranslateService } from '@ngx-translate/core'; +import isEqual from 'lodash/isEqual'; +import { AuthService } from '../../../../core/auth/auth.service'; +import { Router } from '@angular/router'; +import { Subscription } from 'rxjs'; @Component({ selector: 'ds-confirm-email', @@ -9,17 +20,24 @@ import { getRemoteDataPayload } from '../../../../core/shared/operators'; styleUrls: ['./confirm-email.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ConfirmEmailComponent { +export class ConfirmEmailComponent implements OnDestroy { emailForm: FormGroup; - @Input() registrationId: string; + @Input() registrationData: RegistrationData; @Input() token: string; + subs: Subscription[] = []; + constructor( private formBuilder: FormBuilder, private externalLoginService: ExternalLoginService, + private epersonDataService: EPersonDataService, + private notificationService: NotificationsService, + private translate: TranslateService, + private authService: AuthService, + private router: Router ) { this.emailForm = this.formBuilder.group({ email: ['', [Validators.required, Validators.email]] @@ -28,13 +46,73 @@ export class ConfirmEmailComponent { submitForm() { this.emailForm.markAllAsTouched(); + this.router.navigate(['/login'], { queryParams: { authMethod: this.registrationData.registrationType } }); + if (this.emailForm.valid) { - const email = this.emailForm.get('email').value; - this.externalLoginService.patchUpdateRegistration([email], 'email', this.registrationId, this.token, 'replace') + const confirmedEmail = this.emailForm.get('email').value; + if (confirmedEmail && isEqual(this.registrationData.email, confirmedEmail.trim())) { + this.postCreateAccountFromToken(this.token, this.registrationData); + } else { + this.patchUpdateRegistration([confirmedEmail]); + } + } + } + + private patchUpdateRegistration(values: string[]) { + this.subs.push( + this.externalLoginService.patchUpdateRegistration(values, 'email', this.registrationData.id, this.token, 'replace') .pipe(getRemoteDataPayload()) .subscribe((update) => { + // TODO: remove this line (temporary) console.log('Email update:', update); - }); + })); + } + + /** + * Creates a new user from a given token and registration data. + * Based on the registration data, the user will be created with the following properties: + * - email: the email address from the registration data + * - metadata: all metadata values from the registration data, except for the email metadata key (ePerson object does not have an email metadata field) + * - canLogIn: true + * - requireCertificate: false + * @param token The token used to create the user. + * @param registrationData The registration data used to create the user. + * @returns An Observable that emits a boolean indicating whether the user creation was successful. + */ + private postCreateAccountFromToken( + token: string, + registrationData: RegistrationData + ) { + const metadataValues = {}; + for (const [key, value] of Object.entries(registrationData.registrationMetadata)) { + if (hasValue(value[0]?.value) && key !== 'email') { + metadataValues[key] = value[0]; + } } + const eperson = new EPerson(); + eperson.email = registrationData.email; + eperson.metadata = metadataValues; + eperson.canLogIn = true; + eperson.requireCertificate = false; + this.subs.push( + this.epersonDataService.createEPersonForToken(eperson, token).pipe( + getFirstCompletedRemoteData(), + ).subscribe((rd: RemoteData) => { + if (rd.hasFailed) { + this.notificationService.error( + this.translate.get('external-login-page.provide-email.create-account.notifications.error.header'), + this.translate.get('external-login-page.provide-email.create-account.notifications.error.content') + ); + } else if (rd.hasSucceeded) { + // TODO: redirect to ORCID login page + // set Redirect URL to User profile + this.router.navigate(['/login'], { queryParams: { authMethod: registrationData.registrationType } }); + this.authService.setRedirectUrl('/review-account'); + } + })); + } + + ngOnDestroy(): void { + this.subs.filter(sub => hasValue(sub)).forEach((sub) => sub.unsubscribe()); } } diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts index 63e64830394..71d56e73cd1 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts @@ -7,17 +7,21 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; +import { ExternalLoginService } from '../../services/external-login.service'; describe('ProvideEmailComponent', () => { let component: ProvideEmailComponent; let fixture: ComponentFixture; + let externalLoginServiceSpy: jasmine.SpyObj; beforeEach(async () => { + const externalLoginService = jasmine.createSpyObj('ExternalLoginService', ['patchUpdateRegistration']); + await TestBed.configureTestingModule({ declarations: [ ProvideEmailComponent ], providers: [ FormBuilder, - { provide: EpersonRegistrationService, useValue: {} }, + { provide: ExternalLoginService, useValue: externalLoginService }, ], imports: [ CommonModule, @@ -36,10 +40,24 @@ describe('ProvideEmailComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ProvideEmailComponent); component = fixture.componentInstance; + externalLoginServiceSpy = TestBed.inject(ExternalLoginService) as jasmine.SpyObj; fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + // it('should call externalLoginService.patchUpdateRegistration when form is submitted with valid email', () => { + // const email = 'test@example.com'; + // component.emailForm.setValue({ email }); + // component.registrationId = '123'; + // component.token = '456'; + // fixture.detectChanges(); + + // const button = fixture.nativeElement.querySelector('button[type="submit"]'); + // button.click(); + + // expect(externalLoginServiceSpy.patchUpdateRegistration).toHaveBeenCalledWith([email], 'email', component.registrationId, component.token, 'add'); + // }); }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts index 4b680656392..95e7a41ae91 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts @@ -1,7 +1,10 @@ -import { Component, ChangeDetectionStrategy, Input } from '@angular/core'; +import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { getRemoteDataPayload } from '../../../../core/shared/operators'; import { ExternalLoginService } from '../../services/external-login.service'; +import { RemoteData } from '../../../../core/data/remote-data'; +import { Registration } from '../../../../core/shared/registration.model'; +import { Subscription } from 'rxjs'; +import { hasValue } from '../../../../shared/empty.util'; @Component({ selector: 'ds-provide-email', @@ -9,13 +12,22 @@ import { ExternalLoginService } from '../../services/external-login.service'; styleUrls: ['./provide-email.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class ProvideEmailComponent { +export class ProvideEmailComponent implements OnDestroy { + /** + * The form group for the email input + */ emailForm: FormGroup; - + /** + * The registration id + */ @Input() registrationId: string; - + /** + * The token from the URL + */ @Input() token: string; + subs: Subscription[] = []; + constructor( private formBuilder: FormBuilder, private externalLoginService: ExternalLoginService, @@ -29,11 +41,15 @@ export class ProvideEmailComponent { this.emailForm.markAllAsTouched(); if (this.emailForm.valid) { const email = this.emailForm.get('email').value; - this.externalLoginService.patchUpdateRegistration([email], 'email', this.registrationId, this.token, 'add') - .pipe(getRemoteDataPayload()) - .subscribe((update) => { - console.log('Email update:', update); - }); + this.subs.push(this.externalLoginService.patchUpdateRegistration([email], 'email', this.registrationId, this.token, 'add') + .subscribe((rd: RemoteData) => { + // TODO: remove this line (temporary) + console.log('Email update:', rd); + })); } } + + ngOnDestroy(): void { + this.subs.filter(sub => hasValue(sub)).forEach((sub) => sub.unsubscribe()); + } } diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html index 47a301501bf..bc96b37844d 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html @@ -11,7 +11,7 @@

{{ 'external-login.confirmation.header' | translate}}

- + @@ -22,14 +22,14 @@

or

-

{{'Connect to an existing user' | translate}}

+

{{'external-login.connect-to-existing-account.label' | translate}}

@@ -43,9 +43,7 @@

{{'Connect to an existing user' | translate}}<
diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts index d29ebdb8513..cbd8beeb1bb 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts @@ -4,16 +4,40 @@ import { ExternalLogInComponent } from './external-log-in.component'; import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; -import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter, Injector } from '@angular/core'; -import { mockRegistrationDataModel } from '../models/registration-data.mock.model'; +import { EventEmitter, Injector } from '@angular/core'; import { By } from '@angular/platform-browser'; import { of as observableOf } from 'rxjs'; import { FormBuilder } from '@angular/forms'; +import { AuthService } from '../../../core/auth/auth.service'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { AuthServiceMock } from '../../mocks/auth.service.mock'; +import { MetadataValue } from '../../../core/shared/metadata.models'; +import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; +import { RegistrationData } from '../models/registration-data.model'; describe('ExternalLogInComponent', () => { let component: ExternalLogInComponent; let fixture: ComponentFixture; let compiledTemplate: HTMLElement; + + const registrationDataMock = { + id: '3', + email: 'user@institution.edu', + user: '028dcbb8-0da2-4122-a0ea-254be49ca107', + registrationType: AuthMethodType.Orcid, + netId: '0000-1111-2222-3333', + registrationMetadata: { + 'eperson.firstname': [ + Object.assign(new MetadataValue(), { + value: 'User 1', + language: null, + authority: '', + confidence: -1, + place: -1, + }), + ], + } + }; const translateServiceStub = { get: () => observableOf('Info Text'), instant: (key: any) => 'Info Text', @@ -28,6 +52,14 @@ describe('ExternalLogInComponent', () => { providers: [ { provide: TranslateService, useValue: translateServiceStub }, { provide: Injector, useValue: {} }, + { provide: AuthService, useValue: new AuthServiceMock() }, + { + provide: NgbModal, useValue: { + open: () => { + /*comment*/ + } + } + }, FormBuilder ], imports: [ @@ -38,8 +70,7 @@ describe('ExternalLogInComponent', () => { useClass: TranslateLoaderMock } }), - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + ] }) .compileComponents(); }); @@ -47,8 +78,8 @@ describe('ExternalLogInComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ExternalLogInComponent); component = fixture.componentInstance; - component.registrationData = mockRegistrationDataModel; - component.registrationType = mockRegistrationDataModel.registrationType; + component.registrationData = Object.assign(new RegistrationData, registrationDataMock); + component.registrationType = registrationDataMock.registrationType; compiledTemplate = fixture.nativeElement; fixture.detectChanges(); }); @@ -58,28 +89,30 @@ describe('ExternalLogInComponent', () => { }); it('should set registrationType and informationText correctly when email is present', () => { - expect(component.registrationType).toBe('orcid'); + expect(component.registrationType).toBe(registrationDataMock.registrationType); expect(component.informationText).toBeDefined(); }); it('should render the template to confirm email when registrationData has email', () => { - component.registrationData = Object.assign({}, mockRegistrationDataModel, { email: 'test@user.com' }); + component.registrationData = Object.assign(new RegistrationData(), registrationDataMock, { email: 'email@domain.com' }); fixture.detectChanges(); const selector = compiledTemplate.querySelector('ds-confirm-email'); expect(selector).toBeTruthy(); }); - it('should render the template with provide email component when registrationData email is null', () => { - component.registrationData = Object.assign({}, mockRegistrationDataModel, { email: null }); + it('should display provide email component if email is not provided', () => { + component.registrationData.email = null; fixture.detectChanges(); - component.ngOnInit(); - const provideEmailComponent = compiledTemplate.querySelector('ds-provide-email'); - expect(provideEmailComponent).toBeTruthy(); + const provideEmail = fixture.nativeElement.querySelector('ds-provide-email'); + expect(provideEmail).toBeTruthy(); }); - it('should render the template with log-in component', () => { - const logInComponent = compiledTemplate.querySelector('ds-log-in'); - expect(logInComponent).toBeTruthy(); + it('should display login modal when connect to existing account button is clicked', () => { + const button = fixture.nativeElement.querySelector('button'); + button.click(); + fixture.detectChanges(); + const modal = fixture.nativeElement.querySelector('.modal'); + expect(modal).toBeTruthy(); }); it('should render the template with the translated informationText', () => { diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts index 2ef5df0cae1..4e08d633a21 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts @@ -12,7 +12,6 @@ import { hasValue } from '../../empty.util'; import { TranslateService } from '@ngx-translate/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { AuthService } from '../../../core/auth/auth.service'; -import { Router } from '@angular/router'; @Component({ selector: 'ds-external-log-in', @@ -56,7 +55,6 @@ export class ExternalLogInComponent implements OnInit { private translate: TranslateService, private modalService: NgbModal, private authService: AuthService, - private router: Router ) {} /** @@ -114,6 +112,11 @@ export class ExternalLogInComponent implements OnInit { return getExternalLoginConfirmationType(this.registrationType); } + /** + * Opens the login modal and sets the redirect URL to '/review-account'. + * On modal dismissed/closed, the redirect URL is cleared. + * @param content - The content to be displayed in the modal. + */ openLoginModal(content: any) { this.modalRef = this.modalService.open(content); this.authService.setRedirectUrl('/review-account'); @@ -123,6 +126,9 @@ export class ExternalLogInComponent implements OnInit { }); } + /** + * Clears the redirect URL stored in the authentication service. + */ clearRedirectUrl() { this.authService.clearRedirectUrl(); } diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.spec.ts b/src/app/shared/external-log-in-complete/guards/registration-token.guard.spec.ts new file mode 100644 index 00000000000..f62769add66 --- /dev/null +++ b/src/app/shared/external-log-in-complete/guards/registration-token.guard.spec.ts @@ -0,0 +1,79 @@ +import { TestBed } from '@angular/core/testing'; +import { RegistrationTokenGuard } from './registration-token.guard'; +import { ActivatedRoute, convertToParamMap, Params, Router } from '@angular/router'; +import { of as observableOf } from 'rxjs'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; +import { AuthService } from '../../../core/auth/auth.service'; +import { RouterMock } from '../../../shared/mocks/router.mock'; +import { Registration } from '../../../core/shared/registration.model'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; + +describe('RegistrationTokenGuard', () => { + let guard: RegistrationTokenGuard; + const route = new RouterMock(); + const registrationWithGroups = Object.assign(new Registration(), + { + email: 'test@email.org', + token: 'test-token', + }); + const epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { + searchRegistrationByToken: createSuccessfulRemoteDataObject$(registrationWithGroups) + }); + const authService = { + getAuthenticatedUserFromStore: () => observableOf(ePerson), + setRedirectUrl: () => { + return true; + } + } as any; + const ePerson = Object.assign(new EPerson(), { + id: 'test-eperson', + uuid: 'test-eperson' + }); + beforeEach(() => { + const paramObject: Params = {}; + paramObject.token = '1234'; + TestBed.configureTestingModule({ + providers: [{provide: Router, useValue: route}, + { + provide: ActivatedRoute, + useValue: { + queryParamMap: observableOf(convertToParamMap(paramObject)) + }, + }, + {provide: EpersonRegistrationService, useValue: epersonRegistrationService}, + {provide: AuthService, useValue: authService} + ] + }); + guard = TestBed.get(RegistrationTokenGuard); + }); + + it('should be created', () => { + expect(guard).toBeTruthy(); + }); + describe('based on the response of "searchByToken have', () => { + it('can activate must return true when registration data includes groups', () => { + (guard.canActivate({ params: { token: '123456789' } } as any, {} as any) as any) + .subscribe( + (canActivate) => { + expect(canActivate).toEqual(true); + } + ); + }); + it('can activate must return false when registration data includes groups', () => { + const registrationWithDifferentUsedFromLoggedInt = Object.assign(new Registration(), + { + email: 't1@email.org', + token: 'test-token', + }); + epersonRegistrationService.searchRegistrationByToken.and.returnValue(observableOf(registrationWithDifferentUsedFromLoggedInt)); + (guard.canActivate({ params: { token: '123456789' } } as any, {} as any) as any) + .subscribe( + (canActivate) => { + expect(canActivate).toEqual(false); + } + ); + }); + + }); +}); diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts new file mode 100644 index 00000000000..3d4d103b098 --- /dev/null +++ b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts @@ -0,0 +1,54 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + CanActivate, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { Observable, map, of, tap } from 'rxjs'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; +import { RemoteData } from '../../../core/data/remote-data'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { Registration } from '../../../core/shared/registration.model'; +import { hasValue } from '../../empty.util'; + +@Injectable({ + providedIn: 'root', +}) +export class RegistrationTokenGuard implements CanActivate { + constructor( + private router: Router, + private epersonRegistrationService: EpersonRegistrationService + ) {} + + /** + * Determines if a user can activate a route based on the registration token. + * @param route - The activated route snapshot. + * @param state - The router state snapshot. + * @returns A value indicating if the user can activate the route. + */ + canActivate( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Promise | boolean | Observable { + if (route.params.token) { + return this.epersonRegistrationService + .searchRegistrationByToken(route.params.token) + .pipe( + getFirstCompletedRemoteData(), + map( + (data: RemoteData) => + data.hasSucceeded && hasValue(data) + ), + tap((isValid: boolean) => { + if (!isValid) { + this.router.navigate(['/404']); + } + }) + ); + } else { + this.router.navigate(['/404']); + return of(false); + } + } +} diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts index 9ef3d4162c1..fa40cb91c3b 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts +++ b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts @@ -6,18 +6,19 @@ export const mockRegistrationDataModel: RegistrationData = Object.assign( new RegistrationData(), { id: '3', - email: null,//'user@institution.edu', + email: 'user@institution.edu', user: '028dcbb8-0da2-4122-a0ea-254be49ca107', registrationType: AuthMethodType.Orcid, netId: '0000-1111-2222-3333', registrationMetadata: { 'eperson.firstname': [ Object.assign(new MetadataValue(), { - value: 'User 1', + value: 'User', language: null, authority: '', confidence: -1, place: -1, + overrides: 'User', }), ], 'eperson.lastname': [ diff --git a/src/app/shared/external-log-in-complete/models/registration-data.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.model.ts index 4d58c2a13bc..9714d81111b 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.model.ts +++ b/src/app/shared/external-log-in-complete/models/registration-data.model.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line max-classes-per-file import { CacheableObject } from '../../../core/cache/cacheable-object.model'; import { typedObject } from '../../../core/cache/builders/build-decorators'; import { REGISTRATION_DATA } from './registration-data.resource-type'; @@ -5,8 +6,17 @@ import { autoserialize, deserialize } from 'cerialize'; import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; import { ResourceType } from '../../../core/shared/resource-type'; import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; -import { MetadataMap } from '../../../core/shared/metadata.models'; import { HALLink } from '../../../core/shared/hal-link.model'; +import { MetadataValue } from '../../../core/shared/metadata.models'; + +export class RegistrationDataMetadataMap { + [key: string]: RegistrationDataMetadataValue[]; +} + +export class RegistrationDataMetadataValue extends MetadataValue { + @autoserialize + overrides?: string; +} /** * Object that represents the authenticated status of a user @@ -58,7 +68,7 @@ export class RegistrationData implements CacheableObject { * The metadata involved during the registration process */ @autoserialize - registrationMetadata?: MetadataMap; + registrationMetadata?: RegistrationDataMetadataMap; /** * The {@link HALLink}s for this RegistrationData diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts new file mode 100644 index 00000000000..24d40f11533 --- /dev/null +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { RegistrationDataResolver } from './registration-data.resolver'; + +describe('RegistrationDataResolver', () => { + let resolver: RegistrationDataResolver; + + beforeEach(() => { + TestBed.configureTestingModule({}); + resolver = TestBed.inject(RegistrationDataResolver); + }); + + it('should be created', () => { + expect(resolver).toBeTruthy(); + }); +}); diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts new file mode 100644 index 00000000000..6e2a9dc9fc8 --- /dev/null +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts @@ -0,0 +1,50 @@ +import { Injectable } from '@angular/core'; +import { + Resolve, + RouterStateSnapshot, + ActivatedRouteSnapshot, +} from '@angular/router'; +import { Observable, map } from 'rxjs'; +import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; +import { hasValue } from '../../empty.util'; +import { Registration } from 'src/app/core/shared/registration.model'; +import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; +import { RemoteData } from 'src/app/core/data/remote-data'; +import { RegistrationData } from '../models/registration-data.model'; + +@Injectable({ + providedIn: 'root', +}) +/** + * Resolver for retrieving registration data based on a token. + */ +export class RegistrationDataResolver implements Resolve { + + /** + * Constructor for RegistrationDataResolver. + * @param epersonRegistrationService The EpersonRegistrationService used to retrieve registration data. + */ + constructor(private epersonRegistrationService: EpersonRegistrationService) {} + + /** + * Resolves registration data based on a token. + * @param route The ActivatedRouteSnapshot containing the token parameter. + * @param state The RouterStateSnapshot. + * @returns An Observable of RegistrationData. + */ + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + const token = route.params.token; + if (hasValue(token)) { + return this.epersonRegistrationService.searchByTokenAndUpdateData(token).pipe( + getFirstCompletedRemoteData(), + map((registrationRD: RemoteData) => { + if (registrationRD.hasSucceeded && hasValue(registrationRD.payload)) { + return Object.assign(new RegistrationData(), registrationRD.payload); + } else { + return null; + } + }) + ); + } + } +} diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts index 4f60d9e5d25..1ec730516c4 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -6,6 +6,7 @@ import { RemoteData } from '../../../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import { Registration } from 'src/app/core/shared/registration.model'; @Injectable({ providedIn: 'root' @@ -20,16 +21,16 @@ export class ExternalLoginService { ) { } /** - * Update the registration data + * Update the registration data. + * Send a patch request to the server to update the registration data. * @param values the values to update or add * @param field the filed to be updated * @param registrationId the registration id * @param token the registration token * @param operation operation to be performed */ - patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable> { + patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable>{ const updatedValues = values.map((value) => value); - this.router.navigate(['/email-confirmation']); // TODO: remove this line (temporary) return this.epersonRegistrationService.patchUpdateRegistration(updatedValues, field, registrationId, token, operation).pipe( getFirstCompletedRemoteData(), map((rd) => { diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html index 7adea60aa1d..ba9ab9ccc0c 100644 --- a/src/app/shared/log-in/log-in.component.html +++ b/src/app/shared/log-in/log-in.component.html @@ -6,10 +6,7 @@

- - -
- {{"login.form.new-user" | translate}} - {{"login.form.forgot-password" | translate}} - +
+ {{"login.form.new-user" | translate}} + {{"login.form.forgot-password" | translate}}
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index 18a7d6ddf98..0322079475f 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -36,11 +36,20 @@ export class LogInComponent implements OnInit, OnDestroy { */ @Input() isStandalonePage: boolean; + /** + * Method to exclude from the list of authentication methods + */ @Input() excludedAuthMethod: AuthMethodType; - + /** + * Weather or not to show the register link + */ @Input() showRegisterLink = true; - @Input() hideAllLinks = false; + /** + * The external login method to force + * the user to use to login while completing the external login process + */ + @Input() externalLoginMethod: AuthMethodType; /** * The list of authentication methods available @@ -77,7 +86,6 @@ export class LogInComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.store.pipe( select(getAuthenticationMethods), ).subscribe(methods => { @@ -87,6 +95,10 @@ export class LogInComponent implements OnInit, OnDestroy { if (hasValue(this.excludedAuthMethod)) { this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType !== this.excludedAuthMethod); } + // if there is an external login method the user should follow, filter the auth methods to only show that one + if (hasValue(this.externalLoginMethod)) { + this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType === this.externalLoginMethod); + } }); // set loading diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index c2be335f99f..978ee6782d1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7225,4 +7225,14 @@ "external-login.validate-email.no-token": "Something went wrong. Your email address is not validated succesfully.", "external-login-page.provide-email.notifications.error": "Something went wrong.Email address was omitted or the operation is not valid.", + + "external-login.error.notification": "There was an error while processing your request. Please try again later.", + + "external-login.connect-to-existing-account.label": "Connect to an existing user", + + "external-login.modal.label.close": "Close", + + "external-login-page.provide-email.create-account.notifications.error.header": "Something went wrong", + + "external-login-page.provide-email.create-account.notifications.error.content": "Please check again your email address and try again.", } diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index c4b8fdaff6e..7c2d5edca4e 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -11307,4 +11307,48 @@ // "external-login-validation.review-account-info.table.header.action": "Override", // TODO New key - Add a translation "external-login-validation.review-account-info.table.header.action": "Override", + + // "on-label": "ON", + // TODO New key - Add a translation + "on-label": "ON", + + // "off-label": "OFF", + // TODO New key - Add a translation + "off-label": "OFF", + + // "review-account-info.merge-data.notification.success": "Your account information has been updated successfully", + // TODO New key - Add a translation + "review-account-info.merge-data.notification.success": "Your account information has been updated successfully", + + // "review-account-info.merge-data.notification.error": "Something went wrong while updating your account information", + // TODO New key - Add a translation + "review-account-info.merge-data.notification.error": "Something went wrong while updating your account information", + + // "external-login.validate-email.no-token": "Something went wrong. Your email address is not validated succesfully.", + // TODO New key - Add a translation + "external-login.validate-email.no-token": "Something went wrong. Your email address is not validated succesfully.", + + // "external-login-page.provide-email.notifications.error": "Something went wrong.Email address was omitted or the operation is not valid.", + // TODO New key - Add a translation + "external-login-page.provide-email.notifications.error": "Something went wrong.Email address was omitted or the operation is not valid.", + + // "external-login.error.notification": "There was an error while processing your request. Please try again later.", + // TODO New key - Add a translation + "external-login.error.notification": "There was an error while processing your request. Please try again later.", + + // "external-login.connect-to-existing-account.label": "Connect to an existing user", + // TODO New key - Add a translation + "external-login.connect-to-existing-account.label": "Connect to an existing user", + + // "external-login.modal.label.close": "Close", + // TODO New key - Add a translation + "external-login.modal.label.close": "Close", + + // "external-login-page.provide-email.create-account.notifications.error.header": "Something went wrong", + // TODO New key - Add a translation + "external-login-page.provide-email.create-account.notifications.error.header": "Something went wrong", + + // "external-login-page.provide-email.create-account.notifications.error.content": "Please check again your email address and try again.", + // TODO New key - Add a translation + "external-login-page.provide-email.create-account.notifications.error.content": "Please check again your email address and try again.", } From 8f4067b6f19c6029ccd935d7fb4c7218aca6078e Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 3 Oct 2023 18:52:32 +0200 Subject: [PATCH 703/758] [DSC-1277] Italian translation fixes --- src/assets/i18n/it.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 3466ca341ea..5f171a40910 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -5722,7 +5722,7 @@ // "menu.section.statistics": "Statistics", - "menu.section.statistics": "Statistica", + "menu.section.statistics": "Statistiche", // "menu.section.statistics.workflow": "Workflow", "menu.section.statistics.workflow": "Workflow", From c85e8a7175cf4046b98f121c4c8a537e2db9ea5f Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Wed, 4 Oct 2023 10:05:33 +0200 Subject: [PATCH 704/758] [CST-10703] refactor --- src/app/app-routing.module.ts | 5 - .../external-login-page-routing.module.ts | 2 +- .../external-login-page.component.ts | 11 +- ...review-account-info-page-routing.module.ts | 3 +- ...in-review-account-info-page.component.html | 2 +- ...ogin-review-account-info-page.component.ts | 10 +- .../email-validated.component.html | 9 -- .../email-validated.component.scss | 0 .../email-validated.component.spec.ts | 75 ---------- .../email-validated.component.ts | 16 --- ...al-login-validation-page-routing.module.ts | 20 --- ...ernal-login-validation-page.component.html | 10 -- ...ernal-login-validation-page.component.scss | 0 ...al-login-validation-page.component.spec.ts | 112 --------------- ...xternal-login-validation-page.component.ts | 44 ------ .../external-login-validation-page.module.ts | 24 ---- ...stration-data-create-user.resolver.spec.ts | 129 ------------------ .../registration-data-create-user.resolver.ts | 93 ------------- ...xternal-login-validation-page.component.ts | 25 ---- .../confirm-email/confirm-email.component.ts | 19 ++- src/assets/i18n/en.json5 | 6 +- src/assets/i18n/it.json5 | 12 +- 22 files changed, 30 insertions(+), 597 deletions(-) delete mode 100644 src/app/external-login-validation-page/email-validated/email-validated.component.html delete mode 100644 src/app/external-login-validation-page/email-validated/email-validated.component.scss delete mode 100644 src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts delete mode 100644 src/app/external-login-validation-page/email-validated/email-validated.component.ts delete mode 100644 src/app/external-login-validation-page/external-login-validation-page-routing.module.ts delete mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.html delete mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.scss delete mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.spec.ts delete mode 100644 src/app/external-login-validation-page/external-login-validation-page.component.ts delete mode 100644 src/app/external-login-validation-page/external-login-validation-page.module.ts delete mode 100644 src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts delete mode 100644 src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts delete mode 100644 src/app/external-login-validation-page/themed-external-login-validation-page.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2fd18766af9..fb4d658d8cb 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -176,11 +176,6 @@ import { RedirectService } from './redirect/redirect.service'; loadChildren: () => import('./external-login-page/external-login-page.module') .then((m) => m.ExternalLoginPageModule) }, - { - path: 'validate-email', - loadChildren: () => import('./external-login-validation-page/external-login-validation-page.module') - .then((m) => m.ExternalLoginValidationPageModule) - }, { path: 'review-account', loadChildren: () => import('./external-login-review-account-info/external-login-review-account-info-page.module') diff --git a/src/app/external-login-page/external-login-page-routing.module.ts b/src/app/external-login-page/external-login-page-routing.module.ts index 390db1eaf00..f7425b63d82 100644 --- a/src/app/external-login-page/external-login-page-routing.module.ts +++ b/src/app/external-login-page/external-login-page-routing.module.ts @@ -9,7 +9,7 @@ const routes: Routes = [ path: '', pathMatch: 'full', component: ThemedExternalLoginPageComponent, - // canActivate: [RegistrationTokenGuard], // TODO: uncomment this line to enable the guard later + canActivate: [RegistrationTokenGuard], resolve: { registrationData: RegistrationDataResolver }, }, ]; diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index c8bde7cd0da..fd76a047ba5 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -43,12 +43,11 @@ export class ExternalLoginPageComponent implements OnInit { tap((data) => this.hasErrors = hasNoValue(data.registrationData)), map((data) => data.registrationData)); - // TODO: remove this line (temporary) - this.registrationData$ = of( - mockRegistrationDataModel - ); - this.hasErrors = false; - this.token = '1234567890'; + // this.registrationData$ = of( + // mockRegistrationDataModel + // ); + // this.hasErrors = false; + // this.token = '1234567890'; } } diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts index ffec9928371..b83816ece02 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; import { RegistrationDataResolver } from '../shared/external-log-in-complete/resolvers/registration-data.resolver'; +import { ReviewAccountGuard } from './helpers/review-account.guard'; const routes: Routes = [ @@ -9,7 +10,7 @@ const routes: Routes = [ path: '', pathMatch: 'full', component: ExternalLoginReviewAccountInfoPageComponent, - // canActivate: [ReviewAccountGuard],// TODO: Remove comment + canActivate: [ReviewAccountGuard], resolve: { registrationData: RegistrationDataResolver } },]; diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html index 97034110392..831b53ce714 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html @@ -8,6 +8,6 @@
diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts index 5c984445031..62da6995fa1 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts @@ -43,10 +43,10 @@ export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { map((data) => data.registrationData)); // TODO: remove this line (temporary) - this.registrationData$ = of( - mockRegistrationDataModel - ); - this.hasErrors = false; - this.token = '1234567890'; + // this.registrationData$ = of( + // mockRegistrationDataModel + // ); + // this.hasErrors = false; + // this.token = '1234567890'; } } diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.html b/src/app/external-login-validation-page/email-validated/email-validated.component.html deleted file mode 100644 index b58ed085890..00000000000 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.html +++ /dev/null @@ -1,9 +0,0 @@ -

- {{ "external-login.validated-email.header" | translate }} -

- -

- -
- -
diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.scss b/src/app/external-login-validation-page/email-validated/email-validated.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts deleted file mode 100644 index 21c7f5d7d8f..00000000000 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.spec.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EmailValidatedComponent } from './email-validated.component'; -import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; -import { CommonModule } from '@angular/common'; -import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { Router } from '@angular/router'; -import { RouterStub } from 'src/app/shared/testing/router.stub'; -import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; -import { of } from 'rxjs'; -import { AuthServiceMock } from 'src/app/shared/mocks/auth.service.mock'; - -describe('EmailValidatedComponent', () => { - let component: EmailValidatedComponent; - let fixture: ComponentFixture; - let compiledTemplate: HTMLElement; - - const translateServiceStub = { - get: () => of('Mocked Translation Text'), - instant: (key: any) => 'Mocked Translation Text', - onLangChange: new EventEmitter(), - onTranslationChange: new EventEmitter(), - onDefaultLangChange: new EventEmitter() - }; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ EmailValidatedComponent ], - providers: [ - { provide: AuthService, useValue: new AuthServiceMock()}, - { provide: Router, useValue: new RouterStub() }, - { provide: TranslateService, useValue: translateServiceStub }, - ], - imports: [ - CommonModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock - } - }), - ], - schemas: [NO_ERRORS_SCHEMA] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(EmailValidatedComponent); - component = fixture.componentInstance; - compiledTemplate = fixture.nativeElement; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should render translated header', () => { - const headerElement = compiledTemplate.querySelector('h4'); - expect(headerElement.textContent).toContain('Mocked Translation Text'); - }); - - it('should render translated info paragraph', () => { - const infoParagraphElement = compiledTemplate.querySelector('p'); - expect(infoParagraphElement.innerHTML).toBeTruthy(); - }); - - it('should render ds-log-in component', () => { - const dsLogInComponent = compiledTemplate.querySelector('ds-log-in'); - expect(dsLogInComponent).toBeTruthy(); - }); -}); - diff --git a/src/app/external-login-validation-page/email-validated/email-validated.component.ts b/src/app/external-login-validation-page/email-validated/email-validated.component.ts deleted file mode 100644 index 8fd45bc4a7f..00000000000 --- a/src/app/external-login-validation-page/email-validated/email-validated.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; -import { AuthService } from '../../core/auth/auth.service'; -@Component({ - selector: 'ds-email-validated', - templateUrl: './email-validated.component.html', - styleUrls: ['./email-validated.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class EmailValidatedComponent { - - constructor(private authService: AuthService) { - // After the user has validated his email, we need to redirect him to the review account page, - // in order to review his account information - this.authService.setRedirectUrl('/review-account'); - } -} diff --git a/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts b/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts deleted file mode 100644 index 241cebebb2f..00000000000 --- a/src/app/external-login-validation-page/external-login-validation-page-routing.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { ThemedExternalLoginValidationPageComponent } from './themed-external-login-validation-page.component'; -import { RegistrationTokenGuard } from '../shared/external-log-in-complete/guards/registration-token.guard'; -import { RegistrationDataCreateUserResolver } from './resolvers/registration-data-create-user.resolver'; -const routes: Routes = [ - { - path: '', - pathMatch: 'full', - component: ThemedExternalLoginValidationPageComponent, - // canActivate: [RegistrationTokenGuard] // TODO: uncomment this line to enable the guard later - resolve: { createUser: RegistrationDataCreateUserResolver }, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ExternalLoginValidationPageRoutingModule { } diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.html b/src/app/external-login-validation-page/external-login-validation-page.component.html deleted file mode 100644 index cfdaed0d6db..00000000000 --- a/src/app/external-login-validation-page/external-login-validation-page.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
- - - - -
diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.scss b/src/app/external-login-validation-page/external-login-validation-page.component.scss deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts b/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts deleted file mode 100644 index 975fca9f81f..00000000000 --- a/src/app/external-login-validation-page/external-login-validation-page.component.spec.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; -import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; -import { Observable, of } from 'rxjs'; -import { RemoteData } from '../core/data/remote-data'; -import { CommonModule } from '@angular/common'; -import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; -import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; -import { ActivatedRoute } from '@angular/router'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { AlertType } from '../shared/alert/aletr-type'; -import { tr } from 'date-fns/locale'; - -describe('ExternalLoginValidationPageComponent', () => { - let component: ExternalLoginValidationPageComponent; - let componentAsAny: any; - let fixture: ComponentFixture; - let epersonRegistrationService: any; - - const registrationDataMock = { - registrationType: 'orcid', - email: 'test@test.com', - netId: '0000-0000-0000-0000', - user: 'a44d8c9e-9b1f-4e7f-9b1a-5c9d8a0b1f1a', - registrationMetadata: { - 'email': [{ value: 'test@test.com' }], - 'eperson.lastname': [{ value: 'Doe' }], - 'eperson.firstname': [{ value: 'John' }], - }, - }; - - const tokenMock = 'as552-5a5a5-5a5a5-5a5a5'; - - const routeStub = { - snapshot: { - queryParams: { - token: tokenMock - } - }, - data: of({ - createUser: true, - }), - }; - - beforeEach(async () => { - epersonRegistrationService = { - searchByTokenAndUpdateData: (token: string): Observable> => { return createSuccessfulRemoteDataObject$(registrationDataMock); } - }; - - await TestBed.configureTestingModule({ - declarations: [ExternalLoginValidationPageComponent], - providers: [ - { provide: ActivatedRoute, useValue: routeStub }, - ], - imports: [ - CommonModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateLoaderMock, - }, - }), - ], - schemas: [NO_ERRORS_SCHEMA], - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ExternalLoginValidationPageComponent); - component = fixture.componentInstance; - componentAsAny = component; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should set validationFailed to true if createUser is falsy', () => { - const activatedRoute = TestBed.inject(ActivatedRoute); - activatedRoute.data = of({ createUser: false }); - component.ngOnInit(); - expect(componentAsAny.validationFailed.value).toBeTrue(); - }); - - it('should set validationFailed to false if createUser is truthy', () => { - const activatedRoute = TestBed.inject(ActivatedRoute); - activatedRoute.data = of({ createUser: true }); - component.ngOnInit(); - expect(componentAsAny.validationFailed.value).toBeFalse(); - }); - - it('should show DsEmailValidatedComponent when hasFailed() returns false', () => { - spyOn(component, 'hasFailed').and.returnValue(of(false)); - fixture.detectChanges(); - const dsEmailValidated = fixture.nativeElement.querySelector('ds-email-validated'); - expect(dsEmailValidated).toBeTruthy(); - }); - - it('should show DsAlertComponent when hasFailed() returns true', () => { - spyOn(component, 'hasFailed').and.returnValue(of(true)); - fixture.detectChanges(); - const dsAlert = fixture.nativeElement.querySelector('ds-alert'); - expect(dsAlert).toBeTruthy(); - }); - - afterEach(() => { - fixture.destroy(); - }); -}); diff --git a/src/app/external-login-validation-page/external-login-validation-page.component.ts b/src/app/external-login-validation-page/external-login-validation-page.component.ts deleted file mode 100644 index abcd256f8a7..00000000000 --- a/src/app/external-login-validation-page/external-login-validation-page.component.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { AlertType } from '../shared/alert/aletr-type'; -import { BehaviorSubject, Observable } from 'rxjs'; - -@Component({ - templateUrl: './external-login-validation-page.component.html', - styleUrls: ['./external-login-validation-page.component.scss'], -}) -export class ExternalLoginValidationPageComponent implements OnInit { - /** - * The type of alert to show - */ - public AlertTypeEnum = AlertType; - - /** - * Whether the component has errors - */ - private validationFailed: BehaviorSubject = - new BehaviorSubject(false); - - constructor( - private arouter: ActivatedRoute, - ) { - } - - ngOnInit(): void { - this.arouter.data.subscribe((data) => { - const resolvedData = data.createUser; - this.validationFailed.next(!resolvedData); - }); - - // TODO: remove this line (temporary) - this.validationFailed.next(false); - } - - - /** - * Check if the validation has failed - */ - public hasFailed(): Observable { - return this.validationFailed.asObservable(); - } -} diff --git a/src/app/external-login-validation-page/external-login-validation-page.module.ts b/src/app/external-login-validation-page/external-login-validation-page.module.ts deleted file mode 100644 index 3bad614d7e6..00000000000 --- a/src/app/external-login-validation-page/external-login-validation-page.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { ExternalLoginValidationPageRoutingModule } from './external-login-validation-page-routing.module'; -import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; -import { ThemedExternalLoginValidationPageComponent } from './themed-external-login-validation-page.component'; - -import { EmailValidatedComponent } from './email-validated/email-validated.component'; -import { SharedModule } from '../shared/shared.module'; - - -@NgModule({ - declarations: [ - ExternalLoginValidationPageComponent, - ThemedExternalLoginValidationPageComponent, - EmailValidatedComponent, - ], - imports: [ - CommonModule, - ExternalLoginValidationPageRoutingModule, - SharedModule - ] -}) -export class ExternalLoginValidationPageModule { } diff --git a/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts b/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts deleted file mode 100644 index 979bdc89491..00000000000 --- a/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.spec.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { RegistrationDataCreateUserResolver } from './registration-data-create-user.resolver'; -import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { RouterStateSnapshot } from '@angular/router'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; -import { Registration } from '../../core/shared/registration.model'; -import { MetadataValue } from 'src/app/core/shared/metadata.models'; - -describe('RegistrationDataCreateUserResolver', () => { - let resolver: RegistrationDataCreateUserResolver; - let epersonRegistrationService: jasmine.SpyObj; - let epersonDataService: jasmine.SpyObj; - - const registrationDataMock = { - registrationType: 'orcid', - email: 'test@test.com', - netId: '0000-0000-0000-0000', - user: null, - registrationMetadata: { - 'email': [{ value: 'test@test.com' }], - 'eperson.lastname': [{ value: 'Doe' }], - 'eperson.firstname': [{ value: 'John' }], - }, - }; - - const tokenMock = 'as552-5a5a5-5a5a5-5a5a5'; - - - beforeEach(() => { - const spyEpersonRegistrationService = jasmine.createSpyObj('EpersonRegistrationService', [ - 'searchByTokenAndUpdateData' - ]); - const spyEpersonDataService = jasmine.createSpyObj('EPersonDataService', [ - 'createEPersonForToken' - ]); - - TestBed.configureTestingModule({ - providers: [ - RegistrationDataCreateUserResolver, - { provide: EpersonRegistrationService, useValue: spyEpersonRegistrationService }, - { provide: EPersonDataService, useValue: spyEpersonDataService } - ] - }); - resolver = TestBed.inject(RegistrationDataCreateUserResolver); - epersonRegistrationService = TestBed.inject(EpersonRegistrationService) as jasmine.SpyObj; - epersonDataService = TestBed.inject(EPersonDataService) as jasmine.SpyObj; - }); - - it('should be created', () => { - expect(resolver).toBeTruthy(); - }); - - describe('resolve', () => { - const token = tokenMock; - const route = { params: { token: token } } as any; - const state = {} as RouterStateSnapshot; - - it('should create a new user and return true when registration data does not contain a user', (done) => { - const registration = new Registration(); - epersonRegistrationService.searchByTokenAndUpdateData.and.returnValue(createSuccessfulRemoteDataObject$(registration)); - - const createdEPerson = new EPerson(); - createdEPerson.email = registrationDataMock.email; - createdEPerson.metadata = { - 'eperson.lastname': [Object.assign(new MetadataValue(), { value: 'Doe' })], - 'eperson.firstname': [Object.assign(new MetadataValue(), { value: 'John' })], - }; - createdEPerson.canLogIn = true; - createdEPerson.requireCertificate = false; - epersonDataService.createEPersonForToken.and.returnValue(createSuccessfulRemoteDataObject$(createdEPerson)); - - resolver.resolve(route, state).subscribe((result) => { - expect(result).toBeTrue(); - expect(epersonRegistrationService.searchByTokenAndUpdateData).toHaveBeenCalledWith(token); - expect(epersonDataService.createEPersonForToken).toHaveBeenCalledWith(createdEPerson, token); - done(); - }); - }); - - it('should return false when search by token and update data fails', (done) => { - epersonRegistrationService.searchByTokenAndUpdateData.and.returnValue(createFailedRemoteDataObject$()); - - resolver.resolve(route, state).subscribe((result) => { - expect(result).toBeFalse(); - expect(epersonRegistrationService.searchByTokenAndUpdateData).toHaveBeenCalledWith(token); - expect(epersonDataService.createEPersonForToken).not.toHaveBeenCalled(); - done(); - }); - }); - - }); - - describe('createUserFromToken', () => { - const token = tokenMock; - const registrationData: RegistrationData = Object.assign(new RegistrationData(), registrationDataMock); - - it('should create a new user and return true', (done) => { - const createdEPerson = new EPerson(); - createdEPerson.email = registrationData.email; - createdEPerson.metadata = { - 'eperson.lastname': 'Doe', //[{ value: 'Doe' }], - 'eperson.firstname': 'John',// [{ value: 'John' }], - } as any; - createdEPerson.canLogIn = true; - createdEPerson.requireCertificate = false; - epersonDataService.createEPersonForToken.and.returnValue(createSuccessfulRemoteDataObject$(createdEPerson)); - - resolver.createUserFromToken(token, registrationData).subscribe((result) => { - expect(result).toBeTrue(); - expect(epersonDataService.createEPersonForToken).toHaveBeenCalledWith(createdEPerson, token); - done(); - }); - }); - - it('should return false when create EPerson for token fails', (done) => { - epersonDataService.createEPersonForToken.and.returnValue(createFailedRemoteDataObject$()); - - resolver.createUserFromToken(token, registrationData).subscribe((result) => { - expect(result).toBeFalse(); - expect(epersonDataService.createEPersonForToken).toHaveBeenCalledWith(jasmine.any(EPerson), token); - done(); - }); - }); - }); -}); diff --git a/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts b/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts deleted file mode 100644 index 000422f7623..00000000000 --- a/src/app/external-login-validation-page/resolvers/registration-data-create-user.resolver.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { Injectable } from '@angular/core'; -import { - Resolve, - RouterStateSnapshot, - ActivatedRouteSnapshot, -} from '@angular/router'; -import { Observable, map, of, switchMap } from 'rxjs'; -import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; -import { RemoteData } from '../../core/data/remote-data'; -import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { EPerson } from '../../core/eperson/models/eperson.model'; -import { getFirstCompletedRemoteData } from '../../core/shared/operators'; -import { hasValue, hasNoValue } from '../../shared/empty.util'; -import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; - -@Injectable({ - providedIn: 'root', -}) -export class RegistrationDataCreateUserResolver implements Resolve { - constructor( - private epersonRegistrationService: EpersonRegistrationService, - private epersonDataService: EPersonDataService - ) {} - - /** - * Resolves the registration data and creates a new user account from the given token. - * The account will be created only when the registration data does NOT contain a user (uuid). - * @param route The activated route snapshot. - * @param state The router state snapshot. - * @returns An observable of a boolean indicating whether the user was created successfully or not. - */ - resolve( - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot - ): Observable { - const token = route.params.token; - return this.epersonRegistrationService - .searchByTokenAndUpdateData(token) - .pipe( - getFirstCompletedRemoteData(), - switchMap((rd) => { - if ( - rd.hasSucceeded && - hasValue(rd.payload) && - hasNoValue(rd.payload.user) - ) { - const registrationData = Object.assign( - new RegistrationData(), - rd.payload - ); - return this.createUserFromToken(token, registrationData); - } - if (rd.hasFailed) { - return of(false); - } - }) - ); - } - - /** - * Creates a new user from a given token and registration data. - * Based on the registration data, the user will be created with the following properties: - * - email: the email address from the registration data - * - metadata: all metadata values from the registration data, except for the email metadata key (ePerson object does not have an email metadata field) - * - canLogIn: true - * - requireCertificate: false - * @param token The token used to create the user. - * @param registrationData The registration data used to create the user. - * @returns An Observable that emits a boolean indicating whether the user creation was successful. - */ - createUserFromToken( - token: string, - registrationData: RegistrationData - ): Observable { - const metadataValues = {}; - for (const [key, value] of Object.entries(registrationData.registrationMetadata)) { - if (hasValue(value[0]?.value) && key !== 'email') { - metadataValues[key] = value[0]?.value; - } - } - const eperson = new EPerson(); - eperson.email = registrationData.email; - eperson.metadata = metadataValues; - eperson.canLogIn = true; - eperson.requireCertificate = false; - return this.epersonDataService.createEPersonForToken(eperson, token).pipe( - getFirstCompletedRemoteData(), - map((rd: RemoteData) => { - return rd.hasSucceeded; - }) - ); - } -} diff --git a/src/app/external-login-validation-page/themed-external-login-validation-page.component.ts b/src/app/external-login-validation-page/themed-external-login-validation-page.component.ts deleted file mode 100644 index a08b2669deb..00000000000 --- a/src/app/external-login-validation-page/themed-external-login-validation-page.component.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Component } from '@angular/core'; -import { ThemedComponent } from '../shared/theme-support/themed.component'; -import { ExternalLoginValidationPageComponent } from './external-login-validation-page.component'; - -/** - * Themed wrapper for ExternalLoginValidationPageComponent - */ -@Component({ - selector: 'ds-themed-external-login-page', - styleUrls: [], - templateUrl: './../shared/theme-support/themed.component.html' -}) -export class ThemedExternalLoginValidationPageComponent extends ThemedComponent { - protected getComponentName(): string { - return 'ExternalLoginValidationPageComponent'; - } - - protected importThemedComponent(themeName: string): Promise { - return import(`../../themes/${themeName}/app/external-login-validation-page/external-login-validation-page.component`); - } - - protected importUnthemedComponent(): Promise { - return import(`./external-login-validation-page.component`); - } -} diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index d4e470f9e72..45683aaee5b 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -21,13 +21,22 @@ import { Subscription } from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush }) export class ConfirmEmailComponent implements OnDestroy { - + /** + * The form containing the email input + */ emailForm: FormGroup; - + /** + * The registration data object + */ @Input() registrationData: RegistrationData; + /** + * The token to be used to confirm the registration + */ @Input() token: string; - + /** + * The subscriptions to unsubscribe from + */ subs: Subscription[] = []; constructor( @@ -46,8 +55,6 @@ export class ConfirmEmailComponent implements OnDestroy { submitForm() { this.emailForm.markAllAsTouched(); - this.router.navigate(['/login'], { queryParams: { authMethod: this.registrationData.registrationType } }); - if (this.emailForm.valid) { const confirmedEmail = this.emailForm.get('email').value; if (confirmedEmail && isEqual(this.registrationData.email, confirmedEmail.trim())) { @@ -104,7 +111,7 @@ export class ConfirmEmailComponent implements OnDestroy { this.translate.get('external-login-page.provide-email.create-account.notifications.error.content') ); } else if (rd.hasSucceeded) { - // TODO: redirect to ORCID login page + // redirect to ORCID login page // set Redirect URL to User profile this.router.navigate(['/login'], { queryParams: { authMethod: registrationData.registrationType } }); this.authService.setRedirectUrl('/review-account'); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 978ee6782d1..94a153d1772 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7194,10 +7194,6 @@ "external-login.confirm-email-sent.info": " We have sent an emait to the provided address to validate your input.
Please follow the instructions in the email to complete the login process.", - "external-login.validated-email.header": "Email validated", - - "external-login.validated-email.info": "Your email has been validated.
You can now login in the system with your prefered authentication method.", - "external-login.provide-email.header": "Provide email", "external-login.provide-email.button.label": "Send Verification link", @@ -7222,7 +7218,7 @@ "review-account-info.merge-data.notification.error": "Something went wrong while updating your account information", - "external-login.validate-email.no-token": "Something went wrong. Your email address is not validated succesfully.", + "review-account-info.alert.error.content": "Something went wrong. Please try again later.", "external-login-page.provide-email.notifications.error": "Something went wrong.Email address was omitted or the operation is not valid.", diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 7c2d5edca4e..fd5fb8ca8b5 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -11268,14 +11268,6 @@ // TODO New key - Add a translation "external-login.confirm-email-sent.info": " We have sent an emait to the provided address to validate your input.
Please follow the instructions in the email to complete the login process.", - // "external-login.validated-email.header": "Email validated", - // TODO New key - Add a translation - "external-login.validated-email.header": "Email validated", - - // "external-login.validated-email.info": "Your email has been validated.
You can now login in the system with your prefered authentication method.", - // TODO New key - Add a translation - "external-login.validated-email.info": "Your email has been validated.
You can now login in the system with your prefered authentication method.", - // "external-login.provide-email.header": "Provide email", // TODO New key - Add a translation "external-login.provide-email.header": "Provide email", @@ -11324,9 +11316,9 @@ // TODO New key - Add a translation "review-account-info.merge-data.notification.error": "Something went wrong while updating your account information", - // "external-login.validate-email.no-token": "Something went wrong. Your email address is not validated succesfully.", + // "review-account-info.alert.error.content": "Something went wrong. Please try again later.", // TODO New key - Add a translation - "external-login.validate-email.no-token": "Something went wrong. Your email address is not validated succesfully.", + "review-account-info.alert.error.content": "Something went wrong. Please try again later.", // "external-login-page.provide-email.notifications.error": "Something went wrong.Email address was omitted or the operation is not valid.", // TODO New key - Add a translation From 457324e48cce7d53e690601230a9f43fbf245765 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 4 Oct 2023 11:58:45 +0200 Subject: [PATCH 705/758] [DSC-1277] Italian translation fixes --- src/assets/i18n/it.json5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 5f171a40910..8f50f76d0c5 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -1247,7 +1247,7 @@ "bitstream.edit.form.embargo.label": "Embargo fino a data specifica", // "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": "Modificare il nome del file per il bitstream. Si noti che questo cambierà il display bitstream URL , i vecchi collegamenti verranno comunque risolti finché il sequence ID non cambierà  .", + "bitstream.edit.form.fileName.hint": "Modificare il nome del file per il bitstream. Si noti che questo cambierà il display bitstream URL, i vecchi collegamenti verranno comunque risolti finché il sequence ID non cambierà.", // "bitstream.edit.form.fileName.label": "Filename", "bitstream.edit.form.fileName.label": "Filename", @@ -1314,7 +1314,7 @@ "bitstream.edit.title": "Modifica bitstream", // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ", - "bitstream-request-a-copy.alert.canDownload1": "Hai già accesso a questo file. Se si desidera scaricare il file, fare clic su", + "bitstream-request-a-copy.alert.canDownload1": "Hai già accesso a questo file. Se si desidera scaricare il file, fare clic su", // "bitstream-request-a-copy.alert.canDownload2": "here", "bitstream-request-a-copy.alert.canDownload2": "qui", @@ -2366,7 +2366,7 @@ "context-menu.actions.request-correction.confirm.submit": "Sì, sono sicuro.", // "context-menu.actions.request-correction.error.403": "A request for correction has already been sent, impossible to proceed with the operation.", - "context-menu.actions.request-correction.error.403": "È già stata inviata una richiesta di correzione, impossibile procedere con l'operazione.", + "context-menu.actions.request-correction.error.403": "È già stata inviata una richiesta di correzione, impossibile procedere con l'operazione.", // "context-menu.actions.request-correction.error.generic": "There was an issue when requesting a correction for the item, please try again later.", "context-menu.actions.request-correction.error.generic": "Si è verificato un problema durante la richiesta di correzione per l'item, riprova più tardi.", From 1d9689df9b8b12e3f5a8889fe1073480e313f27a Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 4 Oct 2023 16:52:09 +0200 Subject: [PATCH 706/758] [DSC-1277] CRIS/GLAM translation sync 1 --- src/assets/i18n/it.json5 | 88 ++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 8f50f76d0c5..0aaff9e328d 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -21,7 +21,7 @@ "403.link.home-page": "Torna alla home page", // "403.forbidden": "forbidden", - "403.forbidden": "vietato", + "403.forbidden": "Accesso negato", // "500.page-internal-server-error": "Service Unavailable", "500.page-internal-server-error": "Servizio non disponibile", @@ -49,10 +49,10 @@ "410.link.home-page": "Torna alla home page", // "error-page.description.401": "unauthorized", - "error-page.description.401": "non autorizzato", + "error-page.description.401": "Non autorizzato", // "error-page.description.403": "forbidden", - "error-page.description.403": "accesso negato", + "error-page.description.403": "Accesso negato", // "error-page.description.500": "Service Unavailable", "error-page.description.500": "Servizio non disponibile", @@ -90,13 +90,13 @@ // "admin.edit-user-agreement.breadcrumbs": "Edit User Agreement", - "admin.edit-user-agreement.breadcrumbs": "Modifica l'accordo con l'utente finale", + "admin.edit-user-agreement.breadcrumbs": "Modifica User Agreement", // "admin.edit-user-agreement.confirm.title": "Force acceptance", "admin.edit-user-agreement.confirm.title": "Forza l'accettazione", // "admin.edit-user-agreement.confirm.info":"Do you want to force all users to accept the new user agreement?", - "admin.edit-user-agreement.confirm.info": "Si desidera forzare tutti gli utenti ad accettare il nuovo accordo con l'utente finale?", + "admin.edit-user-agreement.confirm.info": "Si desidera forzare tutti gli utenti ad accettare il nuovo User Agreement?", // "admin.edit-user-agreement.confirm.cancel":"Cancel", "admin.edit-user-agreement.confirm.cancel": "Annulla", @@ -111,19 +111,19 @@ "admin.edit-user-agreement.save-button": "Salva", // "admin.edit-user-agreement.header": "Edit User Agreement", - "admin.edit-user-agreement.header": "Modifica accordo con l'utente finale", + "admin.edit-user-agreement.header": "Modifica lo User Agreement", // "admin.edit-user-agreement.success": "User agreement successfully updated", - "admin.edit-user-agreement.success": "Accordo con l'utente finale aggiornato correttamente", + "admin.edit-user-agreement.success": "User Agreement aggiornato correttamente", // "admin.edit-user-agreement.error": "An error occurred while updating the user agreement", - "admin.edit-user-agreement.error": "Si è verificato un errore durante l'aggiornamento dell'accordo con l'utente finale", + "admin.edit-user-agreement.error": "Si è verificato un errore durante l'aggiornamento dell'User Agreement", // "admin.edit-user-agreement.title": "Edit User Agreement", - "admin.edit-user-agreement.title": "Modifica accordo con l'utente finale", + "admin.edit-user-agreement.title": "Modifica User Agreement", // "admin.edit-user-agreement.markdown": "End User Agreement text supports Markdown language.", - "admin.edit-user-agreement.markdown": "L'accordo con l'utente finale supporta il formato Markdown.", + "admin.edit-user-agreement.markdown": "Lo Lo User Agreement supporta il formato Markdown.", // "admin.edit-cms-metadata.title": "Edit CMS Metadata", "admin.edit-cms-metadata.title": "Modifica metadati CMS", @@ -174,7 +174,7 @@ "admin.institution.new.submit": "Invia", // "admin.institution.new.success": "The new institution was successfully created", - "admin.institution.new.success": "La nuova istituzione è stata creata con successo", + "admin.institution.new.success": "La nuova istituzione è stata creata", // "admin.institution.new.title": "Create Institution", "admin.institution.new.title": "Crea istituzione", @@ -207,19 +207,19 @@ // "admin.registries.bitstream-formats.breadcrumbs": "Format registry", - "admin.registries.bitstream-formats.breadcrumbs": "Formattare il registro", + "admin.registries.bitstream-formats.breadcrumbs": "Registro dei formati", // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format", - "admin.registries.bitstream-formats.create.breadcrumbs": "Formato del bitstream", + "admin.registries.bitstream-formats.create.breadcrumbs": "Formato dei bitstream", // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.", "admin.registries.bitstream-formats.create.failure.content": "Si è verificato un errore durante la creazione del nuovo formato bitstream.", // "admin.registries.bitstream-formats.create.failure.head": "Failure", - "admin.registries.bitstream-formats.create.failure.head": "Fallimento", + "admin.registries.bitstream-formats.create.failure.head": "Errore", // "admin.registries.bitstream-formats.create.head": "Create Bitstream format", - "admin.registries.bitstream-formats.create.head": "Crea formato Bitstream", + "admin.registries.bitstream-formats.create.head": "Crea un formato Bitstream", // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format", "admin.registries.bitstream-formats.create.new": "Aggiungere un nuovo formato bitstream", @@ -228,22 +228,22 @@ "admin.registries.bitstream-formats.create.success.content": "Il nuovo formato bitstream è stato creato correttamente.", // "admin.registries.bitstream-formats.create.success.head": "Success", - "admin.registries.bitstream-formats.create.success.head": "Successo", + "admin.registries.bitstream-formats.create.success.head": "Operazione riuscita", // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)", - "admin.registries.bitstream-formats.delete.failure.amount": "Impossibile rimuovere i formati {{ amount }}", + "admin.registries.bitstream-formats.delete.failure.amount": "Impossibile cancellare i formati {{ amount }}", // "admin.registries.bitstream-formats.delete.failure.head": "Failure", - "admin.registries.bitstream-formats.delete.failure.head": "Fallimento", + "admin.registries.bitstream-formats.delete.failure.head": "Errore", // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)", - "admin.registries.bitstream-formats.delete.success.amount": "Rimosso con successo i formati {{ amount }}", + "admin.registries.bitstream-formats.delete.success.amount": "Rimossi con successo i formati {{ amount }}", // "admin.registries.bitstream-formats.delete.success.head": "Success", - "admin.registries.bitstream-formats.delete.success.head": "Successo", + "admin.registries.bitstream-formats.delete.success.head": "Operazione riuscita", // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.", - "admin.registries.bitstream-formats.description": "Questo elenco di formati bitstream fornisce informazioni sui formati noti e sul loro livello di supporto.", + "admin.registries.bitstream-formats.description": "Questo elenco di formati bitstream fornisce informazioni sui formati gestiti dal sistema e sul loro livello di supporto.", // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format", "admin.registries.bitstream-formats.edit.breadcrumbs": "Formato bitstream", @@ -261,22 +261,22 @@ "admin.registries.bitstream-formats.edit.extensions.label": "Estensione", // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot", - "admin.registries.bitstream-formats.edit.extensions.placeholder": "Inserisci un'estensione di file senza il punto", + "admin.registries.bitstream-formats.edit.extensions.placeholder": "Inserisci l'estensione del file senza il punto", // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.", "admin.registries.bitstream-formats.edit.failure.content": "Si è verificato un errore durante la modifica del formato bitstream.", // "admin.registries.bitstream-formats.edit.failure.head": "Failure", - "admin.registries.bitstream-formats.edit.failure.head": "Fallimento", + "admin.registries.bitstream-formats.edit.failure.head": "Errore", // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}", "admin.registries.bitstream-formats.edit.head": "Formato Bitstream: {{ 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": "I formati contrassegnati come interni sono nascosti all'utente e utilizzati per scopi amministrativi.", + "admin.registries.bitstream-formats.edit.internal.hint": "I formati contrassegnati come internal sono nascosti all'utente e utilizzati per scopi amministrativi.", // "admin.registries.bitstream-formats.edit.internal.label": "Internal", - "admin.registries.bitstream-formats.edit.internal.label": "Interno", + "admin.registries.bitstream-formats.edit.internal.label": "Internal", // "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": "Non è necessario che il tipo MIME associato a questo formato sia univoco.", @@ -294,7 +294,7 @@ "admin.registries.bitstream-formats.edit.success.content": "Il formato bitstream è stato modificato correttamente.", // "admin.registries.bitstream-formats.edit.success.head": "Success", - "admin.registries.bitstream-formats.edit.success.head": "Successo", + "admin.registries.bitstream-formats.edit.success.head": "Operazione riuscita", // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.", "admin.registries.bitstream-formats.edit.supportLevel.hint": "Il livello di supporto che la vostra istituzione si impegna a dare a questo formato.", @@ -303,19 +303,19 @@ "admin.registries.bitstream-formats.edit.supportLevel.label": "Livello di supporto", // "admin.registries.bitstream-formats.head": "Bitstream Format Registry", - "admin.registries.bitstream-formats.head": "Registro di sistema del formato Bitstream", + "admin.registries.bitstream-formats.head": "Registro di sistema dei formati Bitstream", // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.", "admin.registries.bitstream-formats.no-items": "Nessun formato bitstream da mostrare.", // "admin.registries.bitstream-formats.table.delete": "Delete selected", - "admin.registries.bitstream-formats.table.delete": "Elimina selezionato", + "admin.registries.bitstream-formats.table.delete": "Elimina bitstream selezionato", // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all", "admin.registries.bitstream-formats.table.deselect-all": "Deseleziona tutto", // "admin.registries.bitstream-formats.table.internal": "internal", - "admin.registries.bitstream-formats.table.internal": "interno", + "admin.registries.bitstream-formats.table.internal": "internal", // "admin.registries.bitstream-formats.table.mimetype": "MIME Type", "admin.registries.bitstream-formats.table.mimetype": "Tipo MIME", @@ -332,7 +332,7 @@ "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conosciuto", // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported", - "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Sostenuto", + "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supportato", // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown", "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Sconosciuto", @@ -341,7 +341,7 @@ "admin.registries.bitstream-formats.table.supportLevel.head": "Livello di supporto", // "admin.registries.bitstream-formats.title": "Bitstream Format Registry", - "admin.registries.bitstream-formats.title": "Registro di sistema del formato Bitstream", + "admin.registries.bitstream-formats.title": "Registro dei formati Bitstream", @@ -349,7 +349,7 @@ "admin.registries.metadata.breadcrumbs": "Registro dei metadati", // "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": "Il Registro dei metadati mantiene un elenco di tutti i campi di metadati disponibili nel repository. Questi campi possono essere suddivisi tra più schemi. Tuttavia, DSpace richiede lo schema Dublin Core qualificato.", + "admin.registries.metadata.description": "Il Registro dei metadati mantiene un elenco di tutti i campi di metadati disponibili nel repository. Questi campi possono essere suddivisi tra più schemi. Tuttavia, la piattaforma richiede lo schema Dublin Core qualificato.", // "admin.registries.metadata.form.create": "Create metadata schema", "admin.registries.metadata.form.create": "Creare un Metadata Schema", @@ -370,7 +370,7 @@ "admin.registries.metadata.schemas.no-items": "Nessun Metadata Schema da mostrare.", // "admin.registries.metadata.schemas.table.delete": "Delete selected", - "admin.registries.metadata.schemas.table.delete": "Elimina selezionato", + "admin.registries.metadata.schemas.table.delete": "Elimina schema selezionato", // "admin.registries.metadata.schemas.table.id": "ID", "admin.registries.metadata.schemas.table.id": "ID", @@ -396,13 +396,13 @@ "admin.registries.schema.description": "Questo è il Metadata Schema per \"{{namespace}}.", // "admin.registries.schema.fields.head": "Schema metadata fields", - "admin.registries.schema.fields.head": "Campi dei metadati dello schema", + "admin.registries.schema.fields.head": "Campi del metadata schema", // "admin.registries.schema.fields.no-items": "No metadata fields to show.", - "admin.registries.schema.fields.no-items": "Nessun campo di metadati da mostrare.", + "admin.registries.schema.fields.no-items": "Nessun campo da mostrare.", // "admin.registries.schema.fields.table.delete": "Delete selected", - "admin.registries.schema.fields.table.delete": "Elimina selezionato", + "admin.registries.schema.fields.table.delete": "Elimina campo selezionato", // "admin.registries.schema.fields.table.field": "Field", "admin.registries.schema.fields.table.field": "Campo", @@ -413,13 +413,13 @@ "admin.registries.schema.fields.table.scopenote": "Nota di ambito", // "admin.registries.schema.form.create": "Create metadata field", - "admin.registries.schema.form.create": "Creare un campo di metadati", + "admin.registries.schema.form.create": "Creare un campo", // "admin.registries.schema.form.edit": "Edit metadata field", - "admin.registries.schema.form.edit": "Modificare il campo dei metadati", + "admin.registries.schema.form.edit": "Modifica il campo ", // "admin.registries.schema.form.element": "Element", - "admin.registries.schema.form.element": "Elemento", + "admin.registries.schema.form.element": "Element", // "admin.registries.schema.form.qualifier": "Qualifier", "admin.registries.schema.form.qualifier": "Qualifier", @@ -446,25 +446,25 @@ "admin.registries.schema.notification.failure": "Errore", // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"", - "admin.registries.schema.notification.field.created": "Campo dei metadati creato correttamente \"{{field}}\"", + "admin.registries.schema.notification.field.created": "Campo \"{{field}}\" creato correttamente", // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields", - "admin.registries.schema.notification.field.deleted.failure": "Impossibile eliminare i campi di metadati {{amount}}", + "admin.registries.schema.notification.field.deleted.failure": "Impossibile eliminare {{amount}} campo/i", // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields", "admin.registries.schema.notification.field.deleted.success": "Campi di metadati {{amount}} eliminati correttamente", // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"", - "admin.registries.schema.notification.field.edited": "Campo dei metadati modificato correttamente \"{{field}}\"", + "admin.registries.schema.notification.field.edited": "Campo \"{{field}}\" modificato correttamente", // "admin.registries.schema.notification.success": "Success", - "admin.registries.schema.notification.success": "Successo", + "admin.registries.schema.notification.success": "Operazione riuscita", // "admin.registries.schema.return": "Back", "admin.registries.schema.return": "Indietro", // "admin.registries.schema.title": "Metadata Schema Registry", - "admin.registries.schema.title": "Registro del Metadata Schema", + "admin.registries.schema.title": "Registro dei Metadata Schema", From 37d593f4a2cce30b1fabaac45f349b2a62d9014a Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Oct 2023 18:55:38 +0200 Subject: [PATCH 707/758] [DSC-1120] set Chrome version for e2e tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3b7aff6897..30c5c9c5dbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: DSPACE_UI_HOST: 127.0.0.1 # When Chrome version is specified, we pin to a specific version of Chrome # Comment this out to use the latest release - #CHROME_VERSION: "90.0.4430.212-1" + CHROME_VERSION: "116.0.5845.179" strategy: # Create a matrix of Node versions to test against (in parallel) matrix: From ab5aa7a64aff8f6fc80a615d35b4487879cf4c9a Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 4 Oct 2023 19:18:00 +0200 Subject: [PATCH 708/758] [DSC-1120] set Chrome version for e2e tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30c5c9c5dbb..dabc0b428e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: DSPACE_UI_HOST: 127.0.0.1 # When Chrome version is specified, we pin to a specific version of Chrome # Comment this out to use the latest release - CHROME_VERSION: "116.0.5845.179" + CHROME_VERSION: "116.0.5845.187-1" strategy: # Create a matrix of Node versions to test against (in parallel) matrix: From 9a874fafe1fae1354b394e33ae47e1fba9ecfc0d Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Wed, 4 Oct 2023 20:07:39 +0200 Subject: [PATCH 709/758] Release DSpace-CRIS 2023.01.01 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c85516b4020..7a9e5ed2edb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "2023.01.01-SNAPSHOT", + "version": "2023.01.01" "scripts": { "ng": "ng", "config:watch": "nodemon", From 4cd0bfa78554029951f6045ed08df7200014262d Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Wed, 4 Oct 2023 20:10:17 +0200 Subject: [PATCH 710/758] Prepare next development iteration --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a9e5ed2edb..0f3b83c87de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "2023.01.01" + "version": "2023.02.00-SNAPSHOT" "scripts": { "ng": "ng", "config:watch": "nodemon", From 81a41dd07a6db75aff41dd6a9446cfd406759f9c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 5 Oct 2023 10:57:55 +0200 Subject: [PATCH 711/758] [DSC-1120] fix package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f3b83c87de..a80ad477a35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "2023.02.00-SNAPSHOT" + "version": "2023.02.00-SNAPSHOT", "scripts": { "ng": "ng", "config:watch": "nodemon", From 7d59f3c87fa6d7acdc734a20a5a1058568841141 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 11:10:20 +0200 Subject: [PATCH 712/758] [CST-10703] unit tests --- .../core/eperson/eperson-data.service.spec.ts | 16 +++ ...-email-confirmation-page-routing.module.ts | 4 +- .../external-login-page-routing.module.ts | 4 +- .../external-login-page.component.ts | 10 +- ...review-account-info-page-routing.module.ts | 18 +-- ...review-account-info-page.component.spec.ts | 1 - ...ogin-review-account-info-page.component.ts | 11 +- .../helpers/review-account.guard.spec.ts | 105 +++++++------- .../review-account-info.component.spec.ts | 57 ++------ .../confirm-email.component.spec.ts | 135 ++++++++++++++++-- .../confirm-email/confirm-email.component.ts | 15 +- .../provide-email.component.spec.ts | 1 - .../provide-email/provide-email.component.ts | 8 +- .../external-log-in.component.html | 2 +- .../external-log-in.component.spec.ts | 35 ++--- .../registration-data.resolver.spec.ts | 33 ++++- .../services/external-login.service.spec.ts | 62 +++++++- 17 files changed, 347 insertions(+), 170 deletions(-) diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts index b4b939eebf4..30ec39aa0d3 100644 --- a/src/app/core/eperson/eperson-data.service.spec.ts +++ b/src/app/core/eperson/eperson-data.service.spec.ts @@ -28,6 +28,7 @@ import { getMockRequestService } from '../../shared/mocks/request.service.mock'; import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test'; import { CoreState } from '../core-state.model'; import { FindListOptions } from '../data/find-list-options.model'; +import { RemoteData } from '../data/remote-data'; describe('EPersonDataService', () => { let service: EPersonDataService; @@ -314,6 +315,21 @@ describe('EPersonDataService', () => { }); }); + describe('mergeEPersonDataWithToken', () => { + const uuid = '1234-5678-9012-3456'; + const token = 'abcd-efgh-ijkl-mnop'; + const metadataKey = 'eperson.firstname'; + beforeEach(() => { + spyOn(service, 'mergeEPersonDataWithToken').and.returnValue(createSuccessfulRemoteDataObject$(EPersonMock)); + }); + + it('should merge EPerson data with token', () => { + service.mergeEPersonDataWithToken(uuid, token, metadataKey).subscribe((result: RemoteData) => { + expect(result.hasSucceeded).toBeTrue(); + }); + expect(service.mergeEPersonDataWithToken).toHaveBeenCalledWith(uuid, token, metadataKey); + }); + }); }); class DummyChangeAnalyzer implements ChangeAnalyzer { diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts index e242d9ea1a9..0033d1620e5 100644 --- a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page-routing.module.ts @@ -12,6 +12,6 @@ const routes: Routes = [ @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule] + exports: [RouterModule], }) -export class ExternalLoginEmailConfirmationPageRoutingModule { } +export class ExternalLoginEmailConfirmationPageRoutingModule {} diff --git a/src/app/external-login-page/external-login-page-routing.module.ts b/src/app/external-login-page/external-login-page-routing.module.ts index f7425b63d82..21bbb7ee920 100644 --- a/src/app/external-login-page/external-login-page-routing.module.ts +++ b/src/app/external-login-page/external-login-page-routing.module.ts @@ -17,6 +17,6 @@ const routes: Routes = [ @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule], - providers: [] + providers: [], }) -export class ExternalLoginPageRoutingModule { } +export class ExternalLoginPageRoutingModule {} diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index fd76a047ba5..27e08e4e5ae 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -2,9 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { hasNoValue } from '../shared/empty.util'; import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; -import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; import { AlertType } from '../shared/alert/aletr-type'; -import { Observable, first, map, of, tap } from 'rxjs'; +import { Observable, first, map, tap } from 'rxjs'; @Component({ templateUrl: './external-login-page.component.html', @@ -42,12 +41,5 @@ export class ExternalLoginPageComponent implements OnInit { first(), tap((data) => this.hasErrors = hasNoValue(data.registrationData)), map((data) => data.registrationData)); - - // TODO: remove this line (temporary) - // this.registrationData$ = of( - // mockRegistrationDataModel - // ); - // this.hasErrors = false; - // this.token = '1234567890'; } } diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts index b83816ece02..1119c9fc49b 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts @@ -4,18 +4,18 @@ import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-re import { RegistrationDataResolver } from '../shared/external-log-in-complete/resolvers/registration-data.resolver'; import { ReviewAccountGuard } from './helpers/review-account.guard'; - const routes: Routes = [ { - path: '', - pathMatch: 'full', - component: ExternalLoginReviewAccountInfoPageComponent, - canActivate: [ReviewAccountGuard], - resolve: { registrationData: RegistrationDataResolver } -},]; + path: '', + pathMatch: 'full', + component: ExternalLoginReviewAccountInfoPageComponent, + canActivate: [ReviewAccountGuard], + resolve: { registrationData: RegistrationDataResolver }, + }, +]; @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule] + exports: [RouterModule], }) -export class ExternalLoginReviewAccountInfoRoutingModule { } +export class ExternalLoginReviewAccountInfoRoutingModule {} diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts index 7622f081d0d..ca65204e8dd 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { AlertType } from '../shared/alert/aletr-type'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts index 62da6995fa1..6e0cab84594 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts @@ -1,10 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { AlertType } from '../shared/alert/aletr-type'; -import { Observable, first, map, of, tap } from 'rxjs'; +import { Observable, first, map, tap } from 'rxjs'; import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; import { ActivatedRoute } from '@angular/router'; import { hasNoValue } from '../shared/empty.util'; -import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; @Component({ templateUrl: './external-login-review-account-info-page.component.html', @@ -36,17 +35,9 @@ export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { this.token = this.arouter.snapshot.queryParams.token; } - ngOnInit(): void { this.registrationData$ = this.arouter.data.pipe(first(), tap((data) => this.hasErrors = hasNoValue(data?.registrationData)), map((data) => data.registrationData)); - - // TODO: remove this line (temporary) - // this.registrationData$ = of( - // mockRegistrationDataModel - // ); - // this.hasErrors = false; - // this.token = '1234567890'; } } diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts index 61cf3f178cc..03e8d53343c 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts @@ -1,79 +1,78 @@ import { TestBed } from '@angular/core/testing'; import { ReviewAccountGuard } from './review-account.guard'; import { ActivatedRoute, convertToParamMap, Params, Router } from '@angular/router'; -import { of as observableOf } from 'rxjs'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; -import { EPerson } from 'src/app/core/eperson/models/eperson.model'; -import { Registration } from 'src/app/core/shared/registration.model'; -import { RouterMock } from 'src/app/shared/mocks/router.mock'; -import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; +import { of as observableOf, of } from 'rxjs'; +import { AuthService } from '../../core/auth/auth.service'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RouterMock } from '../../shared/mocks/router.mock'; +import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; +import { AuthMethodType } from '../../core/auth/models/auth.method-type'; describe('ReviewAccountGuard', () => { let guard: ReviewAccountGuard; + let epersonRegistrationService: any; + let authService: any; + const route = new RouterMock(); - const registrationWithGroups = Object.assign(new Registration(), + const registrationMock = Object.assign(new RegistrationData(), { email: 'test@email.org', - token: 'test-token', + registrationType: AuthMethodType.Validation + }); - const epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { - searchRegistrationByToken: createSuccessfulRemoteDataObject$(registrationWithGroups) - }); - const authService = { - getAuthenticatedUserFromStore: () => observableOf(ePerson), - setRedirectUrl: () => { - return true; - } - } as any; - const ePerson = Object.assign(new EPerson(), { - id: 'test-eperson', - uuid: 'test-eperson' - }); + beforeEach(() => { const paramObject: Params = {}; paramObject.token = '1234'; + epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { + searchRegistrationByToken: createSuccessfulRemoteDataObject$(registrationMock) + }); + authService = { + isAuthenticated: () => observableOf(true) + } as any; TestBed.configureTestingModule({ - providers: [{provide: Router, useValue: route}, - { - provide: ActivatedRoute, - useValue: { - queryParamMap: observableOf(convertToParamMap(paramObject)) - }, + providers: [{ provide: Router, useValue: route }, + { + provide: ActivatedRoute, + useValue: { + queryParamMap: observableOf(convertToParamMap(paramObject)) }, - {provide: EpersonRegistrationService, useValue: epersonRegistrationService}, - {provide: AuthService, useValue: authService} + }, + { provide: EpersonRegistrationService, useValue: epersonRegistrationService }, + { provide: AuthService, useValue: authService } ] }); - guard = TestBed.get(ReviewAccountGuard); + guard = TestBed.inject(ReviewAccountGuard); }); it('should be created', () => { expect(guard).toBeTruthy(); }); - describe('based on the response of "searchByToken have', () => { - it('can activate must return true when registration data includes groups', () => { - (guard.canActivate({ params: { token: '123456789' } } as any, {} as any) as any) - .subscribe( - (canActivate) => { - expect(canActivate).toEqual(true); - } - ); - }); - it('can activate must return false when registration data includes groups', () => { - const registrationWithDifferentUsedFromLoggedInt = Object.assign(new Registration(), - { - email: 't1@email.org', - token: 'test-token', - }); - epersonRegistrationService.searchRegistrationByToken.and.returnValue(observableOf(registrationWithDifferentUsedFromLoggedInt)); - (guard.canActivate({ params: { token: '123456789' } } as any, {} as any) as any) - .subscribe( - (canActivate) => { - expect(canActivate).toEqual(false); - } - ); + + it('can activate must return true when registration type is validation', () => { + (guard.canActivate({ params: { token: 'valid token' } } as any, {} as any) as any) + .subscribe( + (canActivate) => { + expect(canActivate).toEqual(true); + } + ); + }); + + it('should navigate to 404 if the registration search fails', () => { + epersonRegistrationService.searchRegistrationByToken.and.returnValue(createFailedRemoteDataObject$()); + (guard.canActivate({ params: { token: 'invalid-token' } } as any, {} as any) as any).subscribe((result) => { + expect(result).toBeFalse(); + expect(route.navigate).toHaveBeenCalledWith(['/404']); }); + }); + it('should navigate to 404 if the registration type is not validation and the user is not authenticated', () => { + registrationMock.registrationType = AuthMethodType.Password; + epersonRegistrationService.searchRegistrationByToken.and.returnValue(createSuccessfulRemoteDataObject$(registrationMock)); + spyOn(authService, 'isAuthenticated').and.returnValue(of(false)); + (guard.canActivate({ params: { token: 'invalid-token' } } as any, {} as any) as any).subscribe((result) => { + expect(route.navigate).toHaveBeenCalledWith(['/404']); + }); }); }); diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts index 7e1d3f08de3..70185c37543 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts @@ -100,7 +100,6 @@ describe('ReviewAccountInfoComponent', () => { registrationDataMock ); component.registrationToken = 'test-token'; - spyOn(router, 'navigate'); fixture.detectChanges(); }); @@ -108,12 +107,6 @@ describe('ReviewAccountInfoComponent', () => { expect(component).toBeTruthy(); }); - it('should call getEPersonData when ngOnInit is called', () => { - spyOn(component, 'getEPersonData'); - component.ngOnInit(); - expect(component.getEPersonData).toHaveBeenCalled(); - }); - it('should prepare data to compare', () => { component.ngOnInit(); const dataToCompare = component.dataToCompare; @@ -125,16 +118,6 @@ describe('ReviewAccountInfoComponent', () => { expect(dataToCompare[0].receivedValue).toBe('test@test.com'); }); - it('should get EPerson data', fakeAsync(() => { - spyOn(ePersonDataServiceStub, 'findById').and.returnValue( - of({ payload: mockEPerson } as RemoteData) - ); - component.getEPersonData(); - tick(); - expect(ePersonDataServiceStub.findById).toHaveBeenCalledWith(registrationDataMock.user); - expect(component.epersonCurrentData).toEqual(EPersonMock); - })); - it('should update dataToCompare when overrideValue is changed', () => { component.onOverrideChange(true, 'email'); expect(component.dataToCompare[0].overrideValue).toBe(true); @@ -173,30 +156,6 @@ describe('ReviewAccountInfoComponent', () => { expect(router.navigate).toHaveBeenCalledWith(['/profile']); })); - it('should merge EPerson data with token when overrideValue is false', fakeAsync(() => { - spyOn(ePersonDataServiceStub, 'mergeEPersonDataWithToken').and.returnValue( - of({ hasSucceeded: true }) - ); - component.mergeEPersonDataWithToken(); - tick(); - expect(ePersonDataServiceStub.mergeEPersonDataWithToken).toHaveBeenCalledTimes(1); - expect(router.navigate).toHaveBeenCalledWith(['/profile']); - })); - - - it('should unsubscribe from subscriptions when ngOnDestroy is called', () => { - const subscription1 = jasmine.createSpyObj('Subscription', [ - 'unsubscribe', - ]); - const subscription2 = jasmine.createSpyObj('Subscription', [ - 'unsubscribe', - ]); - component.subs = [subscription1, subscription2]; - component.ngOnDestroy(); - expect(subscription1.unsubscribe).toHaveBeenCalled(); - expect(subscription2.unsubscribe).toHaveBeenCalled(); - }); - it('should display registration data', () => { const registrationTypeElement: HTMLElement = fixture.nativeElement.querySelector('tbody tr:first-child th'); const netIdElement: HTMLElement = fixture.nativeElement.querySelector('tbody tr:first-child td'); @@ -214,10 +173,9 @@ describe('ReviewAccountInfoComponent', () => { const firstDataLabel: HTMLElement = firstDataRow.querySelector('th'); const firstDataReceivedValue: HTMLElement = firstDataRow.querySelectorAll('td')[0]; const firstDataOverrideSwitch: HTMLElement = firstDataRow.querySelector('ui-switch'); - expect(firstDataLabel.textContent.trim()).toBe('Lastname'); expect(firstDataReceivedValue.textContent.trim()).toBe('Doe'); - expect(firstDataOverrideSwitch).not.toBeNull(); + expect(firstDataOverrideSwitch).toBeNull(); }); it('should trigger onSave() when the button is clicked', () => { @@ -227,6 +185,19 @@ describe('ReviewAccountInfoComponent', () => { expect(component.onSave).toHaveBeenCalled(); }); + it('should unsubscribe from subscriptions when ngOnDestroy is called', () => { + const subscription1 = jasmine.createSpyObj('Subscription', [ + 'unsubscribe', + ]); + const subscription2 = jasmine.createSpyObj('Subscription', [ + 'unsubscribe', + ]); + component.subs = [subscription1, subscription2]; + component.ngOnDestroy(); + expect(subscription1.unsubscribe).toHaveBeenCalled(); + expect(subscription2.unsubscribe).toHaveBeenCalled(); + }); + afterEach(() => { fixture.destroy(); }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts index f26593040f9..1a43180bbc0 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -2,46 +2,159 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfirmEmailComponent } from './confirm-email.component'; import { FormBuilder } from '@angular/forms'; -import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; import { CommonModule } from '@angular/common'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; -import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; +import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ExternalLoginService } from '../../services/external-login.service'; +import { AuthService } from 'src/app/core/auth/auth.service'; +import { EPersonDataService } from 'src/app/core/eperson/eperson-data.service'; +import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; +import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; +import { RegistrationData } from '../../models/registration-data.model'; +import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; +import { EPerson } from 'src/app/core/eperson/models/eperson.model'; +import { Router } from '@angular/router'; +import { RouterMock } from 'src/app/shared/mocks/router.mock'; +import { of } from 'rxjs'; describe('ConfirmEmailComponent', () => { let component: ConfirmEmailComponent; let fixture: ComponentFixture; + let externalLoginServiceSpy: jasmine.SpyObj; + let epersonDataServiceSpy: jasmine.SpyObj; + let notificationServiceSpy: jasmine.SpyObj; + let authServiceSpy: jasmine.SpyObj; + let router; + const translateServiceStub = { + get: () => of(''), + onLangChange: new EventEmitter(), + onTranslationChange: new EventEmitter(), + onDefaultLangChange: new EventEmitter() + }; beforeEach(async () => { + externalLoginServiceSpy = jasmine.createSpyObj('ExternalLoginService', [ + 'patchUpdateRegistration', + ]); + epersonDataServiceSpy = jasmine.createSpyObj('EPersonDataService', [ + 'createEPersonForToken', + ]); + notificationServiceSpy = jasmine.createSpyObj('NotificationsService', [ + 'error', + ]); + authServiceSpy = jasmine.createSpyObj('AuthService', ['setRedirectUrl']); + router = new RouterMock(); await TestBed.configureTestingModule({ - declarations: [ ConfirmEmailComponent ], + declarations: [ConfirmEmailComponent], providers: [ FormBuilder, - { provide: EpersonRegistrationService, useValue: {} }, - { provide: ExternalLoginService, useValue: {} }, + { provide: ExternalLoginService, useValue: externalLoginServiceSpy }, + { provide: EPersonDataService, useValue: epersonDataServiceSpy }, + { provide: NotificationsService, useValue: notificationServiceSpy }, + { provide: AuthService, useValue: authServiceSpy }, + { provide: Router, useValue: router }, + { provide: TranslateService, useValue: translateServiceStub } ], imports: [ CommonModule, TranslateModule.forRoot({ loader: { provide: TranslateLoader, - useClass: TranslateLoaderMock - } + useClass: TranslateLoaderMock, + }, }), ], - schemas: [NO_ERRORS_SCHEMA] - }) - .compileComponents(); + schemas: [NO_ERRORS_SCHEMA], + }).compileComponents(); }); beforeEach(() => { fixture = TestBed.createComponent(ConfirmEmailComponent); component = fixture.componentInstance; + component.registrationData = Object.assign(new RegistrationData(), { + id: '123', + email: 'test@example.com', + registrationMetadata: {}, + registrationType: AuthMethodType.Orcid, + }); + component.token = 'test-token'; fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + describe('submitForm', () => { + it('should call postCreateAccountFromToken if email is confirmed', () => { + component.emailForm.setValue({ email: 'test@example.com' }); + spyOn(component as any, 'postCreateAccountFromToken'); + component.submitForm(); + expect((component as any).postCreateAccountFromToken).toHaveBeenCalledWith( + 'test-token', + component.registrationData + ); + }); + + it('should call patchUpdateRegistration if email is not confirmed', () => { + component.emailForm.setValue({ email: 'new-email@example.com' }); + spyOn(component as any, 'patchUpdateRegistration'); + component.submitForm(); + expect((component as any).patchUpdateRegistration).toHaveBeenCalledWith([ + 'new-email@example.com', + ]); + }); + + it('should not call any methods if form is invalid', () => { + component.emailForm.setValue({ email: 'invalid-email' }); + spyOn(component as any, 'postCreateAccountFromToken'); + spyOn(component as any, 'patchUpdateRegistration'); + component.submitForm(); + expect((component as any).postCreateAccountFromToken).not.toHaveBeenCalled(); + expect((component as any).patchUpdateRegistration).not.toHaveBeenCalled(); + }); + }); + + describe('postCreateAccountFromToken', () => { + it('should call epersonDataService.createEPersonForToken with correct arguments', () => { + epersonDataServiceSpy.createEPersonForToken.and.returnValue(createSuccessfulRemoteDataObject$(new EPerson())); + (component as any).postCreateAccountFromToken( + 'test-token', + component.registrationData + ); + expect(epersonDataServiceSpy.createEPersonForToken).toHaveBeenCalledWith( + jasmine.any(Object), + 'test-token' + ); + }); + + it('should show error notification if user creation fails', () => { + epersonDataServiceSpy.createEPersonForToken.and.returnValue( + createFailedRemoteDataObject$() + ); + (component as any).postCreateAccountFromToken( + 'test-token', + component.registrationData + ); + expect(notificationServiceSpy.error).toHaveBeenCalled(); + }); + + it('should redirect to login page if user creation succeeds', () => { + epersonDataServiceSpy.createEPersonForToken.and.returnValue( + createSuccessfulRemoteDataObject$(new EPerson()) + ); + (component as any).postCreateAccountFromToken( + 'test-token', + component.registrationData + ); + expect((component as any).router.navigate).toHaveBeenCalledWith(['/login'], { + queryParams: { authMethod: 'orcid' }, + }); + }); + }); + + afterEach(() => { + fixture.destroy(); + }); }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 45683aaee5b..449870f420b 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -53,6 +53,12 @@ export class ConfirmEmailComponent implements OnDestroy { }); } + + /** + * Submits the email form and performs appropriate actions based on the form's validity and user input. + * If the form is valid and the confirmed email matches the registration email, calls the postCreateAccountFromToken method with the token and registration data. + * If the form is valid but the confirmed email does not match the registration email, calls the patchUpdateRegistration method with the confirmed email. + */ submitForm() { this.emailForm.markAllAsTouched(); if (this.emailForm.valid) { @@ -65,6 +71,11 @@ export class ConfirmEmailComponent implements OnDestroy { } } + /** + * Sends a PATCH request to update the user's registration with the given values. + * @param values - The values to update the user's registration with. + * @returns An Observable that emits the updated registration data. + */ private patchUpdateRegistration(values: string[]) { this.subs.push( this.externalLoginService.patchUpdateRegistration(values, 'email', this.registrationData.id, this.token, 'replace') @@ -111,8 +122,8 @@ export class ConfirmEmailComponent implements OnDestroy { this.translate.get('external-login-page.provide-email.create-account.notifications.error.content') ); } else if (rd.hasSucceeded) { - // redirect to ORCID login page - // set Redirect URL to User profile + // redirect to login page with authMethod query param, so that the login page knows which authentication method to use + // set Redirect URL to User profile, so the user is redirected to the profile page after logging in this.router.navigate(['/login'], { queryParams: { authMethod: registrationData.registrationType } }); this.authService.setRedirectUrl('/review-account'); } diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts index 71d56e73cd1..3ccb0a189a5 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts @@ -6,7 +6,6 @@ import { CommonModule } from '@angular/common'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { EpersonRegistrationService } from '../../../../core/data/eperson-registration.service'; import { ExternalLoginService } from '../../services/external-login.service'; describe('ProvideEmailComponent', () => { diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts index 95e7a41ae91..92faf10e756 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts @@ -25,7 +25,9 @@ export class ProvideEmailComponent implements OnDestroy { * The token from the URL */ @Input() token: string; - + /** + * The subscriptions to unsubscribe from + */ subs: Subscription[] = []; constructor( @@ -37,6 +39,10 @@ export class ProvideEmailComponent implements OnDestroy { }); } + /** + * Updates the user's email in the registration data. + * @returns void + */ submitForm() { this.emailForm.markAllAsTouched(); if (this.emailForm.valid) { diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html index bc96b37844d..2bd3b736774 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html @@ -21,7 +21,7 @@

{{ 'external-login.confirmation.header' | translate}}

or

-
diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts index cbd8beeb1bb..f34a7883d1b 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts @@ -18,7 +18,7 @@ import { RegistrationData } from '../models/registration-data.model'; describe('ExternalLogInComponent', () => { let component: ExternalLogInComponent; let fixture: ComponentFixture; - let compiledTemplate: HTMLElement; + let modalService: NgbModal = jasmine.createSpyObj('modalService', ['open']); const registrationDataMock = { id: '3', @@ -53,13 +53,7 @@ describe('ExternalLogInComponent', () => { { provide: TranslateService, useValue: translateServiceStub }, { provide: Injector, useValue: {} }, { provide: AuthService, useValue: new AuthServiceMock() }, - { - provide: NgbModal, useValue: { - open: () => { - /*comment*/ - } - } - }, + { provide: NgbModal, useValue: modalService }, FormBuilder ], imports: [ @@ -80,7 +74,6 @@ describe('ExternalLogInComponent', () => { component = fixture.componentInstance; component.registrationData = Object.assign(new RegistrationData, registrationDataMock); component.registrationType = registrationDataMock.registrationType; - compiledTemplate = fixture.nativeElement; fixture.detectChanges(); }); @@ -88,31 +81,27 @@ describe('ExternalLogInComponent', () => { expect(component).toBeTruthy(); }); + beforeEach(() => { + component.registrationData = Object.assign(new RegistrationData(), registrationDataMock, { email: 'user@institution.edu' }); + fixture.detectChanges(); + }); + it('should set registrationType and informationText correctly when email is present', () => { expect(component.registrationType).toBe(registrationDataMock.registrationType); expect(component.informationText).toBeDefined(); }); it('should render the template to confirm email when registrationData has email', () => { - component.registrationData = Object.assign(new RegistrationData(), registrationDataMock, { email: 'email@domain.com' }); - fixture.detectChanges(); - const selector = compiledTemplate.querySelector('ds-confirm-email'); - expect(selector).toBeTruthy(); - }); - - it('should display provide email component if email is not provided', () => { - component.registrationData.email = null; - fixture.detectChanges(); + const selector = fixture.nativeElement.querySelector('ds-confirm-email'); const provideEmail = fixture.nativeElement.querySelector('ds-provide-email'); - expect(provideEmail).toBeTruthy(); + expect(selector).toBeTruthy(); + expect(provideEmail).toBeNull(); }); it('should display login modal when connect to existing account button is clicked', () => { - const button = fixture.nativeElement.querySelector('button'); + const button = fixture.nativeElement.querySelector('button.btn-primary'); button.click(); - fixture.detectChanges(); - const modal = fixture.nativeElement.querySelector('.modal'); - expect(modal).toBeTruthy(); + expect(modalService.open).toHaveBeenCalled(); }); it('should render the template with the translated informationText', () => { diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts index 24d40f11533..a5ad2df9d43 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts @@ -1,16 +1,47 @@ import { TestBed } from '@angular/core/testing'; import { RegistrationDataResolver } from './registration-data.resolver'; +import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; +import { Registration } from 'src/app/core/shared/registration.model'; +import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; +import { RegistrationData } from '../models/registration-data.model'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; describe('RegistrationDataResolver', () => { let resolver: RegistrationDataResolver; + let epersonRegistrationServiceSpy: jasmine.SpyObj; + const registrationMock = Object.assign(new Registration(), { + email: 'test@user.com', + }); beforeEach(() => { - TestBed.configureTestingModule({}); + const spy = jasmine.createSpyObj('EpersonRegistrationService', ['searchByTokenAndUpdateData']); + + TestBed.configureTestingModule({ + providers: [ + RegistrationDataResolver, + { provide: EpersonRegistrationService, useValue: spy } + ] + }); resolver = TestBed.inject(RegistrationDataResolver); + epersonRegistrationServiceSpy = TestBed.inject(EpersonRegistrationService) as jasmine.SpyObj; }); it('should be created', () => { expect(resolver).toBeTruthy(); }); + + it('should resolve registration data based on a token', () => { + const token = 'abc123'; + const registrationRD$ = createSuccessfulRemoteDataObject$(registrationMock); + epersonRegistrationServiceSpy.searchByTokenAndUpdateData.and.returnValue(registrationRD$); + + const route = new ActivatedRouteSnapshot(); + route.params = { token: token }; + const state = {} as RouterStateSnapshot; + + resolver.resolve(route, state).subscribe((result: RegistrationData) => { + expect(result).toBeDefined(); + }); + }); }); diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts b/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts index 7d1d8ac6a2c..541e71e6a5a 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts @@ -1,16 +1,76 @@ import { TestBed } from '@angular/core/testing'; import { ExternalLoginService } from './external-login.service'; +import { TranslateService } from '@ngx-translate/core'; +import { of as observableOf } from 'rxjs'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; +import { RemoteData } from '../../../core/data/remote-data'; +import { Registration } from '../../../core/shared/registration.model'; +import { NotificationsService } from '../../notifications/notifications.service'; +import { RouterMock } from '../../mocks/router.mock'; +import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { Router } from '@angular/router'; describe('ExternalLoginService', () => { let service: ExternalLoginService; + let epersonRegistrationService; + let router: any; + let notificationService; + let translate; + + const values = ['value1', 'value2']; + const field = 'field1'; + const registrationId = 'registrationId1'; + const token = 'token1'; + const operation = 'add'; beforeEach(() => { - TestBed.configureTestingModule({}); + epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { + patchUpdateRegistration: createSuccessfulRemoteDataObject$(new Registration) + }); + router = new RouterMock(); + notificationService = new NotificationsServiceStub(); + translate = jasmine.createSpyObj('TranslateService', ['get']); + + TestBed.configureTestingModule({ + providers: [ + ExternalLoginService, + { provide: EpersonRegistrationService, useValue: epersonRegistrationService }, + { provide: Router, useValue: router }, + { provide: NotificationsService, useValue: notificationService }, + { provide: TranslateService, useValue: translate }, + ], + schemas: [NO_ERRORS_SCHEMA] + }); service = TestBed.inject(ExternalLoginService); }); it('should be created', () => { expect(service).toBeTruthy(); }); + + it('should call epersonRegistrationService.patchUpdateRegistration with the correct parameters', () => { + epersonRegistrationService.patchUpdateRegistration.and.returnValue(observableOf({} as RemoteData)); + service.patchUpdateRegistration(values, field, registrationId, token, operation); + expect(epersonRegistrationService.patchUpdateRegistration).toHaveBeenCalledWith(values, field, registrationId, token, operation); + }); + + it('should navigate to /email-confirmation if the remote data has succeeded', () => { + const remoteData = { hasSucceeded: true } as RemoteData; + epersonRegistrationService.patchUpdateRegistration.and.returnValue(observableOf(remoteData)); + service.patchUpdateRegistration(values, field, registrationId, token, operation).subscribe(() => { + expect((router as any).navigate).toHaveBeenCalledWith(['/email-confirmation']); + }); + }); + + it('should show an error notification if the remote data has failed', () => { + const remoteData = { hasFailed: true } as RemoteData; + epersonRegistrationService.patchUpdateRegistration.and.returnValue(observableOf(remoteData)); + translate.get.and.returnValue(observableOf('error message')); + service.patchUpdateRegistration(values, field, registrationId, token, operation).subscribe(() => { + expect(notificationService.error).toHaveBeenCalledWith('error message'); + }); + }); }); From 742a078306ff5453a9402ab956d7d10f47176c0f Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 11:22:56 +0200 Subject: [PATCH 713/758] [CST-10703] RegistrationTokenGuard fix --- .../guards/registration-token.guard.ts | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts index 3d4d103b098..0a4a1319344 100644 --- a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts +++ b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts @@ -19,7 +19,7 @@ export class RegistrationTokenGuard implements CanActivate { constructor( private router: Router, private epersonRegistrationService: EpersonRegistrationService - ) {} + ) { } /** * Determines if a user can activate a route based on the registration token. @@ -31,20 +31,22 @@ export class RegistrationTokenGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): Promise | boolean | Observable { - if (route.params.token) { + if (route.queryParams.token) { return this.epersonRegistrationService .searchRegistrationByToken(route.params.token) .pipe( getFirstCompletedRemoteData(), map( - (data: RemoteData) => - data.hasSucceeded && hasValue(data) - ), - tap((isValid: boolean) => { - if (!isValid) { - this.router.navigate(['/404']); + (data: RemoteData) => { + // TODO: remove console.log + console.log(data, 'RegistrationTokenGuard'); + if (data.hasSucceeded && hasValue(data)) { + return true; + } else { + this.router.navigate(['/404']); + } } - }) + ) ); } else { this.router.navigate(['/404']); From ae875a860e55d16fcf13b864795386624afa3999 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 11:26:25 +0200 Subject: [PATCH 714/758] [CST-10703] fix --- .../external-log-in-complete/guards/registration-token.guard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts index 0a4a1319344..1296385602a 100644 --- a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts +++ b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts @@ -33,7 +33,7 @@ export class RegistrationTokenGuard implements CanActivate { ): Promise | boolean | Observable { if (route.queryParams.token) { return this.epersonRegistrationService - .searchRegistrationByToken(route.params.token) + .searchRegistrationByToken(route.queryParams.token) .pipe( getFirstCompletedRemoteData(), map( From 03ea663604414a697d11acc256b15e52b7152fb5 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 11:28:59 +0200 Subject: [PATCH 715/758] [CST-10703] small fixes --- .../helpers/review-account.guard.ts | 4 ++-- .../resolvers/registration-data.resolver.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.ts index c979e3bfc2c..5a1eb8b1c2d 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.ts +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.ts @@ -36,9 +36,9 @@ export class ReviewAccountGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): Promise | boolean | Observable { - if (route.params.token) { + if (route.queryParams.token) { return this.epersonRegistrationService - .searchRegistrationByToken(route.params.token) + .searchRegistrationByToken(route.queryParams.token) .pipe( getFirstCompletedRemoteData(), mergeMap( diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts index 6e2a9dc9fc8..82d0bdc68b7 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts @@ -33,7 +33,7 @@ export class RegistrationDataResolver implements Resolve { * @returns An Observable of RegistrationData. */ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - const token = route.params.token; + const token = route.queryParams.token; if (hasValue(token)) { return this.epersonRegistrationService.searchByTokenAndUpdateData(token).pipe( getFirstCompletedRemoteData(), From 9518e3d267296e921874123c67640e1537ce7467 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 12:46:50 +0200 Subject: [PATCH 716/758] [CST-10703] extend Registration model --- src/app/core/auth/models/auth.method-type.ts | 1 - .../auth/models/auth.registration-type.ts | 7 ++ src/app/core/core.module.ts | 2 - src/app/core/shared/registration.model.ts | 31 +++++++ .../external-login-page.component.spec.ts | 4 +- .../external-login-page.component.ts | 9 ++- ...ogin-review-account-info-page.component.ts | 13 +-- .../helpers/review-account.guard.spec.ts | 10 +-- .../helpers/review-account.guard.ts | 20 +++-- .../review-account-info.component.spec.ts | 4 +- .../review-account-info.component.ts | 14 ++-- .../confirm-email.component.spec.ts | 18 ++--- .../confirm-email/confirm-email.component.ts | 6 +- .../external-log-in.methods-decorator.ts | 6 +- .../external-log-in.component.spec.ts | 10 +-- .../external-log-in.component.ts | 8 +- .../external-login-method-entry.component.ts | 6 +- .../guards/registration-token.guard.ts | 4 +- .../models/registration-data.mock.model.ts | 8 +- .../models/registration-data.model.ts | 80 ------------------- .../models/registration-data.resource-type.ts | 9 --- .../orcid-confirmation.component.ts | 10 +-- .../registration-data.resolver.spec.ts | 7 +- .../resolvers/registration-data.resolver.ts | 26 +++--- 24 files changed, 126 insertions(+), 187 deletions(-) create mode 100644 src/app/core/auth/models/auth.registration-type.ts delete mode 100644 src/app/shared/external-log-in-complete/models/registration-data.model.ts delete mode 100644 src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts diff --git a/src/app/core/auth/models/auth.method-type.ts b/src/app/core/auth/models/auth.method-type.ts index e5b4e0a194c..cc19b5ab94c 100644 --- a/src/app/core/auth/models/auth.method-type.ts +++ b/src/app/core/auth/models/auth.method-type.ts @@ -6,5 +6,4 @@ export enum AuthMethodType { X509 = 'x509', Oidc = 'oidc', Orcid = 'orcid', - Validation = 'validation', } diff --git a/src/app/core/auth/models/auth.registration-type.ts b/src/app/core/auth/models/auth.registration-type.ts new file mode 100644 index 00000000000..e43094ed7bc --- /dev/null +++ b/src/app/core/auth/models/auth.registration-type.ts @@ -0,0 +1,7 @@ +export enum AuthRegistrationType { + Password = 'password', + Shibboleth = 'shibboleth', + Oidc = 'oidc', + Orcid = 'ORCID', + Validation = 'validation', +} diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index c75ce8e65c9..1c6b20285a8 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -232,7 +232,6 @@ import { import { ProductDatasetSchemaType } from './metadata/schema-json-ld/schema-types/product/product-dataset-schema-type'; import { PersonSchemaType } from './metadata/schema-json-ld/schema-types/Person/person-schema-type'; import {ItemRequest} from './shared/item-request.model'; -import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; /** * When not in production, endpoint responses can be mocked for testing purposes @@ -472,7 +471,6 @@ export const models = LoginStatistics, Metric, ItemRequest, - RegistrationData, ]; @NgModule({ diff --git a/src/app/core/shared/registration.model.ts b/src/app/core/shared/registration.model.ts index bc4488964f2..5a3a5d06563 100644 --- a/src/app/core/shared/registration.model.ts +++ b/src/app/core/shared/registration.model.ts @@ -1,11 +1,26 @@ +// eslint-disable-next-line max-classes-per-file import { typedObject } from '../cache/builders/build-decorators'; import { ResourceType } from './resource-type'; import { REGISTRATION } from './registration.resource-type'; import { UnCacheableObject } from './uncacheable-object.model'; +import { MetadataValue } from './metadata.models'; +import { AuthRegistrationType } from '../auth/models/auth.registration-type'; +export class RegistrationDataMetadataMap { + [key: string]: RegistrationDataMetadataValue[]; +} +export class RegistrationDataMetadataValue extends MetadataValue { + overrides?: string; +} @typedObject export class Registration implements UnCacheableObject { static type = REGISTRATION; + + /** + * The unique identifier of this registration data + */ + id: string; + /** * The object type */ @@ -29,8 +44,24 @@ export class Registration implements UnCacheableObject { * The token linked to the registration */ groupNames: string[]; + /** * The token linked to the registration */ groups: string[]; + + /** + * The registration type (e.g. orcid, shibboleth, etc.) + */ + registrationType?: AuthRegistrationType; + + /** + * The netId of the user (e.g. for ORCID - <:orcid>) + */ + netId?: string; + + /** + * The metadata involved during the registration process + */ + registrationMetadata?: RegistrationDataMetadataMap; } diff --git a/src/app/external-login-page/external-login-page.component.spec.ts b/src/app/external-login-page/external-login-page.component.spec.ts index c705b131b3e..8dee4821a7a 100644 --- a/src/app/external-login-page/external-login-page.component.spec.ts +++ b/src/app/external-login-page/external-login-page.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginPageComponent } from './external-login-page.component'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; import { CommonModule } from '@angular/common'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; +import { Registration } from '../core/shared/registration.model'; describe('ExternalLoginPageComponent', () => { let component: ExternalLoginPageComponent; @@ -75,7 +75,7 @@ describe('ExternalLoginPageComponent', () => { }); it('should display the DsExternalLogIn component when there are no errors', () => { - const registrationData = Object.assign(new RegistrationData(), registrationDataMock); + const registrationData = Object.assign(new Registration(), registrationDataMock); component.registrationData$ = of(registrationData); component.token = '1234567890'; component.hasErrors = false; diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index 27e08e4e5ae..1e3862bcd2f 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { hasNoValue } from '../shared/empty.util'; -import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; import { AlertType } from '../shared/alert/aletr-type'; import { Observable, first, map, tap } from 'rxjs'; +import { Registration } from '../core/shared/registration.model'; +import { RemoteData } from '../core/data/remote-data'; @Component({ templateUrl: './external-login-page.component.html', @@ -19,7 +20,7 @@ export class ExternalLoginPageComponent implements OnInit { /** * The registration data of the user. */ - public registrationData$: Observable; + public registrationData$: Observable; /** * The type of alert to show. */ @@ -39,7 +40,7 @@ export class ExternalLoginPageComponent implements OnInit { ngOnInit(): void { this.registrationData$ = this.arouter.data.pipe( first(), - tap((data) => this.hasErrors = hasNoValue(data.registrationData)), - map((data) => data.registrationData)); + tap((data) => this.hasErrors = (data.registrationData as RemoteData).hasFailed), + map((data) => (data.registrationData as RemoteData).payload)); } } diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts index 6e0cab84594..dedb3d9baa1 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { AlertType } from '../shared/alert/aletr-type'; import { Observable, first, map, tap } from 'rxjs'; -import { RegistrationData } from '../shared/external-log-in-complete/models/registration-data.model'; import { ActivatedRoute } from '@angular/router'; import { hasNoValue } from '../shared/empty.util'; +import { Registration } from '../core/shared/registration.model'; +import { RemoteData } from '../core/data/remote-data'; @Component({ templateUrl: './external-login-review-account-info-page.component.html', @@ -23,7 +24,7 @@ export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { /** * The registration data of the user */ - public registrationData$: Observable; + public registrationData$: Observable; /** * Whether the component has errors */ @@ -36,8 +37,10 @@ export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { } ngOnInit(): void { - this.registrationData$ = this.arouter.data.pipe(first(), - tap((data) => this.hasErrors = hasNoValue(data?.registrationData)), - map((data) => data.registrationData)); + this.registrationData$ = this.arouter.data.pipe( + first(), + tap((data) => this.hasErrors = (data.registrationData as RemoteData).hasFailed), + map((data) => (data.registrationData as RemoteData).payload)); } } + diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts index 03e8d53343c..9004e173204 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts @@ -6,8 +6,8 @@ import { AuthService } from '../../core/auth/auth.service'; import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; import { RouterMock } from '../../shared/mocks/router.mock'; import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; +import { Registration } from '../../core/shared/registration.model'; +import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; describe('ReviewAccountGuard', () => { let guard: ReviewAccountGuard; @@ -15,10 +15,10 @@ describe('ReviewAccountGuard', () => { let authService: any; const route = new RouterMock(); - const registrationMock = Object.assign(new RegistrationData(), + const registrationMock = Object.assign(new Registration(), { email: 'test@email.org', - registrationType: AuthMethodType.Validation + registrationType: AuthRegistrationType.Validation }); @@ -68,7 +68,7 @@ describe('ReviewAccountGuard', () => { }); it('should navigate to 404 if the registration type is not validation and the user is not authenticated', () => { - registrationMock.registrationType = AuthMethodType.Password; + registrationMock.registrationType = AuthRegistrationType.Password; epersonRegistrationService.searchRegistrationByToken.and.returnValue(createSuccessfulRemoteDataObject$(registrationMock)); spyOn(authService, 'isAuthenticated').and.returnValue(of(false)); (guard.canActivate({ params: { token: 'invalid-token' } } as any, {} as any) as any).subscribe((result) => { diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.ts index 5a1eb8b1c2d..8ae1bca6f25 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.ts +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.ts @@ -7,14 +7,13 @@ import { } from '@angular/router'; import isEqual from 'lodash/isEqual'; import { Observable, catchError, mergeMap, of, tap } from 'rxjs'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; -import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; -import { RemoteData } from 'src/app/core/data/remote-data'; -import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; -import { Registration } from 'src/app/core/shared/registration.model'; -import { hasValue } from 'src/app/shared/empty.util'; -import { RegistrationData } from 'src/app/shared/external-log-in-complete/models/registration-data.model'; +import { AuthService } from '../../core/auth/auth.service'; +import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { Registration } from '../../core/shared/registration.model'; +import { hasValue } from '../../shared/empty.util'; @Injectable({ providedIn: 'root', @@ -43,10 +42,9 @@ export class ReviewAccountGuard implements CanActivate { getFirstCompletedRemoteData(), mergeMap( (data: RemoteData) => { - if (data.hasSucceeded && hasValue(data)) { - const registrationData = Object.assign(new RegistrationData(), data.payload); + if (data.hasSucceeded && hasValue(data.payload)) { // is the registration type validation (account valid) - if (isEqual(registrationData.registrationType, AuthMethodType.Validation)) { + if (hasValue(data.payload.registrationType) && isEqual(data.payload.registrationType, AuthRegistrationType.Validation)) { return of(true); } else { return this.authService.isAuthenticated(); diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts index 70185c37543..b7663674972 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts @@ -19,9 +19,9 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; import { Router } from '@angular/router'; import { RouterMock } from '../../shared/mocks/router.mock'; -import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; import { EventEmitter } from '@angular/core'; import { CompareValuesPipe } from '../helpers/compare-values.pipe'; +import { Registration } from '../../core/shared/registration.model'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; @@ -96,7 +96,7 @@ describe('ReviewAccountInfoComponent', () => { fixture = TestBed.createComponent(ReviewAccountInfoComponent); component = fixture.componentInstance; component.registrationData = Object.assign( - new RegistrationData(), + new Registration(), registrationDataMock ); component.registrationToken = 'test-token'; diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index ea6b341710e..81c237b7fc2 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -7,15 +7,15 @@ import { } from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { RegistrationData } from '../../shared/external-log-in-complete/models/registration-data.model'; import { Observable, Subscription, filter, from, switchMap, take } from 'rxjs'; -import { RemoteData } from '../..//core/data/remote-data'; -import { ConfirmationModalComponent } from '../..//shared/confirmation-modal/confirmation-modal.component'; +import { RemoteData } from '../../core/data/remote-data'; +import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { hasValue } from '../..//shared/empty.util'; +import { hasValue } from '../../shared/empty.util'; import { TranslateService } from '@ngx-translate/core'; -import { NotificationsService } from '../..//shared/notifications/notifications.service'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; import { Router } from '@angular/router'; +import { Registration } from '../../core/shared/registration.model'; export interface ReviewAccountInfoData { label: string; @@ -39,7 +39,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { /** * User data from the registration token */ - @Input() registrationData: RegistrationData; + @Input() registrationData: Registration; /** * Text to display when the value is not applicable @@ -143,7 +143,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { } if (response.hasFailed) { - this.notificationService.success( + this.notificationService.error( this.translateService.get( 'review-account-info.merge-data.notification.error' ) diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts index 1a43180bbc0..c9c741672dd 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -7,16 +7,16 @@ import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-transla import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ExternalLoginService } from '../../services/external-login.service'; -import { AuthService } from 'src/app/core/auth/auth.service'; -import { EPersonDataService } from 'src/app/core/eperson/eperson-data.service'; -import { NotificationsService } from 'src/app/shared/notifications/notifications.service'; -import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; -import { RegistrationData } from '../../models/registration-data.model'; -import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils'; -import { EPerson } from 'src/app/core/eperson/models/eperson.model'; +import { AuthService } from '../../../../core/auth/auth.service'; +import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; +import { NotificationsService } from '../../../../shared/notifications/notifications.service'; +import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; +import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { EPerson } from '../../../../core/eperson/models/eperson.model'; import { Router } from '@angular/router'; -import { RouterMock } from 'src/app/shared/mocks/router.mock'; +import { RouterMock } from '../../../../shared/mocks/router.mock'; import { of } from 'rxjs'; +import { Registration } from '../../../../core/shared/registration.model'; describe('ConfirmEmailComponent', () => { let component: ConfirmEmailComponent; @@ -72,7 +72,7 @@ describe('ConfirmEmailComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ConfirmEmailComponent); component = fixture.componentInstance; - component.registrationData = Object.assign(new RegistrationData(), { + component.registrationData = Object.assign(new Registration(), { id: '123', email: 'test@example.com', registrationMetadata: {}, diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 449870f420b..ba5c3d3d138 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -2,7 +2,6 @@ import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/c import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators'; -import { RegistrationData } from '../../models/registration-data.model'; import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; import { hasValue } from '../../../../shared/empty.util'; import { EPerson } from '../../../../core/eperson/models/eperson.model'; @@ -13,6 +12,7 @@ import isEqual from 'lodash/isEqual'; import { AuthService } from '../../../../core/auth/auth.service'; import { Router } from '@angular/router'; import { Subscription } from 'rxjs'; +import { Registration } from '../../../../core/shared/registration.model'; @Component({ selector: 'ds-confirm-email', @@ -28,7 +28,7 @@ export class ConfirmEmailComponent implements OnDestroy { /** * The registration data object */ - @Input() registrationData: RegistrationData; + @Input() registrationData: Registration; /** * The token to be used to confirm the registration @@ -99,7 +99,7 @@ export class ConfirmEmailComponent implements OnDestroy { */ private postCreateAccountFromToken( token: string, - registrationData: RegistrationData + registrationData: Registration ) { const metadataValues = {}; for (const [key, value] of Object.entries(registrationData.registrationMetadata)) { diff --git a/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts b/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts index 933edf24640..ce90aea0a3f 100644 --- a/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts +++ b/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts @@ -1,4 +1,4 @@ -import { AuthMethodType } from '../../core/auth/models/auth.method-type'; +import { AuthRegistrationType } from 'src/app/core/auth/models/auth.registration-type'; /** * Map to store the external login confirmation component for the given auth method type @@ -9,7 +9,7 @@ const authMethodsMap = new Map(); * @param authMethodType the type of the external login method */ export function renderExternalLoginConfirmationFor( - authMethodType: AuthMethodType + authMethodType: AuthRegistrationType ) { return function decorator(objectElement: any) { if (!objectElement) { @@ -23,7 +23,7 @@ export function renderExternalLoginConfirmationFor( * @param authMethodType the type of the external login method */ export function getExternalLoginConfirmationType( - authMethodType: AuthMethodType + authMethodType: AuthRegistrationType ) { return authMethodsMap.get(authMethodType); } diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts index f34a7883d1b..9e3b74f2bfe 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts @@ -12,8 +12,8 @@ import { AuthService } from '../../../core/auth/auth.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AuthServiceMock } from '../../mocks/auth.service.mock'; import { MetadataValue } from '../../../core/shared/metadata.models'; -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; -import { RegistrationData } from '../models/registration-data.model'; +import { Registration } from '../../../core/shared/registration.model'; +import { AuthRegistrationType } from '../../../core/auth/models/auth.registration-type'; describe('ExternalLogInComponent', () => { let component: ExternalLogInComponent; @@ -24,7 +24,7 @@ describe('ExternalLogInComponent', () => { id: '3', email: 'user@institution.edu', user: '028dcbb8-0da2-4122-a0ea-254be49ca107', - registrationType: AuthMethodType.Orcid, + registrationType: AuthRegistrationType.Orcid, netId: '0000-1111-2222-3333', registrationMetadata: { 'eperson.firstname': [ @@ -72,7 +72,7 @@ describe('ExternalLogInComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ExternalLogInComponent); component = fixture.componentInstance; - component.registrationData = Object.assign(new RegistrationData, registrationDataMock); + component.registrationData = Object.assign(new Registration, registrationDataMock); component.registrationType = registrationDataMock.registrationType; fixture.detectChanges(); }); @@ -82,7 +82,7 @@ describe('ExternalLogInComponent', () => { }); beforeEach(() => { - component.registrationData = Object.assign(new RegistrationData(), registrationDataMock, { email: 'user@institution.edu' }); + component.registrationData = Object.assign(new Registration(), registrationDataMock, { email: 'user@institution.edu' }); fixture.detectChanges(); }); diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts index 4e08d633a21..0a077405429 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts @@ -6,12 +6,12 @@ import { Injector, } from '@angular/core'; import { getExternalLoginConfirmationType } from '../external-log-in.methods-decorator'; -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; -import { RegistrationData } from '../models/registration-data.model'; import { hasValue } from '../../empty.util'; import { TranslateService } from '@ngx-translate/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { AuthService } from '../../../core/auth/auth.service'; +import { Registration } from '../../../core/shared/registration.model'; +import { AuthRegistrationType } from '../../../core/auth/models/auth.registration-type'; @Component({ selector: 'ds-external-log-in', @@ -23,11 +23,11 @@ export class ExternalLogInComponent implements OnInit { /** * The type of registration type to be confirmed */ - registrationType: AuthMethodType; + registrationType: AuthRegistrationType; /** * The registration data object */ - @Input() registrationData: RegistrationData; + @Input() registrationData: Registration; /** * The token to be used to confirm the registration * @memberof ExternalLogInComponent diff --git a/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts b/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts index 5d03342e0f4..47158274b86 100644 --- a/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts +++ b/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { RegistrationData } from './models/registration-data.model'; +import { Registration } from '../../core/shared/registration.model'; /** * This component renders a form to complete the registration process @@ -12,10 +12,10 @@ export abstract class ExternalLoginMethodEntryComponent { /** * The registration data object */ - public registratioData: RegistrationData; + public registratioData: Registration; constructor( - @Inject('registrationDataProvider') protected injectedRegistrationDataObject: RegistrationData, + @Inject('registrationDataProvider') protected injectedRegistrationDataObject: Registration, ) { this.registratioData = injectedRegistrationDataObject; } diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts index 1296385602a..ec37d9d44e7 100644 --- a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts +++ b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts @@ -5,7 +5,7 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; -import { Observable, map, of, tap } from 'rxjs'; +import { Observable, map, of } from 'rxjs'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { RemoteData } from '../../../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; @@ -30,7 +30,7 @@ export class RegistrationTokenGuard implements CanActivate { canActivate( route: ActivatedRouteSnapshot, state: RouterStateSnapshot - ): Promise | boolean | Observable { + ): Observable { if (route.queryParams.token) { return this.epersonRegistrationService .searchRegistrationByToken(route.queryParams.token) diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts index fa40cb91c3b..6dc1eb28632 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts +++ b/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts @@ -1,9 +1,9 @@ -import { AuthMethodType } from 'src/app/core/auth/models/auth.method-type'; -import { RegistrationData } from './registration-data.model'; +import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; import { MetadataValue } from '../../../core/shared/metadata.models'; +import { Registration } from '../../../core/shared/registration.model'; -export const mockRegistrationDataModel: RegistrationData = Object.assign( - new RegistrationData(), +export const mockRegistrationDataModel: Registration = Object.assign( + new Registration(), { id: '3', email: 'user@institution.edu', diff --git a/src/app/shared/external-log-in-complete/models/registration-data.model.ts b/src/app/shared/external-log-in-complete/models/registration-data.model.ts deleted file mode 100644 index 9714d81111b..00000000000 --- a/src/app/shared/external-log-in-complete/models/registration-data.model.ts +++ /dev/null @@ -1,80 +0,0 @@ -// eslint-disable-next-line max-classes-per-file -import { CacheableObject } from '../../../core/cache/cacheable-object.model'; -import { typedObject } from '../../../core/cache/builders/build-decorators'; -import { REGISTRATION_DATA } from './registration-data.resource-type'; -import { autoserialize, deserialize } from 'cerialize'; -import { excludeFromEquals } from '../../../core/utilities/equals.decorators'; -import { ResourceType } from '../../../core/shared/resource-type'; -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; -import { HALLink } from '../../../core/shared/hal-link.model'; -import { MetadataValue } from '../../../core/shared/metadata.models'; - -export class RegistrationDataMetadataMap { - [key: string]: RegistrationDataMetadataValue[]; -} - -export class RegistrationDataMetadataValue extends MetadataValue { - @autoserialize - overrides?: string; -} - -/** - * Object that represents the authenticated status of a user - */ -@typedObject -export class RegistrationData implements CacheableObject { - - static type = REGISTRATION_DATA; - - /** - * The unique identifier of this registration data - */ - @autoserialize - id: string; - - /** - * The type for this RegistrationData - */ - @excludeFromEquals - @autoserialize - type: ResourceType; - - /** - * The registered email address - */ - @autoserialize - email: string; - - /** - * The registered user identifier - */ - @autoserialize - user: string; - - /** - * The registration type (e.g. orcid, shibboleth, etc.) - */ - @autoserialize - registrationType?: AuthMethodType; - - /** - * The netId of the user (e.g. for ORCID - <:orcid>) - */ - @autoserialize - netId?: string; - - - /** - * The metadata involved during the registration process - */ - @autoserialize - registrationMetadata?: RegistrationDataMetadataMap; - - /** - * The {@link HALLink}s for this RegistrationData - */ - @deserialize - _links: { - self: HALLink; - }; -} diff --git a/src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts b/src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts deleted file mode 100644 index 2a387c3ca38..00000000000 --- a/src/app/shared/external-log-in-complete/models/registration-data.resource-type.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ResourceType } from '../../../core/shared/resource-type'; - -/** - * The resource type for RegistrationData - * - * Needs to be in a separate file to prevent circular - * dependencies in webpack. - */ -export const REGISTRATION_DATA = new ResourceType('registration'); diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts index 0c93b668ec7..3cd3b875dc0 100644 --- a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts +++ b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, ChangeDetectionStrategy, Inject } from '@angular/core'; import { renderExternalLoginConfirmationFor } from '../../external-log-in.methods-decorator'; -import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { RegistrationData } from '../../models/registration-data.model'; import { ExternalLoginMethodEntryComponent } from '../../external-login-method-entry.component'; +import { Registration } from '../../../../core/shared/registration.model'; +import { AuthRegistrationType } from '../../../../core/auth/models/auth.registration-type'; @Component({ selector: 'ds-orcid-confirmation', @@ -11,7 +11,7 @@ import { ExternalLoginMethodEntryComponent } from '../../external-login-method-e styleUrls: ['./orcid-confirmation.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -@renderExternalLoginConfirmationFor(AuthMethodType.Orcid) +@renderExternalLoginConfirmationFor(AuthRegistrationType.Orcid) export class OrcidConfirmationComponent extends ExternalLoginMethodEntryComponent implements OnInit { /** @@ -20,11 +20,11 @@ export class OrcidConfirmationComponent extends ExternalLoginMethodEntryComponen public form: FormGroup; /** - * @param injectedRegistrationDataObject RegistrationData object provided + * @param injectedRegistrationDataObject Registration object provided * @param formBuilder To build the form */ constructor( - @Inject('registrationDataProvider') protected injectedRegistrationDataObject: RegistrationData, + @Inject('registrationDataProvider') protected injectedRegistrationDataObject: Registration, private formBuilder: FormBuilder ) { super(injectedRegistrationDataObject); diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts index a5ad2df9d43..a33434062b5 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts @@ -1,10 +1,9 @@ import { TestBed } from '@angular/core/testing'; import { RegistrationDataResolver } from './registration-data.resolver'; -import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; -import { Registration } from 'src/app/core/shared/registration.model'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; +import { Registration } from '../../../core/shared/registration.model'; import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; -import { RegistrationData } from '../models/registration-data.model'; import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; describe('RegistrationDataResolver', () => { @@ -40,7 +39,7 @@ describe('RegistrationDataResolver', () => { route.params = { token: token }; const state = {} as RouterStateSnapshot; - resolver.resolve(route, state).subscribe((result: RegistrationData) => { + resolver.resolve(route, state).subscribe((result: Registration) => { expect(result).toBeDefined(); }); }); diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts index 82d0bdc68b7..5513a847a43 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts @@ -4,13 +4,12 @@ import { RouterStateSnapshot, ActivatedRouteSnapshot, } from '@angular/router'; -import { Observable, map } from 'rxjs'; -import { EpersonRegistrationService } from 'src/app/core/data/eperson-registration.service'; +import { Observable } from 'rxjs'; +import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { hasValue } from '../../empty.util'; -import { Registration } from 'src/app/core/shared/registration.model'; -import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators'; -import { RemoteData } from 'src/app/core/data/remote-data'; -import { RegistrationData } from '../models/registration-data.model'; +import { Registration } from '../../../core/shared/registration.model'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { RemoteData } from '../../../core/data/remote-data'; @Injectable({ providedIn: 'root', @@ -18,7 +17,7 @@ import { RegistrationData } from '../models/registration-data.model'; /** * Resolver for retrieving registration data based on a token. */ -export class RegistrationDataResolver implements Resolve { +export class RegistrationDataResolver implements Resolve> { /** * Constructor for RegistrationDataResolver. @@ -30,20 +29,13 @@ export class RegistrationDataResolver implements Resolve { * Resolves registration data based on a token. * @param route The ActivatedRouteSnapshot containing the token parameter. * @param state The RouterStateSnapshot. - * @returns An Observable of RegistrationData. + * @returns An Observable of Registration. */ - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> { const token = route.queryParams.token; if (hasValue(token)) { - return this.epersonRegistrationService.searchByTokenAndUpdateData(token).pipe( + return this.epersonRegistrationService.searchRegistrationByToken(token).pipe( getFirstCompletedRemoteData(), - map((registrationRD: RemoteData) => { - if (registrationRD.hasSucceeded && hasValue(registrationRD.payload)) { - return Object.assign(new RegistrationData(), registrationRD.payload); - } else { - return null; - } - }) ); } } From f472fcfa15e7ca874cd89754623d3ce59fa43307 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 5 Oct 2023 14:02:43 +0200 Subject: [PATCH 717/758] [DSC-1277] CRIS/GLAM translation sync 2 --- src/assets/i18n/it.json5 | 102 +++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 0aaff9e328d..670b44fccfd 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -469,31 +469,31 @@ // "admin.access-control.epeople.actions.delete": "Delete EPerson", - "admin.access-control.epeople.actions.delete": "Eliminare EPerson", + "admin.access-control.epeople.actions.delete": "Eliminare l'operatore", // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson", - "admin.access-control.epeople.actions.impersonate": "Impersonare EPerson", + "admin.access-control.epeople.actions.impersonate": "Loggati come ", // "admin.access-control.epeople.actions.reset": "Reset password", "admin.access-control.epeople.actions.reset": "Reimposta password", // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson", - "admin.access-control.epeople.actions.stop-impersonating": "Smetti di impersonare EPerson", + "admin.access-control.epeople.actions.stop-impersonating": "Smetti di loggarti come", // "admin.access-control.epeople.breadcrumbs": "EPeople", - "admin.access-control.epeople.breadcrumbs": "EPeople", + "admin.access-control.epeople.breadcrumbs": "Operatori", // "admin.access-control.epeople.title": "EPeople", - "admin.access-control.epeople.title": "EPeople", + "admin.access-control.epeople.title": "Operatori", // "admin.access-control.epeople.head": "EPeople", - "admin.access-control.epeople.head": "EPeople", + "admin.access-control.epeople.head": "Operatori", // "admin.access-control.epeople.search.head": "Search", "admin.access-control.epeople.search.head": "Ricerca", // "admin.access-control.epeople.button.see-all": "Browse All", - "admin.access-control.epeople.button.see-all": "Sfoglia tutto", + "admin.access-control.epeople.button.see-all": "Sfoglia", // "admin.access-control.epeople.search.scope.metadata": "Metadata", "admin.access-control.epeople.search.scope.metadata": "Metadati", @@ -505,10 +505,10 @@ "admin.access-control.epeople.search.button": "Ricerca", // "admin.access-control.epeople.search.placeholder": "Search people...", - "admin.access-control.epeople.search.placeholder": "Cerca persone...", + "admin.access-control.epeople.search.placeholder": "Cerca operatori...", // "admin.access-control.epeople.button.add": "Add EPerson", - "admin.access-control.epeople.button.add": "Aggiungi EPerson", + "admin.access-control.epeople.button.add": "Aggiungi operatori", // "admin.access-control.epeople.table.id": "ID", "admin.access-control.epeople.table.id": "ID", @@ -520,7 +520,7 @@ "admin.access-control.epeople.table.email": "E-mail (esatta)", // "admin.access-control.epeople.table.edit": "Edit", - "admin.access-control.epeople.table.edit": "Editare", + "admin.access-control.epeople.table.edit": "Modifica", // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"", "admin.access-control.epeople.table.edit.buttons.edit": "Modifica \"{{name}}\"", @@ -529,25 +529,25 @@ "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Non sei autorizzato a modificare questo gruppo", // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"", - "admin.access-control.epeople.table.edit.buttons.remove": "Eliminare \"{{name}}\"", + "admin.access-control.epeople.table.edit.buttons.remove": "Elimina \"{{name}}\"", // "admin.access-control.epeople.no-items": "No EPeople to show.", - "admin.access-control.epeople.no-items": "Nessuna EPersona da mostrare.", + "admin.access-control.epeople.no-items": "Nessun Operatore da mostrare.", // "admin.access-control.epeople.form.create": "Create EPerson", - "admin.access-control.epeople.form.create": "Crea EPersona", + "admin.access-control.epeople.form.create": "Crea Operatore", // "admin.access-control.epeople.form.edit": "Edit EPerson", - "admin.access-control.epeople.form.edit": "Modifica EPersona", + "admin.access-control.epeople.form.edit": "Modifica Operatore", // "admin.access-control.epeople.form.firstName": "First name", - "admin.access-control.epeople.form.firstName": "Nome di battesimo", + "admin.access-control.epeople.form.firstName": "Nome", // "admin.access-control.epeople.form.lastName": "Last name", "admin.access-control.epeople.form.lastName": "Cognome", // "admin.access-control.epeople.form.email": "E-mail", - "admin.access-control.epeople.form.email": "Posta elettronica", + "admin.access-control.epeople.form.email": "E-mail", // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address", "admin.access-control.epeople.form.emailHint": "Deve essere un indirizzo e-mail valido", @@ -562,28 +562,28 @@ "admin.access-control.epeople.form.return": "Indietro", // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"", - "admin.access-control.epeople.form.notification.created.success": "EPerson creato con successo \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.success": "Operatore creato con successo \"{{name}}\"", // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"", - "admin.access-control.epeople.form.notification.created.failure": "Impossibile creare EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.created.failure": "Impossibile creare l'operatore \"{{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": "Impossibile creare EPerson \"{{name}}\", email \"{{email}}\" già in uso.", + "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Impossibile creare l'operatore \"{{name}}\", email \"{{email}}\" già presente.", // "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": "Impossibile modificare EPerson \"{{name}}\", email \"{{email}}\" già in uso.", + "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Impossibile modificare l'operatore \"{{name}}\", email \"{{email}}\" già presenteo.", // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"", - "admin.access-control.epeople.form.notification.edited.success": "EPerson modificato con successo \"{{name}}\"", + "admin.access-control.epeople.form.notification.edited.success": "Operatore modificato con successo \"{{name}}\"", // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"", - "admin.access-control.epeople.form.notification.edited.failure": "Impossibile modificare EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.edited.failure": "Impossibile modificare Operatore \"{{name}}\"", // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"", - "admin.access-control.epeople.form.notification.deleted.success": "EPerson eliminato con successo \"{{name}}\"", + "admin.access-control.epeople.form.notification.deleted.success": "operatore eliminato con successo \"{{name}}\"", // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"", - "admin.access-control.epeople.form.notification.deleted.failure": "Impossibile eliminare EPerson \"{{name}}\"", + "admin.access-control.epeople.form.notification.deleted.failure": "Impossibile eliminare l'operatore\"{{name}}\"", // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:", "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membro dei seguenti gruppi:", @@ -604,20 +604,20 @@ "admin.access-control.epeople.form.table.collectionOrCommunity": "collection/Community", // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups", - "admin.access-control.epeople.form.memberOfNoGroups": "Questo EPerson non è membro di alcun gruppo", + "admin.access-control.epeople.form.memberOfNoGroups": "Questo operatore non è membro di alcun gruppo", // "admin.access-control.epeople.form.goToGroups": "Add to groups", "admin.access-control.epeople.form.goToGroups": "Aggiungi ai gruppi", // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"", - "admin.access-control.epeople.notification.deleted.failure": "Impossibile eliminare l'EPerson: \"{{name}}\"", + "admin.access-control.epeople.notification.deleted.failure": "Impossibile eliminare l'operatore: \"{{name}}\"", // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"", - "admin.access-control.epeople.notification.deleted.success": "EPerson eliminata con successo: \"{{name}}\"", + "admin.access-control.epeople.notification.deleted.success": "Operatore eliminato con successo: \"{{name}}\"", // "admin.access-control.groups.badge.disabled": "Disabled", - "admin.access-control.groups.badge.disabled": "Disabile", + "admin.access-control.groups.badge.disabled": "Disabilitato", // "admin.access-control.groups.badge.enabled": "Enabled", "admin.access-control.groups.badge.enabled": "Abilitato", @@ -662,10 +662,10 @@ "admin.access-control.groups.button.add": "Aggiungi gruppo", // "admin.access-control.groups.search.head": "Search groups", - "admin.access-control.groups.search.head": "Gruppi di ricerca", + "admin.access-control.groups.search.head": "Ricerca gruppi", // "admin.access-control.groups.button.see-all": "Browse all", - "admin.access-control.groups.button.see-all": "Sfoglia tutti", + "admin.access-control.groups.button.see-all": "Sfoglia", // "admin.access-control.groups.search.button": "Search", "admin.access-control.groups.search.button": "Ricerca", @@ -686,7 +686,7 @@ "admin.access-control.groups.table.members": "Membri", // "admin.access-control.groups.table.edit": "Edit", - "admin.access-control.groups.table.edit": "Editare", + "admin.access-control.groups.table.edit": "Modifica", // "admin.access-control.groups.table.edit.buttons.disable": "Disable \"{{name}}\"", "admin.access-control.groups.table.edit.buttons.disable": "Disabilita \"{{name}}\"", @@ -695,7 +695,7 @@ "admin.access-control.groups.table.edit.buttons.edit": "Modifica \"{{name}}\"", // "admin.access-control.groups.table.type": "Type", - "admin.access-control.groups.table.type": "Digitare", + "admin.access-control.groups.table.type": "type", // "admin.access-control.groups.table.status": "Status", "admin.access-control.groups.table.status": "Stato", @@ -713,7 +713,7 @@ "admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{cause}}\"", // "admin.access-control.groups.notification.edit.success": "Successfully edited group \"{{name}}\"", - "admin.access-control.groups.notification.edit.success": "Gruppo modificato correttamente \"{{name}}\"", + "admin.access-control.groups.notification.edit.success": "Gruppo \"{{name}}\" modificato correttamente", // "admin.access-control.groups.notification.edit.failure": "Failed to edit group \"{{name}}\"", "admin.access-control.groups.notification.edit.failure": "Impossibile modificare il gruppo \"{{name}}\"", @@ -748,10 +748,10 @@ "admin.access-control.groups.form.groupStatus.enabled": "Abilitato", // "admin.access-control.groups.form.groupStatus.disabled": "Disabled", - "admin.access-control.groups.form.groupStatus.disabled": "Disabile", + "admin.access-control.groups.form.groupStatus.disabled": "Disabilitato", // "admin.access-control.groups.form.groupType": "Type", - "admin.access-control.groups.form.groupType": "Digitare", + "admin.access-control.groups.form.groupType": "Type", // "admin.access-control.groups.form.groupType.institutional": "Institutional Role type", "admin.access-control.groups.form.groupType.institutional": "Tipo di ruolo istituzionale", @@ -772,13 +772,13 @@ "admin.access-control.groups.form.notification.created.failure": "Impossibile creare il gruppo \"{{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": "Impossibile creare il Gruppo con nome: \"{{name}}\", assicurarsi che il nome non sia già in uso.", + "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Impossibile creare il Gruppo con nome: \"{{name}}\", assicurarsi che il nome non sia già presente.", // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"", "admin.access-control.groups.form.notification.edited.failure": "Impossibile modificare il gruppo \"{{name}}\"", // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!", - "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nome \"{{name}}\" già in uso!", + "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nome \"{{name}}\" già presente!", // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"", "admin.access-control.groups.form.notification.edited.success": "Gruppo modificato correttamente \"{{name}}\"", @@ -796,7 +796,7 @@ "admin.access-control.groups.form.delete-group.modal.cancel": "Annulla", // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete", - "admin.access-control.groups.form.delete-group.modal.confirm": "Cancellare", + "admin.access-control.groups.form.delete-group.modal.confirm": "Cancella", // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"", "admin.access-control.groups.form.notification.deleted.success": "Gruppo eliminato con successo \"{{ name }}\"", @@ -808,10 +808,10 @@ "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.head": "Operatore", // "admin.access-control.groups.form.members-list.search.head": "Add EPeople", - "admin.access-control.groups.form.members-list.search.head": "Aggiungi EPeople", + "admin.access-control.groups.form.members-list.search.head": "Aggiungi Operatore", // "admin.access-control.groups.form.members-list.button.see-all": "Browse All", "admin.access-control.groups.form.members-list.button.see-all": "Sfoglia tutto", @@ -847,31 +847,31 @@ "admin.access-control.groups.form.members-list.table.edit": "Rimuovi / Aggiungi", // "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": "Rimuovi membro con nome \"{{name}}\"", + "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Rimuovi utente con nome \"{{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": "Membro aggiunto con successo: \"{{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": "Impossibile aggiungere il membro: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.failure.addMember": "Impossibile aggiungere l'utente: \"{{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": "Membro eliminato con successo: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Utente eliminato con successo: \"{{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": "Impossibile eliminare il membro: \"{{name}}\"", + "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Impossibile eliminare l'utente: \"{{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": "Aggiungi membro con nome \"{{name}}\"", + "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Aggiungi l'utente con nome \"{{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": "Nessun gruppo corrente attivo, invia prima un nome.", // "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": "Ancora nessun membro del gruppo, cercali e aggiungili.", + "admin.access-control.groups.form.members-list.no-members-yet": "Ancora nessun utente del gruppo, cercali e aggiungili.", // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search", - "admin.access-control.groups.form.members-list.no-items": "Nessun EPeople trovato in quella ricerca", + "admin.access-control.groups.form.members-list.no-items": "Nessun operatore trovato nella ricerca", // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"", "admin.access-control.groups.form.subgroups-list.notification.failure": "Qualcosa è andato storto: \"{{cause}}\"", @@ -910,7 +910,7 @@ "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Aggiungi sottogruppo con nome \"{{name}}\"", // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group", - "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Gruppo attuale", + "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Gruppo corrente", // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"", "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Sottogruppo aggiunto con successo: \"{{name}}\"", @@ -925,16 +925,16 @@ "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Impossibile eliminare il sottogruppo: \"{{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": "Al momento nessun gruppo attivo, invia prima un nome.", + "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Al momento nessun gruppo attivo, invia prima un operatore.", // "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": "Questo è il gruppo corrente, non può essere aggiunto.", // "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": "Nessun gruppo trovato con questo nel loro nome o questo come UUID", + "admin.access-control.groups.form.subgroups-list.no-items": "Nessun gruppo trovato con questo nome o questo come 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": "Nessun sottogruppo ancora nel gruppo.", + "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Nessun sottogruppo nel gruppo.", // "admin.access-control.groups.form.return": "Back", "admin.access-control.groups.form.return": "Indietro", From 1c18e1fa605cf5d941bdccbb243478f08c0708f8 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 5 Oct 2023 14:11:53 +0200 Subject: [PATCH 718/758] [DSC-1277] CRIS/GLAM translation sync 3 --- src/assets/i18n/it.json5 | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 670b44fccfd..b0bc4d529b1 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -971,16 +971,16 @@ "admin.search.breadcrumbs": "Ricerca amministrativa", // "admin.search.collection.edit": "Edit", - "admin.search.collection.edit": "Editare", + "admin.search.collection.edit": "Modifica", // "admin.search.community.edit": "Edit", - "admin.search.community.edit": "Editare", + "admin.search.community.edit": "Modifica", // "admin.search.item.delete": "Delete", - "admin.search.item.delete": "Cancellare", + "admin.search.item.delete": "Cancella", // "admin.search.item.edit": "Edit", - "admin.search.item.edit": "Editare", + "admin.search.item.edit": "Modifica", // "admin.search.item.make-private": "Make non-discoverable", "admin.search.item.make-private": "Rendi privato", @@ -992,10 +992,10 @@ "admin.search.item.move": "Sposta", // "admin.search.item.reinstate": "Reinstate", - "admin.search.item.reinstate": "Reintegrare", + "admin.search.item.reinstate": "Reintegra", // "admin.search.item.withdraw": "Withdraw", - "admin.search.item.withdraw": "Ritirare", + "admin.search.item.withdraw": "Ritira", // "admin.search.title": "Administrative Search", "admin.search.title": "Ricerca amministrativa", @@ -1007,22 +1007,22 @@ // "admin.workflow.breadcrumbs": "Administer Workflow", - "admin.workflow.breadcrumbs": "Amministrare il flusso di lavoro", + "admin.workflow.breadcrumbs": "Amministrazione Workflow", // "admin.workflow.title": "Administer Workflow", - "admin.workflow.title": "Amministrare il flusso di lavoro", + "admin.workflow.title": "Amministrazione Workflow", // "admin.workflow.item.workflow": "Workflow", - "admin.workflow.item.workflow": "Flusso di lavoro", + "admin.workflow.item.workflow": "Workflow", // "admin.workflow.item.workspace": "Workspace", "admin.workflow.item.workspace": "Workspace", // "admin.workflow.item.delete": "Delete", - "admin.workflow.item.delete": "Cancellare", + "admin.workflow.item.delete": "Cancella", // "admin.workflow.item.send-back": "Send back", - "admin.workflow.item.send-back": "Rinviare", + "admin.workflow.item.send-back": "Rinvia", // "admin.workflow.item.policies": "Policies", "admin.workflow.item.policies": "Policy", @@ -1033,19 +1033,19 @@ // "admin.metadata-import.breadcrumbs": "Import Metadata", - "admin.metadata-import.breadcrumbs": "Importare metadati", + "admin.metadata-import.breadcrumbs": "Importa metadati", // "admin.batch-import.breadcrumbs": "Import Batch", "admin.batch-import.breadcrumbs": "Batch Import", // "admin.metadata-import.title": "Import Metadata", - "admin.metadata-import.title": "Importare metadati", + "admin.metadata-import.title": "Importa metadati", // "admin.batch-import.title": "Import Batch", "admin.batch-import.title": "Batch Import", // "admin.metadata-import.page.header": "Import Metadata", - "admin.metadata-import.page.header": "Importare metadati", + "admin.metadata-import.page.header": "Importa metadati", // "admin.batch-import.page.header": "Import Batch", "admin.batch-import.page.header": "Batch Import", @@ -1054,34 +1054,34 @@ "admin.metadata-import.page.help": "È possibile trascinare o ricercare qui i file CSV che contengono le informazioni di import metadata", // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import", - "admin.batch-import.page.help": "Selezionare la Collection in cui effettuare l'import. Quindi, rilasciare o sfogliare un file zip Simple Archive Format (SAF) che include gli elementi da importare", + "admin.batch-import.page.help": "Seleziona la Collezione in cui importare la risorsa. Trascina o seleziona il file zip Simple Archive Format (SAF) che include gli elementi da importare", // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import", - "admin.metadata-import.page.dropMsg": "Rilasciare un CSV di metadati da importare", + "admin.metadata-import.page.dropMsg": "Rilascia un CSV di metadati da importare", // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import", "admin.batch-import.page.dropMsg": "Rilasciare un batch ZIP da importare", // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import", - "admin.metadata-import.page.dropMsgReplace": "Rilasciare per sostituire i metadati CSV da importare", + "admin.metadata-import.page.dropMsgReplace": "Rilascia un nuovo file CSV per sostituire il file corrente da importare", // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import", - "admin.batch-import.page.dropMsgReplace": "Rilasciare per sostituire il batch ZIP da importare", + "admin.batch-import.page.dropMsgReplace": "Rilascia un nuovo file ZIP per sostituire il file corrente da importare", // "admin.metadata-import.page.button.return": "Back", "admin.metadata-import.page.button.return": "Indietro", // "admin.metadata-import.page.button.proceed": "Proceed", - "admin.metadata-import.page.button.proceed": "Procedere", + "admin.metadata-import.page.button.proceed": "Procedi", // "admin.metadata-import.page.button.select-collection": "Select Collection", - "admin.metadata-import.page.button.select-collection": "Selezionare una Collection", + "admin.metadata-import.page.button.select-collection": "Selezionare una Collezione", // "admin.metadata-import.page.error.addFile": "Select file first!", "admin.metadata-import.page.error.addFile": "Seleziona prima il file!", // "admin.batch-import.page.error.addFile": "Select Zip file first!", - "admin.batch-import.page.error.addFile": "Seleziona prima il file ZIP!", + "admin.batch-import.page.error.addFile": "Seleziona prima il file ZIP", // "admin.metadata-import.page.validateOnly": "Validate Only", "admin.metadata-import.page.validateOnly": "Solo Validazione", @@ -1188,11 +1188,11 @@ "admin.batch-import.page.validateOnly.hint": "Una volta selezionato, il file ZIP caricato verrà convalidato. Si riceverà un rapporto sulle modifiche rilevate, ma non verrà salvata alcuna modifica.", // "admin.batch-import.page.remove": "remove", - "admin.batch-import.page.remove": "rimuovere", + "admin.batch-import.page.remove": "Elimina", // "alert.close.aria": "Close", - "alert.close.aria": "Chiudere", + "alert.close.aria": "Chiudi", // "alert.toggle.hide": "Show less", "alert.toggle.hide": "Mostra meno", @@ -1205,10 +1205,10 @@ "auth.errors.invalid-user": "Indirizzo e-mail o password non validi.", // "auth.messages.expired": "Your session has expired. Please log in again.", - "auth.messages.expired": "La sessione è scaduta. Effettua nuovamente l'accesso.", + "auth.messages.expired": "La sessione è scaduta. Effettua nuovamente il log in.", // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.", - "auth.messages.token-refresh-failed": "Aggiornamento del token di sessione non riuscito. Effettua nuovamente l'accesso.", + "auth.messages.token-refresh-failed": "Aggiornamento del token di sessione non riuscita. Effettua nuovamente il log in.", @@ -1219,14 +1219,14 @@ "bitstream.download.page.back": "Indietro", // "bitstream.download.page.close": "Close", - "bitstream.download.page.close": "Chiudere", + "bitstream.download.page.close": "Chiudi", // "bitstream.edit.authorizations.link": "Edit bitstream's Policies", - "bitstream.edit.authorizations.link": "Modificare i criteri di bitstream", + "bitstream.edit.authorizations.link": "Modifica le policies di bitstream", // "bitstream.edit.authorizations.title": "Edit bitstream's Policies", - "bitstream.edit.authorizations.title": "Modificare i criteri di bitstream", + "bitstream.edit.authorizations.title": "Modifica le policies di bitstream", // "bitstream.edit.return": "Back", "bitstream.edit.return": "Indietro", @@ -1262,10 +1262,10 @@ "bitstream.edit.form.primaryBitstream.label": "Primary bitstream", // "bitstream.edit.form.fileType.label": "File type", - "bitstream.edit.form.fileType.label": "Tipologi File", + "bitstream.edit.form.fileType.label": "Tipologia del File", // "bitstream.edit.form.fileType.hint": "Personal picture, logo, main article, etc.", - "bitstream.edit.form.fileType.hint": "Immagine personale, logo, articolo principale, ecc.", + "bitstream.edit.form.fileType.hint": "ersonal picture, logo, main article, ecc.", // "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": "Se il formato non è presente nell'elenco precedente, selezionare \"formato non presente in elenco\" sopra e descriverlo in \"Descrivi nuovo formato.", @@ -1283,13 +1283,13 @@ "bitstream.edit.form.iiifLabel.label": "Etichetta IIIF", // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.", - "bitstream.edit.form.iiifLabel.hint": "Etichetta canvas per questa immagine. Se non viene fornita, verrà utilizzata l'etichetta predefinita.", + "bitstream.edit.form.iiifLabel.hint": "Etichetta di cornice per questa immagine. Se non viene fornita, verrà utilizzata l'etichetta predefinita.", // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents", - "bitstream.edit.form.iiifToc.label": "Sommario IIIF", + "bitstream.edit.form.iiifToc.label": "Indice IIIF", // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.", - "bitstream.edit.form.iiifToc.hint": "L'aggiunta di testo qui rende questo l'inizio di un nuovo intervallo di sommario.", + "bitstream.edit.form.iiifToc.hint": "L'aggiunta di testo qui rende questo l'inizio di un nuovo intervallo dell'indice.", // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width", "bitstream.edit.form.iiifWidth.label": "Larghezza area di lavoro IIIF", @@ -1396,7 +1396,7 @@ "browse.comcol.by.rpname": "Per nome", // "browse.comcol.by.subject": "By Subject", - "browse.comcol.by.subject": "Per argomento", + "browse.comcol.by.subject": "Per soggetto", // "browse.comcol.by.title": "By Title", "browse.comcol.by.title": "Per titolo", @@ -1406,7 +1406,7 @@ // "browse.comcol.head": "Browse", - "browse.comcol.head": "Sfogliare", + "browse.comcol.head": "Sfoglia", // "browse.empty": "No items to show.", "browse.empty": "Nessun item da mostrare.", @@ -1445,7 +1445,7 @@ "browse.metadata.subject": "Soggetto", // "browse.metadata.type": "Type", - "browse.metadata.type": "Digitare", + "browse.metadata.type": "Tipo", // "browse.metadata.title": "Title", "browse.metadata.title": "Titolo", From b62aaad77a426b67cf4977540a33b7fb897b0337 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 14:39:01 +0200 Subject: [PATCH 719/758] [CST-10703] confirm email fixes --- src/app/core/data/eperson-registration.service.ts | 3 ++- .../confirm-email/confirm-email.component.ts | 9 ++++----- .../provide-email/provide-email.component.ts | 5 +---- .../services/external-login.service.ts | 4 ++-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts index 259b5f66c50..43bd957f928 100644 --- a/src/app/core/data/eperson-registration.service.ts +++ b/src/app/core/data/eperson-registration.service.ts @@ -16,6 +16,7 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service'; import { HttpHeaders } from '@angular/common/http'; import { HttpParams } from '@angular/common/http'; import { Operation } from 'fast-json-patch'; +import { NoContent } from '../shared/NoContent.model'; @Injectable({ providedIn: 'root', }) @@ -157,7 +158,7 @@ export class EpersonRegistrationService{ * @param updateValue Flag to indicate if the email should be updated or added * @returns Remote Data state of the patch request */ - patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operator: 'add' | 'replace'): Observable> { + patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operator: 'add' | 'replace'): Observable> { const requestId = this.requestService.generateRequestId(); const href$ = this.getRegistrationEndpoint().pipe( diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index ba5c3d3d138..696d5d265e1 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -80,10 +80,7 @@ export class ConfirmEmailComponent implements OnDestroy { this.subs.push( this.externalLoginService.patchUpdateRegistration(values, 'email', this.registrationData.id, this.token, 'replace') .pipe(getRemoteDataPayload()) - .subscribe((update) => { - // TODO: remove this line (temporary) - console.log('Email update:', update); - })); + .subscribe()); } /** @@ -104,14 +101,16 @@ export class ConfirmEmailComponent implements OnDestroy { const metadataValues = {}; for (const [key, value] of Object.entries(registrationData.registrationMetadata)) { if (hasValue(value[0]?.value) && key !== 'email') { - metadataValues[key] = value[0]; + metadataValues[key] = value; } } const eperson = new EPerson(); eperson.email = registrationData.email; + eperson.netid = registrationData.netId; eperson.metadata = metadataValues; eperson.canLogIn = true; eperson.requireCertificate = false; + eperson.selfRegistered = true; this.subs.push( this.epersonDataService.createEPersonForToken(eperson, token).pipe( getFirstCompletedRemoteData(), diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts index 92faf10e756..5efbd0f7d62 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts @@ -48,10 +48,7 @@ export class ProvideEmailComponent implements OnDestroy { if (this.emailForm.valid) { const email = this.emailForm.get('email').value; this.subs.push(this.externalLoginService.patchUpdateRegistration([email], 'email', this.registrationId, this.token, 'add') - .subscribe((rd: RemoteData) => { - // TODO: remove this line (temporary) - console.log('Email update:', rd); - })); + .subscribe()); } } diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts index 1ec730516c4..3d3f97571c9 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -6,7 +6,7 @@ import { RemoteData } from '../../../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; -import { Registration } from 'src/app/core/shared/registration.model'; +import { NoContent } from '../../../core/shared/NoContent.model'; @Injectable({ providedIn: 'root' @@ -29,7 +29,7 @@ export class ExternalLoginService { * @param token the registration token * @param operation operation to be performed */ - patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable>{ + patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable>{ const updatedValues = values.map((value) => value); return this.epersonRegistrationService.patchUpdateRegistration(updatedValues, field, registrationId, token, operation).pipe( getFirstCompletedRemoteData(), From 236338f5e665932842843d5339609dbe460aeffe Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 15:04:23 +0200 Subject: [PATCH 720/758] [CST-10703] changed how to get token parameter --- src/app/app-routing.module.ts | 4 ++-- .../external-login-page/external-login-page.component.ts | 4 ++-- .../external-login-review-account-info-page.component.ts | 3 ++- .../helpers/review-account.guard.ts | 4 ++-- .../provide-email/provide-email.component.ts | 2 -- .../guards/registration-token.guard.ts | 6 ++---- .../resolvers/registration-data.resolver.ts | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index fb4d658d8cb..a652eadde9e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -172,12 +172,12 @@ import { RedirectService } from './redirect/redirect.service'; .then((m) => m.LoginPageModule) }, { - path: 'external-login', + path: 'external-login/:token', loadChildren: () => import('./external-login-page/external-login-page.module') .then((m) => m.ExternalLoginPageModule) }, { - path: 'review-account', + path: 'review-account/:token', loadChildren: () => import('./external-login-review-account-info/external-login-review-account-info-page.module') .then((m) => m.ExternalLoginReviewAccountInfoModule) }, diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index 1e3862bcd2f..d717bce739b 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -33,8 +33,8 @@ export class ExternalLoginPageComponent implements OnInit { constructor( private arouter: ActivatedRoute ) { - this.token = this.arouter.snapshot.queryParams.token; - this.hasErrors = hasNoValue(this.arouter.snapshot.queryParams.token); + this.token = this.arouter.snapshot.params.token; + this.hasErrors = hasNoValue(this.arouter.snapshot.params.token); } ngOnInit(): void { diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts index dedb3d9baa1..a42c9e05cfd 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts @@ -33,7 +33,8 @@ export class ExternalLoginReviewAccountInfoPageComponent implements OnInit { constructor( private arouter: ActivatedRoute ) { - this.token = this.arouter.snapshot.queryParams.token; + this.token = this.arouter.snapshot.params.token; + this.hasErrors = hasNoValue(this.arouter.snapshot.params.token); } ngOnInit(): void { diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.ts index 8ae1bca6f25..03caf6d63ed 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.ts +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.ts @@ -35,9 +35,9 @@ export class ReviewAccountGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): Promise | boolean | Observable { - if (route.queryParams.token) { + if (route.params.token) { return this.epersonRegistrationService - .searchRegistrationByToken(route.queryParams.token) + .searchRegistrationByToken(route.params.token) .pipe( getFirstCompletedRemoteData(), mergeMap( diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts index 5efbd0f7d62..a63486dea60 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts @@ -1,8 +1,6 @@ import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; -import { RemoteData } from '../../../../core/data/remote-data'; -import { Registration } from '../../../../core/shared/registration.model'; import { Subscription } from 'rxjs'; import { hasValue } from '../../../../shared/empty.util'; diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts index ec37d9d44e7..d565dfbd91a 100644 --- a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts +++ b/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts @@ -31,15 +31,13 @@ export class RegistrationTokenGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot ): Observable { - if (route.queryParams.token) { + if (route.params.token) { return this.epersonRegistrationService - .searchRegistrationByToken(route.queryParams.token) + .searchRegistrationByToken(route.params.token) .pipe( getFirstCompletedRemoteData(), map( (data: RemoteData) => { - // TODO: remove console.log - console.log(data, 'RegistrationTokenGuard'); if (data.hasSucceeded && hasValue(data)) { return true; } else { diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts index 5513a847a43..6a9b6b8b31b 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts @@ -32,7 +32,7 @@ export class RegistrationDataResolver implements Resolve> { - const token = route.queryParams.token; + const token = route.params.token; if (hasValue(token)) { return this.epersonRegistrationService.searchRegistrationByToken(token).pipe( getFirstCompletedRemoteData(), From 51830cff8b3010484e010d760b237eedcdac2439 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 15:36:50 +0200 Subject: [PATCH 721/758] [CST-10703] minor fix --- .../confirm-email/confirm-email.component.ts | 10 ++++++++-- src/app/shared/log-in/log-in.component.ts | 2 +- src/assets/i18n/en.json5 | 2 ++ src/assets/i18n/it.json5 | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 696d5d265e1..1e2191db664 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators'; import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { hasValue } from '../../../../shared/empty.util'; +import { hasNoValue, hasValue } from '../../../../shared/empty.util'; import { EPerson } from '../../../../core/eperson/models/eperson.model'; import { RemoteData } from '../../../../core/data/remote-data'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; @@ -98,6 +98,12 @@ export class ConfirmEmailComponent implements OnDestroy { token: string, registrationData: Registration ) { + + if (hasNoValue(this.registrationData.netId)) { + this.notificationService.error(this.translate.get('external-login-page.confirm-email.create-account.notifications.error.no-netId')); + return; + } + const metadataValues = {}; for (const [key, value] of Object.entries(registrationData.registrationMetadata)) { if (hasValue(value[0]?.value) && key !== 'email') { @@ -124,7 +130,7 @@ export class ConfirmEmailComponent implements OnDestroy { // redirect to login page with authMethod query param, so that the login page knows which authentication method to use // set Redirect URL to User profile, so the user is redirected to the profile page after logging in this.router.navigate(['/login'], { queryParams: { authMethod: registrationData.registrationType } }); - this.authService.setRedirectUrl('/review-account'); + this.authService.setRedirectUrl('/profile'); } })); } diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index 0322079475f..30dc535d313 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -97,7 +97,7 @@ export class LogInComponent implements OnInit, OnDestroy { } // if there is an external login method the user should follow, filter the auth methods to only show that one if (hasValue(this.externalLoginMethod)) { - this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType === this.externalLoginMethod); + this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType === this.externalLoginMethod.toLocaleLowerCase()); } }); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 94a153d1772..e1d53265164 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7231,4 +7231,6 @@ "external-login-page.provide-email.create-account.notifications.error.header": "Something went wrong", "external-login-page.provide-email.create-account.notifications.error.content": "Please check again your email address and try again.", + + "external-login-page.confirm-email.create-account.notifications.error.no-netId": "Something went wrong with this email account. Try again or use a different method to login.", } diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index fd5fb8ca8b5..db38d085fe5 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -11343,4 +11343,8 @@ // "external-login-page.provide-email.create-account.notifications.error.content": "Please check again your email address and try again.", // TODO New key - Add a translation "external-login-page.provide-email.create-account.notifications.error.content": "Please check again your email address and try again.", + + // "external-login-page.confirm-email.create-account.notifications.error.no-netId": "Something went wrong with this email account. Try again or use a different method to login.", + // TODO New key - Add a translation + "external-login-page.confirm-email.create-account.notifications.error.no-netId": "Something went wrong with this email account. Try again or use a different method to login.", } From 85c002cd2d01fc782c5956198def7be0dbe326b5 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 5 Oct 2023 15:53:43 +0200 Subject: [PATCH 722/758] [DSC-1277] CRIS/GLAM translation sync 4 --- src/assets/i18n/it.json5 | 114 +++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index b0bc4d529b1..84fee4e2926 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -1481,7 +1481,7 @@ "browse.metadata.rpname.breadcrumbs": "Sfoglia per Nome", // "browse.metadata.subject.breadcrumbs": "Browse by Subject", - "browse.metadata.subject.breadcrumbs": "Sfoglia per Argomento", + "browse.metadata.subject.breadcrumbs": "Sfoglia per Soggetto", // "browse.metadata.type.breadcrumbs": "Browse by Type", "browse.metadata.type.breadcrumbs": "Sfoglia per Tipo", @@ -1493,13 +1493,13 @@ "pagination.next.button": "Avanti", // "pagination.previous.button": "Previous", - "pagination.previous.button": "Precedente", + "pagination.previous.button": "Indietro", // "pagination.next.button.disabled.tooltip": "No more pages of results", - "pagination.next.button.disabled.tooltip": "Non ci sono ulteriori pagine di risultati", + "pagination.next.button.disabled.tooltip": "Non ci sono ulteriori pagine", // "browse.startsWith": ", starting with {{ startsWith }}", - "browse.startsWith": ", inizia per {{ startsWith }}", + "browse.startsWith": ", a partire da {{ startsWith }}", // "browse.startsWith.choose_start": "(Choose start)", "browse.startsWith.choose_start": "(Scegli start)", @@ -1508,7 +1508,7 @@ "browse.startsWith.choose_year": "(Scegli l'anno)", // "browse.startsWith.choose_year.label": "Choose the issue year", - "browse.startsWith.choose_year.label": "Scegli l'anno di pubblicazione", + "browse.startsWith.choose_year.label": "Scegli l'anno", // "browse.startsWith.jump": "Filter results by year or month", "browse.startsWith.jump": "Filtra i risultati per anno o mese", @@ -1544,7 +1544,7 @@ "browse.startsWith.months.none": "(Scegli il mese)", // "browse.startsWith.months.none.label": "Choose the issue month", - "browse.startsWith.months.none.label": "Scegli il mese di pubblicazione", + "browse.startsWith.months.none.label": "Scegli il mese", // "browse.startsWith.months.november": "November", "browse.startsWith.months.november": "Novembre", @@ -1556,7 +1556,7 @@ "browse.startsWith.months.september": "Settembre", // "browse.startsWith.submit": "Browse", - "browse.startsWith.submit": "Sfogliare", + "browse.startsWith.submit": "Sfoglia", // "browse.startsWith.type_date": "Filter results by date", "browse.startsWith.type_date": "Filtra per data", @@ -1586,31 +1586,31 @@ "bulk-import.back": "Indietro", // "bulk-import.breadcrumbs" : "Bulk import", - "bulk-import.breadcrumbs" : "Bulk import", + "bulk-import.breadcrumbs" : "Import massivo", // "bulk-import.collection-name" : "Collection", "bulk-import.collection-name" : "Collezione", // "bulk-import.error": "An error occurred while creating the import process", - "bulk-import.error": "Si è verificato un errore durante la creazione del processo di importazione", + "bulk-import.error": "Si è verificato un errore durante la creazione del processo di import", // "bulk-import.file" : "Source file", - "bulk-import.file" : "Source file", + "bulk-import.file" : "File sorgente", // "bulk-import.header" : "Bulk import", - "bulk-import.header" : "Bulk import", + "bulk-import.header" : "Import massivo", // "bulk-import.processing": "Processing...", - "bulk-import.processing": "Elaborazione...", + "bulk-import.processing": "Elaborazione in corso...", // "bulk-import.success": "The import process was successfully created", - "bulk-import.success": "Il processo di importazione è stato creato correttamente", + "bulk-import.success": "Il processo di import è stato creato correttamente", // "bulk-import.submit": "Start import", - "bulk-import.submit": "Avvia importazione", + "bulk-import.submit": "Avvia import", // "bulk-import.title" : "Bulk import", - "bulk-import.title" : "Bulk import", + "bulk-import.title" : "Import massivo", @@ -1631,13 +1631,13 @@ // "collection.create.head": "Create a Collection", - "collection.create.head": "Creare una collection", + "collection.create.head": "Crea una collection", // "collection.create.notifications.success": "Successfully created the Collection", "collection.create.notifications.success": "Collection creata con successo", // "collection.create.sub-head": "Create a Collection for Community {{ parent }}", - "collection.create.sub-head": "Creare una collection per la Community {{ parent }}", + "collection.create.sub-head": "Crea una collection per la Community {{ parent }}", // "collection.curate.header": "Curate Collection: {{collection}}", "collection.curate.header": "Curate della collezione: {{collection}}", @@ -1646,10 +1646,10 @@ "collection.delete.cancel": "Annulla", // "collection.delete.confirm": "Confirm", - "collection.delete.confirm": "Confermare", + "collection.delete.confirm": "Conferma", // "collection.delete.processing": "Deleting", - "collection.delete.processing": "Eliminazione", + "collection.delete.processing": "Eliminazione in corso", // "collection.delete.head": "Delete Collection", "collection.delete.head": "Elimina collection", @@ -1692,7 +1692,7 @@ "collection.edit.item-mapper.confirm": "Mappare gli item selezionati", // "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": "Si tratta dello strumento di mapping degli item che consente agli amministratori della collection di mappare gli item di altre collections in questa collection. È possibile cercare item di altre collections e mapparli o sfogliare l'elenco degli item attualmente mappati.", + "collection.edit.item-mapper.description": "Questo è lo strumento di mapping degli item che consente agli amministratori della collection di mappare gli item di altre collections su questa collection. È possibile cercare item di altre collectioni e mapparli oppure sfogliare l'elenco degli item attualmente mappati.", // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections", "collection.edit.item-mapper.head": "Item Mapper - Mappa item di altre collections", @@ -1716,7 +1716,7 @@ "collection.edit.item-mapper.notifications.unmap.error.content": "Si sono verificati errori per la rimozione dei mapping degli item {{amount}}.", // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors", - "collection.edit.item-mapper.notifications.unmap.error.head": "Rimuovere gli errori di mappatura", + "collection.edit.item-mapper.notifications.unmap.error.head": "Rimuovi gli errori di mappatura", // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.", "collection.edit.item-mapper.notifications.unmap.success.content": "Rimosse con successo le mappature degli item {{amount}}.", @@ -1738,10 +1738,10 @@ // "collection.edit.logo.delete.title": "Delete logo", - "collection.edit.logo.delete.title": "Annulla eliminazione", + "collection.edit.logo.delete.title": "Cancella Logo", // "collection.edit.logo.delete-undo.title": "Undo delete", - "collection.edit.logo.delete-undo.title": "Elimina logo", + "collection.edit.logo.delete-undo.title": "Annula la cancellazione", // "collection.edit.logo.label": "Collection logo", "collection.edit.logo.label": "Logo della collection", @@ -1756,16 +1756,16 @@ "collection.edit.logo.notifications.delete.success.title": "Logo cancellato", // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo", - "collection.edit.logo.notifications.delete.success.content": "Eliminato con successo il logo della collection", + "collection.edit.logo.notifications.delete.success.content": "Il logo della collezione è stato eliminato", // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo", "collection.edit.logo.notifications.delete.error.title": "Errore durante l'eliminazione del logo", // "collection.edit.logo.upload": "Drop a Collection Logo to upload", - "collection.edit.logo.upload": "Rilascia un logo della collection da caricare", + "collection.edit.logo.upload": "Trascina qui il logo da caricare per la collezione", // "collection.edit.notifications.success": "Successfully edited the Collection", - "collection.edit.notifications.success": "Modificata correttamente la collection", + "collection.edit.notifications.success": "Modificata correttamente la collezione", // "collection.edit.return": "Back", "collection.edit.return": "Indietro", @@ -1776,13 +1776,13 @@ "collection.edit.tabs.curate.head": "Curate", // "collection.edit.tabs.curate.title": "Collection Edit - Curate", - "collection.edit.tabs.curate.title": "Modifica collection - Curate", + "collection.edit.tabs.curate.title": "Modifica la collection - Curate", // "collection.edit.tabs.authorizations.head": "Authorizations", "collection.edit.tabs.authorizations.head": "Autorizzazioni", // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations", - "collection.edit.tabs.authorizations.title": "Collection Edit - Autorizzazioni", + "collection.edit.tabs.authorizations.title": "Modifica la collezione - Autorizzazioni", // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles", "collection.edit.item.authorizations.load-bundle-button": "Carica più bundles", @@ -1791,19 +1791,19 @@ "collection.edit.item.authorizations.load-more-button": "Carica più risorse", // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle", - "collection.edit.item.authorizations.show-bitstreams-button": "Mostra le policy del bitstream per il bundle", + "collection.edit.item.authorizations.show-bitstreams-button": "Mostra le policiy dei bitstream per i bundle", // "collection.edit.tabs.metadata.head": "Edit Metadata", - "collection.edit.tabs.metadata.head": "Modifica metadati", + "collection.edit.tabs.metadata.head": "Modifica i metadati", // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata", - "collection.edit.tabs.metadata.title": "Modifica collection - Metadati", + "collection.edit.tabs.metadata.title": "Modifica la collezione - Metadati", // "collection.edit.tabs.roles.head": "Assign Roles", "collection.edit.tabs.roles.head": "Assegna ruoli", // "collection.edit.tabs.roles.title": "Collection Edit - Roles", - "collection.edit.tabs.roles.title": "Modifica collection - Ruoli", + "collection.edit.tabs.roles.title": "Modifica la collezione - Ruoli", // "collection.edit.tabs.source.external": "This collection harvests its content from an external source", "collection.edit.tabs.source.external": "Questa collection raccoglie il suo contenuto da una fonte esterna", @@ -1812,13 +1812,13 @@ "collection.edit.tabs.source.form.adminEmail": "Indirizzo dell'amministratore", // "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": "È necessario fornire un ID impostato della collection di destinazione.", + "collection.edit.tabs.source.form.errors.oaiSource.required": "È necessario fornire un ID della collezione di destinazione.", // "collection.edit.tabs.source.form.harvestType": "Content being harvested", - "collection.edit.tabs.source.form.harvestType": "Contenuto che è stato harvestato", + "collection.edit.tabs.source.form.harvestType": "Dati esterni harvestati", // "collection.edit.tabs.source.form.head": "Configure an external source", - "collection.edit.tabs.source.form.head": "Configurare un'origine esterna", + "collection.edit.tabs.source.form.head": "Configura un'origine esterna", // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format", "collection.edit.tabs.source.form.metadataConfigId": "Formato dei metadati", @@ -1830,10 +1830,10 @@ "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)", - "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadati e flussi di bit (richiede il supporto ORE)", + "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest dei metadata e bitstream (richiede il supporto OAI-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": "Harvest di metadati e riferimenti a bitstream (richiede il supporto ORE)", + "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest di metadati e bitstream (richiede il supporto OAI-ORE)", // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only", "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvesta solo metadati", @@ -1845,7 +1845,7 @@ "collection.edit.tabs.source.form.postTransform": "Nome post trasformazione", // "collection.edit.tabs.source.form.forceSynchronization": "Force Synchronization", - "collection.edit.tabs.source.form.forceSynchronization": "Forza sincronizzazione", + "collection.edit.tabs.source.form.forceSynchronization": "Forza la sincronizzazione", // "collection.edit.tabs.source.form.recordValidationEnabled": "Record validation", "collection.edit.tabs.source.form.recordValidationEnabled": "Convalida dei record", @@ -1883,7 +1883,7 @@ // "collection.edit.template.add-button": "Add", - "collection.edit.template.add-button": "Aggiungere", + "collection.edit.template.add-button": "Aggiungi", // "collection.edit.template.breadcrumbs": "Item template", "collection.edit.template.breadcrumbs": "Modello di Item", @@ -1892,38 +1892,38 @@ "collection.edit.template.cancel": "Annulla", // "collection.edit.template.delete-button": "Delete", - "collection.edit.template.delete-button": "Cancellare", + "collection.edit.template.delete-button": "Cancella", // "collection.edit.template.edit-button": "Edit", - "collection.edit.template.edit-button": "Editare", + "collection.edit.template.edit-button": "Modifica", // "collection.edit.template.error": "An error occurred retrieving the template item", - "collection.edit.template.error": "Si è verificato un errore durante il recupero del modello dell' Item", + "collection.edit.template.error": "Si è verificato un errore durante il recupero del template dell'Item", // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"", - "collection.edit.template.head": "Modifica item modello per la collection \"{{ collection }}\"", + "collection.edit.template.head": "Modifica il template dell'item per la collezione \"{{ collection }}\"", // "collection.edit.template.label": "Template item", - "collection.edit.template.label": "Template per Item", + "collection.edit.template.label": "Template dell'Item", // "collection.edit.template.loading": "Loading template item...", - "collection.edit.template.loading": "Caricamento del Template per Item...", + "collection.edit.template.loading": "Caricamento del Template per Item in corso...", // "collection.edit.template.notifications.delete.error": "Failed to delete the item template", - "collection.edit.template.notifications.delete.error": "Impossibile eliminare il Template dell' Item", + "collection.edit.template.notifications.delete.error": "Impossibile eliminare il template dell'Item", // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template", - "collection.edit.template.notifications.delete.success": "Eliminato correttamente il Template dell' Item", + "collection.edit.template.notifications.delete.success": "Eliminato correttamente il template dell'Item", // "collection.edit.template.title": "Edit Template Item", - "collection.edit.template.title": "Modifica Template dell' Item", + "collection.edit.template.title": "Modifica il template dell'Item", // "collection-export.success": "Export of the collection's items started successfully", "collection-export.success": "L'esportazione degli item della collection è iniziata correttamente", // "collection-export.error": "An error occurs starting the collection's items export", - "collection-export.error": "Si verifica un errore durante l'avvio dell'esportazione degli item della collection", + "collection-export.error": "Si verifica un errore nell'export degli item della collezione", // "collection.form.abstract": "Short Description", @@ -1936,7 +1936,7 @@ "collection.form.errors.title.required": "Inserisci il nome di una collection", // "collection.form.license": "License", - "collection.form.license": "Licenza", + "collection.form.license": "Licenza di deposito", // "collection.form.provenance": "Provenance", "collection.form.provenance": "Provenienza", @@ -1954,10 +1954,10 @@ "collection.form.title": "Nome", // "collection.form.entityType": "Entity Type", - "collection.form.entityType": "Tipo di entità", + "collection.form.entityType": "Entità", // "collection.form.errors.entityType.required": "Please choose an entity type for this collection", - "collection.form.errors.entityType.required": "Scegli un tipo di entità per questa collection", + "collection.form.errors.entityType.required": "Scegli un'entità per questa collection", // "collection.form.errors.submissionDefinition.required": "Please choose a submission definition for this collection", "collection.form.errors.submissionDefinition.required": "Scegli una definizione di submission per questa collection", @@ -1971,12 +1971,12 @@ // "collection.listelement.badge": "Collection", - "collection.listelement.badge": "collection", + "collection.listelement.badge": "Collezione", // "collection.page.browse.recent.head": "Recent Submissions", - "collection.page.browse.recent.head": "submissions recenti", + "collection.page.browse.recent.head": "Inserimenti recenti", // "collection.page.browse.recent.empty": "No items to show", "collection.page.browse.recent.empty": "Nessun item da mostrare", @@ -1985,13 +1985,13 @@ "collection.page.edit": "Modifica questa collection", // "collection.page.export": "Export items from this collection", - "collection.page.export": "Esportare item da questa collection", + "collection.page.export": "Esporta gli item da questa collezione", // "collection.page.handle": "Permanent URI for this collection", "collection.page.handle": "URI permanente per questa collection", // "collection.page.license": "License", - "collection.page.license": "Licenza", + "collection.page.license": "Licenza di deposito", // "collection.page.news": "News", "collection.page.news": "News", @@ -1999,7 +1999,7 @@ // "collection.select.confirm": "Confirm selected", - "collection.select.confirm": "Conferma selezionato", + "collection.select.confirm": "Conferma", // "collection.select.empty": "No collections to show", "collection.select.empty": "Nessuna collection da mostrare", From f89461c0cd75414b4ea17b9d84052f04e0642fb0 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 5 Oct 2023 16:17:51 +0200 Subject: [PATCH 723/758] [DSC-1277] CRIS/GLAM translation sync 5 --- src/assets/i18n/it.json5 | 84 ++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 84fee4e2926..e454ed44643 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -2011,39 +2011,39 @@ // "collection.source.controls.head": "Harvest Controls", "collection.source.controls.head": "Controlli del Harvester", // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings", - "collection.source.controls.test.submit.error": "Qualcosa è andato storto con l'avvio del test delle impostazioni", + "collection.source.controls.test.submit.error": "Qualcosa è andato storto durante l'avvio del test delle impostazioni", // "collection.source.controls.test.failed": "The script to test the settings has failed", "collection.source.controls.test.failed": "Lo script per testare le impostazioni non è riuscito", // "collection.source.controls.test.completed": "The script to test the settings has successfully finished", - "collection.source.controls.test.completed": "Lo script per testare le impostazioni è stato completato correttamente", + "collection.source.controls.test.completed": "La procedura per testare le impostazioni è stato completato correttamente", // "collection.source.controls.test.submit": "Test configuration", "collection.source.controls.test.submit": "Configurazione di prova", // "collection.source.controls.test.running": "Testing configuration...", - "collection.source.controls.test.running": "Configurazione di test...", + "collection.source.controls.test.running": "Configurazione di prova...", // "collection.source.controls.import.submit.success": "The import has been successfully initiated", - "collection.source.controls.import.submit.success": "L'importazione è stata avviata correttamente", + "collection.source.controls.import.submit.success": "L'import è stato avviato correttamente", // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import", - "collection.source.controls.import.submit.error": "Qualcosa è andato storto con l'avvio dell'importazione", + "collection.source.controls.import.submit.error": "Qualcosa è andato storto nell'import", // "collection.source.controls.import.submit": "Import now", "collection.source.controls.import.submit": "Importa ora", // "collection.source.controls.import.running": "Importing...", - "collection.source.controls.import.running": "Importazione...", + "collection.source.controls.import.running": "Import in corso...", // "collection.source.controls.import.failed": "An error occurred during the import", - "collection.source.controls.import.failed": "Si è verificato un errore durante l'importazione", + "collection.source.controls.import.failed": "Si è verificato un errore durante l'import ", // "collection.source.controls.import.completed": "The import completed", - "collection.source.controls.import.completed": "L'importazione completata", + "collection.source.controls.import.completed": "L'import è completato", // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated", - "collection.source.controls.reset.submit.success": "Il ripristino e la reimportazione sono stati avviati correttamente", + "collection.source.controls.reset.submit.success": "Il reset e il reimport sono stati avviati correttamente", // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport", - "collection.source.controls.reset.submit.error": "Qualcosa è andato storto con l'avvio del ripristino e della reimportazione", + "collection.source.controls.reset.submit.error": "Qualcosa è andato storto durante l'avvio del reset e reimport", // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport", - "collection.source.controls.reset.failed": "Si è verificato un errore durante il ripristino e la reimportazione", + "collection.source.controls.reset.failed": "Si è verificato un errore durante il reimport", // "collection.source.controls.reset.completed": "The reset and reimport completed", - "collection.source.controls.reset.completed": "Il ripristino e la reimportazione completati", + "collection.source.controls.reset.completed": "Reset e reimport completati", // "collection.source.controls.reset.submit": "Reset and reimport", - "collection.source.controls.reset.submit": "Reimpostazione e reimportazione", + "collection.source.controls.reset.submit": "Reset e reimport", // "collection.source.controls.reset.running": "Resetting and reimporting...", - "collection.source.controls.reset.running": "Reimpostazione e reimportazione...", + "collection.source.controls.reset.running": "Reset e reimport...", // "collection.source.controls.harvest.status": "Harvest status:", "collection.source.controls.harvest.status": "Stato dell'harvest:", // "collection.source.controls.harvest.start": "Harvest start time:", @@ -2065,10 +2065,10 @@ // "communityList.breadcrumbs": "Community List", - "communityList.breadcrumbs": "Elenco della Community", + "communityList.breadcrumbs": "Elenco Community", // "communityList.tabTitle": "Community List", - "communityList.tabTitle": "Elenco della Community", + "communityList.tabTitle": "Elenco Community", // "communityList.title": "List of Communities", "communityList.title": "Elenco delle Community", @@ -2097,7 +2097,7 @@ "community.delete.confirm": "Conferma", // "community.delete.processing": "Deleting...", - "community.delete.processing": "Eliminazione...", + "community.delete.processing": "Eliminazione in corso...", // "community.delete.head": "Delete Community", "community.delete.head": "Elimina la community", @@ -2146,7 +2146,7 @@ "community.edit.logo.notifications.delete.error.title": "Errore durante l'eliminazione del logo", // "community.edit.logo.upload": "Drop a Community Logo to upload", - "community.edit.logo.upload": "Rilascia un logo della community da caricare", + "community.edit.logo.upload": "Trascina qui il logo da caricare per la community", @@ -2205,7 +2205,7 @@ "comcol-role.edit.create.error.title": "Non è stato possibile creare un gruppo per il ruolo '{{ role }}'", // "comcol-role.edit.restrict": "Restrict", - "comcol-role.edit.restrict": "Restringi", + "comcol-role.edit.restrict": "Limita", // "comcol-role.edit.delete": "Delete", "comcol-role.edit.delete": "Cancella", @@ -2222,58 +2222,58 @@ // "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": "Gli amministratori della community possono creare sotto-community o collections e gestire o assegnare la loro gestione. Inoltre, decidono chi può depositare item in qualsiasi sotto-collections, modificare i metadati degli item (dopo l'invio) e aggiungere (mappare) item esistenti da altre collections (previa autorizzazione).", + "comcol-role.edit.community-admin.description": "Gli amministratori della community possono creare sotto-community o collections e gestirne o assegnarne l'amministrazione ad altri gruppi. Inoltre, decidono chi può inserire gli item in qualsiasi sotto-collezione, modificare i metadati degli item e aggiungere (mappare) item esistenti da altre collezioni (previa autorizzazione).", // "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": "Gli amministratori della collection decidono chi può depositare item nella collection, modificare i metadati dell'item (dopo l'invio) e aggiungere (mappare) item da altre collections a questa collection (soggetto all'autorizzazione per tale collection).", + "comcol-role.edit.collection-admin.description": "Gli amministratori della collezione decidono chi può inserire item nella collection, modificare i metadati dell'item e aggiungere (mappare) item da altre collezioni.", // "comcol-role.edit.submitters.name": "Submitters", - "comcol-role.edit.submitters.name": "Submitters", + "comcol-role.edit.submitters.name": "Catalogatori", // "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": "E-People e Gruppi che dispongono dell'autorizzazione per depositare nuovi item in questa collection.", + "comcol-role.edit.submitters.description": "Operatori e Gruppi che dispongono dell'autorizzazione per inserire nuovi item in questa collezione.", // "comcol-role.edit.item_read.name": "Default item read access", - "comcol-role.edit.item_read.name": "Accesso di sola lettura per gli item", + "comcol-role.edit.item_read.name": "Accesso di sola lettura per l'item", // "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 e gruppi in grado di leggere i nuovi item depositati in questa collection. Le modifiche a questo ruolo non sono retroattive. Gli item esistenti nel sistema saranno ancora visualizzabili da coloro che avevano accesso in sola lettura al momento della loro archiviazione.", + "comcol-role.edit.item_read.description": "Operatori e gruppi abilitati a leggere i nuovi item inseriti. Le modifiche a questo ruolo non sono retroattive. Gli item esistenti nel sistema saranno ancora visualizzabili da coloro che avevano accesso in sola lettura al momento della loro archiviazione.", // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.", - "comcol-role.edit.item_read.anonymous-group": "L'accesso di sola lettura per gli item depositati è attualmente impostata su Anonimo.", + "comcol-role.edit.item_read.anonymous-group": "L'accesso di sola lettura per gli item inseriti è attualmente impostata su Anonymous.", // "comcol-role.edit.bitstream_read.name": "Default bitstream read access", "comcol-role.edit.bitstream_read.name": "Accesso di sola lettura per il bitstream", // "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": "Gli amministratori della community possono creare sotto-community o collections e gestire o assegnare la loro gestione. Inoltre, decidono chi può depositare item in qualsiasi sotto-collections, modificare i metadati degli item (dopo l'invio) e aggiungere (mappare) item esistenti da altre collections (previa autorizzazione).", + "comcol-role.edit.bitstream_read.description": "Gli amministratori della community possono creare sotto-community o collezioni e gestirne o assegnarne l'amministrazione. Inoltre, decidono chi può depositare item in qualsiasi sotto-collezione, modificare i metadati degli item e aggiungere (mappare) item esistenti da altre collezioni(previa autorizzazione).", // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.", - "comcol-role.edit.bitstream_read.anonymous-group": "L'accesso di sola lettura per i bitstreams depositati è attualmente impostata su Anonimo.", + "comcol-role.edit.bitstream_read.anonymous-group": "L'accesso di sola lettura per i bitstreams inseriti è attualmente impostata su Anonymous.", // "comcol-role.edit.editor.name": "Editors", - "comcol-role.edit.editor.name": "Editor", + "comcol-role.edit.editor.name": "Validatori", // "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": "Gli editor possono modificare i metadati delle submissions depositate e quindi accettarli o rifiutarli.", + "comcol-role.edit.editor.description": "I validatori possono modificare i metadati delle submissions depositate e quindi accettarli o rifiutarli.", // "comcol-role.edit.finaleditor.name": "Final editors", - "comcol-role.edit.finaleditor.name": "Editor finali", + "comcol-role.edit.finaleditor.name": "Validatori di secondo livello", // "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": "Gli editor finali sono in grado di modificare i metadati delle submissions depositate, ma non saranno in grado di rifiutarli.", + "comcol-role.edit.finaleditor.description": " I validatori di secondo livello sono in grado di modificare i metadati delle catalogazioni inserite, ma non potranno rifiutarle.", // "comcol-role.edit.reviewer.name": "Reviewers", "comcol-role.edit.reviewer.name": "Revisori", // "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": "I revisori sono in grado di accettare o rifiutare le submissions depositate. Tuttavia, non sono in grado di modificare i metadati della submission.", + "comcol-role.edit.reviewer.description": "I revisori sono in grado di accettare o rifiutare le catalogazioni inserite. Tuttavia, non sono in grado di modificarne i metadati.", // "comcol-role.edit.scorereviewers.name": "Score Reviewers", @@ -2917,7 +2917,7 @@ "confirmation-modal.export-metadata.confirm": "Export", // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}", - "confirmation-modal.export-batch.header": "Esporta batch (ZIP) per {{ dsoName }}", + "confirmation-modal.export-batch.header": "Export Batch (ZIP) da {{ dsoName }}", // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}", "confirmation-modal.export-batch.info": "Sei sicuro di voler esportare batch (ZIP) per {{ dsoName }}?", @@ -2926,7 +2926,7 @@ "confirmation-modal.export-batch.cancel": "Annulla", // "confirmation-modal.export-batch.confirm": "Export", - "confirmation-modal.export-batch.confirm": "Esporta", + "confirmation-modal.export-batch.confirm": "Export", // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"", "confirmation-modal.delete-eperson.header": "Elimina EPerson \"{{ dsoName }}\"", @@ -3065,7 +3065,7 @@ "error.validation.groupExists": "Gruppo già esistente", // "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "At least one investigator or one lead organization is required", - "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "È richiesto almeno un ricercatore o una unità principale", + "error.validation.fundingInvestigatorOrLeadOrganizationRequired" : "È necessario inserire almeno un revisore o un'organizzazione dirigente", // "error.validation.notRepeatable": "This field is not repeatable, please choose only one value and discard the others.", "error.validation.notRepeatable": "Questo campo non è ripetibile, scegliere un solo valore e scartare gli altri.", @@ -3089,7 +3089,7 @@ "explore.facet-section.title" : "Scopri", // "explore.index.all" : "All", - "explore.index.all" : "Tutti", + "explore.index.all" : "Tutto", // "explore.index.author" : "Author", "explore.index.author" : "Autore", @@ -3113,17 +3113,17 @@ "explore.index.metric.scopus.citation" : "Più citati", // "explore.index.chart.pie.itemtype_filter" : "Item Type", - "explore.index.chart.pie.itemtype_filter" : "Tipo di item", + "explore.index.chart.pie.itemtype_filter" : "Tipologia di Item", // "explore.index.chart.bar.dateIssued.year": "Year", "explore.index.chart.bar.dateIssued.year": "Anno", // "explore.index.dateIssued" : "Date issued", - "explore.index.dateIssued" : "Data di inserimento", + "explore.index.dateIssued" : "Data puntuale", // "explore.index.dateissued" : "Date issued", - "explore.index.dateissued" : "Data di inserimento", + "explore.index.dateissued" : "Data puntuale", // "explore.index.dc.date.accessioned" : "Recent Additions", "explore.index.dc.date.accessioned" : "Aggiunte recenti", @@ -3153,7 +3153,7 @@ "explore.index.funding" : "Finanziamento", // "explore.index.givenName" : "Given name", - "explore.index.givenName" : "Nome", + "explore.index.givenName" : "Nome puntuale", // "explore.index.has_content_in_original_bundle" : "Has content in original bundle", "explore.index.has_content_in_original_bundle" : "Sono presenti dei contenuti nel bundle original", @@ -3207,7 +3207,7 @@ "explore.index.itemidentifier" : "Identificativo dell'item", // "explore.index.jobTitle" : "Job title", - "explore.index.jobTitle" : "Ruolo", + "explore.index.jobTitle" : "Titolo", // "explore.index.knowsLanguage" : "Knows languages", "explore.index.knowsLanguage" : "Lingue conosciute", From ef123bf5e9aff278a960a78490a7fa63bee59184 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 16:20:50 +0200 Subject: [PATCH 724/758] [CST-10703] minor fix --- src/app/core/auth/models/auth.registration-type.ts | 5 +---- .../review-account-info/review-account-info.component.ts | 1 - .../confirm-email/confirm-email.component.ts | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/core/auth/models/auth.registration-type.ts b/src/app/core/auth/models/auth.registration-type.ts index e43094ed7bc..aa9f9d88b67 100644 --- a/src/app/core/auth/models/auth.registration-type.ts +++ b/src/app/core/auth/models/auth.registration-type.ts @@ -1,7 +1,4 @@ export enum AuthRegistrationType { - Password = 'password', - Shibboleth = 'shibboleth', - Oidc = 'oidc', Orcid = 'ORCID', - Validation = 'validation', + Validation = 'VALIDATION', } diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index 81c237b7fc2..fc065fdf1d0 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -165,7 +165,6 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { const dataToCompare: ReviewAccountInfoData[] = []; Object.entries(this.registrationData.registrationMetadata).forEach( ([key, value]) => { - console.log(key, value); dataToCompare.push({ label: key.split('.')?.[1] ?? key.split('.')?.[0], currentValue: value[0]?.overrides ?? '', diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 1e2191db664..df57939021b 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -98,7 +98,8 @@ export class ConfirmEmailComponent implements OnDestroy { token: string, registrationData: Registration ) { - + // check if the netId is present + // in order to create an account, the netId is required (since the user is created without a password) if (hasNoValue(this.registrationData.netId)) { this.notificationService.error(this.translate.get('external-login-page.confirm-email.create-account.notifications.error.no-netId')); return; From 8ee09346a64f3b36b306bdd3ab71bbe3fa48f96d Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 16:36:57 +0200 Subject: [PATCH 725/758] [CST-10703] fix --- .../review-account-info/review-account-info.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index fc065fdf1d0..bf5099c3767 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -130,10 +130,8 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); } this.subs.push( - override$.subscribe((response: RemoteData) => { + override$.subscribe((response) => { if (response.hasSucceeded) { - // TODO: remove this line (temporary) - console.log('mergeEPersonDataWithToken', response.payload); this.notificationService.success( this.translateService.get( 'review-account-info.merge-data.notification.success' From f28555a274ee27dbff64dba1a1f97465b5b1817f Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Thu, 5 Oct 2023 17:19:57 +0200 Subject: [PATCH 726/758] [DSC-1277] CRIS/GLAM translation sync 6 (last) --- src/assets/i18n/it.json5 | 140 +++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index e454ed44643..aef5c4b4596 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -3630,10 +3630,10 @@ // "health.breadcrumbs": "Health", - "health.breadcrumbs": "Health", + "health.breadcrumbs": "Stato del sistema", // "health-page.heading" : "Health", - "health-page.heading" : "Health", + "health-page.heading" : "Stato del sistema", // "health-page.info-tab" : "Info", "health-page.info-tab" : "Informazioni", @@ -3645,7 +3645,7 @@ "health-page.error.msg": "Il servizio di health check è temporaneamente non disponibile.", // "health-page.property.status": "Status code", - "health-page.property.status": "Codice di stato", + "health-page.property.status": "Status code", // "health-page.section.db.title": "Database", "health-page.section.db.title": "Database", @@ -3684,7 +3684,7 @@ "health-page.status.warning.info": "Sono stati rilevati dei potenziali problemi", // "health-page.title": "Health", - "health-page.title": "Health", + "health-page.title": "Stato del sistema", // "health-page.section.no-issues": "No issues detected", "health-page.section.no-issues": "Nessun problema rilevato", @@ -4785,7 +4785,7 @@ "item.preview.dc.contributor.applicant": "Richiedente", // "item.preview.dc.contributor.editor": "Editors:", - "item.preview.dc.contributor.editor": "Editori:", + "item.preview.dc.contributor.editor": "Editore:", // "item.preview.dc.date.embargoEnd" : "Embargo End", "item.preview.dc.date.embargoEnd" : "Fine embargo", @@ -4797,7 +4797,7 @@ "item.preview.dc.description.abstract": "Abstract:", // "item.preview.dc.description.sponsorship" : "Sponsorship", - "item.preview.dc.description.sponsorship" : "Sponsorship", + "item.preview.dc.description.sponsorship" : "Sponsorizzazione", // "item.preview.dc.identifier.other": "Other identifier:", "item.preview.dc.identifier.other": "Altri identificativi:", @@ -4818,7 +4818,7 @@ "item.preview.dc.rights.uri" : "URI Diritti", // "item.preview.dc.subject": "Subjects:", - "item.preview.dc.subject": "Soggetti:", + "item.preview.dc.subject": "Contenuto:", // "item.preview.dc.title": "Title:", "item.preview.dc.title": "Titolo:", @@ -4878,7 +4878,7 @@ "item.preview.oairecerif.funder" : "Finanziatore", // "item.preview.oairecerif.funding.identifier" : "Grant Number / Funding identifier", - "item.preview.oairecerif.funding.identifier" : "Numero di finanziamento / Identificativo di finanziamento", + "item.preview.oairecerif.funding.identifier" : "Numero di gestione/ Identificativo del fondo", // "item.preview.oairecerif.funding.endDate" : "End Date", "item.preview.oairecerif.funding.endDate" : "Data finale", @@ -6155,13 +6155,13 @@ "nav.statistics.header": "Statistiche", // "nav.stop-impersonating": "Stop impersonating EPerson", - "nav.stop-impersonating": "Smetti di impersonare EPerson", + "nav.stop-impersonating": "Smetti di controllare l'operatore", // "nav.subscriptions" : "Subscriptions", - "nav.subscriptions" : "Subscription", + "nav.subscriptions" : "Sottoscrizioni", // "nav.toggle" : "Toggle navigation", - "nav.toggle" : "Attivare la navigazione", + "nav.toggle" : "Toggle di navigazione", // "nav.user.description" : "User profile bar", "nav.user.description" : "Barra del profilo utente", @@ -6239,10 +6239,10 @@ "openaire.broker.event.action.import": "Importa progetto e accetta suggerimenti", // "openaire.broker.event.table.pidtype": "PID Type:", - "openaire.broker.event.table.pidtype": "Tipo di PID", + "openaire.broker.event.table.pidtype": "Tipologia PID:", // "openaire.broker.event.table.pidvalue": "PID Value:", - "openaire.broker.event.table.pidvalue": "Valore di PID:", + "openaire.broker.event.table.pidvalue": "Valore PID:", // "openaire.broker.event.table.subjectValue": "Subject Value:", "openaire.broker.event.table.subjectValue": "Valore del soggetto:", @@ -6281,7 +6281,7 @@ "openaire.broker.event.table.more": "Mostra di più", // "openaire.broker.event.project.found": "Bound to the local record:", - "openaire.broker.event.project.found": "Legato al record locale:", + "openaire.broker.event.project.found": "Aggancia al record:", // "openaire.broker.event.project.notFound": "No local record found", "openaire.broker.event.project.notFound": "Nessun record locale trovato", @@ -6314,7 +6314,7 @@ "openaire.broker.event.modal.project.publication": "Pubblicazione:", // "openaire.broker.event.modal.project.bountToLocal": "Bound to the local record:", - "openaire.broker.event.modal.project.bountToLocal": "Legato al record locale:", + "openaire.broker.event.modal.project.bountToLocal": "Aggancia al record:", // "openaire.broker.event.modal.project.select": "Project search", "openaire.broker.event.modal.project.select": "Ricerca del progetto", @@ -6474,7 +6474,7 @@ "orgunit.page.id": "ID", // "orgunit.page.titleprefix": "Organizational Unit: ", - "orgunit.page.titleprefix": "Unità organizzativa: ", + "orgunit.page.titleprefix": "Unità Organizzativa: ", @@ -6538,7 +6538,7 @@ "person.search.results.head": "Risultati della ricerca per persona", // "person-relationships.search.results.head": "Person Search Results", - "person-relationships.search.results.head": "Risultati della ricerca per persona", + "person-relationships.search.results.head": "Risultati della ricerca", // "person.search.title": "Person Search", "person.search.title": "Cerca i Ricercatori", @@ -6579,7 +6579,7 @@ "process.new.parameter.type.file": "file", // "process.new.parameter.required.missing": "The following parameters are required but still missing:", - "process.new.parameter.required.missing": "I seguenti parametri mancanti sono obbligatori:", + "process.new.parameter.required.missing": "I seguenti parametri sono obbligatori:", // "process.new.notification.success.title": "Success", "process.new.notification.success.title": "Successo", @@ -6597,7 +6597,7 @@ "process.new.notification.process.processing": "Elaborazione...", // "process.new.notification.process.files": "Output Files: ", - "process.new.notification.process.files": "File di output: ", + "process.new.notification.process.files": "File di Output: ", // "process.new.header": "Create a new process", "process.new.header": "Creare un nuovo processo", @@ -6653,7 +6653,7 @@ "process.detail.status" : "Stato", // "process.detail.create" : "Create similar process", - "process.detail.create" : "Crea un processo analogo", + "process.detail.create" : "Crea un processo simile", // "process.detail.actions": "Actions", "process.detail.actions": "Azioni", @@ -6677,7 +6677,7 @@ "process.detail.delete.success": "Il processo è stato eliminato con successo", // "process.detail.delete.error": "Something went wrong when deleting the process", - "process.detail.delete.error": "Qualcosa è andato storto durante l'elininazione del processo", + "process.detail.delete.error": "Errore durante l'eliminazione del processo", // "process.overview.delete.failed" : "An error occurs deleting the process.", "process.overview.delete.failed" : "Si è verificato un errore durante l'eliminazine del processo.", @@ -6820,10 +6820,10 @@ "profile.card.access-token.copy": "Copia token", // "profile.card.access-token.copy-info": "Make sure to copy your personal access token now. You won’t be able to see it again!", - "profile.card.access-token.copy-info": "Assicurati di copiare il tuo token di accesso personale. Non potrai più farlo in seguito!", + "profile.card.access-token.copy-info": "Assicurati di aver copiato il tuo token di accesso personale. Non potrai più farlo in seguito!", // "profile.card.access-token.info": "Tokens you have generated that can be used to access the DSpace-CRIS API.", - "profile.card.access-token.info": "I token che hai generato che possono essere utilizzati per accedere all'API di DSpace-CRIS", + "profile.card.access-token.info": "Token generati che possono essere usati per accedere alle API di DSpace-CRIS", // "profile.card.access-token.create.error": "An error occurred while generating the token, please try again later.", "profile.card.access-token.create.error": "Si è verificato un errore durante la generazione del token, si prega di riprovare più tardi.", @@ -6853,10 +6853,10 @@ "profile.card.access-token.delete": "Revoca il token", // "profile.card.access-token.no-token-generated": "You don't have personal access token. Generate a personal access token for quick access to the DSpace-CRIS API.", - "profile.card.access-token.no-token-generated": "Non sei in possesso di un token di accesso personale. Genera un token per accedere velocemente all'API di DSpace-CRIS.", + "profile.card.access-token.no-token-generated": "Non si dispone di un token di accesso personale. Generare un token di accesso personale per accedere rapidamente all'API DSpace-CRIS.", // "profile.card.access-token.token-generated": "You have already generated a personal access token.", - "profile.card.access-token.token-generated": "Hai già generato un token di accesso personale.", + "profile.card.access-token.token-generated": "Avete già generato un token di accesso personale.", // "profile.card.identify": "Identify", "profile.card.identify": "Identificare", @@ -6977,7 +6977,7 @@ "project.page.status": "Parole chiave", // "project.page.titleprefix": "Research Project: ", - "project.page.titleprefix": "Progetto di ricerca: ", + "project.page.titleprefix": "Progetti di ricerca: ", // "project.search.results.head": "Project Search Results", "project.search.results.head": "Risultati della ricerca per progetti", @@ -7295,10 +7295,10 @@ "resource-policies.edit.page.failure.content": "Si è verificato un errore durante la modifica della policy di risorsa.", // "resource-policies.edit.page.target-failure.content": "An error occurred while editing the target (ePerson or group) of the resource policy.", - "resource-policies.edit.page.target-failure.content": "Si è verificato un errore durante la modifica dell'obiettivo (ePerson o gruppo) della policy di risorsa.", + "resource-policies.edit.page.target-failure.content": "Si è verificato un errore durante la modifica del target (EPerson o gruppo) del criterio della risorsa.", // "resource-policies.edit.page.other-failure.content": "An error occurred while editing the resource policy. The target (ePerson or group) has been successfully updated.", - "resource-policies.edit.page.other-failure.content": "Si è verificato un errore durante la modifica della policy di risorsa. L'obiettio (ePerson o gruppo) è stato aggiornato con successo.", + "resource-policies.edit.page.other-failure.content": "Si è verificato un errore durante la modifica del criterio della risorsa. Il target (EPerson o gruppo) è stato aggiornato con successo.", // "resource-policies.edit.page.success.content": "Operation successful", "resource-policies.edit.page.success.content": "Operazione riuscita", @@ -7334,16 +7334,16 @@ "resource-policies.form.eperson-group-list.table.headers.name": "Nome", // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type", - "resource-policies.form.eperson-group-list.modal.header": "Impossibile modificare il tipo", + "resource-policies.form.eperson-group-list.modal.header": "Impossibile modificare il tipo.", // "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.", - "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Impossibile sostituire una ePerson con un gruppo.", + "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Non è possibile sostituire una EPerson con un gruppo.", // "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "It is not possible to replace a group with an ePerson.", - "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Impossibile sostituire un gruppo con una ePerson.", + "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Non è possibile sostituire un gruppo con una EPerson.", // "resource-policies.form.eperson-group-list.modal.text2": "Delete the current resource policy and create a new one with the desired type.", - "resource-policies.form.eperson-group-list.modal.text2": "Elimina la policy di risorsa corrente e creane una nuova con il tipo desiderato.", + "resource-policies.form.eperson-group-list.modal.text2": "Eliminare la policy della risorsa corrente e crearne una nuova con il tipo desiderato.", // "resource-policies.form.eperson-group-list.modal.close": "Ok", "resource-policies.form.eperson-group-list.modal.close": "Ok", @@ -7517,16 +7517,16 @@ "search.filters.applied.charts.defaultConfiguration.title": "Output di ricerca", // "search.filters.applied.charts.chart.bar.dateIssued.year.tab" : "Date Issued", - "search.filters.applied.charts.chart.bar.dateIssued.year.tab" : "Data di inserimento", + "search.filters.applied.charts.chart.bar.dateIssued.year.tab" : "Data puntuale", // "search.filters.applied.charts.chart.pie.more-value" : "More", - "search.filters.applied.charts.chart.pie.more-value" : "Più", + "search.filters.applied.charts.chart.pie.more-value" : "Visualizza altri", // "search.filters.applied.charts.chart.pie.itemtype_filter.tab" : "Item Type", - "search.filters.applied.charts.chart.pie.itemtype_filter.tab" : "Tipo di item", + "search.filters.applied.charts.chart.pie.itemtype_filter.tab" : "Tipologia dell'item", // "search.filters.applied.charts.graphitemtype.tab" : "Visualization by Type", - "search.filters.applied.charts.graphitemtype.tab" : "Visualizzazione per tipo", + "search.filters.applied.charts.graphitemtype.tab" : "Visualizzazione per tipologia", // "search.filters.applied.charts.graphpubldate.tab" : "Visualization by Date", "search.filters.applied.charts.graphpubldate.tab" : "Visualizzazione per data", @@ -7655,7 +7655,7 @@ "search.filters.filter.editor.placeholder": "Editore", // "search.filters.filter.editor.label": "Search editor", - "search.filters.filter.editor.label": "Cerca editore", + "search.filters.filter.editor.label": "Ricerca Editore", // "search.filters.filter.withdrawn.head": "Withdrawn", "search.filters.filter.withdrawn.head": "Ritirato", @@ -7691,7 +7691,7 @@ "search.filters.filter.funding.placeholder": "Finanziamento", // "search.filters.filter.funding.label": "Search funding", - "search.filters.filter.funding.label": "Cerca finanziamento", + "search.filters.filter.funding.label": "Ricerca fondi", // "search.filters.filter.has_content_in_original_bundle.head": "Has files", "search.filters.filter.has_content_in_original_bundle.head": "Ha file", @@ -7742,22 +7742,22 @@ "search.filters.filter.language.placeholder": "Lingue", // "search.filters.filter.projectOrgUnits.head" : "Organizations", - "search.filters.filter.projectOrgUnits.head" : "Strutture", + "search.filters.filter.projectOrgUnits.head" : "Organizzazioni", // "search.filters.filter.projectOrgUnits.label" : "Organizations", "search.filters.filter.projectOrgUnits.label" : "Strutture", // "search.filters.filter.projectOrgUnits.placeholder" : "Organizations", - "search.filters.filter.projectOrgUnits.placeholder" : "Strutture", + "search.filters.filter.projectOrgUnits.placeholder" : "Organizzazioni", // "search.filters.filter.personOrgUnits.head" : "Organizations", - "search.filters.filter.personOrgUnits.head" : "Strutture", + "search.filters.filter.personOrgUnits.head" : "Organizzazioni", // "search.filters.filter.personOrgUnits.label" : "Search organizations", - "search.filters.filter.personOrgUnits.label" : "Cerca strutture", + "search.filters.filter.personOrgUnits.label" : "Ricerca Organizzazioni", // "search.filters.filter.personOrgUnits.placeholder" : "Organizations", - "search.filters.filter.personOrgUnits.placeholder" : "Strutture", + "search.filters.filter.personOrgUnits.placeholder" : "Organizzazioni", // "search.filters.filter.namedresourcetype.head": "Status", "search.filters.filter.namedresourcetype.head": "Stato", @@ -7784,7 +7784,7 @@ "search.filters.filter.organization.placeholder": "Struttura", // "search.filters.filter.organization.label": "Search organization", - "search.filters.filter.organization.label": "Cerca struttura", + "search.filters.filter.organization.label": "Ricerca Organizzazioni", // "search.filters.filter.organizationAddressCountry.head": "Country", "search.filters.filter.organizationAddressCountry.head": "Paese", @@ -8014,10 +8014,10 @@ "sorting.dc.title.DESC": "Titolo decrescente", // "sorting.metric.view.ASC" : "Views Ascending", - "sorting.metric.view.ASC" : "Vista in ordine crescente", + "sorting.metric.view.ASC" : "Visualizzazioni in ordine crescente", // "sorting.metric.view.DESC" : "Views Descending", - "sorting.metric.view.DESC" : "Vista in ordine decrescente", + "sorting.metric.view.DESC" : "Visualizzazioni in ordine decrescente", // "sorting.metric.download.ASC" : "Downloads Ascending", "sorting.metric.download.ASC" : "Download in ordine crescente", @@ -8168,16 +8168,16 @@ "statistics.table.downloadReports.title.TopCities": "Più scaricati per città", // "statistics.table.mainReports.header.views": "Views", - "statistics.table.mainReports.header.views": "Visualizzazioni", + "statistics.table.mainReports.header.views": "Visite", // "statistics.table.mainReports.header.bitstream": "File Visits", - "statistics.table.mainReports.header.bitstream": "Visite al file", + "statistics.table.mainReports.header.bitstream": "Visualizzazioni del file", // "statistics.table.mainReports.header.continent": "Continent", "statistics.table.mainReports.header.continent": "Continente", // "statistics.table.mainReports.header.country": "Country", - "statistics.table.mainReports.header.country": "Paese", + "statistics.table.mainReports.header.country": "Nazione", // "statistics.table.mainReports.header.city": "City", "statistics.table.mainReports.header.city": "Città", @@ -8192,7 +8192,7 @@ "statistics.table.downloadReports.header.continent": "Continente", // "statistics.table.downloadReports.header.country": "Country", - "statistics.table.downloadReports.header.country": "Paese", + "statistics.table.downloadReports.header.country": "Nazione", // "statistics.table.downloadReports.header.city": "City", "statistics.table.downloadReports.header.city": "Città", @@ -8594,13 +8594,13 @@ "submission.sections.correction.column.file": "File", // "submission.sections.correction.column.file.info": "Here are the changes related the item's bitstream", - "submission.sections.correction.column.file.info": "Ecco le modifiche relative al bistream dell'item", + "submission.sections.correction.column.file.info": "Elenco delle modifiche relative al bitstream dell'Item", // "submission.sections.correction.column.metadata": "Metadata", "submission.sections.correction.column.metadata": "Metadati", // "submission.sections.correction.column.metadata.info": "Here are the changes related the item's metadata", - "submission.sections.correction.column.metadata.info": "Ecco le modifiche relative ai metadati dell'item", + "submission.sections.correction.column.metadata.info": "Ecco le modifiche relative ai metadati dell'item", // "submission.sections.correction.column.previous-value": "Previous value", "submission.sections.correction.column.previous-value": "Valore precedente", @@ -8609,7 +8609,7 @@ "submission.sections.correction.column.policy": "Policy", // "submission.sections.submit.progressbar.correction": "Correction details", - "submission.sections.submit.progressbar.correction": "Correzione dei dettagli", + "submission.sections.submit.progressbar.correction": "Dettagli della correzione", @@ -8665,10 +8665,10 @@ "submission.sections.detect-duplicate.not-duplicate-help": "Clicca qui se questo non è un duplicato del tuo articolo", // "submission.sections.detect-duplicate.submitter-decision": "Submitter decision:", - "submission.sections.detect-duplicate.submitter-decision": "Decisione del submitter:", + "submission.sections.detect-duplicate.submitter-decision": "Decisione del compilatore:", // "submission.sections.detect-duplicate.submitter-note": "Submitter note:", - "submission.sections.detect-duplicate.submitter-note": "Nota del submitter:", + "submission.sections.detect-duplicate.submitter-note": "Note del compilatore:", @@ -8814,7 +8814,7 @@ "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Importato e aggiunto con successo volume di journal esterno alla selezione", // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:", - "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleziona una corrispondenza locale:", + "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Selezionare una corrispondenza locale:", // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all", "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleziona tutto", @@ -9111,7 +9111,7 @@ "submission.sections.ccLicense.option.select": "Seleziona un'opzione...", // "submission.sections.ccLicense.link": "You’ve selected the following license:", - "submission.sections.ccLicense.link": "Hai selezionato la seguente licenza:", + "submission.sections.ccLicense.link": "Avete selezionato la seguente licenza:", // "submission.sections.ccLicense.confirmation": "I grant the license above", "submission.sections.ccLicense.confirmation": "Concedo la licenza di cui sopra", @@ -9120,7 +9120,7 @@ "submission.sections.general.add-more": "Aggiungi altro", // "submission.sections.general.cannot_deposit": "Deposit cannot be completed due to errors in the form.
Please fill out all required fields to complete the deposit.", - "submission.sections.general.cannot_deposit": "L'immissione non può essere competata a causa di errori nel modulo.
Si prega di compilare tutti i campi obbligatori.", + "submission.sections.general.cannot_deposit": "Il deposito non può essere completato a causa di errori nel modulo.
Si prega di compilare tutti i campi richiesti per completare il deposito.", // "submission.sections.general.collection": "Collection", "submission.sections.general.collection": "Collezione", @@ -9273,13 +9273,13 @@ "submission.sections.submit.progressbar.license": "Licenza di deposito", // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies", - "submission.sections.submit.progressbar.sherpapolicy": "Policy di Sherpa", + "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies", // "submission.sections.submit.progressbar.upload": "Upload files", "submission.sections.submit.progressbar.upload": "Carica file", // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information", - "submission.sections.submit.progressbar.sherpaPolicies": "Informazioni sulla policy di open access dell'editore", + "submission.sections.submit.progressbar.sherpaPolicies": "Informazioni sulle policy open access dell'editore", // "submission.sections.submit.progressbar.correction-step": "Corrections", "submission.sections.submit.progressbar.correction-step": "Correzioni", @@ -9287,7 +9287,7 @@ // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.", - "submission.sections.sherpa-policy.title-empty": "Non sono disponibili informazioni sulle policy dell'editore. Se il lavoro ha un ISSN associato, si prega di inserirlo qui sopra per vedere le policy di open access dell'editore.", + "submission.sections.sherpa-policy.title-empty": "Non sono disponibili informazioni sulle policy dell'editore. Se il vostro lavoro ha un ISSN associato, inseritelo qui sopra per vedere le open access policies dell'editore.", // "submission.sections.status.errors.title": "Errors", "submission.sections.status.errors.title": "Errori", @@ -9392,10 +9392,10 @@ "submission.sections.upload.form.until-placeholder": "Fino a quando", // "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": "I file caricati nella collection {{collectionName}} saranno accessibili in base ai seguenti gruppi:", + "submission.sections.upload.header.policy.default.nolist": "I file caricati nella raccolta {{collectionName}} saranno accessibili ai seguenti gruppi:", // "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": "Si prega di notare che i file caricati nella collection {{collectionName}} saranno accessibili, in aggiunta a quanto esplicitamente deciso per il singolo file, con i seguenti gruppi:", + "submission.sections.upload.header.policy.default.withlist": "Si noti che i file caricati nella raccolta {{collectionName}} saranno accessibili, oltre a quanto esplicitamente deciso per il singolo file, con i seguenti gruppi:", // "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 by dragging & dropping them anywhere on the page.", "submission.sections.upload.info": "Qui troverai tutti i file attualmente presenti nell'item. È possibile aggiornare i metadati dei file e le condizioni di accesso o caricare file aggiuntivi semplicemente trascinandoli e rilasciandoli ovunque nella pagina", @@ -9507,10 +9507,10 @@ "submission.sections.sherpa.publisher.policy.description": "Le informazioni riportate di seguito sono state reperite tramite Sherpa Romeo. In base alle policy del vostro editore, fornisce consigli sull'eventuale necessità di un embargo e/o su quali file è possibile caricare. In caso di domande, contattare l'amministratore del sito tramite il modulo di feedback nel piè di pagina.", // "submission.sections.sherpa.publisher.policy.openaccess": "Open Access pathways permitted by this journal's policy are listed below by article version. Click on a pathway for a more detailed view", - "submission.sections.sherpa.publisher.policy.openaccess": "I percorsi open access consentiti dalle policy di questa rivista sono elencati di seguito per versione dell'articolo. Clicca su un percorso per vederlo nel dettaglio", + "submission.sections.sherpa.publisher.policy.openaccess": "I percorsi Open Access consentiti dalle policy di questa rivista sono elencati di seguito per versione dell'articolo. Clicca su un percorso per vederlo nel dettaglio", // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:", - "submission.sections.sherpa.publisher.policy.more.information": "Per maggiori informazioni si prega di consultare il seguente link:", + "submission.sections.sherpa.publisher.policy.more.information": "Per ulteriori informazioni, consultare i seguenti link:", // "submission.sections.sherpa.publisher.policy.version": "Version", "submission.sections.sherpa.publisher.policy.version": "Versione", @@ -9531,7 +9531,7 @@ "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisiti", // "submission.sections.sherpa.publisher.policy.location": "Location", - "submission.sections.sherpa.publisher.policy.location": "Località", + "submission.sections.sherpa.publisher.policy.location": "Posizione", // "submission.sections.sherpa.publisher.policy.conditions": "Conditions", "submission.sections.sherpa.publisher.policy.conditions": "Condizioni", @@ -9540,7 +9540,7 @@ "submission.sections.sherpa.publisher.policy.refresh": "Ricarica", // "submission.sections.sherpa.record.information": "Record Information", - "submission.sections.sherpa.record.information": "Informazioni sulla registrazione", + "submission.sections.sherpa.record.information": "Informazioni del record", // "submission.sections.sherpa.record.information.id": "ID", "submission.sections.sherpa.record.information.id": "ID", @@ -9555,7 +9555,7 @@ "submission.sections.sherpa.record.information.uri": "URI", // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations", - "submission.sections.sherpa.error.message": "Si è verificato un errore nel recuperare le informazioni da Sherpa", + "submission.sections.sherpa.error.message": "Si è verificato un errore nel recupero delle informazioni da Sherpa", @@ -10562,7 +10562,7 @@ "curation-task.task.iiifpdfmultipages.label": "Creare un PDF multipagina dalle immagini IIIF", // "curation-task.task.iiifclean.label": "Remove all metadata bundles created by a previous upload to the image server", - "curation-task.task.iiifclean.label": "Rimuovere tutti i bundle di metadati generati da precedenti caricamenti sull'Image Server", + "curation-task.task.iiifclean.label": "Rimuovi tutti i bitstream e bundle creati durante il processamento della risorsa IIIF", // "curation-task.task.pdftoimagecmyk.label": "Extract images from PDF (CMYK)", "curation-task.task.pdftoimagecmyk.label": "Estrarre le immagini da PDF (CMYK)", @@ -10652,7 +10652,7 @@ // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts", "admin.system-wide-alert.breadcrumbs": "Allarmi di sistema", - // "admin.system-wide-alert.title": "System-wide Alerts" + // "admin.system-wide-alert.title": "System-wide Alerts", "admin.system-wide-alert.title": "Allarmi di sistema", From 875f154e4ed86c7e978245797590c53469ce0ebc Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 5 Oct 2023 18:09:54 +0200 Subject: [PATCH 727/758] [CST-10703] unit tests --- .../external-login-page.component.spec.ts | 9 +-------- ...-review-account-info-page.component.spec.ts | 12 +----------- .../helpers/review-account.guard.spec.ts | 2 +- .../confirm-email.component.spec.ts | 1 + .../orcid-confirmation.component.spec.ts | 18 ++++++------------ .../registration-data.resolver.spec.ts | 12 ++++++------ 6 files changed, 16 insertions(+), 38 deletions(-) diff --git a/src/app/external-login-page/external-login-page.component.spec.ts b/src/app/external-login-page/external-login-page.component.spec.ts index 8dee4821a7a..3ea6724278a 100644 --- a/src/app/external-login-page/external-login-page.component.spec.ts +++ b/src/app/external-login-page/external-login-page.component.spec.ts @@ -32,7 +32,7 @@ describe('ExternalLoginPageComponent', () => { provide: ActivatedRoute, useValue: { snapshot: { - queryParams: { + params: { token: '1234567890', }, }, @@ -67,13 +67,6 @@ describe('ExternalLoginPageComponent', () => { expect(component.token).toEqual('1234567890'); }); - it('should set the hasErrors flag if the token is not present', () => { - const activatedRoute = TestBed.inject(ActivatedRoute); - activatedRoute.snapshot.queryParams.token = undefined; - fixture.detectChanges(); - expect(component.hasErrors).toBeTrue(); - }); - it('should display the DsExternalLogIn component when there are no errors', () => { const registrationData = Object.assign(new Registration(), registrationDataMock); component.registrationData$ = of(registrationData); diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts index ca65204e8dd..4b136cbef7a 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts @@ -10,7 +10,7 @@ describe('ExternalLoginReviewAccountInfoPageComponent', () => { const mockActivatedRoute = { snapshot: { - queryParams: { + params: { token: '1234567890' } }, @@ -43,16 +43,6 @@ describe('ExternalLoginReviewAccountInfoPageComponent', () => { expect(component.token).toEqual('1234567890'); }); - it('should set hasErrors to false if registrationData is not empty', () => { - expect(component.hasErrors).toBeFalse(); - }); - - it('should set the registrationData$', () => { - component.registrationData$.subscribe((registrationData) => { - expect(registrationData.email).toEqual(mockRegistrationDataModel.email); - }); - }); - it('should display review account info component when there are no errors', () => { component.hasErrors = false; component.registrationData$ = of(mockRegistrationDataModel); diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts index 9004e173204..3a8ee083586 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts @@ -68,7 +68,7 @@ describe('ReviewAccountGuard', () => { }); it('should navigate to 404 if the registration type is not validation and the user is not authenticated', () => { - registrationMock.registrationType = AuthRegistrationType.Password; + registrationMock.registrationType = AuthRegistrationType.Orcid; epersonRegistrationService.searchRegistrationByToken.and.returnValue(createSuccessfulRemoteDataObject$(registrationMock)); spyOn(authService, 'isAuthenticated').and.returnValue(of(false)); (guard.canActivate({ params: { token: 'invalid-token' } } as any, {} as any) as any).subscribe((result) => { diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts index c9c741672dd..2247d8de904 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -75,6 +75,7 @@ describe('ConfirmEmailComponent', () => { component.registrationData = Object.assign(new Registration(), { id: '123', email: 'test@example.com', + netId: 'test-netid', registrationMetadata: {}, registrationType: AuthMethodType.Orcid, }); diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts index e3f84663539..441a326ef53 100644 --- a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts +++ b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts @@ -2,16 +2,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { OrcidConfirmationComponent } from './orcid-confirmation.component'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { mockRegistrationDataModel } from '../../models/registration-data.mock.model'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe'; +import { Registration } from 'src/app/core/shared/registration.model'; +import { mockRegistrationDataModel } from '../../models/registration-data.mock.model'; describe('OrcidConfirmationComponent', () => { let component: OrcidConfirmationComponent; let fixture: ComponentFixture; + let model: Registration; beforeEach(async () => { await TestBed.configureTestingModule({ @@ -32,7 +34,7 @@ describe('OrcidConfirmationComponent', () => { } }), ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + schemas: [NO_ERRORS_SCHEMA] }) .compileComponents(); }); @@ -40,7 +42,6 @@ describe('OrcidConfirmationComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(OrcidConfirmationComponent); component = fixture.componentInstance; - component.registratioData = mockRegistrationDataModel; fixture.detectChanges(); }); @@ -59,17 +60,10 @@ describe('OrcidConfirmationComponent', () => { it('should initialize the form with null email as an empty string', () => { component.registratioData.email = null; - fixture.detectChanges(); component.ngOnInit(); + fixture.detectChanges(); const emailFormControl = component.form.get('email'); expect(emailFormControl.value).toBe(''); }); - it('should not render email input when email is null', () => { - component.registratioData.email = null; - fixture.detectChanges(); - component.ngOnInit(); - const emailInput = fixture.nativeElement.querySelector('input[type="email"]'); - expect(emailInput).toBeFalsy(); - }); }); diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts index a33434062b5..0d1f415a3b4 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts +++ b/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts @@ -4,7 +4,7 @@ import { RegistrationDataResolver } from './registration-data.resolver'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { Registration } from '../../../core/shared/registration.model'; import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; -import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; describe('RegistrationDataResolver', () => { let resolver: RegistrationDataResolver; @@ -14,7 +14,7 @@ describe('RegistrationDataResolver', () => { }); beforeEach(() => { - const spy = jasmine.createSpyObj('EpersonRegistrationService', ['searchByTokenAndUpdateData']); + const spy = jasmine.createSpyObj('EpersonRegistrationService', ['searchRegistrationByToken']); TestBed.configureTestingModule({ providers: [ @@ -33,14 +33,14 @@ describe('RegistrationDataResolver', () => { it('should resolve registration data based on a token', () => { const token = 'abc123'; const registrationRD$ = createSuccessfulRemoteDataObject$(registrationMock); - epersonRegistrationServiceSpy.searchByTokenAndUpdateData.and.returnValue(registrationRD$); - + epersonRegistrationServiceSpy.searchRegistrationByToken.and.returnValue(registrationRD$); const route = new ActivatedRouteSnapshot(); route.params = { token: token }; const state = {} as RouterStateSnapshot; - resolver.resolve(route, state).subscribe((result: Registration) => { - expect(result).toBeDefined(); + resolver.resolve(route, state).subscribe((data) => { + expect(data).toEqual(createSuccessfulRemoteDataObject(registrationMock)); }); + expect(epersonRegistrationServiceSpy.searchRegistrationByToken).toHaveBeenCalledWith(token); }); }); From 3efd491e68f5e1c0fab9b10a9461be371b43a157 Mon Sep 17 00:00:00 2001 From: Andrea Bollini Date: Fri, 6 Oct 2023 09:54:41 +0200 Subject: [PATCH 728/758] CST-11817 enable bitbucket pipeline over coar notify demo --- bitbucket-pipelines.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 bitbucket-pipelines.yml diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml new file mode 100644 index 00000000000..95040af1ead --- /dev/null +++ b/bitbucket-pipelines.yml @@ -0,0 +1,27 @@ +options: + runs-on: ubuntu-latest + +definitions: + steps: + - step: &unittest-code-checks + name: test-code-checks + image: + name: cypress/browsers:node18.12.0-chrome107 + run-as-user: 1000 + size: 2x + caches: + - node + script: + - yarn install --frozen-lockfile + - yarn run lint --quiet + - yarn run check-circ-deps + - yarn run build:prod + - yarn run test:headless + +pipelines: + branches: + 'coar-notify7-demo': + - step: *unittest-code-checks + pull-requests: + '**': + - step: *unittest-code-checks \ No newline at end of file From d9c4cbef536c68e23fbc576246dd287b05898a8c Mon Sep 17 00:00:00 2001 From: Andrea Bollini Date: Fri, 6 Oct 2023 12:29:15 +0200 Subject: [PATCH 729/758] CST-11817 revert commit to the wrong branch --- bitbucket-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 95040af1ead..5cdc81bfd51 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -20,8 +20,8 @@ definitions: pipelines: branches: - 'coar-notify7-demo': + 'dspace-cris-7': - step: *unittest-code-checks pull-requests: '**': - - step: *unittest-code-checks \ No newline at end of file + - step: *unittest-code-checks From 24f242558fe1acd9fb9eebaf2200b0840813627e Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Fri, 6 Oct 2023 12:51:22 +0200 Subject: [PATCH 730/758] [CST-10703] handle authenticated user to merge registration data --- .../review-account-info.component.spec.ts | 5 +- .../review-account-info.component.ts | 62 +++++++++++++------ .../external-log-in.component.ts | 8 ++- 3 files changed, 53 insertions(+), 22 deletions(-) diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts index b7663674972..c7343c87bff 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts @@ -22,6 +22,8 @@ import { RouterMock } from '../../shared/mocks/router.mock'; import { EventEmitter } from '@angular/core'; import { CompareValuesPipe } from '../helpers/compare-values.pipe'; import { Registration } from '../../core/shared/registration.model'; +import { AuthService } from '../../core/auth/auth.service'; +import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; @@ -79,6 +81,7 @@ describe('ReviewAccountInfoComponent', () => { }, { provide: TranslateService, useValue: translateServiceStub }, { provide: Router, useValue: router }, + { provide: AuthService, useValue: new AuthServiceMock() } ], imports: [ CommonModule, @@ -150,7 +153,7 @@ describe('ReviewAccountInfoComponent', () => { spyOn(ePersonDataServiceStub, 'mergeEPersonDataWithToken').and.returnValue( of({ hasSucceeded: true }) ); - component.mergeEPersonDataWithToken(); + component.mergeEPersonDataWithToken(registrationDataMock.user); tick(); expect(ePersonDataServiceStub.mergeEPersonDataWithToken).toHaveBeenCalledTimes(1); expect(router.navigate).toHaveBeenCalledWith(['/profile']); diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index bf5099c3767..53b56d79c53 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -7,7 +7,7 @@ import { } from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { Observable, Subscription, filter, from, switchMap, take } from 'rxjs'; +import { Observable, Subscription, filter, from, map, switchMap, take, tap } from 'rxjs'; import { RemoteData } from '../../core/data/remote-data'; import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -16,6 +16,7 @@ import { TranslateService } from '@ngx-translate/core'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { Router } from '@angular/router'; import { Registration } from '../../core/shared/registration.model'; +import { AuthService } from '../../core/auth/auth.service'; export interface ReviewAccountInfoData { label: string; @@ -59,8 +60,9 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { private modalService: NgbModal, private notificationService: NotificationsService, private translateService: TranslateService, - private router: Router - ) {} + private router: Router, + private authService: AuthService + ) { } ngOnInit(): void { this.dataToCompare = this.prepareDataToCompare(); @@ -94,15 +96,37 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { modalRef.componentInstance.brandColor = 'primary'; modalRef.componentInstance.confirmIcon = 'fa fa-check'; - this.subs.push( - modalRef.componentInstance.response - .pipe(take(1)) - .subscribe((confirm: boolean) => { - if (confirm) { - this.mergeEPersonDataWithToken(); - } - }) - ); + if (!this.registrationData.user) { + this.subs.push( + this.isAuthenticated() + .pipe( + filter((isAuthenticated) => isAuthenticated), + switchMap(() => this.authService.getAuthenticatedUserFromStore()), + filter((user) => hasValue(user)), + map((user) => user.uuid), + switchMap((userId) => + modalRef.componentInstance.response.pipe( + tap((confirm: boolean) => { + if (confirm) { + this.mergeEPersonDataWithToken(userId); + } + }) + ) + ) + ) + .subscribe() + ); + } else if (this.registrationData.user) { + this.subs.push( + modalRef.componentInstance.response + .pipe(take(1)) + .subscribe((confirm: boolean) => { + if (confirm && this.registrationData.user) { + this.mergeEPersonDataWithToken(this.registrationData.user); + } + }) + ); + } } /** @@ -110,14 +134,14 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { * If any of the metadata is overridden, sent a merge request for each metadata to override. * If none of the metadata is overridden, sent a merge request with the registration token only. */ - mergeEPersonDataWithToken() { + mergeEPersonDataWithToken(userId: string) { let override$: Observable>; if (this.dataToCompare.some((d) => d.overrideValue)) { override$ = from(this.dataToCompare).pipe( filter((data: ReviewAccountInfoData) => data.overrideValue), switchMap((data: ReviewAccountInfoData) => { return this.ePersonService.mergeEPersonDataWithToken( - this.registrationData.user, + userId, this.registrationToken, data.identifier ); @@ -125,7 +149,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); } else { override$ = this.ePersonService.mergeEPersonDataWithToken( - this.registrationData.user, + userId, this.registrationToken ); } @@ -138,9 +162,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ) ); this.router.navigate(['/profile']); - } - - if (response.hasFailed) { + } else { this.notificationService.error( this.translateService.get( 'review-account-info.merge-data.notification.error' @@ -151,6 +173,10 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); } + private isAuthenticated(): Observable { + return this.authService.isAuthenticated(); + } + /** * Prepare the data to compare and display: * -> For each metadata from the registration token, get the current value from the eperson. diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts index 0a077405429..d167a0c5d08 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts @@ -55,7 +55,7 @@ export class ExternalLogInComponent implements OnInit { private translate: TranslateService, private modalService: NgbModal, private authService: AuthService, - ) {} + ) { } /** * Provide the registration data object to the objectInjector. @@ -118,11 +118,13 @@ export class ExternalLogInComponent implements OnInit { * @param content - The content to be displayed in the modal. */ openLoginModal(content: any) { + setTimeout(() => { + this.authService.setRedirectUrl(`/review-account/${this.token}`); + }, 100); this.modalRef = this.modalService.open(content); - this.authService.setRedirectUrl('/review-account'); this.modalRef.dismissed.subscribe(() => { - this.clearRedirectUrl(); + this.clearRedirectUrl(); }); } From 80fd96cba5785bd9be0cc630c7ea7df25c8b80a5 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Fri, 6 Oct 2023 14:41:34 +0200 Subject: [PATCH 731/758] [DSC-1283] Fixes user agreement acceptance for new users --- src/app/core/auth/auth.actions.ts | 48 ++++++++++++++ src/app/core/auth/auth.effects.spec.ts | 65 +++++++++++++++++++ src/app/core/auth/auth.effects.ts | 21 ++++++ src/app/core/auth/auth.reducer.ts | 20 ++++++ .../end-user-agreement.component.ts | 4 +- src/app/shared/testing/auth-service.stub.ts | 4 ++ 6 files changed, 160 insertions(+), 2 deletions(-) diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index b8a943ee106..4ffaada1951 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -37,6 +37,9 @@ export const AuthActionTypes = { RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS'), RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'), REDIRECT_AFTER_LOGIN_SUCCESS: type('dspace/auth/REDIRECT_AFTER_LOGIN_SUCCESS'), + REFRESH_STATE_TOKEN_REDIRECT: type('dspace/auth/REFRESH_STATE_TOKEN_REDIRECT'), + REFRESH_STATE_TOKEN_REDIRECT_ERROR: type('dspace/auth/REFRESH_STATE_TOKEN_REDIRECT_ERROR'), + REFRESH_STATE_TOKEN_REDIRECT_SUCCESS: type('dspace/auth/REFRESH_STATE_TOKEN_REDIRECT_SUCCESS'), REFRESH_TOKEN_AND_REDIRECT: type('dspace/auth/REFRESH_TOKEN_AND_REDIRECT'), REFRESH_TOKEN_AND_REDIRECT_SUCCESS: type('dspace/auth/REFRESH_TOKEN_AND_REDIRECT_SUCCESS'), REFRESH_TOKEN_AND_REDIRECT_ERROR: type('dspace/auth/REFRESH_TOKEN_AND_REDIRECT_ERROR'), @@ -416,6 +419,51 @@ export class UnsetUserAsIdleAction implements Action { public type: string = AuthActionTypes.UNSET_USER_AS_IDLE; } + +/** + * Refresh user state, the token and execute a redirect. + * @class RefreshTokenAndRedirectAction + * @implements {Action} + */ +export class RefreshStateTokenRedirectAction implements Action { + public type: string = AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT; + payload: { + token: AuthTokenInfo, + redirectUrl: string + }; + + constructor(token: AuthTokenInfo, redirectUrl: string) { + this.payload = { token, redirectUrl }; + } +} + +/** + * Refresh user state, the token and execute a redirect. + * @class RefreshStateTokenRedirectSuccessAction + * @implements {Action} + */ +export class RefreshStateTokenRedirectSuccessAction implements Action { + public type: string = AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS; + payload: { + ePerson: EPerson, + token: AuthTokenInfo, + redirectUrl: string + }; + + constructor(ePerson: EPerson, token: AuthTokenInfo, redirectUrl: string) { + this.payload = { ePerson, token, redirectUrl }; + } +} + +/** + * Refresh user state, the token and execute a redirect. + * @class RefreshStateTokenRedirectErrorAction + * @implements {Action} + */ +export class RefreshStateTokenRedirectErrorAction implements Action { + public type: string = AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_ERROR; +} + /** * Refresh authentication token and redirect. * @class RefreshTokenAndRedirectAction diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts index 7b0b8dd5d68..c32bf1193ab 100644 --- a/src/app/core/auth/auth.effects.spec.ts +++ b/src/app/core/auth/auth.effects.spec.ts @@ -20,6 +20,9 @@ import { CheckAuthenticationTokenCookieAction, LogOutErrorAction, LogOutSuccessAction, + RefreshStateTokenRedirectErrorAction, + RefreshStateTokenRedirectSuccessAction, + RefreshTokenAndRedirectAction, RefreshTokenAndRedirectErrorAction, RefreshTokenAndRedirectSuccessAction, RefreshTokenErrorAction, @@ -457,6 +460,68 @@ describe('AuthEffects', () => { }); }); + describe('refreshStateTokenRedirect$', () => { + + describe('when refresh state, token and redirect action', () => { + it('should return a REFRESH_STATE_TOKEN_AND_REDIRECT_SUCCESS action in response to a REFRESH_STATE_TOKEN_AND_REDIRECT action', (done) => { + spyOn((authEffects as any).authService, 'retrieveAuthenticatedUserById').and.returnValue(observableOf(EPersonMock)); + + actions = hot('--a-', { + a: { + type: AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT, + payload: { token, redirectUrl } + } + }); + + const expected = cold('--b-', { b: new RefreshStateTokenRedirectSuccessAction(EPersonMock, token, redirectUrl) }); + + expect(authEffects.refreshStateTokenRedirect$).toBeObservable(expected); + done(); + }); + }); + + describe('when refresh state token failed', () => { + it('should return a REFRESH_STATE_TOKEN_AND_REDIRECT_SUCCESS action in response to a REFRESH_STATE_TOKEN_AND_REDIRECT action', (done) => { + spyOn((authEffects as any).authService, 'retrieveAuthenticatedUserById').and.returnValue(observableThrow('')); + + actions = hot('--a-', { + a: { + type: AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT, + payload: { token, redirectUrl } + } + }); + + const expected = cold('--b-', { b: new RefreshStateTokenRedirectErrorAction() }); + + expect(authEffects.refreshStateTokenRedirect$).toBeObservable(expected); + done(); + }); + }); + + }); + + describe('refreshStateTokenRedirectSuccess$', () => { + + beforeEach(() => { + scheduler = getTestScheduler(); + }); + + it('should return a REFRESH_TOKEN_AND_REDIRECT action', (done) => { + + actions = hot('--a-', { + a: { + type: AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS, + payload: { ePerson: EPersonMock, token, redirectUrl } + } + }); + + const expected = cold('--b-', { b: new RefreshTokenAndRedirectAction(token, redirectUrl) }); + + expect(authEffects.refreshStateTokenRedirectSuccess$).toBeObservable(expected); + done(); + }); + }); + describe('refreshTokenAndRedirect$', () => { describe('when refresh token and redirect succeeded', () => { diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 2ed01e1eb86..25380328eba 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -35,6 +35,9 @@ import { LogOutErrorAction, LogOutSuccessAction, RedirectAfterLoginSuccessAction, + RefreshStateTokenRedirectAction, + RefreshStateTokenRedirectErrorAction, + RefreshStateTokenRedirectSuccessAction, RefreshTokenAction, RefreshTokenAndRedirectAction, RefreshTokenAndRedirectErrorAction, @@ -270,6 +273,24 @@ export class AuthEffects { })) ); + public refreshStateTokenRedirect$: Observable = createEffect(() => this.actions$ + .pipe(ofType(AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT), + switchMap((action: RefreshStateTokenRedirectAction) => + this.authService.getAuthenticatedUserFromStore() + .pipe( + switchMap(user => this.authService.retrieveAuthenticatedUserById(user.id)), + map(user => new RefreshStateTokenRedirectSuccessAction(user, action.payload.token, action.payload.redirectUrl)), + catchError((error) => observableOf(new RefreshStateTokenRedirectErrorAction())) + ) + ) + ) + ); + + public refreshStateTokenRedirectSuccess$: Observable = createEffect(() => this.actions$ + .pipe(ofType(AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS), + map((action: RefreshStateTokenRedirectAction) => new RefreshTokenAndRedirectAction(action.payload.token, action.payload.redirectUrl))) + ); + public refreshTokenAndRedirectSuccess$: Observable = createEffect(() => this.actions$ .pipe(ofType(AuthActionTypes.REFRESH_TOKEN_AND_REDIRECT_SUCCESS), tap((action: RefreshTokenAndRedirectSuccessAction) => this.authService.replaceToken(action.payload.token)), diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts index 0a02257fcd7..7deb207fc2e 100644 --- a/src/app/core/auth/auth.reducer.ts +++ b/src/app/core/auth/auth.reducer.ts @@ -8,6 +8,7 @@ import { LogOutErrorAction, RedirectWhenAuthenticationIsRequiredAction, RedirectWhenTokenExpiredAction, + RefreshStateTokenRedirectSuccessAction, RefreshTokenAndRedirectSuccessAction, RefreshTokenSuccessAction, RetrieveAuthenticatedEpersonSuccessAction, @@ -190,6 +191,25 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut user: undefined }); + case AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT: + return Object.assign({}, state, { + loading: true, + loaded: false, + }); + + case AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS: + return Object.assign({}, state, { + loading: false, + loaded: false, + user: (action as RefreshStateTokenRedirectSuccessAction).payload.ePerson, + }); + + case AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_ERROR: + return Object.assign({}, state, { + loading: false, + loaded: false, + }); + case AuthActionTypes.REFRESH_TOKEN: return Object.assign({}, state, { refreshing: true, diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts index c925feb141e..f2e4c469ceb 100644 --- a/src/app/info/end-user-agreement/end-user-agreement.component.ts +++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts @@ -1,4 +1,4 @@ -import { LogOutAction, RefreshTokenAndRedirectAction } from '../../core/auth/auth.actions'; +import { LogOutAction, RefreshStateTokenRedirectAction } from '../../core/auth/auth.actions'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { AuthService } from '../../core/auth/auth.service'; import { map, switchMap, take } from 'rxjs/operators'; @@ -92,7 +92,7 @@ export class EndUserAgreementComponent implements OnInit, OnDestroy { take(1) ).subscribe((redirectUrl) => { if (isNotEmpty(redirectUrl)) { - this.store.dispatch(new RefreshTokenAndRedirectAction(this.authService.getToken(), redirectUrl)); + this.store.dispatch(new RefreshStateTokenRedirectAction(this.authService.getToken(), redirectUrl)); } }); } diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts index d859db0bdf1..a5254ddf76c 100644 --- a/src/app/shared/testing/auth-service.stub.ts +++ b/src/app/shared/testing/auth-service.stub.ts @@ -175,4 +175,8 @@ export class AuthServiceStub { getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction { return; } + + public getAuthenticatedUserFromStore(): Observable { + return observableOf(EPersonMock); + } } From 31351cd24d4b6749174a55f8bf8d7639fb96defd Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Fri, 6 Oct 2023 17:04:30 +0200 Subject: [PATCH 732/758] [DSC-1283] Fixes failing agreement test --- .../end-user-agreement/end-user-agreement.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts index 7d6b07d73f1..bcaf045578e 100644 --- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts +++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts @@ -9,7 +9,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { of as observableOf } from 'rxjs'; import { Store } from '@ngrx/store'; import { By } from '@angular/platform-browser'; -import { LogOutAction, RefreshTokenAndRedirectAction } from '../../core/auth/auth.actions'; +import { LogOutAction, RefreshStateTokenRedirectAction } from '../../core/auth/auth.actions'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; @@ -113,7 +113,7 @@ describe('EndUserAgreementComponent', () => { }); it('should refresh the token and navigate the user to the redirect url', () => { - expect(store.dispatch).toHaveBeenCalledWith(new RefreshTokenAndRedirectAction(token, redirectUrl)); + expect(store.dispatch).toHaveBeenCalledWith(new RefreshStateTokenRedirectAction(token, redirectUrl)); }); }); From 19579e4cb8b7af95c1a7611bfa30bd78b2797324 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Fri, 6 Oct 2023 18:22:43 +0200 Subject: [PATCH 733/758] [CST-10703] redirectToExternalProvider to login --- src/app/core/auth/auth.service.ts | 25 ++++++++ .../auth/models/auth.registration-type.ts | 2 +- .../helpers/review-account.guard.ts | 3 +- .../review-account-info.component.ts | 57 ++++++++++++++++--- .../confirm-email/confirm-email.component.ts | 46 +++++++++------ .../services/external-login.service.ts | 43 ++++++++++---- .../log-in-external-provider.component.ts | 21 +------ 7 files changed, 139 insertions(+), 58 deletions(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index ec98dbc06a2..4e089fc6347 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -50,6 +50,7 @@ import { PageInfo } from '../shared/page-info.model'; import { followLink } from '../../shared/utils/follow-link-config.model'; import { MachineToken } from './models/machine-token.model'; import { NoContent } from '../shared/NoContent.model'; +import { URLCombiner } from '../url-combiner/url-combiner'; export const LOGIN_ROUTE = '/login'; export const LOGOUT_ROUTE = '/logout'; @@ -523,6 +524,30 @@ export class AuthService { }); } + /** + * Returns the external server redirect URL. + * @param redirectRoute - The redirect route. + * @param location - The location. + * @returns The external server redirect URL. + */ + getExternalServerRedirectUrl(redirectRoute: string, location: string): string { + const correctRedirectUrl = new URLCombiner(this._window.nativeWindow.origin, redirectRoute).toString(); + + let externalServerUrl = location; + const myRegexp = /\?redirectUrl=(.*)/g; + const match = myRegexp.exec(location); + const redirectUrlFromServer = (match && match[1]) ? match[1] : null; + + // Check whether the current page is different from the redirect url received from rest + if (isNotNull(redirectUrlFromServer) && redirectUrlFromServer !== correctRedirectUrl) { + // change the redirect url with the current page url + const newRedirectUrl = `?redirectUrl=${correctRedirectUrl}`; + externalServerUrl = location.replace(/\?redirectUrl=(.*)/g, newRedirectUrl); + } + + return externalServerUrl; + } + /** * Clear redirect url */ diff --git a/src/app/core/auth/models/auth.registration-type.ts b/src/app/core/auth/models/auth.registration-type.ts index aa9f9d88b67..b8aaa1fe40d 100644 --- a/src/app/core/auth/models/auth.registration-type.ts +++ b/src/app/core/auth/models/auth.registration-type.ts @@ -1,4 +1,4 @@ export enum AuthRegistrationType { Orcid = 'ORCID', - Validation = 'VALIDATION', + Validation = 'VALIDATION_', } diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.ts b/src/app/external-login-review-account-info/helpers/review-account.guard.ts index 03caf6d63ed..d908483c152 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.ts +++ b/src/app/external-login-review-account-info/helpers/review-account.guard.ts @@ -5,7 +5,6 @@ import { Router, RouterStateSnapshot, } from '@angular/router'; -import isEqual from 'lodash/isEqual'; import { Observable, catchError, mergeMap, of, tap } from 'rxjs'; import { AuthService } from '../../core/auth/auth.service'; import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; @@ -44,7 +43,7 @@ export class ReviewAccountGuard implements CanActivate { (data: RemoteData) => { if (data.hasSucceeded && hasValue(data.payload)) { // is the registration type validation (account valid) - if (hasValue(data.payload.registrationType) && isEqual(data.payload.registrationType, AuthRegistrationType.Validation)) { + if (hasValue(data.payload.registrationType) && data.payload.registrationType.includes(AuthRegistrationType.Validation)) { return of(true); } else { return this.authService.isAuthenticated(); diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index 53b56d79c53..38944f18f5f 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -7,7 +7,7 @@ import { } from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { Observable, Subscription, filter, from, map, switchMap, take, tap } from 'rxjs'; +import { Observable, Subscription, combineLatest, filter, from, map, switchMap, take, tap } from 'rxjs'; import { RemoteData } from '../../core/data/remote-data'; import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -17,6 +17,9 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { Router } from '@angular/router'; import { Registration } from '../../core/shared/registration.model'; import { AuthService } from '../../core/auth/auth.service'; +import { ExternalLoginService } from '../../shared/external-log-in-complete/services/external-login.service'; +import { HardRedirectService } from '../../core/services/hard-redirect.service'; +import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; export interface ReviewAccountInfoData { label: string; @@ -61,7 +64,9 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { private notificationService: NotificationsService, private translateService: TranslateService, private router: Router, - private authService: AuthService + private authService: AuthService, + private externalLoginService: ExternalLoginService, + private hardRedirectService: HardRedirectService, ) { } ngOnInit(): void { @@ -108,7 +113,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { modalRef.componentInstance.response.pipe( tap((confirm: boolean) => { if (confirm) { - this.mergeEPersonDataWithToken(userId); + this.mergeEPersonDataWithToken(userId, this.registrationData.registrationType); } }) ) @@ -122,7 +127,8 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { .pipe(take(1)) .subscribe((confirm: boolean) => { if (confirm && this.registrationData.user) { - this.mergeEPersonDataWithToken(this.registrationData.user); + const registrationType = this.registrationData.registrationType.split(AuthRegistrationType.Validation)[1]; + this.mergeEPersonDataWithToken(this.registrationData.user, registrationType); } }) ); @@ -134,7 +140,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { * If any of the metadata is overridden, sent a merge request for each metadata to override. * If none of the metadata is overridden, sent a merge request with the registration token only. */ - mergeEPersonDataWithToken(userId: string) { + mergeEPersonDataWithToken(userId: string, registrationType: string) { let override$: Observable>; if (this.dataToCompare.some((d) => d.overrideValue)) { override$ = from(this.dataToCompare).pipe( @@ -153,8 +159,16 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { this.registrationToken ); } + if (this.registrationData.user && this.registrationData.registrationType.includes(AuthRegistrationType.Validation)) { + this.handleUnauthenticatedUser(override$, registrationType); + } else { + this.handleAuthenticatedUser(override$); + } + } + + handleAuthenticatedUser(override$: Observable>) { this.subs.push( - override$.subscribe((response) => { + override$.subscribe((response: RemoteData) => { if (response.hasSucceeded) { this.notificationService.success( this.translateService.get( @@ -162,7 +176,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ) ); this.router.navigate(['/profile']); - } else { + } else if (response.hasFailed) { this.notificationService.error( this.translateService.get( 'review-account-info.merge-data.notification.error' @@ -173,6 +187,35 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); } + handleUnauthenticatedUser(override$: Observable>, registrationType: string) { + this.subs.push( + combineLatest([ + override$, + this.externalLoginService.getExternalAuthLocation(registrationType), + this.authService.getRedirectUrl()]) + .subscribe(([response, location, redirectRoute]) => { + if (response.hasSucceeded) { + this.notificationService.success( + this.translateService.get( + 'review-account-info.merge-data.notification.success' + ) + ); + // set Redirect URL to User profile, so the user is redirected to the profile page after logging in + this.authService.setRedirectUrl('/profile'); + const externalServerUrl = this.authService.getExternalServerRedirectUrl(redirectRoute, location); + // redirect to external registration type authentication url + this.hardRedirectService.redirect(externalServerUrl); + } else if (response.hasFailed) { + this.notificationService.error( + this.translateService.get( + 'review-account-info.merge-data.notification.error' + ) + ); + } + }) + ); + } + private isAuthenticated(): Observable { return this.authService.isAuthenticated(); } diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index df57939021b..ad8205a2ea7 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -5,14 +5,14 @@ import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../../c import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; import { hasNoValue, hasValue } from '../../../../shared/empty.util'; import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { RemoteData } from '../../../../core/data/remote-data'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import isEqual from 'lodash/isEqual'; import { AuthService } from '../../../../core/auth/auth.service'; import { Router } from '@angular/router'; -import { Subscription } from 'rxjs'; +import { Subscription, combineLatest, take } from 'rxjs'; import { Registration } from '../../../../core/shared/registration.model'; +import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; @Component({ selector: 'ds-confirm-email', @@ -39,6 +39,8 @@ export class ConfirmEmailComponent implements OnDestroy { */ subs: Subscription[] = []; + externalLocation: string; + constructor( private formBuilder: FormBuilder, private externalLoginService: ExternalLoginService, @@ -46,7 +48,8 @@ export class ConfirmEmailComponent implements OnDestroy { private notificationService: NotificationsService, private translate: TranslateService, private authService: AuthService, - private router: Router + private router: Router, + private hardRedirectService: HardRedirectService, ) { this.emailForm = this.formBuilder.group({ email: ['', [Validators.required, Validators.email]] @@ -119,21 +122,28 @@ export class ConfirmEmailComponent implements OnDestroy { eperson.requireCertificate = false; eperson.selfRegistered = true; this.subs.push( - this.epersonDataService.createEPersonForToken(eperson, token).pipe( - getFirstCompletedRemoteData(), - ).subscribe((rd: RemoteData) => { - if (rd.hasFailed) { - this.notificationService.error( - this.translate.get('external-login-page.provide-email.create-account.notifications.error.header'), - this.translate.get('external-login-page.provide-email.create-account.notifications.error.content') - ); - } else if (rd.hasSucceeded) { - // redirect to login page with authMethod query param, so that the login page knows which authentication method to use - // set Redirect URL to User profile, so the user is redirected to the profile page after logging in - this.router.navigate(['/login'], { queryParams: { authMethod: registrationData.registrationType } }); - this.authService.setRedirectUrl('/profile'); - } - })); + combineLatest([ + this.epersonDataService.createEPersonForToken(eperson, token).pipe( + getFirstCompletedRemoteData(), + ), + this.externalLoginService.getExternalAuthLocation(this.registrationData.registrationType), + this.authService.getRedirectUrl().pipe(take(1)) + ]) + .subscribe(([rd, location, redirectRoute]) => { + if (rd.hasFailed) { + this.notificationService.error( + this.translate.get('external-login-page.provide-email.create-account.notifications.error.header'), + this.translate.get('external-login-page.provide-email.create-account.notifications.error.content') + ); + } else if (rd.hasSucceeded) { + // set Redirect URL to User profile, so the user is redirected to the profile page after logging in + this.authService.setRedirectUrl('/profile'); + const externalServerUrl = this.authService.getExternalServerRedirectUrl(redirectRoute, location); + // redirect to external registration type authentication url + this.hardRedirectService.redirect(externalServerUrl); + } + }) + ); } ngOnDestroy(): void { diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts index 3d3f97571c9..fbe64198b21 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -1,12 +1,16 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable, map } from 'rxjs'; +import { Observable, filter, map, tap } from 'rxjs'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { RemoteData } from '../../../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { NotificationsService } from '../../notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import { NoContent } from '../../../core/shared/NoContent.model'; +import { AuthMethod } from 'src/app/core/auth/models/auth.method'; +import { getAuthenticationMethods } from 'src/app/core/auth/selectors'; +import { Store, select } from '@ngrx/store'; +import { CoreState } from 'src/app/core/core-state.model'; @Injectable({ providedIn: 'root' @@ -17,19 +21,20 @@ export class ExternalLoginService { private epersonRegistrationService: EpersonRegistrationService, private router: Router, private notificationService: NotificationsService, - private translate: TranslateService + private translate: TranslateService, + private store: Store, ) { } - /** - * Update the registration data. - * Send a patch request to the server to update the registration data. - * @param values the values to update or add - * @param field the filed to be updated - * @param registrationId the registration id - * @param token the registration token - * @param operation operation to be performed - */ - patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable>{ + /** + * Update the registration data. + * Send a patch request to the server to update the registration data. + * @param values the values to update or add + * @param field the filed to be updated + * @param registrationId the registration id + * @param token the registration token + * @param operation operation to be performed + */ + patchUpdateRegistration(values: string[], field: string, registrationId: string, token: string, operation: 'add' | 'replace'): Observable> { const updatedValues = values.map((value) => value); return this.epersonRegistrationService.patchUpdateRegistration(updatedValues, field, registrationId, token, operation).pipe( getFirstCompletedRemoteData(), @@ -44,4 +49,18 @@ export class ExternalLoginService { }) ); } + + /** + * Returns an Observable that emits the external authentication location for the given registration type. + * @param registrationType The type of registration to get the external authentication location for. + * @returns An Observable that emits the external authentication location as a string. + */ + getExternalAuthLocation(registrationType: string): Observable { + return this.store.pipe( + select(getAuthenticationMethods), + filter((methods: AuthMethod[]) => methods.length > 0), + tap((methods: AuthMethod[]) => console.log(methods.find(m => m.authMethodType === registrationType.toLocaleLowerCase()), methods.find(m => m.authMethodType === registrationType.toLocaleLowerCase()).location)), + map((methods: AuthMethod[]) => methods.find(m => m.authMethodType === registrationType.toLocaleLowerCase()).location), + ); + } } diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts index f1829684575..32b551e05cd 100644 --- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts +++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts @@ -8,10 +8,9 @@ import { AuthMethod } from '../../../../core/auth/models/auth.method'; import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/selectors'; import { NativeWindowRef, NativeWindowService } from '../../../../core/services/window.service'; -import { isEmpty, isNotNull } from '../../../empty.util'; +import { isEmpty } from '../../../empty.util'; import { AuthService } from '../../../../core/auth/auth.service'; import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; -import { URLCombiner } from '../../../../core/url-combiner/url-combiner'; import { CoreState } from '../../../../core/core-state.model'; import { renderAuthMethodFor } from '../log-in.methods-decorator'; import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; @@ -92,24 +91,10 @@ export class LogInExternalProviderComponent implements OnInit { } else if (isEmpty(redirectRoute)) { redirectRoute = '/'; } - const correctRedirectUrl = new URLCombiner(this._window.nativeWindow.origin, redirectRoute).toString(); - - let externalServerUrl = this.location; - const myRegexp = /\?redirectUrl=(.*)/g; - const match = myRegexp.exec(this.location); - const redirectUrlFromServer = (match && match[1]) ? match[1] : null; - - // Check whether the current page is different from the redirect url received from rest - if (isNotNull(redirectUrlFromServer) && redirectUrlFromServer !== correctRedirectUrl) { - // change the redirect url with the current page url - const newRedirectUrl = `?redirectUrl=${correctRedirectUrl}`; - externalServerUrl = this.location.replace(/\?redirectUrl=(.*)/g, newRedirectUrl); - } - - // redirect to shibboleth authentication url + const externalServerUrl = this.authService.getExternalServerRedirectUrl(redirectRoute, this.location); + // redirect to shibboleth/orcid/(external) authentication url this.hardRedirectService.redirect(externalServerUrl); }); - } getButtonLabel() { From 689bd0aa451756aeffd3d0dadd385f591718caa6 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 9 Oct 2023 10:32:10 +0200 Subject: [PATCH 734/758] [CST-10703] unit test fixes --- .../review-account-info.component.spec.ts | 16 ++- .../confirm-email.component.spec.ts | 107 ++++++++++-------- .../confirm-email/confirm-email.component.ts | 2 - .../services/external-login.service.spec.ts | 2 + .../services/external-login.service.ts | 1 - ...log-in-external-provider.component.spec.ts | 3 +- src/app/shared/testing/auth-service.stub.ts | 4 + 7 files changed, 82 insertions(+), 53 deletions(-) diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts index c7343c87bff..7c52f4dddbb 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts @@ -24,6 +24,8 @@ import { CompareValuesPipe } from '../helpers/compare-values.pipe'; import { Registration } from '../../core/shared/registration.model'; import { AuthService } from '../../core/auth/auth.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; +import { ExternalLoginService } from '../../shared/external-log-in-complete/services/external-login.service'; +import { HardRedirectService } from '../../core/services/hard-redirect.service'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; @@ -31,6 +33,8 @@ describe('ReviewAccountInfoComponent', () => { let ePersonDataServiceStub: any; let router: any; let notificationsService: any; + let externalLoginServiceStub: any; + let hardRedirectService: HardRedirectService; const translateServiceStub = { get: () => of('test-message'), @@ -70,6 +74,12 @@ describe('ReviewAccountInfoComponent', () => { }; router = new RouterMock(); notificationsService = new NotificationsServiceStub(); + externalLoginServiceStub = { + getExternalAuthLocation: () => 'location', + }; + hardRedirectService = jasmine.createSpyObj('HardRedirectService', { + redirect: {} + }); await TestBed.configureTestingModule({ declarations: [ReviewAccountInfoComponent, CompareValuesPipe], providers: [ @@ -81,7 +91,9 @@ describe('ReviewAccountInfoComponent', () => { }, { provide: TranslateService, useValue: translateServiceStub }, { provide: Router, useValue: router }, - { provide: AuthService, useValue: new AuthServiceMock() } + { provide: AuthService, useValue: new AuthServiceMock() }, + { provide: ExternalLoginService, useValue: externalLoginServiceStub }, + { provide: HardRedirectService, useValue: hardRedirectService }, ], imports: [ CommonModule, @@ -153,7 +165,7 @@ describe('ReviewAccountInfoComponent', () => { spyOn(ePersonDataServiceStub, 'mergeEPersonDataWithToken').and.returnValue( of({ hasSucceeded: true }) ); - component.mergeEPersonDataWithToken(registrationDataMock.user); + component.mergeEPersonDataWithToken(registrationDataMock.user, registrationDataMock.registrationType); tick(); expect(ePersonDataServiceStub.mergeEPersonDataWithToken).toHaveBeenCalledTimes(1); expect(router.navigate).toHaveBeenCalledWith(['/profile']); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts index 2247d8de904..651608b9300 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -3,7 +3,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfirmEmailComponent } from './confirm-email.component'; import { FormBuilder } from '@angular/forms'; import { CommonModule } from '@angular/common'; -import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; +import { + TranslateLoader, + TranslateModule, + TranslateService, +} from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ExternalLoginService } from '../../services/external-login.service'; @@ -11,12 +15,13 @@ import { AuthService } from '../../../../core/auth/auth.service'; import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; -import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; +import { + createSuccessfulRemoteDataObject$, +} from '../../../../shared/remote-data.utils'; import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { Router } from '@angular/router'; -import { RouterMock } from '../../../../shared/mocks/router.mock'; import { of } from 'rxjs'; import { Registration } from '../../../../core/shared/registration.model'; +import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; describe('ConfirmEmailComponent', () => { let component: ConfirmEmailComponent; @@ -25,17 +30,19 @@ describe('ConfirmEmailComponent', () => { let epersonDataServiceSpy: jasmine.SpyObj; let notificationServiceSpy: jasmine.SpyObj; let authServiceSpy: jasmine.SpyObj; - let router; + let hardRedirectService: HardRedirectService; + const translateServiceStub = { get: () => of(''), onLangChange: new EventEmitter(), onTranslationChange: new EventEmitter(), - onDefaultLangChange: new EventEmitter() + onDefaultLangChange: new EventEmitter(), }; beforeEach(async () => { externalLoginServiceSpy = jasmine.createSpyObj('ExternalLoginService', [ 'patchUpdateRegistration', + 'getExternalAuthLocation', ]); epersonDataServiceSpy = jasmine.createSpyObj('EPersonDataService', [ 'createEPersonForToken', @@ -43,8 +50,10 @@ describe('ConfirmEmailComponent', () => { notificationServiceSpy = jasmine.createSpyObj('NotificationsService', [ 'error', ]); - authServiceSpy = jasmine.createSpyObj('AuthService', ['setRedirectUrl']); - router = new RouterMock(); + authServiceSpy = jasmine.createSpyObj('AuthService', ['getRedirectUrl', 'setRedirectUrl', 'getExternalServerRedirectUrl']); + hardRedirectService = jasmine.createSpyObj('HardRedirectService', { + redirect: {}, + }); await TestBed.configureTestingModule({ declarations: [ConfirmEmailComponent], providers: [ @@ -53,8 +62,8 @@ describe('ConfirmEmailComponent', () => { { provide: EPersonDataService, useValue: epersonDataServiceSpy }, { provide: NotificationsService, useValue: notificationServiceSpy }, { provide: AuthService, useValue: authServiceSpy }, - { provide: Router, useValue: router }, - { provide: TranslateService, useValue: translateServiceStub } + { provide: TranslateService, useValue: translateServiceStub }, + { provide: HardRedirectService, useValue: hardRedirectService }, ], imports: [ CommonModule, @@ -92,10 +101,9 @@ describe('ConfirmEmailComponent', () => { component.emailForm.setValue({ email: 'test@example.com' }); spyOn(component as any, 'postCreateAccountFromToken'); component.submitForm(); - expect((component as any).postCreateAccountFromToken).toHaveBeenCalledWith( - 'test-token', - component.registrationData - ); + expect( + (component as any).postCreateAccountFromToken + ).toHaveBeenCalledWith('test-token', component.registrationData); }); it('should call patchUpdateRegistration if email is not confirmed', () => { @@ -112,49 +120,56 @@ describe('ConfirmEmailComponent', () => { spyOn(component as any, 'postCreateAccountFromToken'); spyOn(component as any, 'patchUpdateRegistration'); component.submitForm(); - expect((component as any).postCreateAccountFromToken).not.toHaveBeenCalled(); + expect( + (component as any).postCreateAccountFromToken + ).not.toHaveBeenCalled(); expect((component as any).patchUpdateRegistration).not.toHaveBeenCalled(); }); }); - describe('postCreateAccountFromToken', () => { - it('should call epersonDataService.createEPersonForToken with correct arguments', () => { - epersonDataServiceSpy.createEPersonForToken.and.returnValue(createSuccessfulRemoteDataObject$(new EPerson())); - (component as any).postCreateAccountFromToken( - 'test-token', - component.registrationData - ); - expect(epersonDataServiceSpy.createEPersonForToken).toHaveBeenCalledWith( - jasmine.any(Object), - 'test-token' - ); - }); + // describe('postCreateAccountFromToken', () => { + // beforeEach(() => { + // authServiceSpy.getRedirectUrl.and.returnValue(of('test-redirect')); + // authServiceSpy.getExternalServerRedirectUrl.and.returnValue('test-external-url'); + // }); + // it('should call epersonDataService.createEPersonForToken with correct arguments', () => { + // epersonDataServiceSpy.createEPersonForToken.and.returnValue( + // createSuccessfulRemoteDataObject$(new EPerson()) + // ); + // (component as any).postCreateAccountFromToken( + // 'test-token', + // component.registrationData + // ); + // expect(epersonDataServiceSpy.createEPersonForToken).toHaveBeenCalledWith( + // jasmine.any(Object), + // 'test-token' + // ); + // }); + // }); - it('should show error notification if user creation fails', () => { - epersonDataServiceSpy.createEPersonForToken.and.returnValue( - createFailedRemoteDataObject$() - ); - (component as any).postCreateAccountFromToken( - 'test-token', - component.registrationData - ); + describe('postCreateAccountFromToken', () => { + it('should call NotificationsService.error if the registration data does not have a netId', () => { + component.registrationData.netId = undefined; + (component as any).postCreateAccountFromToken('test-token', component.registrationData); expect(notificationServiceSpy.error).toHaveBeenCalled(); }); - it('should redirect to login page if user creation succeeds', () => { - epersonDataServiceSpy.createEPersonForToken.and.returnValue( - createSuccessfulRemoteDataObject$(new EPerson()) - ); - (component as any).postCreateAccountFromToken( - 'test-token', - component.registrationData - ); - expect((component as any).router.navigate).toHaveBeenCalledWith(['/login'], { - queryParams: { authMethod: 'orcid' }, - }); + it('should call EPersonDataService.createEPersonForToken and ExternalLoginService.getExternalAuthLocation if the registration data has a netId', () => { + externalLoginServiceSpy.getExternalAuthLocation.and.returnValue(of('test-location')); + authServiceSpy.getRedirectUrl.and.returnValue(of('/test-redirect')); + authServiceSpy.getExternalServerRedirectUrl.and.returnValue('test-external-url'); + epersonDataServiceSpy.createEPersonForToken.and.returnValue(createSuccessfulRemoteDataObject$(new EPerson())); + (component as any).postCreateAccountFromToken('test-token', component.registrationData); + expect(epersonDataServiceSpy.createEPersonForToken).toHaveBeenCalled(); + expect(externalLoginServiceSpy.getExternalAuthLocation).toHaveBeenCalledWith(AuthMethodType.Orcid); + expect(authServiceSpy.getRedirectUrl).toHaveBeenCalled(); + expect(authServiceSpy.setRedirectUrl).toHaveBeenCalledWith('/profile'); + expect(authServiceSpy.getExternalServerRedirectUrl).toHaveBeenCalledWith('/test-redirect', 'test-location'); + expect(hardRedirectService.redirect).toHaveBeenCalledWith('test-external-url'); }); }); + afterEach(() => { fixture.destroy(); }); diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index ad8205a2ea7..80841a8f8de 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -9,7 +9,6 @@ import { NotificationsService } from '../../../../shared/notifications/notificat import { TranslateService } from '@ngx-translate/core'; import isEqual from 'lodash/isEqual'; import { AuthService } from '../../../../core/auth/auth.service'; -import { Router } from '@angular/router'; import { Subscription, combineLatest, take } from 'rxjs'; import { Registration } from '../../../../core/shared/registration.model'; import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; @@ -48,7 +47,6 @@ export class ConfirmEmailComponent implements OnDestroy { private notificationService: NotificationsService, private translate: TranslateService, private authService: AuthService, - private router: Router, private hardRedirectService: HardRedirectService, ) { this.emailForm = this.formBuilder.group({ diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts b/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts index 541e71e6a5a..ce0dcb4e269 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts @@ -12,6 +12,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Router } from '@angular/router'; +import { Store } from '@ngrx/store'; describe('ExternalLoginService', () => { let service: ExternalLoginService; @@ -41,6 +42,7 @@ describe('ExternalLoginService', () => { { provide: Router, useValue: router }, { provide: NotificationsService, useValue: notificationService }, { provide: TranslateService, useValue: translate }, + { provide: Store, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA] }); diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts index fbe64198b21..03c671b570a 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -59,7 +59,6 @@ export class ExternalLoginService { return this.store.pipe( select(getAuthenticationMethods), filter((methods: AuthMethod[]) => methods.length > 0), - tap((methods: AuthMethod[]) => console.log(methods.find(m => m.authMethodType === registrationType.toLocaleLowerCase()), methods.find(m => m.authMethodType === registrationType.toLocaleLowerCase()).location)), map((methods: AuthMethod[]) => methods.find(m => m.authMethodType === registrationType.toLocaleLowerCase()).location), ); } diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts index de4f62eb9eb..e75d80c5c39 100644 --- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts +++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts @@ -110,8 +110,7 @@ describe('LogInExternalProviderComponent', () => { component.redirectToExternalProvider(); - expect(setHrefSpy).toHaveBeenCalledWith(currentUrl); - + expect(hardRedirectService.redirect).toHaveBeenCalled(); }); it('should not set a new redirectUrl', () => { diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts index d859db0bdf1..29953208f86 100644 --- a/src/app/shared/testing/auth-service.stub.ts +++ b/src/app/shared/testing/auth-service.stub.ts @@ -175,4 +175,8 @@ export class AuthServiceStub { getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction { return; } + + public getExternalServerRedirectUrl(redirectRoute: string, location: string) { + return; + } } From a46500b8bcca3b2e8b95c6e113c828d422da7d98 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 9 Oct 2023 10:33:10 +0200 Subject: [PATCH 735/758] [CST-10703] remove comments --- .../confirm-email.component.spec.ts | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts index 651608b9300..e250fc41e03 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -127,26 +127,6 @@ describe('ConfirmEmailComponent', () => { }); }); - // describe('postCreateAccountFromToken', () => { - // beforeEach(() => { - // authServiceSpy.getRedirectUrl.and.returnValue(of('test-redirect')); - // authServiceSpy.getExternalServerRedirectUrl.and.returnValue('test-external-url'); - // }); - // it('should call epersonDataService.createEPersonForToken with correct arguments', () => { - // epersonDataServiceSpy.createEPersonForToken.and.returnValue( - // createSuccessfulRemoteDataObject$(new EPerson()) - // ); - // (component as any).postCreateAccountFromToken( - // 'test-token', - // component.registrationData - // ); - // expect(epersonDataServiceSpy.createEPersonForToken).toHaveBeenCalledWith( - // jasmine.any(Object), - // 'test-token' - // ); - // }); - // }); - describe('postCreateAccountFromToken', () => { it('should call NotificationsService.error if the registration data does not have a netId', () => { component.registrationData.netId = undefined; @@ -169,7 +149,6 @@ describe('ConfirmEmailComponent', () => { }); }); - afterEach(() => { fixture.destroy(); }); From f7e6ab6b0f267c6423d3488a5b6f36c4c783dd76 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 9 Oct 2023 11:49:27 +0200 Subject: [PATCH 736/758] [CST-10703] added missing docs to methods --- .../review-account-info.component.spec.ts | 17 ++++++++++++--- .../review-account-info.component.ts | 21 ++++++++++++++++++- src/app/shared/mocks/auth.service.mock.ts | 8 +++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts index 7c52f4dddbb..63545370ab7 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts @@ -29,12 +29,14 @@ import { HardRedirectService } from '../../core/services/hard-redirect.service'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; + let componentAsAny: any; let fixture: ComponentFixture; let ePersonDataServiceStub: any; let router: any; let notificationsService: any; let externalLoginServiceStub: any; let hardRedirectService: HardRedirectService; + let authService: any; const translateServiceStub = { get: () => of('test-message'), @@ -75,11 +77,12 @@ describe('ReviewAccountInfoComponent', () => { router = new RouterMock(); notificationsService = new NotificationsServiceStub(); externalLoginServiceStub = { - getExternalAuthLocation: () => 'location', + getExternalAuthLocation: () => of('https://orcid.org/oauth/authorize'), }; hardRedirectService = jasmine.createSpyObj('HardRedirectService', { - redirect: {} + redirect: (url: string) => null, }); + authService = new AuthServiceMock(); await TestBed.configureTestingModule({ declarations: [ReviewAccountInfoComponent, CompareValuesPipe], providers: [ @@ -91,7 +94,7 @@ describe('ReviewAccountInfoComponent', () => { }, { provide: TranslateService, useValue: translateServiceStub }, { provide: Router, useValue: router }, - { provide: AuthService, useValue: new AuthServiceMock() }, + { provide: AuthService, useValue: authService }, { provide: ExternalLoginService, useValue: externalLoginServiceStub }, { provide: HardRedirectService, useValue: hardRedirectService }, ], @@ -110,6 +113,7 @@ describe('ReviewAccountInfoComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ReviewAccountInfoComponent); component = fixture.componentInstance; + componentAsAny = component; component.registrationData = Object.assign( new Registration(), registrationDataMock @@ -213,6 +217,13 @@ describe('ReviewAccountInfoComponent', () => { expect(subscription2.unsubscribe).toHaveBeenCalled(); }); + it('should handle authenticated user', () => { + const override$ = createSuccessfulRemoteDataObject$(new EPerson()); + component.handleAuthenticatedUser(override$); + expect(componentAsAny.notificationService.success).toHaveBeenCalled(); + expect(router.navigate).toHaveBeenCalledWith(['/profile']); + }); + afterEach(() => { fixture.destroy(); }); diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index 38944f18f5f..9759e77c339 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -86,7 +86,10 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { /** * Open a confirmation modal to confirm the override of the data - * If confirmed, merge the data from the registration token with the data from the eperson + * If confirmed, merge the data from the registration token with the data from the eperson. + * There are 2 cases: + * -> If the user is authenticated, merge the data and redirect to profile page. + * -> If the user is not authenticated, combine the override$, external auth location and redirect URL observables. */ public onSave() { const modalRef = this.modalService.open(ConfirmationModalComponent); @@ -166,6 +169,11 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { } } + /** + * Handles the authenticated user by subscribing to the override$ observable and displaying a success or error notification based on the response. + * If the response has succeeded, the user is redirected to the profile page. + * @param override$ - The observable that emits the response containing the RemoteData object. + */ handleAuthenticatedUser(override$: Observable>) { this.subs.push( override$.subscribe((response: RemoteData) => { @@ -187,6 +195,13 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); } + /** + * Handles unauthenticated user by combining the override$, external auth location and redirect URL observables. + * If the response has succeeded, sets the redirect URL to user profile and redirects to external registration type authentication URL. + * If the response has failed, shows an error notification. + * @param override$ - The override$ observable. + * @param registrationType - The registration type. + */ handleUnauthenticatedUser(override$: Observable>, registrationType: string) { this.subs.push( combineLatest([ @@ -216,6 +231,10 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); } + /** + * Checks if the user is authenticated. + * @returns An observable that emits a boolean value indicating whether the user is authenticated or not. + */ private isAuthenticated(): Observable { return this.authService.isAuthenticated(); } diff --git a/src/app/shared/mocks/auth.service.mock.ts b/src/app/shared/mocks/auth.service.mock.ts index 992a8ad034c..4345b79bcd4 100644 --- a/src/app/shared/mocks/auth.service.mock.ts +++ b/src/app/shared/mocks/auth.service.mock.ts @@ -30,4 +30,12 @@ export class AuthServiceMock { public getImpersonateID(): string { return null; } + + public getRedirectUrl(): Observable { + return; + } + + public getExternalServerRedirectUrl(): string { + return; + } } From dc5623bcd32395a9ef6f94d37ba84ef84d22067a Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 9 Oct 2023 12:18:48 +0200 Subject: [PATCH 737/758] [CST-10703] refactor --- src/app/login-page/login-page.component.html | 1 - src/app/login-page/login-page.component.ts | 4 ---- src/app/shared/log-in/log-in.component.ts | 12 +----------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html index 067da65739a..2a95e0ce1c5 100644 --- a/src/app/login-page/login-page.component.html +++ b/src/app/login-page/login-page.component.html @@ -4,7 +4,6 @@

{{"login.form.header" | translate}}

diff --git a/src/app/login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts index 62a72ab7907..d9ecf3e8e6b 100644 --- a/src/app/login-page/login-page.component.ts +++ b/src/app/login-page/login-page.component.ts @@ -15,7 +15,6 @@ import { import { hasValue, isNotEmpty } from '../shared/empty.util'; import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model'; import { isAuthenticated } from '../core/auth/selectors'; -import { AuthMethodType } from '../core/auth/models/auth.method-type'; /** * This component represents the login page @@ -34,8 +33,6 @@ export class LoginPageComponent implements OnDestroy, OnInit { */ sub: Subscription; - externalLoginMethod: AuthMethodType; - /** * Initialize instance variables * @@ -51,7 +48,6 @@ export class LoginPageComponent implements OnDestroy, OnInit { ngOnInit() { const queryParamsObs = this.route.queryParams; const authenticated = this.store.select(isAuthenticated); - this.externalLoginMethod = this.route.snapshot.queryParams.authMethod; this.sub = observableCombineLatest(queryParamsObs, authenticated).pipe( filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)), take(1) diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts index 30dc535d313..eff53f3b6c4 100644 --- a/src/app/shared/log-in/log-in.component.ts +++ b/src/app/shared/log-in/log-in.component.ts @@ -45,12 +45,6 @@ export class LogInComponent implements OnInit, OnDestroy { */ @Input() showRegisterLink = true; - /** - * The external login method to force - * the user to use to login while completing the external login process - */ - @Input() externalLoginMethod: AuthMethodType; - /** * The list of authentication methods available * @type {AuthMethod[]} @@ -93,11 +87,7 @@ export class LogInComponent implements OnInit, OnDestroy { this.authMethods = uniqBy(methods.filter(a => a.authMethodType !== AuthMethodType.Ip), 'authMethodType'); // exclude the given auth method in case there is one if (hasValue(this.excludedAuthMethod)) { - this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType !== this.excludedAuthMethod); - } - // if there is an external login method the user should follow, filter the auth methods to only show that one - if (hasValue(this.externalLoginMethod)) { - this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType === this.externalLoginMethod.toLocaleLowerCase()); + this.authMethods = this.authMethods.filter((authMethod: AuthMethod) => authMethod.authMethodType !== this.excludedAuthMethod.toLocaleLowerCase()); } }); From c8a7e01974725a0f352cfa82e29d9ec26b33f99b Mon Sep 17 00:00:00 2001 From: "yevhenii.lohatskyi" Date: Mon, 9 Oct 2023 13:47:08 +0300 Subject: [PATCH 738/758] [DSC-1248] fix basic search configuration parameter to be set by searchSection.discoveryConfiguration --- .../search-section/search-section.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/explore/section-component/search-section/search-section.component.html b/src/app/shared/explore/section-component/search-section/search-section.component.html index 57cf6e66447..1f1e684b489 100644 --- a/src/app/shared/explore/section-component/search-section/search-section.component.html +++ b/src/app/shared/explore/section-component/search-section/search-section.component.html @@ -29,7 +29,7 @@

{{ 'explore.search-section.' + sectionId
>

From 5e67345118db92b6e94247e0e452e87b27a87df3 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 9 Oct 2023 12:48:45 +0200 Subject: [PATCH 739/758] [DSC-1289] Removed unused labels --- src/assets/i18n/en.json5 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index ecd8a7dd3d9..a8421efe6bb 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -6381,22 +6381,8 @@ "access.condition.value.embargo": "Embargo", - "access.condition.value.vlan48": "ITG Subnet", - - "access.condition.value.vlan-campus": "IAS Campus Network", - - "access.condition.value.ldap": "IAS Users", - - "access.condition.value.staff": "Staff Only", - - "access.condition.value.faculty": "Faculty Only", - - "access.condition.value.member": "Members Only", - "access.condition.value.administrator": "Administrator Only", - "access.condition.value.embargoed": "Embargoed", - "access.condition.value.lease": "Lease", "submission.sections.license.granted-label": "I confirm the license above", From 9edb8e10b39712d0b885c0440ee2b6cffa8a05b7 Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Mon, 9 Oct 2023 12:56:44 +0200 Subject: [PATCH 740/758] [CST-10703] minor fixes --- .../review-account-info/review-account-info.component.ts | 5 +++++ .../confirm-email/confirm-email.component.ts | 1 + 2 files changed, 6 insertions(+) diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index 9759e77c339..cca523ce4c2 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -251,6 +251,11 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { const dataToCompare: ReviewAccountInfoData[] = []; Object.entries(this.registrationData.registrationMetadata).forEach( ([key, value]) => { + // eperson.orcid is not always present in the registration metadata, + // so display netId instead and skip it in the metadata in order not to have duplicate data. + if (value[0].value === this.registrationData.netId) { + return; + } dataToCompare.push({ label: key.split('.')?.[1] ?? key.split('.')?.[0], currentValue: value[0]?.overrides ?? '', diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 80841a8f8de..73bc5adfa2c 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -108,6 +108,7 @@ export class ConfirmEmailComponent implements OnDestroy { const metadataValues = {}; for (const [key, value] of Object.entries(registrationData.registrationMetadata)) { + // exclude the email metadata key, since the ePerson object does not have an email metadata field if (hasValue(value[0]?.value) && key !== 'email') { metadataValues[key] = value; } From 51daf53069b2abd7d5521fa5d55c3e81c4a57a82 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 9 Oct 2023 18:23:02 +0200 Subject: [PATCH 741/758] [DSC-1283] Rename actions --- src/app/core/auth/auth.actions.ts | 24 +++++++++---------- src/app/core/auth/auth.effects.spec.ts | 14 +++++------ src/app/core/auth/auth.effects.ts | 18 +++++++------- src/app/core/auth/auth.reducer.ts | 10 ++++---- .../end-user-agreement.component.spec.ts | 4 ++-- .../end-user-agreement.component.ts | 4 ++-- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts index 4ffaada1951..2e971c47c8b 100644 --- a/src/app/core/auth/auth.actions.ts +++ b/src/app/core/auth/auth.actions.ts @@ -37,9 +37,9 @@ export const AuthActionTypes = { RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS'), RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'), REDIRECT_AFTER_LOGIN_SUCCESS: type('dspace/auth/REDIRECT_AFTER_LOGIN_SUCCESS'), - REFRESH_STATE_TOKEN_REDIRECT: type('dspace/auth/REFRESH_STATE_TOKEN_REDIRECT'), - REFRESH_STATE_TOKEN_REDIRECT_ERROR: type('dspace/auth/REFRESH_STATE_TOKEN_REDIRECT_ERROR'), - REFRESH_STATE_TOKEN_REDIRECT_SUCCESS: type('dspace/auth/REFRESH_STATE_TOKEN_REDIRECT_SUCCESS'), + REFRESH_EPERSON_AND_TOKEN_REDIRECT: type('dspace/auth/REFRESH_EPERSON_AND_TOKEN_REDIRECT'), + REFRESH_EPERSON_AND_TOKEN_REDIRECT_ERROR: type('dspace/auth/REFRESH_EPERSON_AND_TOKEN_REDIRECT_ERROR'), + REFRESH_EPERSON_AND_TOKEN_REDIRECT_SUCCESS: type('dspace/auth/REFRESH_EPERSON_AND_TOKEN_REDIRECT_SUCCESS'), REFRESH_TOKEN_AND_REDIRECT: type('dspace/auth/REFRESH_TOKEN_AND_REDIRECT'), REFRESH_TOKEN_AND_REDIRECT_SUCCESS: type('dspace/auth/REFRESH_TOKEN_AND_REDIRECT_SUCCESS'), REFRESH_TOKEN_AND_REDIRECT_ERROR: type('dspace/auth/REFRESH_TOKEN_AND_REDIRECT_ERROR'), @@ -422,11 +422,11 @@ export class UnsetUserAsIdleAction implements Action { /** * Refresh user state, the token and execute a redirect. - * @class RefreshTokenAndRedirectAction + * @class RefreshEpersonAndTokenRedirectAction * @implements {Action} */ -export class RefreshStateTokenRedirectAction implements Action { - public type: string = AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT; +export class RefreshEpersonAndTokenRedirectAction implements Action { + public type: string = AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT; payload: { token: AuthTokenInfo, redirectUrl: string @@ -439,11 +439,11 @@ export class RefreshStateTokenRedirectAction implements Action { /** * Refresh user state, the token and execute a redirect. - * @class RefreshStateTokenRedirectSuccessAction + * @class RefreshEpersonAndTokenRedirectSuccessAction * @implements {Action} */ -export class RefreshStateTokenRedirectSuccessAction implements Action { - public type: string = AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS; +export class RefreshEpersonAndTokenRedirectSuccessAction implements Action { + public type: string = AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT_SUCCESS; payload: { ePerson: EPerson, token: AuthTokenInfo, @@ -457,11 +457,11 @@ export class RefreshStateTokenRedirectSuccessAction implements Action { /** * Refresh user state, the token and execute a redirect. - * @class RefreshStateTokenRedirectErrorAction + * @class RefreshEpersonAndTokenRedirectErrorAction * @implements {Action} */ -export class RefreshStateTokenRedirectErrorAction implements Action { - public type: string = AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_ERROR; +export class RefreshEpersonAndTokenRedirectErrorAction implements Action { + public type: string = AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT_ERROR; } /** diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts index c32bf1193ab..c23d671583b 100644 --- a/src/app/core/auth/auth.effects.spec.ts +++ b/src/app/core/auth/auth.effects.spec.ts @@ -20,8 +20,8 @@ import { CheckAuthenticationTokenCookieAction, LogOutErrorAction, LogOutSuccessAction, - RefreshStateTokenRedirectErrorAction, - RefreshStateTokenRedirectSuccessAction, + RefreshEpersonAndTokenRedirectErrorAction, + RefreshEpersonAndTokenRedirectSuccessAction, RefreshTokenAndRedirectAction, RefreshTokenAndRedirectErrorAction, RefreshTokenAndRedirectSuccessAction, @@ -468,12 +468,12 @@ describe('AuthEffects', () => { actions = hot('--a-', { a: { - type: AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT, + type: AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT, payload: { token, redirectUrl } } }); - const expected = cold('--b-', { b: new RefreshStateTokenRedirectSuccessAction(EPersonMock, token, redirectUrl) }); + const expected = cold('--b-', { b: new RefreshEpersonAndTokenRedirectSuccessAction(EPersonMock, token, redirectUrl) }); expect(authEffects.refreshStateTokenRedirect$).toBeObservable(expected); done(); @@ -486,12 +486,12 @@ describe('AuthEffects', () => { actions = hot('--a-', { a: { - type: AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT, + type: AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT, payload: { token, redirectUrl } } }); - const expected = cold('--b-', { b: new RefreshStateTokenRedirectErrorAction() }); + const expected = cold('--b-', { b: new RefreshEpersonAndTokenRedirectErrorAction() }); expect(authEffects.refreshStateTokenRedirect$).toBeObservable(expected); done(); @@ -510,7 +510,7 @@ describe('AuthEffects', () => { actions = hot('--a-', { a: { - type: AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS, + type: AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT_SUCCESS, payload: { ePerson: EPersonMock, token, redirectUrl } } }); diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index 25380328eba..c96aa34916f 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -35,9 +35,9 @@ import { LogOutErrorAction, LogOutSuccessAction, RedirectAfterLoginSuccessAction, - RefreshStateTokenRedirectAction, - RefreshStateTokenRedirectErrorAction, - RefreshStateTokenRedirectSuccessAction, + RefreshEpersonAndTokenRedirectAction, + RefreshEpersonAndTokenRedirectErrorAction, + RefreshEpersonAndTokenRedirectSuccessAction, RefreshTokenAction, RefreshTokenAndRedirectAction, RefreshTokenAndRedirectErrorAction, @@ -274,21 +274,21 @@ export class AuthEffects { ); public refreshStateTokenRedirect$: Observable = createEffect(() => this.actions$ - .pipe(ofType(AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT), - switchMap((action: RefreshStateTokenRedirectAction) => + .pipe(ofType(AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT), + switchMap((action: RefreshEpersonAndTokenRedirectAction) => this.authService.getAuthenticatedUserFromStore() .pipe( switchMap(user => this.authService.retrieveAuthenticatedUserById(user.id)), - map(user => new RefreshStateTokenRedirectSuccessAction(user, action.payload.token, action.payload.redirectUrl)), - catchError((error) => observableOf(new RefreshStateTokenRedirectErrorAction())) + map(user => new RefreshEpersonAndTokenRedirectSuccessAction(user, action.payload.token, action.payload.redirectUrl)), + catchError((error) => observableOf(new RefreshEpersonAndTokenRedirectErrorAction())) ) ) ) ); public refreshStateTokenRedirectSuccess$: Observable = createEffect(() => this.actions$ - .pipe(ofType(AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS), - map((action: RefreshStateTokenRedirectAction) => new RefreshTokenAndRedirectAction(action.payload.token, action.payload.redirectUrl))) + .pipe(ofType(AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT_SUCCESS), + map((action: RefreshEpersonAndTokenRedirectAction) => new RefreshTokenAndRedirectAction(action.payload.token, action.payload.redirectUrl))) ); public refreshTokenAndRedirectSuccess$: Observable = createEffect(() => this.actions$ diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts index 7deb207fc2e..101f918dbef 100644 --- a/src/app/core/auth/auth.reducer.ts +++ b/src/app/core/auth/auth.reducer.ts @@ -8,7 +8,7 @@ import { LogOutErrorAction, RedirectWhenAuthenticationIsRequiredAction, RedirectWhenTokenExpiredAction, - RefreshStateTokenRedirectSuccessAction, + RefreshEpersonAndTokenRedirectSuccessAction, RefreshTokenAndRedirectSuccessAction, RefreshTokenSuccessAction, RetrieveAuthenticatedEpersonSuccessAction, @@ -191,20 +191,20 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut user: undefined }); - case AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT: + case AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT: return Object.assign({}, state, { loading: true, loaded: false, }); - case AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_SUCCESS: + case AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT_SUCCESS: return Object.assign({}, state, { loading: false, loaded: false, - user: (action as RefreshStateTokenRedirectSuccessAction).payload.ePerson, + user: (action as RefreshEpersonAndTokenRedirectSuccessAction).payload.ePerson, }); - case AuthActionTypes.REFRESH_STATE_TOKEN_REDIRECT_ERROR: + case AuthActionTypes.REFRESH_EPERSON_AND_TOKEN_REDIRECT_ERROR: return Object.assign({}, state, { loading: false, loaded: false, diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts index bcaf045578e..3dd6b92f342 100644 --- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts +++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts @@ -9,7 +9,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { of as observableOf } from 'rxjs'; import { Store } from '@ngrx/store'; import { By } from '@angular/platform-browser'; -import { LogOutAction, RefreshStateTokenRedirectAction } from '../../core/auth/auth.actions'; +import { LogOutAction, RefreshEpersonAndTokenRedirectAction } from '../../core/auth/auth.actions'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; @@ -113,7 +113,7 @@ describe('EndUserAgreementComponent', () => { }); it('should refresh the token and navigate the user to the redirect url', () => { - expect(store.dispatch).toHaveBeenCalledWith(new RefreshStateTokenRedirectAction(token, redirectUrl)); + expect(store.dispatch).toHaveBeenCalledWith(new RefreshEpersonAndTokenRedirectAction(token, redirectUrl)); }); }); diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts index f2e4c469ceb..d6ab02c38a1 100644 --- a/src/app/info/end-user-agreement/end-user-agreement.component.ts +++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts @@ -1,4 +1,4 @@ -import { LogOutAction, RefreshStateTokenRedirectAction } from '../../core/auth/auth.actions'; +import { LogOutAction, RefreshEpersonAndTokenRedirectAction } from '../../core/auth/auth.actions'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { AuthService } from '../../core/auth/auth.service'; import { map, switchMap, take } from 'rxjs/operators'; @@ -92,7 +92,7 @@ export class EndUserAgreementComponent implements OnInit, OnDestroy { take(1) ).subscribe((redirectUrl) => { if (isNotEmpty(redirectUrl)) { - this.store.dispatch(new RefreshStateTokenRedirectAction(this.authService.getToken(), redirectUrl)); + this.store.dispatch(new RefreshEpersonAndTokenRedirectAction(this.authService.getToken(), redirectUrl)); } }); } From 0322defd164c2b1fa8b41f2cbfc40a56a6fec518 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Mon, 9 Oct 2023 20:29:56 +0200 Subject: [PATCH 742/758] [CST-10703] Use alert box for info messages --- .../review-account-info/review-account-info.component.html | 4 ++-- .../external-log-in/external-log-in.component.html | 4 ++-- src/assets/i18n/en.json5 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html index 039bc763b28..da5d943676f 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html @@ -1,7 +1,7 @@

{{'external-login-validation.review-account-info.header' | translate}}

-

-
+ +
diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html index 2bd3b736774..aefa9719669 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html +++ b/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html @@ -5,9 +5,9 @@

{{ 'external-login.confirmation.header' | translate}}

-
+ {{ informationText }} -
+
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 8a7ea498216..6b4a33f7960 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -7204,7 +7204,7 @@ "external-login.confirm-email-sent.header": "Confirmation email sent", - "external-login.confirm-email-sent.info": " We have sent an emait to the provided address to validate your input.
Please follow the instructions in the email to complete the login process.", + "external-login.confirm-email-sent.info": " We have sent an email to the provided address to validate your input.
Please follow the instructions in the email to complete the login process.", "external-login.provide-email.header": "Provide email", @@ -7212,7 +7212,7 @@ "external-login-validation.review-account-info.header": "Review your account information", - "external-login-validation.review-account-info.info": "The information received from ORCID differs from the one recorded in your profile.
Please review them and decide if you want to update any of them.After saving you will be redirected to your profile page.", + "external-login-validation.review-account-info.info": "The information received from ORCID differs from the one recorded in your profile.
Please review them and decide if you want to update any of them. After saving you will be redirected to your profile page.", "external-login-validation.review-account-info.table.header.information": "Information", From 5362313558373be08fe9771777fc47921d3be494 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 10 Oct 2023 09:27:40 +0200 Subject: [PATCH 743/758] [CST-10703] Fix lint --- .../orcid-confirmation/orcid-confirmation.component.spec.ts | 6 +++--- .../services/external-login.service.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts index 441a326ef53..66330b2aa76 100644 --- a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts +++ b/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { OrcidConfirmationComponent } from './orcid-confirmation.component'; import { FormBuilder, FormGroup } from '@angular/forms'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; -import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; +import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe'; +import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe'; import { Registration } from 'src/app/core/shared/registration.model'; import { mockRegistrationDataModel } from '../../models/registration-data.mock.model'; diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/shared/external-log-in-complete/services/external-login.service.ts index 03c671b570a..38cca02a9ea 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/shared/external-log-in-complete/services/external-login.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable, filter, map, tap } from 'rxjs'; +import { Observable, filter, map } from 'rxjs'; import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; import { RemoteData } from '../../../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; From 821cb99f5be3100a895325be5bc9f53e0e9f914d Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Tue, 10 Oct 2023 11:22:36 +0200 Subject: [PATCH 744/758] [CST-10703] relocation of files --- .../external-log-in.methods-decorator.ts | 2 +- .../external-login-method-entry.component.ts | 0 .../confirm-email.component.html | 0 .../confirm-email.component.scss | 0 .../confirm-email.component.spec.ts | 20 +++++------ .../confirm-email/confirm-email.component.ts | 16 ++++----- .../confirmation-sent.component.html | 0 .../confirmation-sent.component.scss | 0 .../confirmation-sent.component.spec.ts | 2 +- .../confirmation-sent.component.ts | 0 .../provide-email.component.html | 0 .../provide-email.component.scss | 0 .../provide-email.component.spec.ts | 2 +- .../provide-email/provide-email.component.ts | 2 +- .../external-log-in.component.html | 0 .../external-log-in.component.scss | 0 .../external-log-in.component.spec.ts | 32 ++++++++++------- .../external-log-in.component.ts | 12 +++---- .../external-login-complete.module.ts | 35 +++++++++++++++++++ .../guards/registration-token.guard.spec.ts | 14 ++++---- .../guards/registration-token.guard.ts | 13 +++---- .../models/registration-data.mock.model.ts | 7 ++-- .../orcid-confirmation.component.html | 8 ++--- .../orcid-confirmation.component.scss | 0 .../orcid-confirmation.component.spec.ts | 10 +++--- .../orcid-confirmation.component.ts | 9 +++-- .../registration-data.resolver.spec.ts | 6 ++-- .../resolvers/registration-data.resolver.ts | 10 +++--- .../services/external-login.service.spec.ts | 14 ++++---- .../services/external-login.service.ts | 18 +++++----- ...-email-confirmation-page.component.spec.ts | 2 +- ...al-login-email-confirmation-page.module.ts | 4 +-- .../external-login-page-routing.module.ts | 4 +-- .../external-login-page.module.ts | 4 ++- ...review-account-info-page-routing.module.ts | 2 +- ...review-account-info-page.component.spec.ts | 2 +- ...l-login-review-account-info-page.module.ts | 3 +- .../review-account-info.component.html | 2 +- .../review-account-info.component.spec.ts | 4 +-- .../review-account-info.component.ts | 2 +- ...-menu-expandable-section.component.spec.ts | 2 +- src/app/shared/shared.module.ts | 10 ------ 42 files changed, 154 insertions(+), 119 deletions(-) rename src/app/{shared/external-log-in-complete => external-log-in-complete/decorators}/external-log-in.methods-decorator.ts (90%) rename src/app/{shared/external-log-in-complete => external-log-in-complete/decorators}/external-login-method-entry.component.ts (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts (88%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts (89%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts (95%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss (100%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts (96%) rename src/app/{shared => }/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts (96%) rename src/app/{shared => }/external-log-in-complete/external-log-in/external-log-in.component.html (100%) rename src/app/{shared => }/external-log-in-complete/external-log-in/external-log-in.component.scss (100%) rename src/app/{shared => }/external-log-in-complete/external-log-in/external-log-in.component.spec.ts (78%) rename src/app/{shared => }/external-log-in-complete/external-log-in/external-log-in.component.ts (89%) create mode 100644 src/app/external-log-in-complete/external-login-complete.module.ts rename src/app/{shared => }/external-log-in-complete/guards/registration-token.guard.spec.ts (81%) rename src/app/{shared => }/external-log-in-complete/guards/registration-token.guard.ts (68%) rename src/app/{shared => }/external-log-in-complete/models/registration-data.mock.model.ts (82%) rename src/app/{shared => }/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html (83%) rename src/app/{shared => }/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.scss (100%) rename src/app/{shared => }/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts (84%) rename src/app/{shared => }/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts (83%) rename src/app/{shared => }/external-log-in-complete/resolvers/registration-data.resolver.spec.ts (89%) rename src/app/{shared => }/external-log-in-complete/resolvers/registration-data.resolver.ts (76%) rename src/app/{shared => }/external-log-in-complete/services/external-login.service.spec.ts (84%) rename src/app/{shared => }/external-log-in-complete/services/external-login.service.ts (77%) diff --git a/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts b/src/app/external-log-in-complete/decorators/external-log-in.methods-decorator.ts similarity index 90% rename from src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts rename to src/app/external-log-in-complete/decorators/external-log-in.methods-decorator.ts index ce90aea0a3f..cfd3a42d40b 100644 --- a/src/app/shared/external-log-in-complete/external-log-in.methods-decorator.ts +++ b/src/app/external-log-in-complete/decorators/external-log-in.methods-decorator.ts @@ -1,4 +1,4 @@ -import { AuthRegistrationType } from 'src/app/core/auth/models/auth.registration-type'; +import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; /** * Map to store the external login confirmation component for the given auth method type diff --git a/src/app/shared/external-log-in-complete/external-login-method-entry.component.ts b/src/app/external-log-in-complete/decorators/external-login-method-entry.component.ts similarity index 100% rename from src/app/shared/external-log-in-complete/external-login-method-entry.component.ts rename to src/app/external-log-in-complete/decorators/external-login-method-entry.component.ts diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html b/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html rename to src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss b/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss rename to src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts similarity index 88% rename from src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts rename to src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts index e250fc41e03..eb398597aac 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -8,20 +8,18 @@ import { TranslateModule, TranslateService, } from '@ngx-translate/core'; -import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ExternalLoginService } from '../../services/external-login.service'; -import { AuthService } from '../../../../core/auth/auth.service'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; -import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; -import { - createSuccessfulRemoteDataObject$, -} from '../../../../shared/remote-data.utils'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; import { of } from 'rxjs'; -import { Registration } from '../../../../core/shared/registration.model'; -import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; +import { AuthService } from '../../../core/auth/auth.service'; +import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; +import { HardRedirectService } from '../../../core/services/hard-redirect.service'; +import { Registration } from '../../../core/shared/registration.model'; +import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; describe('ConfirmEmailComponent', () => { let component: ConfirmEmailComponent; diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts similarity index 89% rename from src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts rename to src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts index 73bc5adfa2c..02692afa7a3 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts @@ -1,17 +1,17 @@ import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; -import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators'; -import { EPersonDataService } from '../../../../core/eperson/eperson-data.service'; -import { hasNoValue, hasValue } from '../../../../shared/empty.util'; -import { EPerson } from '../../../../core/eperson/models/eperson.model'; -import { NotificationsService } from '../../../../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; import isEqual from 'lodash/isEqual'; -import { AuthService } from '../../../../core/auth/auth.service'; import { Subscription, combineLatest, take } from 'rxjs'; -import { Registration } from '../../../../core/shared/registration.model'; -import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; +import { AuthService } from '../../../core/auth/auth.service'; +import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; +import { EPerson } from '../../../core/eperson/models/eperson.model'; +import { HardRedirectService } from '../../../core/services/hard-redirect.service'; +import { getRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { Registration } from '../../../core/shared/registration.model'; +import { hasNoValue, hasValue } from '../../../shared/empty.util'; +import { NotificationsService } from '../../../shared/notifications/notifications.service'; @Component({ selector: 'ds-confirm-email', diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html b/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html rename to src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss b/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss rename to src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts b/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts similarity index 95% rename from src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts rename to src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts index 3de88d9ba26..791e0e58e46 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts +++ b/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts @@ -4,8 +4,8 @@ import { ConfirmationSentComponent } from './confirmation-sent.component'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { TranslateService, TranslateModule, TranslateLoader } from '@ngx-translate/core'; -import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { of } from 'rxjs'; +import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; describe('ConfirmationSentComponent', () => { let component: ConfirmationSentComponent; diff --git a/src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts b/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts rename to src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html b/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html rename to src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss b/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss similarity index 100% rename from src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss rename to src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts b/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts similarity index 96% rename from src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts rename to src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts index 3ccb0a189a5..a346bfa930f 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts +++ b/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts @@ -4,9 +4,9 @@ import { ProvideEmailComponent } from './provide-email.component'; import { FormBuilder } from '@angular/forms'; import { CommonModule } from '@angular/common'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ExternalLoginService } from '../../services/external-login.service'; +import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; describe('ProvideEmailComponent', () => { let component: ProvideEmailComponent; diff --git a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts similarity index 96% rename from src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts rename to src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts index a63486dea60..52687b62010 100644 --- a/src/app/shared/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/c import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; import { Subscription } from 'rxjs'; -import { hasValue } from '../../../../shared/empty.util'; +import { hasValue } from '../../../shared/empty.util'; @Component({ selector: 'ds-provide-email', diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/external-log-in-complete/external-log-in/external-log-in.component.html similarity index 100% rename from src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.html rename to src/app/external-log-in-complete/external-log-in/external-log-in.component.html diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.scss b/src/app/external-log-in-complete/external-log-in/external-log-in.component.scss similarity index 100% rename from src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.scss rename to src/app/external-log-in-complete/external-log-in/external-log-in.component.scss diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts b/src/app/external-log-in-complete/external-log-in/external-log-in.component.spec.ts similarity index 78% rename from src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts rename to src/app/external-log-in-complete/external-log-in/external-log-in.component.spec.ts index 9e3b74f2bfe..4f444e920df 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.spec.ts +++ b/src/app/external-log-in-complete/external-log-in/external-log-in.component.spec.ts @@ -3,17 +3,19 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLogInComponent } from './external-log-in.component'; import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; -import { TranslateLoaderMock } from '../../mocks/translate-loader.mock'; -import { EventEmitter, Injector } from '@angular/core'; +import { EventEmitter, Injector, NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; import { of as observableOf } from 'rxjs'; import { FormBuilder } from '@angular/forms'; -import { AuthService } from '../../../core/auth/auth.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { AuthServiceMock } from '../../mocks/auth.service.mock'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { Registration } from '../../../core/shared/registration.model'; -import { AuthRegistrationType } from '../../../core/auth/models/auth.registration-type'; +import { AuthService } from '../../core/auth/auth.service'; +import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; +import { MetadataValue } from '../../core/shared/metadata.models'; +import { Registration } from '../../core/shared/registration.model'; +import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; +import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; +import { BrowserOnlyMockPipe } from '../../shared/testing/browser-only-mock.pipe'; +import { OrcidConfirmationComponent } from '../registration-types/orcid-confirmation/orcid-confirmation.component'; describe('ExternalLogInComponent', () => { let component: ExternalLogInComponent; @@ -40,7 +42,9 @@ describe('ExternalLogInComponent', () => { }; const translateServiceStub = { get: () => observableOf('Info Text'), - instant: (key: any) => 'Info Text', + instant(key) { + return 'Info Text'; + }, onLangChange: new EventEmitter(), onTranslationChange: new EventEmitter(), onDefaultLangChange: new EventEmitter() @@ -48,7 +52,7 @@ describe('ExternalLogInComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ExternalLogInComponent], + declarations: [ExternalLogInComponent, BrowserOnlyMockPipe, ], providers: [ { provide: TranslateService, useValue: translateServiceStub }, { provide: Injector, useValue: {} }, @@ -64,12 +68,18 @@ describe('ExternalLogInComponent', () => { useClass: TranslateLoaderMock } }), - ] + ], + schemas: [NO_ERRORS_SCHEMA] }) .compileComponents(); }); beforeEach(() => { + TestBed.overrideComponent(OrcidConfirmationComponent, { + set: { + template: '
Mocked OrcidConfirmationComponent
', + }, + }); fixture = TestBed.createComponent(ExternalLogInComponent); component = fixture.componentInstance; component.registrationData = Object.assign(new Registration, registrationDataMock); @@ -111,5 +121,3 @@ describe('ExternalLogInComponent', () => { expect(infoText.nativeElement.innerHTML).toContain('Info Text'); }); }); - - diff --git a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/external-log-in-complete/external-log-in/external-log-in.component.ts similarity index 89% rename from src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts rename to src/app/external-log-in-complete/external-log-in/external-log-in.component.ts index d167a0c5d08..3917567e414 100644 --- a/src/app/shared/external-log-in-complete/external-log-in/external-log-in.component.ts +++ b/src/app/external-log-in-complete/external-log-in/external-log-in.component.ts @@ -5,13 +5,13 @@ import { Input, Injector, } from '@angular/core'; -import { getExternalLoginConfirmationType } from '../external-log-in.methods-decorator'; -import { hasValue } from '../../empty.util'; +import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { AuthService } from '../../../core/auth/auth.service'; -import { Registration } from '../../../core/shared/registration.model'; -import { AuthRegistrationType } from '../../../core/auth/models/auth.registration-type'; +import { AuthService } from '../../core/auth/auth.service'; +import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; +import { Registration } from '../../core/shared/registration.model'; +import { hasValue } from '../../shared/empty.util'; +import { getExternalLoginConfirmationType } from '../decorators/external-log-in.methods-decorator'; @Component({ selector: 'ds-external-log-in', diff --git a/src/app/external-log-in-complete/external-login-complete.module.ts b/src/app/external-log-in-complete/external-login-complete.module.ts new file mode 100644 index 00000000000..d68f13b0eca --- /dev/null +++ b/src/app/external-log-in-complete/external-login-complete.module.ts @@ -0,0 +1,35 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { ConfirmEmailComponent } from './email-confirmation/confirm-email/confirm-email.component'; +import { ConfirmationSentComponent } from './email-confirmation/confirmation-sent/confirmation-sent.component'; +import { ProvideEmailComponent } from './email-confirmation/provide-email/provide-email.component'; +import { ExternalLogInComponent } from './external-log-in/external-log-in.component'; +import { OrcidConfirmationComponent } from './registration-types/orcid-confirmation/orcid-confirmation.component'; +import { SharedModule } from '../shared/shared.module'; + +const COMPONENTS = [ + ExternalLogInComponent, + ProvideEmailComponent, + ConfirmEmailComponent, + ConfirmationSentComponent, +]; + +const ENTRY_COMPONENTS = [OrcidConfirmationComponent]; + +@NgModule({ + declarations: [...COMPONENTS, ...ENTRY_COMPONENTS], + imports: [CommonModule, SharedModule], + exports: [...COMPONENTS, ...ENTRY_COMPONENTS], +}) +export class ExternalLoginCompleteModule { + /** + * NOTE: this method allows to resolve issue with components that using a custom decorator + * which are not loaded during SSR otherwise + */ + static withEntryComponents() { + return { + ngModule: ExternalLoginCompleteModule, + providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })), + }; + } +} diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.spec.ts b/src/app/external-log-in-complete/guards/registration-token.guard.spec.ts similarity index 81% rename from src/app/shared/external-log-in-complete/guards/registration-token.guard.spec.ts rename to src/app/external-log-in-complete/guards/registration-token.guard.spec.ts index f62769add66..155e27c4c53 100644 --- a/src/app/shared/external-log-in-complete/guards/registration-token.guard.spec.ts +++ b/src/app/external-log-in-complete/guards/registration-token.guard.spec.ts @@ -2,12 +2,13 @@ import { TestBed } from '@angular/core/testing'; import { RegistrationTokenGuard } from './registration-token.guard'; import { ActivatedRoute, convertToParamMap, Params, Router } from '@angular/router'; import { of as observableOf } from 'rxjs'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { AuthService } from '../../../core/auth/auth.service'; -import { RouterMock } from '../../../shared/mocks/router.mock'; -import { Registration } from '../../../core/shared/registration.model'; -import { EPerson } from '../../../core/eperson/models/eperson.model'; -import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { AuthService } from '../../core/auth/auth.service'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { EPerson } from '../../core/eperson/models/eperson.model'; +import { Registration } from '../../core/shared/registration.model'; +import { RouterMock } from '../../shared/mocks/router.mock'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { AuthRegistrationType } from 'src/app/core/auth/models/auth.registration-type'; describe('RegistrationTokenGuard', () => { let guard: RegistrationTokenGuard; @@ -16,6 +17,7 @@ describe('RegistrationTokenGuard', () => { { email: 'test@email.org', token: 'test-token', + registrationType: AuthRegistrationType.Orcid, }); const epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', { searchRegistrationByToken: createSuccessfulRemoteDataObject$(registrationWithGroups) diff --git a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts b/src/app/external-log-in-complete/guards/registration-token.guard.ts similarity index 68% rename from src/app/shared/external-log-in-complete/guards/registration-token.guard.ts rename to src/app/external-log-in-complete/guards/registration-token.guard.ts index d565dfbd91a..8f0db7b63f4 100644 --- a/src/app/shared/external-log-in-complete/guards/registration-token.guard.ts +++ b/src/app/external-log-in-complete/guards/registration-token.guard.ts @@ -6,11 +6,12 @@ import { RouterStateSnapshot, } from '@angular/router'; import { Observable, map, of } from 'rxjs'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { Registration } from '../../../core/shared/registration.model'; -import { hasValue } from '../../empty.util'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { Registration } from '../../core/shared/registration.model'; +import { hasValue } from '../../shared/empty.util'; +import { AuthRegistrationType } from 'src/app/core/auth/models/auth.registration-type'; @Injectable({ providedIn: 'root', @@ -38,7 +39,7 @@ export class RegistrationTokenGuard implements CanActivate { getFirstCompletedRemoteData(), map( (data: RemoteData) => { - if (data.hasSucceeded && hasValue(data)) { + if (data.hasSucceeded && hasValue(data.payload) && !data.payload.registrationType.includes(AuthRegistrationType.Validation)) { return true; } else { this.router.navigate(['/404']); diff --git a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/external-log-in-complete/models/registration-data.mock.model.ts similarity index 82% rename from src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts rename to src/app/external-log-in-complete/models/registration-data.mock.model.ts index 6dc1eb28632..4c288d17483 100644 --- a/src/app/shared/external-log-in-complete/models/registration-data.mock.model.ts +++ b/src/app/external-log-in-complete/models/registration-data.mock.model.ts @@ -1,6 +1,7 @@ -import { AuthMethodType } from '../../../core/auth/models/auth.method-type'; -import { MetadataValue } from '../../../core/shared/metadata.models'; -import { Registration } from '../../../core/shared/registration.model'; +import { AuthMethodType } from '../../core/auth/models/auth.method-type'; +import { MetadataValue } from '../../core/shared/metadata.models'; +import { Registration } from '../../core/shared/registration.model'; + export const mockRegistrationDataModel: Registration = Object.assign( new Registration(), diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html b/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html similarity index 83% rename from src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html rename to src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html index 4c81c7fdb15..df5bb454dde 100644 --- a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html +++ b/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html @@ -1,7 +1,7 @@ - - {{ registratioData.registrationType }} + - - { let component: OrcidConfirmationComponent; let fixture: ComponentFixture; - let model: Registration; beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [ OrcidConfirmationComponent, - BrowserOnlyMockPipe, + BrowserOnlyMockPipe ], providers: [ FormBuilder, diff --git a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts b/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts similarity index 83% rename from src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts rename to src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts index 3cd3b875dc0..4cba863bef3 100644 --- a/src/app/shared/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts +++ b/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts @@ -1,10 +1,9 @@ import { Component, OnInit, ChangeDetectionStrategy, Inject } from '@angular/core'; -import { renderExternalLoginConfirmationFor } from '../../external-log-in.methods-decorator'; import { FormBuilder, FormGroup } from '@angular/forms'; -import { ExternalLoginMethodEntryComponent } from '../../external-login-method-entry.component'; -import { Registration } from '../../../../core/shared/registration.model'; -import { AuthRegistrationType } from '../../../../core/auth/models/auth.registration-type'; - +import { AuthRegistrationType } from '../../../core/auth/models/auth.registration-type'; +import { Registration } from '../../../core/shared/registration.model'; +import { renderExternalLoginConfirmationFor } from '../../decorators/external-log-in.methods-decorator'; +import { ExternalLoginMethodEntryComponent } from '../../decorators/external-login-method-entry.component'; @Component({ selector: 'ds-orcid-confirmation', templateUrl: './orcid-confirmation.component.html', diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts b/src/app/external-log-in-complete/resolvers/registration-data.resolver.spec.ts similarity index 89% rename from src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts rename to src/app/external-log-in-complete/resolvers/registration-data.resolver.spec.ts index 0d1f415a3b4..82641a6a94d 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.spec.ts +++ b/src/app/external-log-in-complete/resolvers/registration-data.resolver.spec.ts @@ -1,10 +1,10 @@ import { TestBed } from '@angular/core/testing'; import { RegistrationDataResolver } from './registration-data.resolver'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { Registration } from '../../../core/shared/registration.model'; import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; -import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { Registration } from '../../core/shared/registration.model'; +import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; describe('RegistrationDataResolver', () => { let resolver: RegistrationDataResolver; diff --git a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts b/src/app/external-log-in-complete/resolvers/registration-data.resolver.ts similarity index 76% rename from src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts rename to src/app/external-log-in-complete/resolvers/registration-data.resolver.ts index 6a9b6b8b31b..49667ab77a0 100644 --- a/src/app/shared/external-log-in-complete/resolvers/registration-data.resolver.ts +++ b/src/app/external-log-in-complete/resolvers/registration-data.resolver.ts @@ -5,11 +5,11 @@ import { ActivatedRouteSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { hasValue } from '../../empty.util'; -import { Registration } from '../../../core/shared/registration.model'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { RemoteData } from '../../../core/data/remote-data'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { Registration } from '../../core/shared/registration.model'; +import { hasValue } from '../../shared/empty.util'; @Injectable({ providedIn: 'root', diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts b/src/app/external-log-in-complete/services/external-login.service.spec.ts similarity index 84% rename from src/app/shared/external-log-in-complete/services/external-login.service.spec.ts rename to src/app/external-log-in-complete/services/external-login.service.spec.ts index ce0dcb4e269..896fec12a8b 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.spec.ts +++ b/src/app/external-log-in-complete/services/external-login.service.spec.ts @@ -3,16 +3,16 @@ import { TestBed } from '@angular/core/testing'; import { ExternalLoginService } from './external-login.service'; import { TranslateService } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { Registration } from '../../../core/shared/registration.model'; -import { NotificationsService } from '../../notifications/notifications.service'; -import { RouterMock } from '../../mocks/router.mock'; -import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils'; -import { NotificationsServiceStub } from '../../testing/notifications-service.stub'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { Registration } from '../../core/shared/registration.model'; +import { RouterMock } from '../../shared/mocks/router.mock'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; +import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; describe('ExternalLoginService', () => { let service: ExternalLoginService; diff --git a/src/app/shared/external-log-in-complete/services/external-login.service.ts b/src/app/external-log-in-complete/services/external-login.service.ts similarity index 77% rename from src/app/shared/external-log-in-complete/services/external-login.service.ts rename to src/app/external-log-in-complete/services/external-login.service.ts index 03c671b570a..70ab98832ff 100644 --- a/src/app/shared/external-log-in-complete/services/external-login.service.ts +++ b/src/app/external-log-in-complete/services/external-login.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable, filter, map, tap } from 'rxjs'; -import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service'; -import { RemoteData } from '../../../core/data/remote-data'; -import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import { NotificationsService } from '../../notifications/notifications.service'; +import { Observable, filter, map } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; -import { NoContent } from '../../../core/shared/NoContent.model'; -import { AuthMethod } from 'src/app/core/auth/models/auth.method'; -import { getAuthenticationMethods } from 'src/app/core/auth/selectors'; +import { AuthMethod } from '../../core/auth/models/auth.method'; +import { getAuthenticationMethods } from '../../core/auth/selectors'; import { Store, select } from '@ngrx/store'; -import { CoreState } from 'src/app/core/core-state.model'; +import { CoreState } from '../../core/core-state.model'; +import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; +import { RemoteData } from '../../core/data/remote-data'; +import { NoContent } from '../../core/shared/NoContent.model'; +import { getFirstCompletedRemoteData } from '../../core/shared/operators'; +import { NotificationsService } from '../../shared/notifications/notifications.service'; @Injectable({ providedIn: 'root' diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts index 89a96222d13..270dc60125e 100644 --- a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; -import { ConfirmationSentComponent } from '../shared/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; +import { ConfirmationSentComponent } from '../external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component'; describe('ExternalLoginEmailConfirmationPageComponent', () => { let component: ExternalLoginEmailConfirmationPageComponent; diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts index 36684f2f367..d62da55dbd7 100644 --- a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { ExternalLoginEmailConfirmationPageRoutingModule } from './external-login-email-confirmation-page-routing.module'; import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; -import { SharedModule } from '../shared/shared.module'; +import { ExternalLoginCompleteModule } from '../external-log-in-complete/external-login-complete.module'; @NgModule({ @@ -13,7 +13,7 @@ import { SharedModule } from '../shared/shared.module'; imports: [ CommonModule, ExternalLoginEmailConfirmationPageRoutingModule, - SharedModule + ExternalLoginCompleteModule, ] }) export class ExternalLoginEmailConfirmationPageModule { } diff --git a/src/app/external-login-page/external-login-page-routing.module.ts b/src/app/external-login-page/external-login-page-routing.module.ts index 21bbb7ee920..641809740d3 100644 --- a/src/app/external-login-page/external-login-page-routing.module.ts +++ b/src/app/external-login-page/external-login-page-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; -import { RegistrationTokenGuard } from '../shared/external-log-in-complete/guards/registration-token.guard'; -import { RegistrationDataResolver } from '../shared/external-log-in-complete/resolvers/registration-data.resolver'; +import { RegistrationDataResolver } from '../external-log-in-complete/resolvers/registration-data.resolver'; +import { RegistrationTokenGuard } from '../external-log-in-complete/guards/registration-token.guard'; const routes: Routes = [ { diff --git a/src/app/external-login-page/external-login-page.module.ts b/src/app/external-login-page/external-login-page.module.ts index 697ae7e1a8e..ac68dc5c309 100644 --- a/src/app/external-login-page/external-login-page.module.ts +++ b/src/app/external-login-page/external-login-page.module.ts @@ -5,6 +5,7 @@ import { ExternalLoginPageRoutingModule } from './external-login-page-routing.mo import { ExternalLoginPageComponent } from './external-login-page.component'; import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; import { SharedModule } from '../shared/shared.module'; +import { ExternalLoginCompleteModule } from '../external-log-in-complete/external-login-complete.module'; const COMPONENTS = [ ExternalLoginPageComponent, @@ -18,7 +19,8 @@ const COMPONENTS = [ imports: [ CommonModule, ExternalLoginPageRoutingModule, - SharedModule + SharedModule, + ExternalLoginCompleteModule ] }) export class ExternalLoginPageModule { } diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts index 1119c9fc49b..66e3e29d056 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; -import { RegistrationDataResolver } from '../shared/external-log-in-complete/resolvers/registration-data.resolver'; import { ReviewAccountGuard } from './helpers/review-account.guard'; +import { RegistrationDataResolver } from '../external-log-in-complete/resolvers/registration-data.resolver'; const routes: Routes = [ { diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts index 4b136cbef7a..816cdb4e1ff 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; -import { mockRegistrationDataModel } from '../shared/external-log-in-complete/models/registration-data.mock.model'; +import { mockRegistrationDataModel } from '../external-log-in-complete/models/registration-data.mock.model'; describe('ExternalLoginReviewAccountInfoPageComponent', () => { let component: ExternalLoginReviewAccountInfoPageComponent; diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts b/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts index 368f988a829..13bad328d1f 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts +++ b/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts @@ -8,7 +8,7 @@ import { ThemedExternalLoginReviewAccountInfoPageComponent } from './themed-exte import { ReviewAccountInfoComponent } from './review-account-info/review-account-info.component'; import { UiSwitchModule } from 'ngx-ui-switch'; import { SharedModule } from '../shared/shared.module'; - +import { ExternalLoginCompleteModule } from '../external-log-in-complete/external-login-complete.module'; @NgModule({ declarations: [ @@ -22,6 +22,7 @@ import { SharedModule } from '../shared/shared.module'; ExternalLoginReviewAccountInfoRoutingModule, SharedModule, UiSwitchModule, + ExternalLoginCompleteModule ] }) export class ExternalLoginReviewAccountInfoModule { } diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html index da5d943676f..fb4e1298be0 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html @@ -19,7 +19,7 @@

{{'external-login-validation.review-account-info.header' | translate}}

- +
{{ registrationData.registrationType | uppercase }}{{ registrationData.registrationType }} {{ registrationData.netId }} diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts index 63545370ab7..2bfbd582e4a 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts @@ -24,8 +24,8 @@ import { CompareValuesPipe } from '../helpers/compare-values.pipe'; import { Registration } from '../../core/shared/registration.model'; import { AuthService } from '../../core/auth/auth.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; -import { ExternalLoginService } from '../../shared/external-log-in-complete/services/external-login.service'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; +import { ExternalLoginService } from '../../external-log-in-complete/services/external-login.service'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; @@ -179,7 +179,7 @@ describe('ReviewAccountInfoComponent', () => { const registrationTypeElement: HTMLElement = fixture.nativeElement.querySelector('tbody tr:first-child th'); const netIdElement: HTMLElement = fixture.nativeElement.querySelector('tbody tr:first-child td'); - expect(registrationTypeElement.textContent.trim()).toBe(registrationDataMock.registrationType.toUpperCase()); + expect(registrationTypeElement.textContent.trim()).toBe(registrationDataMock.registrationType); expect(netIdElement.textContent.trim()).toBe(registrationDataMock.netId); }); diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts index cca523ce4c2..79f9cac83c5 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts @@ -17,9 +17,9 @@ import { NotificationsService } from '../../shared/notifications/notifications.s import { Router } from '@angular/router'; import { Registration } from '../../core/shared/registration.model'; import { AuthService } from '../../core/auth/auth.service'; -import { ExternalLoginService } from '../../shared/external-log-in-complete/services/external-login.service'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; +import { ExternalLoginService } from '../../external-log-in-complete/services/external-login.service'; export interface ReviewAccountInfoData { label: string; diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts index 79ab35bd28c..7a72cc907cc 100644 --- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts +++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts @@ -10,7 +10,7 @@ import { of as observableOf } from 'rxjs'; import { Component } from '@angular/core'; import { DsoEditMenuExpandableSectionComponent } from './dso-edit-menu-expandable-section.component'; import { By } from '@angular/platform-browser'; -import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model'; +import { MenuItemType } from '../../../../shared/menu/menu-item-type.model'; describe('DsoEditMenuExpandableSectionComponent', () => { let component: DsoEditMenuExpandableSectionComponent; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 65bcd2dfa3c..c59d2bedaf2 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -332,11 +332,6 @@ import { EntityIconDirective } from './entity-icon/entity-icon.directive'; import { AdditionalMetadataComponent } from './object-list/search-result-list-element/additional-metadata/additional-metadata.component'; -import { ExternalLogInComponent } from './external-log-in-complete/external-log-in/external-log-in.component'; -import { OrcidConfirmationComponent } from './external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component'; -import { ProvideEmailComponent } from './external-log-in-complete/email-confirmation/provide-email/provide-email.component'; -import { ConfirmEmailComponent } from './external-log-in-complete/email-confirmation/confirm-email/confirm-email.component'; -import { ConfirmationSentComponent } from './external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component'; const MODULES = [ CommonModule, @@ -475,10 +470,6 @@ const COMPONENTS = [ ExportExcelSelectorComponent, ThemedBrowseMostElementsComponent, SearchChartBarHorizontalComponent, - ExternalLogInComponent, - ProvideEmailComponent, - ConfirmEmailComponent, - ConfirmationSentComponent, ]; const ENTRY_COMPONENTS = [ @@ -553,7 +544,6 @@ const ENTRY_COMPONENTS = [ SearchChartBarHorizontalComponent, RelationshipsListComponent, AdditionalMetadataComponent, - OrcidConfirmationComponent, ]; const PROVIDERS = [ From 2fc33b5ca2e0906efe8e2a130b4a7371df350757 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 10 Oct 2023 13:14:50 +0200 Subject: [PATCH 745/758] [CST-10703] Renamed components and modules --- src/app/app-routing.module.ts | 2 +- .../decorators/external-log-in.methods-decorator.ts | 0 .../external-login-method-entry.component.ts | 0 .../confirm-email/confirm-email.component.html | 0 .../confirm-email/confirm-email.component.scss | 0 .../confirm-email/confirm-email.component.spec.ts | 6 +----- .../confirm-email/confirm-email.component.ts | 6 +++--- .../confirmation-sent.component.html | 0 .../confirmation-sent.component.scss | 0 .../confirmation-sent.component.spec.ts | 2 +- .../confirmation-sent/confirmation-sent.component.ts | 2 +- .../provide-email/provide-email.component.html | 0 .../provide-email/provide-email.component.scss | 0 .../provide-email/provide-email.component.spec.ts | 0 .../provide-email/provide-email.component.ts | 2 +- .../external-log-in/external-log-in.component.html | 0 .../external-log-in/external-log-in.component.scss | 0 .../external-log-in.component.spec.ts | 0 .../external-log-in/external-log-in.component.ts | 10 ++-------- .../external-login.module.ts} | 4 ++-- .../guards/registration-token.guard.spec.ts | 0 .../guards/registration-token.guard.ts | 9 ++------- .../models/registration-data.mock.model.ts | 0 .../orcid-confirmation.component.html | 0 .../orcid-confirmation.component.scss | 0 .../orcid-confirmation.component.spec.ts | 0 .../orcid-confirmation.component.ts | 3 ++- .../resolvers/registration-data.resolver.spec.ts | 0 .../resolvers/registration-data.resolver.ts | 6 +----- .../services/external-login.service.spec.ts | 0 .../services/external-login.service.ts | 4 ++-- ...l-login-email-confirmation-page.component.spec.ts | 4 +++- .../external-login-email-confirmation-page.module.ts | 8 +++++--- .../external-login-page-routing.module.ts | 4 ++-- .../external-login-page.module.ts | 4 ++-- ...-login-review-account-info-page-routing.module.ts | 2 +- ...nal-login-review-account-info-page.component.html | 0 ...nal-login-review-account-info-page.component.scss | 0 ...-login-review-account-info-page.component.spec.ts | 2 +- ...ernal-login-review-account-info-page.component.ts | 2 +- ...external-login-review-account-info-page.module.ts | 8 +++++--- .../helpers/compare-values.pipe.ts | 0 .../helpers/review-account.guard.spec.ts | 0 .../helpers/review-account.guard.ts | 9 ++------- .../review-account-info.component.html | 0 .../review-account-info.component.scss | 0 .../review-account-info.component.spec.ts | 12 ++++-------- .../review-account-info.component.ts | 12 +++--------- ...ernal-login-review-account-info-page.component.ts | 0 49 files changed, 48 insertions(+), 75 deletions(-) rename src/app/{external-log-in-complete => external-log-in}/decorators/external-log-in.methods-decorator.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/decorators/external-login-method-entry.component.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirm-email/confirm-email.component.html (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirm-email/confirm-email.component.scss (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirm-email/confirm-email.component.spec.ts (98%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirm-email/confirm-email.component.ts (97%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirmation-sent/confirmation-sent.component.html (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirmation-sent/confirmation-sent.component.scss (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts (96%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/confirmation-sent/confirmation-sent.component.ts (80%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/provide-email/provide-email.component.html (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/provide-email/provide-email.component.scss (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/provide-email/provide-email.component.spec.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/email-confirmation/provide-email/provide-email.component.ts (96%) rename src/app/{external-log-in-complete => external-log-in}/external-log-in/external-log-in.component.html (100%) rename src/app/{external-log-in-complete => external-log-in}/external-log-in/external-log-in.component.scss (100%) rename src/app/{external-log-in-complete => external-log-in}/external-log-in/external-log-in.component.spec.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/external-log-in/external-log-in.component.ts (96%) rename src/app/{external-log-in-complete/external-login-complete.module.ts => external-log-in/external-login.module.ts} (93%) rename src/app/{external-log-in-complete => external-log-in}/guards/registration-token.guard.spec.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/guards/registration-token.guard.ts (91%) rename src/app/{external-log-in-complete => external-log-in}/models/registration-data.mock.model.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/registration-types/orcid-confirmation/orcid-confirmation.component.html (100%) rename src/app/{external-log-in-complete => external-log-in}/registration-types/orcid-confirmation/orcid-confirmation.component.scss (100%) rename src/app/{external-log-in-complete => external-log-in}/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/registration-types/orcid-confirmation/orcid-confirmation.component.ts (97%) rename src/app/{external-log-in-complete => external-log-in}/resolvers/registration-data.resolver.spec.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/resolvers/registration-data.resolver.ts (93%) rename src/app/{external-log-in-complete => external-log-in}/services/external-login.service.spec.ts (100%) rename src/app/{external-log-in-complete => external-log-in}/services/external-login.service.ts (96%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/external-login-review-account-info-page-routing.module.ts (85%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/external-login-review-account-info-page.component.html (100%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/external-login-review-account-info-page.component.scss (100%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/external-login-review-account-info-page.component.spec.ts (94%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/external-login-review-account-info-page.component.ts (96%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/external-login-review-account-info-page.module.ts (78%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/helpers/compare-values.pipe.ts (100%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/helpers/review-account.guard.spec.ts (100%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/helpers/review-account.guard.ts (92%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/review-account-info/review-account-info.component.html (100%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/review-account-info/review-account-info.component.scss (100%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/review-account-info/review-account-info.component.spec.ts (96%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/review-account-info/review-account-info.component.ts (97%) rename src/app/{external-login-review-account-info => external-login-review-account-info-page}/themed-external-login-review-account-info-page.component.ts (100%) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a652eadde9e..513628fc413 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -178,7 +178,7 @@ import { RedirectService } from './redirect/redirect.service'; }, { path: 'review-account/:token', - loadChildren: () => import('./external-login-review-account-info/external-login-review-account-info-page.module') + loadChildren: () => import('./external-login-review-account-info-page/external-login-review-account-info-page.module') .then((m) => m.ExternalLoginReviewAccountInfoModule) }, { diff --git a/src/app/external-log-in-complete/decorators/external-log-in.methods-decorator.ts b/src/app/external-log-in/decorators/external-log-in.methods-decorator.ts similarity index 100% rename from src/app/external-log-in-complete/decorators/external-log-in.methods-decorator.ts rename to src/app/external-log-in/decorators/external-log-in.methods-decorator.ts diff --git a/src/app/external-log-in-complete/decorators/external-login-method-entry.component.ts b/src/app/external-log-in/decorators/external-login-method-entry.component.ts similarity index 100% rename from src/app/external-log-in-complete/decorators/external-login-method-entry.component.ts rename to src/app/external-log-in/decorators/external-login-method-entry.component.ts diff --git a/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html similarity index 100% rename from src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.html rename to src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html diff --git a/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.scss similarity index 100% rename from src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.scss rename to src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.scss diff --git a/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts similarity index 98% rename from src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts rename to src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts index eb398597aac..7c0e7f8d926 100644 --- a/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -3,11 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfirmEmailComponent } from './confirm-email.component'; import { FormBuilder } from '@angular/forms'; import { CommonModule } from '@angular/common'; -import { - TranslateLoader, - TranslateModule, - TranslateService, -} from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule, TranslateService, } from '@ngx-translate/core'; import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ExternalLoginService } from '../../services/external-login.service'; import { of } from 'rxjs'; diff --git a/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts similarity index 97% rename from src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts rename to src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts index 02692afa7a3..56e28333b62 100644 --- a/src/app/external-log-in-complete/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts @@ -1,14 +1,14 @@ -import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; import { TranslateService } from '@ngx-translate/core'; import isEqual from 'lodash/isEqual'; -import { Subscription, combineLatest, take } from 'rxjs'; +import { combineLatest, Subscription, take } from 'rxjs'; import { AuthService } from '../../../core/auth/auth.service'; import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; import { EPerson } from '../../../core/eperson/models/eperson.model'; import { HardRedirectService } from '../../../core/services/hard-redirect.service'; -import { getRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators'; import { Registration } from '../../../core/shared/registration.model'; import { hasNoValue, hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; diff --git a/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.html similarity index 100% rename from src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.html rename to src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.html diff --git a/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.scss similarity index 100% rename from src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.scss rename to src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.scss diff --git a/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts similarity index 96% rename from src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts rename to src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts index 791e0e58e46..da4e5416d54 100644 --- a/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts +++ b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ConfirmationSentComponent } from './confirmation-sent.component'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; -import { TranslateService, TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; diff --git a/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts similarity index 80% rename from src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts rename to src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts index 78a0ef81fed..2f82991c0d4 100644 --- a/src/app/external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component.ts +++ b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ selector: 'ds-confirmation-sent', diff --git a/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html similarity index 100% rename from src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.html rename to src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html diff --git a/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.scss similarity index 100% rename from src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.scss rename to src/app/external-log-in/email-confirmation/provide-email/provide-email.component.scss diff --git a/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.spec.ts similarity index 100% rename from src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.spec.ts rename to src/app/external-log-in/email-confirmation/provide-email/provide-email.component.spec.ts diff --git a/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts similarity index 96% rename from src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts rename to src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts index 52687b62010..4e3e220eceb 100644 --- a/src/app/external-log-in-complete/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy, Input, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; import { Subscription } from 'rxjs'; diff --git a/src/app/external-log-in-complete/external-log-in/external-log-in.component.html b/src/app/external-log-in/external-log-in/external-log-in.component.html similarity index 100% rename from src/app/external-log-in-complete/external-log-in/external-log-in.component.html rename to src/app/external-log-in/external-log-in/external-log-in.component.html diff --git a/src/app/external-log-in-complete/external-log-in/external-log-in.component.scss b/src/app/external-log-in/external-log-in/external-log-in.component.scss similarity index 100% rename from src/app/external-log-in-complete/external-log-in/external-log-in.component.scss rename to src/app/external-log-in/external-log-in/external-log-in.component.scss diff --git a/src/app/external-log-in-complete/external-log-in/external-log-in.component.spec.ts b/src/app/external-log-in/external-log-in/external-log-in.component.spec.ts similarity index 100% rename from src/app/external-log-in-complete/external-log-in/external-log-in.component.spec.ts rename to src/app/external-log-in/external-log-in/external-log-in.component.spec.ts diff --git a/src/app/external-log-in-complete/external-log-in/external-log-in.component.ts b/src/app/external-log-in/external-log-in/external-log-in.component.ts similarity index 96% rename from src/app/external-log-in-complete/external-log-in/external-log-in.component.ts rename to src/app/external-log-in/external-log-in/external-log-in.component.ts index 3917567e414..60d91d2aee3 100644 --- a/src/app/external-log-in-complete/external-log-in/external-log-in.component.ts +++ b/src/app/external-log-in/external-log-in/external-log-in.component.ts @@ -1,11 +1,5 @@ -import { - Component, - OnInit, - ChangeDetectionStrategy, - Input, - Injector, -} from '@angular/core'; -import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ChangeDetectionStrategy, Component, Injector, Input, OnInit, } from '@angular/core'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { AuthService } from '../../core/auth/auth.service'; import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; diff --git a/src/app/external-log-in-complete/external-login-complete.module.ts b/src/app/external-log-in/external-login.module.ts similarity index 93% rename from src/app/external-log-in-complete/external-login-complete.module.ts rename to src/app/external-log-in/external-login.module.ts index d68f13b0eca..b0d75aa7303 100644 --- a/src/app/external-log-in-complete/external-login-complete.module.ts +++ b/src/app/external-log-in/external-login.module.ts @@ -21,14 +21,14 @@ const ENTRY_COMPONENTS = [OrcidConfirmationComponent]; imports: [CommonModule, SharedModule], exports: [...COMPONENTS, ...ENTRY_COMPONENTS], }) -export class ExternalLoginCompleteModule { +export class ExternalLoginModule { /** * NOTE: this method allows to resolve issue with components that using a custom decorator * which are not loaded during SSR otherwise */ static withEntryComponents() { return { - ngModule: ExternalLoginCompleteModule, + ngModule: ExternalLoginModule, providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })), }; } diff --git a/src/app/external-log-in-complete/guards/registration-token.guard.spec.ts b/src/app/external-log-in/guards/registration-token.guard.spec.ts similarity index 100% rename from src/app/external-log-in-complete/guards/registration-token.guard.spec.ts rename to src/app/external-log-in/guards/registration-token.guard.spec.ts diff --git a/src/app/external-log-in-complete/guards/registration-token.guard.ts b/src/app/external-log-in/guards/registration-token.guard.ts similarity index 91% rename from src/app/external-log-in-complete/guards/registration-token.guard.ts rename to src/app/external-log-in/guards/registration-token.guard.ts index 8f0db7b63f4..31e38143a3b 100644 --- a/src/app/external-log-in-complete/guards/registration-token.guard.ts +++ b/src/app/external-log-in/guards/registration-token.guard.ts @@ -1,11 +1,6 @@ import { Injectable } from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - Router, - RouterStateSnapshot, -} from '@angular/router'; -import { Observable, map, of } from 'rxjs'; +import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, } from '@angular/router'; +import { map, Observable, of } from 'rxjs'; import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; import { RemoteData } from '../../core/data/remote-data'; import { getFirstCompletedRemoteData } from '../../core/shared/operators'; diff --git a/src/app/external-log-in-complete/models/registration-data.mock.model.ts b/src/app/external-log-in/models/registration-data.mock.model.ts similarity index 100% rename from src/app/external-log-in-complete/models/registration-data.mock.model.ts rename to src/app/external-log-in/models/registration-data.mock.model.ts diff --git a/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.html similarity index 100% rename from src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.html rename to src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.html diff --git a/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.scss b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.scss similarity index 100% rename from src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.scss rename to src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.scss diff --git a/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts similarity index 100% rename from src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts rename to src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.spec.ts diff --git a/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts similarity index 97% rename from src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts rename to src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts index 4cba863bef3..52973e8267b 100644 --- a/src/app/external-log-in-complete/registration-types/orcid-confirmation/orcid-confirmation.component.ts +++ b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts @@ -1,9 +1,10 @@ -import { Component, OnInit, ChangeDetectionStrategy, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { AuthRegistrationType } from '../../../core/auth/models/auth.registration-type'; import { Registration } from '../../../core/shared/registration.model'; import { renderExternalLoginConfirmationFor } from '../../decorators/external-log-in.methods-decorator'; import { ExternalLoginMethodEntryComponent } from '../../decorators/external-login-method-entry.component'; + @Component({ selector: 'ds-orcid-confirmation', templateUrl: './orcid-confirmation.component.html', diff --git a/src/app/external-log-in-complete/resolvers/registration-data.resolver.spec.ts b/src/app/external-log-in/resolvers/registration-data.resolver.spec.ts similarity index 100% rename from src/app/external-log-in-complete/resolvers/registration-data.resolver.spec.ts rename to src/app/external-log-in/resolvers/registration-data.resolver.spec.ts diff --git a/src/app/external-log-in-complete/resolvers/registration-data.resolver.ts b/src/app/external-log-in/resolvers/registration-data.resolver.ts similarity index 93% rename from src/app/external-log-in-complete/resolvers/registration-data.resolver.ts rename to src/app/external-log-in/resolvers/registration-data.resolver.ts index 49667ab77a0..306d0d8f235 100644 --- a/src/app/external-log-in-complete/resolvers/registration-data.resolver.ts +++ b/src/app/external-log-in/resolvers/registration-data.resolver.ts @@ -1,9 +1,5 @@ import { Injectable } from '@angular/core'; -import { - Resolve, - RouterStateSnapshot, - ActivatedRouteSnapshot, -} from '@angular/router'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; import { RemoteData } from '../../core/data/remote-data'; diff --git a/src/app/external-log-in-complete/services/external-login.service.spec.ts b/src/app/external-log-in/services/external-login.service.spec.ts similarity index 100% rename from src/app/external-log-in-complete/services/external-login.service.spec.ts rename to src/app/external-log-in/services/external-login.service.spec.ts diff --git a/src/app/external-log-in-complete/services/external-login.service.ts b/src/app/external-log-in/services/external-login.service.ts similarity index 96% rename from src/app/external-log-in-complete/services/external-login.service.ts rename to src/app/external-log-in/services/external-login.service.ts index 70ab98832ff..8f3fce41514 100644 --- a/src/app/external-log-in-complete/services/external-login.service.ts +++ b/src/app/external-log-in/services/external-login.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable, filter, map } from 'rxjs'; +import { filter, map, Observable } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { AuthMethod } from '../../core/auth/models/auth.method'; import { getAuthenticationMethods } from '../../core/auth/selectors'; -import { Store, select } from '@ngrx/store'; +import { select, Store } from '@ngrx/store'; import { CoreState } from '../../core/core-state.model'; import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; import { RemoteData } from '../../core/data/remote-data'; diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts index 270dc60125e..60e03b3c51c 100644 --- a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.component.spec.ts @@ -3,7 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; -import { ConfirmationSentComponent } from '../external-log-in-complete/email-confirmation/confirmation-sent/confirmation-sent.component'; +import { + ConfirmationSentComponent +} from '../external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component'; describe('ExternalLoginEmailConfirmationPageComponent', () => { let component: ExternalLoginEmailConfirmationPageComponent; diff --git a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts index d62da55dbd7..fe91160627e 100644 --- a/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts +++ b/src/app/external-login-email-confirmation-page/external-login-email-confirmation-page.module.ts @@ -1,9 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ExternalLoginEmailConfirmationPageRoutingModule } from './external-login-email-confirmation-page-routing.module'; +import { + ExternalLoginEmailConfirmationPageRoutingModule +} from './external-login-email-confirmation-page-routing.module'; import { ExternalLoginEmailConfirmationPageComponent } from './external-login-email-confirmation-page.component'; -import { ExternalLoginCompleteModule } from '../external-log-in-complete/external-login-complete.module'; +import { ExternalLoginModule } from '../external-log-in/external-login.module'; @NgModule({ @@ -13,7 +15,7 @@ import { ExternalLoginCompleteModule } from '../external-log-in-complete/externa imports: [ CommonModule, ExternalLoginEmailConfirmationPageRoutingModule, - ExternalLoginCompleteModule, + ExternalLoginModule, ] }) export class ExternalLoginEmailConfirmationPageModule { } diff --git a/src/app/external-login-page/external-login-page-routing.module.ts b/src/app/external-login-page/external-login-page-routing.module.ts index 641809740d3..b248115ddbb 100644 --- a/src/app/external-login-page/external-login-page-routing.module.ts +++ b/src/app/external-login-page/external-login-page-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; -import { RegistrationDataResolver } from '../external-log-in-complete/resolvers/registration-data.resolver'; -import { RegistrationTokenGuard } from '../external-log-in-complete/guards/registration-token.guard'; +import { RegistrationDataResolver } from '../external-log-in/resolvers/registration-data.resolver'; +import { RegistrationTokenGuard } from '../external-log-in/guards/registration-token.guard'; const routes: Routes = [ { diff --git a/src/app/external-login-page/external-login-page.module.ts b/src/app/external-login-page/external-login-page.module.ts index ac68dc5c309..a7808057629 100644 --- a/src/app/external-login-page/external-login-page.module.ts +++ b/src/app/external-login-page/external-login-page.module.ts @@ -5,7 +5,7 @@ import { ExternalLoginPageRoutingModule } from './external-login-page-routing.mo import { ExternalLoginPageComponent } from './external-login-page.component'; import { ThemedExternalLoginPageComponent } from './themed-external-login-page.component'; import { SharedModule } from '../shared/shared.module'; -import { ExternalLoginCompleteModule } from '../external-log-in-complete/external-login-complete.module'; +import { ExternalLoginModule } from '../external-log-in/external-login.module'; const COMPONENTS = [ ExternalLoginPageComponent, @@ -20,7 +20,7 @@ const COMPONENTS = [ CommonModule, ExternalLoginPageRoutingModule, SharedModule, - ExternalLoginCompleteModule + ExternalLoginModule ] }) export class ExternalLoginPageModule { } diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts b/src/app/external-login-review-account-info-page/external-login-review-account-info-page-routing.module.ts similarity index 85% rename from src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts rename to src/app/external-login-review-account-info-page/external-login-review-account-info-page-routing.module.ts index 66e3e29d056..afe0249f076 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page-routing.module.ts +++ b/src/app/external-login-review-account-info-page/external-login-review-account-info-page-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; import { ReviewAccountGuard } from './helpers/review-account.guard'; -import { RegistrationDataResolver } from '../external-log-in-complete/resolvers/registration-data.resolver'; +import { RegistrationDataResolver } from '../external-log-in/resolvers/registration-data.resolver'; const routes: Routes = [ { diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.html b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.html similarity index 100% rename from src/app/external-login-review-account-info/external-login-review-account-info-page.component.html rename to src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.html diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.scss b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.scss similarity index 100% rename from src/app/external-login-review-account-info/external-login-review-account-info-page.component.scss rename to src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.scss diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.spec.ts similarity index 94% rename from src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts rename to src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.spec.ts index 816cdb4e1ff..7ef0e1cac3d 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.spec.ts +++ b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; -import { mockRegistrationDataModel } from '../external-log-in-complete/models/registration-data.mock.model'; +import { mockRegistrationDataModel } from '../external-log-in/models/registration-data.mock.model'; describe('ExternalLoginReviewAccountInfoPageComponent', () => { let component: ExternalLoginReviewAccountInfoPageComponent; diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts similarity index 96% rename from src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts rename to src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts index a42c9e05cfd..6217d4c79c2 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { AlertType } from '../shared/alert/aletr-type'; -import { Observable, first, map, tap } from 'rxjs'; +import { first, map, Observable, tap } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; import { hasNoValue } from '../shared/empty.util'; import { Registration } from '../core/shared/registration.model'; diff --git a/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.module.ts similarity index 78% rename from src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts rename to src/app/external-login-review-account-info-page/external-login-review-account-info-page.module.ts index 13bad328d1f..bcad6db4265 100644 --- a/src/app/external-login-review-account-info/external-login-review-account-info-page.module.ts +++ b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.module.ts @@ -4,11 +4,13 @@ import { CommonModule } from '@angular/common'; import { ExternalLoginReviewAccountInfoRoutingModule } from './external-login-review-account-info-page-routing.module'; import { ExternalLoginReviewAccountInfoPageComponent } from './external-login-review-account-info-page.component'; import { CompareValuesPipe } from './helpers/compare-values.pipe'; -import { ThemedExternalLoginReviewAccountInfoPageComponent } from './themed-external-login-review-account-info-page.component'; +import { + ThemedExternalLoginReviewAccountInfoPageComponent +} from './themed-external-login-review-account-info-page.component'; import { ReviewAccountInfoComponent } from './review-account-info/review-account-info.component'; import { UiSwitchModule } from 'ngx-ui-switch'; import { SharedModule } from '../shared/shared.module'; -import { ExternalLoginCompleteModule } from '../external-log-in-complete/external-login-complete.module'; +import { ExternalLoginModule } from '../external-log-in/external-login.module'; @NgModule({ declarations: [ @@ -22,7 +24,7 @@ import { ExternalLoginCompleteModule } from '../external-log-in-complete/externa ExternalLoginReviewAccountInfoRoutingModule, SharedModule, UiSwitchModule, - ExternalLoginCompleteModule + ExternalLoginModule ] }) export class ExternalLoginReviewAccountInfoModule { } diff --git a/src/app/external-login-review-account-info/helpers/compare-values.pipe.ts b/src/app/external-login-review-account-info-page/helpers/compare-values.pipe.ts similarity index 100% rename from src/app/external-login-review-account-info/helpers/compare-values.pipe.ts rename to src/app/external-login-review-account-info-page/helpers/compare-values.pipe.ts diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts b/src/app/external-login-review-account-info-page/helpers/review-account.guard.spec.ts similarity index 100% rename from src/app/external-login-review-account-info/helpers/review-account.guard.spec.ts rename to src/app/external-login-review-account-info-page/helpers/review-account.guard.spec.ts diff --git a/src/app/external-login-review-account-info/helpers/review-account.guard.ts b/src/app/external-login-review-account-info-page/helpers/review-account.guard.ts similarity index 92% rename from src/app/external-login-review-account-info/helpers/review-account.guard.ts rename to src/app/external-login-review-account-info-page/helpers/review-account.guard.ts index d908483c152..7caf465550c 100644 --- a/src/app/external-login-review-account-info/helpers/review-account.guard.ts +++ b/src/app/external-login-review-account-info-page/helpers/review-account.guard.ts @@ -1,11 +1,6 @@ import { Injectable } from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - Router, - RouterStateSnapshot, -} from '@angular/router'; -import { Observable, catchError, mergeMap, of, tap } from 'rxjs'; +import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, } from '@angular/router'; +import { catchError, mergeMap, Observable, of, tap } from 'rxjs'; import { AuthService } from '../../core/auth/auth.service'; import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; import { EpersonRegistrationService } from '../../core/data/eperson-registration.service'; diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.html b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html similarity index 100% rename from src/app/external-login-review-account-info/review-account-info/review-account-info.component.html rename to src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.scss b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.scss similarity index 100% rename from src/app/external-login-review-account-info/review-account-info/review-account-info.component.scss rename to src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.scss diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts similarity index 96% rename from src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts rename to src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts index 2bfbd582e4a..9b4bd2b8242 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts @@ -1,15 +1,11 @@ -import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { ReviewAccountInfoComponent } from './review-account-info.component'; -import { - TranslateLoader, - TranslateModule, - TranslateService, -} from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule, TranslateService, } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { Observable, Subscription, of } from 'rxjs'; +import { Observable, of, Subscription } from 'rxjs'; import { RemoteData } from '../../core/data/remote-data'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; @@ -25,7 +21,7 @@ import { Registration } from '../../core/shared/registration.model'; import { AuthService } from '../../core/auth/auth.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; -import { ExternalLoginService } from '../../external-log-in-complete/services/external-login.service'; +import { ExternalLoginService } from '../../external-log-in/services/external-login.service'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; diff --git a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts similarity index 97% rename from src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts rename to src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts index 79f9cac83c5..aee858c339c 100644 --- a/src/app/external-login-review-account-info/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts @@ -1,13 +1,7 @@ -import { - Component, - ChangeDetectionStrategy, - OnInit, - Input, - OnDestroy, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, } from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; -import { Observable, Subscription, combineLatest, filter, from, map, switchMap, take, tap } from 'rxjs'; +import { combineLatest, filter, from, map, Observable, Subscription, switchMap, take, tap } from 'rxjs'; import { RemoteData } from '../../core/data/remote-data'; import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @@ -19,7 +13,7 @@ import { Registration } from '../../core/shared/registration.model'; import { AuthService } from '../../core/auth/auth.service'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; -import { ExternalLoginService } from '../../external-log-in-complete/services/external-login.service'; +import { ExternalLoginService } from '../../external-log-in/services/external-login.service'; export interface ReviewAccountInfoData { label: string; diff --git a/src/app/external-login-review-account-info/themed-external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info-page/themed-external-login-review-account-info-page.component.ts similarity index 100% rename from src/app/external-login-review-account-info/themed-external-login-review-account-info-page.component.ts rename to src/app/external-login-review-account-info-page/themed-external-login-review-account-info-page.component.ts From bf7f6eaebcde8e7aac8e35abfd113e745db4c44c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 10 Oct 2023 13:44:13 +0200 Subject: [PATCH 746/758] [CST-10703] change getExternalServerRedirectUrl in order to have origin as param --- src/app/core/auth/auth.service.ts | 5 +++-- .../confirm-email/confirm-email.component.spec.ts | 5 ++++- .../confirm-email/confirm-email.component.ts | 10 ++++++++-- .../review-account-info.component.spec.ts | 3 +++ .../review-account-info.component.ts | 10 ++++++++-- .../log-in-external-provider.component.ts | 6 +++++- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 4e089fc6347..128b03bd4d0 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -526,12 +526,13 @@ export class AuthService { /** * Returns the external server redirect URL. + * @param origin - The origin route. * @param redirectRoute - The redirect route. * @param location - The location. * @returns The external server redirect URL. */ - getExternalServerRedirectUrl(redirectRoute: string, location: string): string { - const correctRedirectUrl = new URLCombiner(this._window.nativeWindow.origin, redirectRoute).toString(); + getExternalServerRedirectUrl(origin: string, redirectRoute: string, location: string): string { + const correctRedirectUrl = new URLCombiner(origin, redirectRoute).toString(); let externalServerUrl = location; const myRegexp = /\?redirectUrl=(.*)/g; diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts index 7c0e7f8d926..1c9a876b027 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.spec.ts @@ -16,6 +16,8 @@ import { Registration } from '../../../core/shared/registration.model'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { NativeWindowService } from '../../../core/services/window.service'; +import { MockWindow, NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref'; describe('ConfirmEmailComponent', () => { let component: ConfirmEmailComponent; @@ -52,6 +54,7 @@ describe('ConfirmEmailComponent', () => { declarations: [ConfirmEmailComponent], providers: [ FormBuilder, + { provide: NativeWindowService, useFactory: NativeWindowMockFactory }, { provide: ExternalLoginService, useValue: externalLoginServiceSpy }, { provide: EPersonDataService, useValue: epersonDataServiceSpy }, { provide: NotificationsService, useValue: notificationServiceSpy }, @@ -138,7 +141,7 @@ describe('ConfirmEmailComponent', () => { expect(externalLoginServiceSpy.getExternalAuthLocation).toHaveBeenCalledWith(AuthMethodType.Orcid); expect(authServiceSpy.getRedirectUrl).toHaveBeenCalled(); expect(authServiceSpy.setRedirectUrl).toHaveBeenCalledWith('/profile'); - expect(authServiceSpy.getExternalServerRedirectUrl).toHaveBeenCalledWith('/test-redirect', 'test-location'); + expect(authServiceSpy.getExternalServerRedirectUrl).toHaveBeenCalledWith(MockWindow.origin,'/test-redirect', 'test-location'); expect(hardRedirectService.redirect).toHaveBeenCalledWith('test-external-url'); }); }); diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts index 56e28333b62..eaecf71cb2d 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, Input, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; import { TranslateService } from '@ngx-translate/core'; @@ -12,6 +12,7 @@ import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core import { Registration } from '../../../core/shared/registration.model'; import { hasNoValue, hasValue } from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; +import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service'; @Component({ selector: 'ds-confirm-email', @@ -41,6 +42,7 @@ export class ConfirmEmailComponent implements OnDestroy { externalLocation: string; constructor( + @Inject(NativeWindowService) protected _window: NativeWindowRef, private formBuilder: FormBuilder, private externalLoginService: ExternalLoginService, private epersonDataService: EPersonDataService, @@ -137,7 +139,11 @@ export class ConfirmEmailComponent implements OnDestroy { } else if (rd.hasSucceeded) { // set Redirect URL to User profile, so the user is redirected to the profile page after logging in this.authService.setRedirectUrl('/profile'); - const externalServerUrl = this.authService.getExternalServerRedirectUrl(redirectRoute, location); + const externalServerUrl = this.authService.getExternalServerRedirectUrl( + this._window.nativeWindow.origin, + redirectRoute, + location + ); // redirect to external registration type authentication url this.hardRedirectService.redirect(externalServerUrl); } diff --git a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts index 9b4bd2b8242..63559ef904c 100644 --- a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts +++ b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.spec.ts @@ -22,6 +22,8 @@ import { AuthService } from '../../core/auth/auth.service'; import { AuthServiceMock } from '../../shared/mocks/auth.service.mock'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; import { ExternalLoginService } from '../../external-log-in/services/external-login.service'; +import { NativeWindowService } from '../../core/services/window.service'; +import { NativeWindowMockFactory } from '../../shared/mocks/mock-native-window-ref'; describe('ReviewAccountInfoComponent', () => { let component: ReviewAccountInfoComponent; @@ -82,6 +84,7 @@ describe('ReviewAccountInfoComponent', () => { await TestBed.configureTestingModule({ declarations: [ReviewAccountInfoComponent, CompareValuesPipe], providers: [ + { provide: NativeWindowService, useFactory: NativeWindowMockFactory }, { provide: EPersonDataService, useValue: ePersonDataServiceStub }, { provide: NgbModal, useValue: modalStub }, { diff --git a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts index aee858c339c..f388cffb91d 100644 --- a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts +++ b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, Input, OnDestroy, OnInit, } from '@angular/core'; import { EPerson } from '../../core/eperson/models/eperson.model'; import { EPersonDataService } from '../../core/eperson/eperson-data.service'; import { combineLatest, filter, from, map, Observable, Subscription, switchMap, take, tap } from 'rxjs'; @@ -14,6 +14,7 @@ import { AuthService } from '../../core/auth/auth.service'; import { HardRedirectService } from '../../core/services/hard-redirect.service'; import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type'; import { ExternalLoginService } from '../../external-log-in/services/external-login.service'; +import { NativeWindowRef, NativeWindowService } from '../../core/services/window.service'; export interface ReviewAccountInfoData { label: string; @@ -53,6 +54,7 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { subs: Subscription[] = []; constructor( + @Inject(NativeWindowService) protected _window: NativeWindowRef, private ePersonService: EPersonDataService, private modalService: NgbModal, private notificationService: NotificationsService, @@ -211,7 +213,11 @@ export class ReviewAccountInfoComponent implements OnInit, OnDestroy { ); // set Redirect URL to User profile, so the user is redirected to the profile page after logging in this.authService.setRedirectUrl('/profile'); - const externalServerUrl = this.authService.getExternalServerRedirectUrl(redirectRoute, location); + const externalServerUrl = this.authService.getExternalServerRedirectUrl( + this._window.nativeWindow.origin, + redirectRoute, + location + ); // redirect to external registration type authentication url this.hardRedirectService.redirect(externalServerUrl); } else if (response.hasFailed) { diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts index 32b551e05cd..e52cfcc40c6 100644 --- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts +++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts @@ -91,7 +91,11 @@ export class LogInExternalProviderComponent implements OnInit { } else if (isEmpty(redirectRoute)) { redirectRoute = '/'; } - const externalServerUrl = this.authService.getExternalServerRedirectUrl(redirectRoute, this.location); + const externalServerUrl = this.authService.getExternalServerRedirectUrl( + this._window.nativeWindow.origin, + redirectRoute, + this.location + ); // redirect to shibboleth/orcid/(external) authentication url this.hardRedirectService.redirect(externalServerUrl); }); From 327d8b5a66790dcc8154f0e278454f999e321322 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Wed, 11 Oct 2023 16:28:18 +0200 Subject: [PATCH 747/758] [DSC-337] Fix for merge and refactoring --- src/app/core/layout/tab-data.service.spec.ts | 507 +++++++++++++++++- src/app/core/layout/tab-data.service.ts | 61 ++- .../item-page/cris-item-page-tab.resolver.ts | 1 + 3 files changed, 537 insertions(+), 32 deletions(-) diff --git a/src/app/core/layout/tab-data.service.spec.ts b/src/app/core/layout/tab-data.service.spec.ts index 256bff1618f..b4620f18102 100644 --- a/src/app/core/layout/tab-data.service.spec.ts +++ b/src/app/core/layout/tab-data.service.spec.ts @@ -16,7 +16,8 @@ import { of } from 'rxjs'; import { FindListOptions } from '../data/find-list-options.model'; import { RequestParam } from '../cache/models/request-param.model'; import { createPaginatedList } from '../../shared/testing/utils.test'; -import { bothTabs } from '../../shared/testing/layout-tab.mocks'; +import objectContaining = jasmine.objectContaining; +import arrayContaining = jasmine.arrayContaining; describe('TabDataService', () => { let scheduler: TestScheduler; @@ -75,6 +76,484 @@ describe('TabDataService', () => { } }; + const tabWithOnlyMinors: CrisLayoutTab = { + type: TAB, + id: 4, + shortname: 'person-bibliometrics', + header: 'person-bibliometrics-header', + entityType: 'Person', + priority: 0, + security: 0, + rows: [ + { + style: '', + cells: [ + { + style: '', + boxes: [ + { + id: 3418, + shortname: 'heading', + header: null, + entityType: 'Person', + collapsed: false, + minor: true, + style: null, + security: 0, + boxType: 'METADATA', + maxColumn: null, + clear: false, + configuration: { + id: '1', + type: 'boxmetadataconfiguration', + rows: [ + { + style: '', + cells: [ + { + style: '', + fields: [ + { + metadata: 'dc.title', + label: null, + rendering: 'heading', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + } + ] + } + ] + } + ] + }, + metadataSecurityFields: [], + container: false + } + ] + } + ] + }, + { + style: '', + cells: [ + { + style: '', + boxes: [ + { + id: 3419, + shortname: 'namecard', + header: 'Name Card', + entityType: 'Person', + collapsed: false, + minor: true, + style: null, + security: 0, + boxType: 'METADATA', + maxColumn: null, + clear: false, + configuration: { + id: '0', + type: 'boxmetadataconfiguration', + rows: [ + { + style: '', + cells: [ + { + style: 'col-3', + fields: [ + { + bitstream: { + bundle: 'ORIGINAL', + metadataField: 'dc.type', + metadataValue: 'personal pictur' + }, + label: null, + rendering: 'thumbnail', + fieldType: 'BITSTREAM', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + } + ] + }, + { + style: 'px-2', + fields: [ + { + metadata: 'dc.title', + label: 'Preferred name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.name', + label: 'Official Name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.name.translated', + label: 'Translated Name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.name.variant', + label: 'Alternative Name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.affiliation.name', + label: 'Main Affiliation', + rendering: 'crisref', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.workgroup', + label: null, + rendering: 'crisref', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'oairecerif.identifier.url', + label: 'Web Site', + rendering: 'link', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.email', + label: 'Email', + rendering: 'crisref.email', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.identifier.orcid', + label: 'ORCID', + rendering: 'orcid', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.identifier.scopus-author-id', + label: 'Scopus Author ID', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.identifier.rid', + label: 'Researcher ID', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + } + ] + } + ] + } + ] + }, + metadataSecurityFields: [], + container: false + } + ] + } + ] + } + ], + uuid: 'person-bibliometrics-4', + _links: { + self: { + href: 'https://rest.api/rest/api/tabs/3' + } + } + }; + + const tabWithSomeMinors: CrisLayoutTab = { + type: TAB, + id: 5, + shortname: 'person-bibliometrics', + header: 'person-bibliometrics-header', + entityType: 'Person', + priority: 0, + security: 0, + rows: [ + { + style: '', + cells: [ + { + style: '', + boxes: [ + { + id: 3418, + shortname: 'heading', + header: null, + entityType: 'Person', + collapsed: false, + minor: false, + style: null, + security: 0, + boxType: 'METADATA', + maxColumn: null, + clear: false, + configuration: { + id: '3', + type: 'boxmetadataconfiguration', + rows: [ + { + style: '', + cells: [ + { + style: '', + fields: [ + { + metadata: 'dc.title', + label: null, + rendering: 'heading', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + } + ] + } + ] + } + ] + }, + metadataSecurityFields: [], + container: false + } + ] + } + ] + }, + { + style: '', + cells: [ + { + style: '', + boxes: [ + { + id: 3419, + shortname: 'namecard', + header: 'Name Card', + entityType: 'Person', + collapsed: false, + minor: true, + style: null, + security: 0, + boxType: 'METADATA', + maxColumn: null, + clear: false, + configuration: { + id: '0', + type: 'boxmetadataconfiguration', + rows: [ + { + style: '', + cells: [ + { + style: 'col-3', + fields: [ + { + bitstream: { + bundle: 'ORIGINAL', + metadataField: 'dc.type', + metadataValue: 'personal pictur' + }, + label: null, + rendering: 'thumbnail', + fieldType: 'BITSTREAM', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + } + ] + }, + { + style: 'px-2', + fields: [ + { + metadata: 'dc.title', + label: 'Preferred name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.name', + label: 'Official Name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.name.translated', + label: 'Translated Name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.name.variant', + label: 'Alternative Name', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.affiliation.name', + label: 'Main Affiliation', + rendering: 'crisref', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'crisrp.workgroup', + label: null, + rendering: 'crisref', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'oairecerif.identifier.url', + label: 'Web Site', + rendering: 'link', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.email', + label: 'Email', + rendering: 'crisref.email', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.identifier.orcid', + label: 'ORCID', + rendering: 'orcid', + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.identifier.scopus-author-id', + label: 'Scopus Author ID', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + }, + { + metadata: 'person.identifier.rid', + label: 'Researcher ID', + rendering: null, + fieldType: 'METADATA', + styleLabel: 'font-weight-bold col-3', + styleValue: null, + labelAsHeading: false, + valuesInline: false + } + ] + } + ] + } + ] + }, + metadataSecurityFields: [], + container: false + } + ] + } + ] + } + ], + uuid: 'person-bibliometrics-5', + _links: { + self: { + href: 'https://rest.api/rest/api/tabs/3' + } + } + }; + const endpointURL = `https://rest.api/rest/api/tabs`; const requestURL = `https://rest.api/rest/api/tabs/${tabPersonProfile.id}`; const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a'; @@ -82,10 +561,13 @@ describe('TabDataService', () => { const entityType = 'Person'; const tabId = '1'; - const array = [tabPersonProfile, tabPersonBiography, tabPersonBibliometrics]; + const array = [tabPersonProfile, tabPersonBiography, tabPersonBibliometrics, tabWithOnlyMinors, tabWithSomeMinors]; const paginatedList = createPaginatedList(array); const tabRD = createSuccessfulRemoteDataObject(tabPersonProfile); const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList); + const noMinorsList = + createPaginatedList([tabPersonProfile, tabPersonBiography, tabPersonBibliometrics, tabWithSomeMinors]); + const paginatedListWithoutMinorsRD = createSuccessfulRemoteDataObject(noMinorsList); beforeEach(() => { scheduler = getTestScheduler(); @@ -168,6 +650,19 @@ describe('TabDataService', () => { expect(result).toBeObservable(expected); }); + it('should remove tab with minor cells', () => { + const result = service.findByItem(itemUUID, true, true); + result.subscribe(tabs => { + expect(tabs.payload.page).toHaveSize(4); + expect(tabs.payload.page).not.toEqual( + arrayContaining([objectContaining({ id: tabWithOnlyMinors.id })]) + ); + expect(tabs.payload.page).toEqual( + arrayContaining([objectContaining({ id: tabWithSomeMinors.id })]) + ); + }); + }); + }); describe('searchByEntityType', () => { @@ -191,12 +686,4 @@ describe('TabDataService', () => { }); }); - - - fdescribe('filterTab', () => { - it('should return non minor element', () => { - const tabs: CrisLayoutTab[] = service.filterTab(bothTabs); - expect(tabs.length).toBe(2); - }); - }); }); diff --git a/src/app/core/layout/tab-data.service.ts b/src/app/core/layout/tab-data.service.ts index 2a9c1663539..2e9437742fe 100644 --- a/src/app/core/layout/tab-data.service.ts +++ b/src/app/core/layout/tab-data.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { CrisLayoutTab } from './models/tab.model'; +import { CrisLayoutCell, CrisLayoutRow, CrisLayoutTab } from './models/tab.model'; import { RequestService } from '../data/request.service'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../cache/object-cache.service'; @@ -12,11 +12,13 @@ import { TAB } from './models/tab.resource-type'; import { dataService } from '../data/base/data-service.decorator'; import { RemoteData } from '../data/remote-data'; import { PaginatedList } from '../data/paginated-list.model'; -import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { FindListOptions } from '../data/find-list-options.model'; import { RequestParam } from '../cache/models/request-param.model'; import { IdentifiableDataService } from '../data/base/identifiable-data.service'; import { SearchDataImpl } from '../data/base/search-data'; +import { map } from 'rxjs/operators'; +import { hasNoValue, hasValue } from '../../shared/empty.util'; +import { CrisLayoutBox } from './models/box.model'; /** * A service responsible for fetching data from the REST API on the tabs endpoint @@ -54,43 +56,58 @@ export class TabDataService extends IdentifiableDataService { * available data. Empty tabs are filter out. * @param itemUuid UUID of the Item * @param useCachedVersionIfAvailable - * @param linkToFollow */ - findByItem(itemUuid: string, useCachedVersionIfAvailable, excludeMinors?: boolean ,linkToFollow?: FollowLinkConfig): Observable>> { + findByItem( + itemUuid: string, useCachedVersionIfAvailable: boolean, excludeMinors?: boolean + ): Observable>> { const options = new FindListOptions(); options.searchParams = [new RequestParam('uuid', itemUuid)]; - return this.searchData.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable).pipe(map((data) => { - if (!!data.payload && !!data.payload.page && excludeMinors) { - data.payload.page = this.filterTab(data.payload.page); - } - return data; - })); + return this.searchData.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable) + .pipe( + map((data) => { + if (hasValue(data?.payload?.page) && excludeMinors) { + data.payload.page = this.filterTabWithOnlyMinor(data.payload.page); + } + return data; + })); } /** * @param tabs * @returns Tabs which contains non minor element */ - filterTab(tabs: CrisLayoutTab[]): CrisLayoutTab[] { - return tabs.filter(tab => this.checkForMinor(tab)); + filterTabWithOnlyMinor(tabs: CrisLayoutTab[]): CrisLayoutTab[] { + return tabs.filter(tab => !this.hasTabOnlyMinor(tab)); } /** * @param tab Contains a tab data which has rows, cells and boxes * @returns Boolean based on cells has minor or not */ - checkForMinor(tab: CrisLayoutTab): boolean { - for (const row of tab.rows) { - for (const cell of row.cells) { - for (const box of cell.boxes) { - if (box.minor) { - return false; - } - } - } + hasTabOnlyMinor(tab: CrisLayoutTab): boolean { + if (hasNoValue(tab?.rows)) { + return false; } - return true; + return tab.rows.every(row => this.hasRowOnlyMinor(row)); + } + + hasRowOnlyMinor(row: CrisLayoutRow): boolean { + if (hasNoValue(row?.cells)) { + return false; + } + return row.cells.every(cell => this.hasCellOnlyMinor(cell)); + } + + hasCellOnlyMinor(cell: CrisLayoutCell): boolean { + if (hasNoValue(cell?.boxes)) { + return false; + } + return cell.boxes.every(box => this.isMinor(box)); + } + + isMinor(box: CrisLayoutBox): boolean { + return box.minor === true; } /** diff --git a/src/app/item-page/cris-item-page-tab.resolver.ts b/src/app/item-page/cris-item-page-tab.resolver.ts index 5efc7d311f3..e601c75fbdc 100644 --- a/src/app/item-page/cris-item-page-tab.resolver.ts +++ b/src/app/item-page/cris-item-page-tab.resolver.ts @@ -37,6 +37,7 @@ export class CrisItemPageTabResolver implements Resolve Date: Wed, 11 Oct 2023 17:37:38 +0200 Subject: [PATCH 748/758] [DSC-1251] Refactoring --- .../file-download-link/file-download-link.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 d2f1d215c0d..025cb2ce537 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 @@ -4,8 +4,8 @@ import { getBitstreamDownloadRoute, getBitstreamRequestACopyRoute } from '../../ import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { hasValue, isNotEmpty } from '../empty.util'; -import { map } from 'rxjs/operators'; -import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; +import { combineLatest as observableCombineLatest, Observable, of as observableOf, shareReplay } from 'rxjs'; import { Item } from '../../core/shared/item.model'; import { ConfigurationDataService } from '../../core/data/configuration-data.service'; import { getFirstCompletedRemoteData, getRemoteDataPayload } from 'src/app/core/shared/operators'; @@ -79,6 +79,8 @@ export class FileDownloadLinkComponent implements OnInit { // in case requestItemType empty/commented out(undefined) - request-copy not allowed hasValue(requestItemType) && requestItemType.values.length > 0 ), + catchError(() => observableOf(false)), + shareReplay(1) ); } else { this.bitstreamPath$ = observableOf(this.getBitstreamDownloadPath()); From f3072b89916df988c6eeffa99826bbbf06ec29bd Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 11 Oct 2023 19:11:50 +0200 Subject: [PATCH 749/758] [CST-12212] Prefill email with the one received from registration data --- .../confirm-email/confirm-email.component.html | 1 + .../confirm-email/confirm-email.component.spec.ts | 11 ++++++++++- .../confirm-email/confirm-email.component.ts | 10 ++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html index 455aaf75e73..69b65341549 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html @@ -10,6 +10,7 @@

formControlName="email" placeholder="profile.email@example.com" class="form-control form-control-lg position-relative" + data-test="emailInput" />
{ it('should call postCreateAccountFromToken if email is confirmed', () => { component.emailForm.setValue({ email: 'test@example.com' }); diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts index eaecf71cb2d..e996babddce 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Inject, Input, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, Input, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ExternalLoginService } from '../../services/external-login.service'; import { TranslateService } from '@ngx-translate/core'; @@ -20,7 +20,7 @@ import { NativeWindowRef, NativeWindowService } from '../../../core/services/win styleUrls: ['./confirm-email.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ConfirmEmailComponent implements OnDestroy { +export class ConfirmEmailComponent implements OnInit, OnDestroy { /** * The form containing the email input */ @@ -51,12 +51,14 @@ export class ConfirmEmailComponent implements OnDestroy { private authService: AuthService, private hardRedirectService: HardRedirectService, ) { + } + + ngOnInit() { this.emailForm = this.formBuilder.group({ - email: ['', [Validators.required, Validators.email]] + email: [this.registrationData.email, [Validators.required, Validators.email]] }); } - /** * Submits the email form and performs appropriate actions based on the form's validity and user input. * If the form is valid and the confirmed email matches the registration email, calls the postCreateAccountFromToken method with the token and registration data. From c012d4a5195638d5c822387ce7cc779c2b698c1f Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Wed, 11 Oct 2023 19:17:32 +0200 Subject: [PATCH 750/758] [CST-12212] Add input placeholder label --- .../confirm-email/confirm-email.component.html | 2 +- .../provide-email/provide-email.component.html | 2 +- .../external-log-in/external-log-in.component.html | 2 +- src/assets/i18n/en.json5 | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html index 69b65341549..43848a2d3e5 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html @@ -8,7 +8,7 @@

type="email" id="email" formControlName="email" - placeholder="profile.email@example.com" + placeholder="{{'external-login.form.email' | translate}}" class="form-control form-control-lg position-relative" data-test="emailInput" /> diff --git a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html index 46e804e1c2e..ab95d3986eb 100644 --- a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html +++ b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html @@ -8,7 +8,7 @@

type="email" id="email" formControlName="email" - placeholder="Input box" + placeholder="{{'external-login.form.email' | translate}}" class="form-control form-control-lg position-relative" /> diff --git a/src/app/external-log-in/external-log-in/external-log-in.component.html b/src/app/external-log-in/external-log-in/external-log-in.component.html index aefa9719669..5fdb56f626c 100644 --- a/src/app/external-log-in/external-log-in/external-log-in.component.html +++ b/src/app/external-log-in/external-log-in/external-log-in.component.html @@ -18,7 +18,7 @@

{{ 'external-login.confirmation.header' | translate}}

-

or

+

{{'external-login.form.or-divider' | translate}}

diff --git a/src/app/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/breadcrumbs/breadcrumbs.component.spec.ts index 7c80c87c3af..ae07babdfc0 100644 --- a/src/app/breadcrumbs/breadcrumbs.component.spec.ts +++ b/src/app/breadcrumbs/breadcrumbs.component.spec.ts @@ -10,8 +10,9 @@ import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock'; import { RouterTestingModule } from '@angular/router/testing'; import { of as observableOf } from 'rxjs'; import { DebugElement } from '@angular/core'; -import { IsTextTruncatedPipe } from './breadcrumb/is-text-truncated.pipe'; +import { BreadcrumbTooltipPipe } from './breadcrumb/breadcrumb-tooltip.pipe'; import { TruncateBreadcrumbItemCharactersPipe } from './breadcrumb/truncate-breadcrumb-item-characters.pipe'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; describe('BreadcrumbsComponent', () => { let component: BreadcrumbsComponent; @@ -42,6 +43,7 @@ describe('BreadcrumbsComponent', () => { // NOTE: a root breadcrumb is automatically rendered new Breadcrumb('bc 1', 'example.com'), new Breadcrumb('bc 2', 'another.com'), + new Breadcrumb('breadcrumb to be truncated', 'truncated.com'), ]), showBreadcrumbs$: observableOf(true), } as BreadcrumbsService; @@ -50,10 +52,11 @@ describe('BreadcrumbsComponent', () => { declarations: [ BreadcrumbsComponent, VarDirective, - IsTextTruncatedPipe, + BreadcrumbTooltipPipe, TruncateBreadcrumbItemCharactersPipe, ], imports: [ + NgbTooltipModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot({ loader: { @@ -78,12 +81,35 @@ describe('BreadcrumbsComponent', () => { expect(component).toBeTruthy(); }); - it('should render the breadcrumbs', () => { + it('should render the breadcrumbs accordingly', () => { const breadcrumbs = fixture.debugElement.queryAll(By.css('.breadcrumb-item')); - expect(breadcrumbs.length).toBe(3); + expect(breadcrumbs.length).toBe(4); expectBreadcrumb(breadcrumbs[0], 'home.breadcrumbs', '/'); expectBreadcrumb(breadcrumbs[1], 'bc 1', '/example.com'); expectBreadcrumb(breadcrumbs[2].query(By.css('.text-truncate')), 'bc 2', null); + expectBreadcrumb(breadcrumbs[3].query(By.css('.text-truncate')), 'breadcrumb...', null); + }); + + it('should show tooltip only for truncated text', () => { + const breadcrumbs = fixture.debugElement.queryAll(By.css('.breadcrumb-item .text-truncate')); + expect(breadcrumbs.length).toBe(4); + + const truncatable = breadcrumbs[3]; + truncatable.triggerEventHandler('mouseenter', null); + fixture.detectChanges(); + let tooltip = truncatable.parent.query(By.css('div.tooltip-inner')); + expect(tooltip).not.toBeNull(); + expect(tooltip.nativeElement.innerText).toBe('breadcrumb to be truncated'); + truncatable.triggerEventHandler('mouseleave', null); + fixture.detectChanges(); + + const notTruncatable = breadcrumbs[2]; + notTruncatable.triggerEventHandler('mouseenter', null); + fixture.detectChanges(); + const tooltip2 = notTruncatable.parent.query(By.css('div.tooltip-inner')); + expect(tooltip2).toBeNull(); + notTruncatable.triggerEventHandler('mouseleave', null); + fixture.detectChanges(); }); }); diff --git a/src/app/root.module.ts b/src/app/root.module.ts index 84841ae7068..a4edec2a914 100644 --- a/src/app/root.module.ts +++ b/src/app/root.module.ts @@ -42,8 +42,10 @@ import { import { FooterModule } from './footer/footer.module'; import { SocialModule } from './social/social.module'; import { ExploreModule } from './shared/explore/explore.module'; -import { IsTextTruncatedPipe } from './breadcrumbs/breadcrumb/is-text-truncated.pipe'; -import { TruncateBreadcrumbItemCharactersPipe } from './breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe'; +import { BreadcrumbTooltipPipe } from './breadcrumbs/breadcrumb/breadcrumb-tooltip.pipe'; +import { + TruncateBreadcrumbItemCharactersPipe +} from './breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe'; const IMPORTS = [ CommonModule, @@ -86,7 +88,7 @@ const DECLARATIONS = [ PageErrorComponent, ContextHelpToggleComponent, TruncateBreadcrumbItemCharactersPipe, - IsTextTruncatedPipe + BreadcrumbTooltipPipe ]; const EXPORTS = [ From 62e150db555ade4073a6bcc519345e9cff579303 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 12 Oct 2023 16:08:35 +0200 Subject: [PATCH 754/758] [DSC-106] fixes import lint error --- .../models/date-picker/date-picker.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts index e34989f9765..29e62fe266a 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts @@ -8,7 +8,7 @@ import { DynamicFormValidationService } from '@ng-dynamic-forms/core'; import { DOCUMENT } from '@angular/common'; -import { isEqual } from 'lodash'; +import isEqual from 'lodash/isEqual'; export const DS_DATE_PICKER_SEPARATOR = '-'; From 6ceb4e196924817b8d95304984731ef897b958b0 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 12 Oct 2023 16:26:41 +0200 Subject: [PATCH 755/758] [DSC-1058] Add margin to labels --- src/app/shared/search/search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html index d85a8d40dbd..39a2aa1e42e 100644 --- a/src/app/shared/search/search.component.html +++ b/src/app/shared/search/search.component.html @@ -116,7 +116,7 @@ -
+
From 852c5bf85dffdbc4cedd052c836202617001fde4 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 12 Oct 2023 16:39:08 +0200 Subject: [PATCH 756/758] [DSC-106] Refactoring to handle shift + tab --- .../date-picker/date-picker.component.ts | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts index 29e62fe266a..2fafdc0ae3d 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts @@ -11,6 +11,8 @@ import { DOCUMENT } from '@angular/common'; import isEqual from 'lodash/isEqual'; +export type DatePickerFieldType = '_year' | '_month' | '_day'; + export const DS_DATE_PICKER_SEPARATOR = '-'; @Component({ @@ -52,6 +54,9 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement disabledMonth = true; disabledDay = true; + + private readonly fields: DatePickerFieldType[] = ['_year', '_month', '_day']; + constructor(protected layoutService: DynamicFormLayoutService, protected validationService: DynamicFormValidationService, private renderer: Renderer2, @@ -172,31 +177,52 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement * Listen to keydown Tab event. * Get the active element and blur it, in order to focus the next input field. */ - @HostListener('keydown', ['$event']) - onKeyDown(event: KeyboardEvent) { - if (event.key === 'Tab') { - event.preventDefault(); - const activeElement: Element = this._document.activeElement; - (activeElement as any).blur(); - if (isEqual(activeElement.id, this.model.id.concat('_year')) ) { - this.focusInput('_month'); - } else if (isEqual(activeElement.id, this.model.id.concat('_month'))) { - this.focusInput('_day'); - } + @HostListener('keydown.tab', ['$event']) + onTabKeydown(event: KeyboardEvent) { + event.preventDefault(); + const activeElement: Element = this._document.activeElement; + (activeElement as any).blur(); + const index = this.selectedFieldIndex(activeElement); + if (index < 0) { + return; + } + let fieldToFocusOn = index + 1; + if (fieldToFocusOn < this.fields.length) { + this.focusInput(this.fields[fieldToFocusOn]); } } + @HostListener('keydown.shift.tab', ['$event']) + onShiftTabKeyDown(event: KeyboardEvent) { + event.preventDefault(); + const activeElement: Element = this._document.activeElement; + (activeElement as any).blur(); + const index = this.selectedFieldIndex(activeElement); + let fieldToFocusOn = index - 1; + if (fieldToFocusOn >= 0) { + this.focusInput(this.fields[fieldToFocusOn]); + } + } + + private selectedFieldIndex(activeElement: Element): number { + return this.fields.findIndex(field => isEqual(activeElement.id, this.model.id.concat(field))); + } + /** * Focus the input field for the given type * based on the model id. * Used to focus the next input field * in case of a disabled field. - * @param type '_month' | '_day' + * @param type DatePickerFieldType */ - focusInput(type: '_month' | '_day') { + focusInput(type: DatePickerFieldType) { const field = this._document.getElementById(this.model.id.concat(type)); if (field) { + if (hasValue(this.year) && isEqual(type, '_year')) { + this.disabledMonth = true; + this.disabledDay = true; + } if (hasValue(this.year) && isEqual(type, '_month')) { this.disabledMonth = false; } else if (hasValue(this.month) && isEqual(type, '_day')) { From aa4e4bb5d6fb37c02f2bda94bd2cc350d89e110d Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 12 Oct 2023 16:55:50 +0200 Subject: [PATCH 757/758] [DSC-106] Fixed tests --- .../models/date-picker/date-picker.component.spec.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts index 4989dab93a7..094fa582753 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts @@ -1,5 +1,5 @@ // Load the implementations that should be tested -import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, Renderer2 } from '@angular/core'; import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing'; import { FormControl, FormGroup } from '@angular/forms'; @@ -39,6 +39,11 @@ describe('DsDatePickerComponent test suite', () => { let dateFixture: ComponentFixture; let html; + const renderer2: Renderer2 = { + selectRootElement: jasmine.createSpy('selectRootElement'), + querySelector: jasmine.createSpy('querySelector'), + } as unknown as Renderer2; + // waitForAsync beforeEach beforeEach(waitForAsync(() => { @@ -54,7 +59,8 @@ describe('DsDatePickerComponent test suite', () => { ChangeDetectorRef, DsDatePickerComponent, { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService }, - { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService } + { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }, + { provide: Renderer2, useValue: renderer2 }, ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }); From c5b67d7299086d997d5dafe8062658bcaeee75a5 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 12 Oct 2023 18:10:03 +0200 Subject: [PATCH 758/758] [DSC-106] Improved Tests --- .../date-picker/date-picker.component.spec.ts | 99 ++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts index 094fa582753..f3ca741475c 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts @@ -1,6 +1,6 @@ // Load the implementations that should be tested import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, Renderer2 } from '@angular/core'; -import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing'; import { FormControl, FormGroup } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -13,6 +13,7 @@ import { mockDynamicFormLayoutService, mockDynamicFormValidationService } from '../../../../../testing/dynamic-form-mock-services'; +import { By } from '@angular/platform-browser'; export const DATE_TEST_GROUP = new FormGroup({ @@ -239,6 +240,102 @@ describe('DsDatePickerComponent test suite', () => { expect(dateComp.disabledMonth).toBeFalsy(); expect(dateComp.disabledDay).toBeFalsy(); }); + + it('should move focus on month field when on year field and tab pressed', fakeAsync(() => { + const event = { + field: 'day', + value: null + }; + const event1 = { + field: 'month', + value: null + }; + dateComp.onChange(event); + dateComp.onChange(event1); + + const yearElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_year`)); + const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`)); + + yearElement.nativeElement.focus(); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(yearElement.nativeElement); + + dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'tab' })); + dateFixture.detectChanges(); + + tick(200); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(monthElement.nativeElement); + })); + + it('should move focus on day field when on month field and tab pressed', fakeAsync(() => { + const event = { + field: 'day', + value: null + }; + dateComp.onChange(event); + + const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`)); + const dayElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_day`)); + + monthElement.nativeElement.focus(); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(monthElement.nativeElement); + + dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'tab' })); + dateFixture.detectChanges(); + + tick(200); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(dayElement.nativeElement); + })); + + it('should move focus on month field when on day field and shift tab pressed', fakeAsync(() => { + const event = { + field: 'day', + value: null + }; + dateComp.onChange(event); + + const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`)); + const dayElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_day`)); + + dayElement.nativeElement.focus(); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(dayElement.nativeElement); + + dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'shift.tab' })); + dateFixture.detectChanges(); + + tick(200); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(monthElement.nativeElement); + })); + + it('should move focus on year field when on month field and shift tab pressed', fakeAsync(() => { + const yearElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_year`)); + const monthElement = dateFixture.debugElement.query(By.css(`#${dateComp.model.id}_month`)); + + monthElement.nativeElement.focus(); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(monthElement.nativeElement); + + dateFixture.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'shift.tab' })); + dateFixture.detectChanges(); + + tick(200); + dateFixture.detectChanges(); + + expect(document.activeElement).toBe(yearElement.nativeElement); + })); + }); });