hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-09 19:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename / move 'relationship.type' metadata field to 'dspace.entity.type'

Browse Source
This commit is contained in:
Tim Donohue
2021-03-12 14:06:45 -06:00
parent cfbf587184
commit d36ac7e6fa
28 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
View File

@@ -112,7 +112,7 @@ export class ItemDeleteComponent
super.ngOnInit();
this.url = this.router.url;
const label = this.item.firstMetadataValue('relationship.type');
const label = this.item.firstMetadataValue('dspace.entity.type');
if (label !== undefined) {
this.types$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
getFirstSucceededRemoteData(),

2
src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
View File

@@ -75,7 +75,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
*/
public initializeUpdates(): void {
const label = this.item.firstMetadataValue('relationship.type');
const label = this.item.firstMetadataValue('dspace.entity.type');
if (label !== undefined) {
this.entityType$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(

2
src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
View File

@@ -1,5 +1,5 @@
<h2 class="item-page-title-field">
<div *ngIf="item.firstMetadataValue('relationship.type') as type">
<div *ngIf="item.firstMetadataValue('dspace.entity.type') as type">
{{ type.toLowerCase() + '.page.titleprefix' | translate }}
</div>
<ds-metadata-values [mdValues]="item?.allMetadata(fields)"></ds-metadata-values>

2
src/app/core/shared/item.model.ts
View File

@@ -104,7 +104,7 @@ export class Item extends DSpaceObject implements ChildHALResource {
* Method that returns as which type of object this object should be rendered
*/
getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
const entityType = this.firstMetadataValue('relationship.type');
const entityType = this.firstMetadataValue('dspace.entity.type');
if (isEmpty(entityType)) {
return super.getRenderTypes();
}

4
src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts
View File

@@ -24,7 +24,7 @@ describe('ItemMetadataRepresentation', () => {
for (const metadataField of Object.keys(item.metadata)) {
describe(`when creating an ItemMetadataRepresentation`, () => {
beforeEach(() => {
item.metadata['relationship.type'] = [
item.metadata['dspace.entity.type'] = [
Object.assign(new MetadataValue(), {
value: itemType
})
@@ -41,7 +41,7 @@ describe('ItemMetadataRepresentation', () => {
});
it('should return the correct item type', () => {
expect(itemMetadataRepresentation.itemType).toEqual(item.firstMetadataValue('relationship.type'));
expect(itemMetadataRepresentation.itemType).toEqual(item.firstMetadataValue('dspace.entity.type'));
});
});
}

2
src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts
View File

@@ -21,7 +21,7 @@ export class ItemMetadataRepresentation extends Item implements MetadataRepresen
* The type of item this item can be represented as
*/
get itemType(): string {
return this.firstMetadataValue('relationship.type');
return this.firstMetadataValue('dspace.entity.type');
}
/**

4
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
View File

@@ -66,12 +66,12 @@ describe('RelationshipEffects', () => {
leftItem = Object.assign(new Item(), {
uuid: testUUID1,
metadata: { 'relationship.type': [leftTypeMD] }
metadata: { 'dspace.entity.type': [leftTypeMD] }
});
rightItem = Object.assign(new Item(), {
uuid: testUUID2,
metadata: { 'relationship.type': [rightTypeMD] }
metadata: { 'dspace.entity.type': [rightTypeMD] }
});
relationshipType = Object.assign(new RelationshipType(), {

4
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
View File

@@ -167,8 +167,8 @@ export class RelationshipEffects {
}
private addRelationship(item1: Item, item2: Item, relationshipType: string, submissionId: string, nameVariant?: string) {
const type1: string = item1.firstMetadataValue('relationship.type');
const type2: string = item2.firstMetadataValue('relationship.type');
const type1: string = item1.firstMetadataValue('dspace.entity.type');
const type2: string = item2.firstMetadataValue('dspace.entity.type');
return this.relationshipTypeService.getRelationshipTypeByLabelAndTypes(relationshipType, type1, type2)
.pipe(
mergeMap((type: RelationshipType) => {

2
src/app/shared/metadata-representation/metadata-representation-loader.component.ts
View File

@@ -14,7 +14,7 @@ import { ThemeService } from '../theme-support/theme.service';
templateUrl: './metadata-representation-loader.component.html'
})
/**
* Component for determining what component to use depending on the item's relationship type (relationship.type), its metadata representation and, optionally, its context
* Component for determining what component to use depending on the item's entity type (dspace.entity.type), its metadata representation and, optionally, its context
*/
export class MetadataRepresentationLoaderComponent implements OnInit {
private componentRefInstance: MetadataRepresentationListElementComponent;

2
src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
View File

@@ -27,7 +27,7 @@ import { ThemeService } from '../../../theme-support/theme.service';
templateUrl: './listable-object-component-loader.component.html'
})
/**
* Component for determining what component to use depending on the item's relationship type (relationship.type)
* Component for determining what component to use depending on the item's entity type (dspace.entity.type)
*/
export class ListableObjectComponentLoaderComponent implements OnInit, OnDestroy {
/**

2
src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
View File

@@ -57,7 +57,7 @@ const mockItemWithEntityType: Item = Object.assign(new Item(), {
value: 'This is just another title'
}
],
'relationship.type': [
'dspace.entity.type': [
{
language: null,
value: 'Publication'

2
src/app/shared/object-list/type-badge/type-badge.component.spec.ts
View File

@@ -15,7 +15,7 @@ const type = 'authorOfPublication';
const mockItemWithRelationshipType = Object.assign(new Item(), {
bundles: observableOf({}),
metadata: {
'relationship.type': [
'dspace.entity.type': [
{
language: 'en_US',
value: type

4
src/assets/i18n/ar.json5
View File

@@ -3180,9 +3180,9 @@
// TODO New key - Add a translation
"item.edit.relationships.save-button": "Save",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/cs.json5
View File

@@ -3120,9 +3120,9 @@
// TODO New key - Add a translation
"item.edit.relationships.save-button": "Save",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/de.json5
View File

@@ -2789,9 +2789,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Speichern",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

2
src/assets/i18n/en.json5
View File

@@ -1668,7 +1668,7 @@
"item.edit.relationships.save-button": "Save",
"item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/es.json5
View File

@@ -2861,9 +2861,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Guardar",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/fi.json5
View File

@@ -2625,9 +2625,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Tallenna",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/fr.json5
View File

@@ -2864,9 +2864,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Sauvegarder",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/hu.json5
View File

@@ -2430,8 +2430,8 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Mentés",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Adja hozzá a 'relationship.type' metaadatot ezen elem hivatkozásánek engedélyezéséhez",
// "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Adja hozzá a 'dspace.entity.type' metaadatot ezen elem hivatkozásánek engedélyezéséhez",

4
src/assets/i18n/ja.json5
View File

@@ -3180,9 +3180,9 @@
// TODO New key - Add a translation
"item.edit.relationships.save-button": "Save",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/lv.json5
View File

@@ -2620,9 +2620,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Saglabāt",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/nl.json5
View File

@@ -2860,9 +2860,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Opslaan",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/pl.json5
View File

@@ -3180,9 +3180,9 @@
// TODO New key - Add a translation
"item.edit.relationships.save-button": "Save",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/pt-BR.json5
View File

@@ -2818,9 +2818,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Salvar",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/pt-PT.json5
View File

@@ -2818,9 +2818,9 @@
// "item.edit.relationships.save-button": "Save",
"item.edit.relationships.save-button": "Salvar",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/sw.json5
View File

@@ -3180,9 +3180,9 @@
// TODO New key - Add a translation
"item.edit.relationships.save-button": "Save",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",

4
src/assets/i18n/tr.json5
View File

@@ -3180,9 +3180,9 @@
// TODO New key - Add a translation
"item.edit.relationships.save-button": "Save",
// "item.edit.relationships.no-entity-type": "Add 'relationship.type' metadata to enable relationships for this item",
// "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 'relationship.type' metadata to enable relationships for this item",
"item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",