mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-10 11:33:04 +00:00
[TLC-380] Renaming, changes as per review feedback
This commit is contained in:
@@ -55,7 +55,7 @@ export class IdentifierDataService extends BaseDataService<IdentifierData> {
|
|||||||
* Should we allow registration of new DOIs via the item status page?
|
* Should we allow registration of new DOIs via the item status page?
|
||||||
*/
|
*/
|
||||||
public getIdentifierRegistrationConfiguration(): Observable<string[]> {
|
public getIdentifierRegistrationConfiguration(): Observable<string[]> {
|
||||||
return this.configurationService.findByPropertyName('identifiers.item-status.registerDOI').pipe(
|
return this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
|
||||||
getFirstCompletedRemoteData(),
|
getFirstCompletedRemoteData(),
|
||||||
map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
|
map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
|
||||||
);
|
);
|
||||||
|
@@ -10,7 +10,7 @@ import { ItemStatusComponent } from './item-status/item-status.component';
|
|||||||
import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
|
import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
|
||||||
import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
|
import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
|
||||||
import { ItemMoveComponent } from './item-move/item-move.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 { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
|
||||||
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
|
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
|
||||||
import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
|
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 { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
|
||||||
import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
|
import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.guard';
|
||||||
import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
|
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
|
* 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,
|
path: ITEM_EDIT_REGISTER_DOI_PATH,
|
||||||
component: ItemRegisterDoiComponent,
|
component: ItemRegisterDoiComponent,
|
||||||
canActivate: [ItemPageRegisterDoiGuard],
|
canActivate: [ItemPageRegisterDoiGuard],
|
||||||
data: { title: 'item.edit.registerdoi.title' },
|
data: { title: 'item.edit.register-doi.title' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: ITEM_EDIT_AUTHORIZATIONS_PATH,
|
path: ITEM_EDIT_AUTHORIZATIONS_PATH,
|
||||||
|
@@ -13,7 +13,7 @@ import { ItemDataService } from '../../../core/data/item-data.service';
|
|||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||||
import { By } from '@angular/platform-browser';
|
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 { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
|
||||||
import { IdentifierDataService } from '../../../core/data/identifier-data.service';
|
import { IdentifierDataService } from '../../../core/data/identifier-data.service';
|
||||||
|
|
||||||
@@ -83,15 +83,15 @@ describe('ItemRegisterDoiComponent', () => {
|
|||||||
fixture.detectChanges();
|
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;
|
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;
|
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;
|
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;
|
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', () => {
|
describe('performAction', () => {
|
@@ -16,8 +16,8 @@ import { IdentifierDataService } from '../../../core/data/identifier-data.servic
|
|||||||
import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
|
import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-item-registerdoi',
|
selector: 'ds-item-register-doi',
|
||||||
templateUrl: './item-registerdoi-component.html'
|
templateUrl: './item-register-doi-component.html'
|
||||||
})
|
})
|
||||||
/**
|
/**
|
||||||
* Component responsible for rendering the Item Registe DOI page
|
* Component responsible for rendering the Item Registe DOI page
|
@@ -41,7 +41,7 @@ describe('ItemStatusComponent', () => {
|
|||||||
|
|
||||||
mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', {
|
mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', {
|
||||||
findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
|
findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
|
||||||
name: 'identifiers.item-status.registerDOI',
|
name: 'identifiers.item-status.register-doi',
|
||||||
values: [
|
values: [
|
||||||
'true'
|
'true'
|
||||||
]
|
]
|
||||||
|
@@ -108,7 +108,7 @@ export class ItemStatusComponent implements OnInit {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Observable for configuration determining whether the Register DOI feature is enabled
|
// Observable for configuration determining whether the Register DOI feature is enabled
|
||||||
let registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.registerDOI').pipe(
|
let registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
|
||||||
map((enabled: RemoteData<ConfigurationProperty>) => {
|
map((enabled: RemoteData<ConfigurationProperty>) => {
|
||||||
let show = false;
|
let show = false;
|
||||||
if (enabled.hasSucceeded) {
|
if (enabled.hasSucceeded) {
|
||||||
|
@@ -1327,7 +1327,7 @@
|
|||||||
|
|
||||||
"curation-task.task.vscan.label": "Virus Scan",
|
"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.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",
|
"item.edit.item-mapper.buttons.add": "Map item to selected collections",
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user