DigitaleBibliothek / Frontend / 202c84c4840

Commits

Gantner, Florian Klaus authored and github-actions[bot] committed 202c84c4840 17 Apr 2024

extend eperson render type for display of dso name

https://github.com/DSpace/dspace-angular/issues/2947
(cherry picked from commit 97fade00a47eb0e1bc5e1d8b8d264878d808654d)

src/app/core/breadcrumbs/dso-name.service.spec.ts

Modified

-1
+import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-2
+import { DSpaceObject } from '../shared/dspace-object.model';
-3
+import { GenericConstructor } from '../shared/generic-constructor';
-4
+import { Item } from '../shared/item.model';
-5
+import { MetadataValueFilter } from '../shared/metadata.models';
-6
+import { DSONameService } from './dso-name.service';
-7
-8
+describe(`DSONameService`, () => {
-9
+  let service: DSONameService;
-10
+  let mockPersonName: string;
-11
+  let mockPerson: DSpaceObject;
-+
+  let mockEPersonNameFirst: string;
-+
+  let mockEPersonFirst: DSpaceObject;
-+
+  let mockEPersonName: string;
-+
+  let mockEPerson: DSpaceObject;
-16
+  let mockOrgUnitName: string;
-17
+  let mockOrgUnit: DSpaceObject;
-18
+  let mockDSOName: string;
-19
+  let mockDSO: DSpaceObject;
-20
-21
+  beforeEach(() => {
-22
+    mockPersonName = 'Doe, John';
-23
+    mockPerson = Object.assign(new DSpaceObject(), {
-24
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
-25
+        return mockPersonName;
-26
+      },
-27
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
-28
+        return ['Person', Item, DSpaceObject];
-29
+      }
-30
+    });
-31
-+
+    mockEPersonName = 'John Doe';
-+
+    mockEPerson = Object.assign(new DSpaceObject(), {
-+
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
-+
+        return mockEPersonName;
-+
+      },
-+
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
-+
+        return ['EPerson', Item, DSpaceObject];
-+
+      },
-+
+    });
-+
-+
+    mockEPersonNameFirst = 'John';
-+
+    mockEPersonFirst = Object.assign(new DSpaceObject(), {
-+
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
-+
+        return mockEPersonNameFirst;
-+
+      },
-+
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
-+
+        return ['EPerson', Item, DSpaceObject];
-+
+      },
-+
+    });
-+
-52
+    mockOrgUnitName = 'Molecular Spectroscopy';
-53
+    mockOrgUnit = Object.assign(new DSpaceObject(), {
-54
+      firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
-55
+        return mockOrgUnitName;
-56
+      },
-57
+      getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
-58
+        return ['OrgUnit', Item, DSpaceObject];
-59
+      }
-60
+    });
-61
-84
-85
+    it(`should use the OrgUnit factory for OrgUnit entities`, () => {
-86
+      spyOn((service as any).factories, 'OrgUnit').and.returnValue('Bingo!');
-87
-88
+      const result = service.getName(mockOrgUnit);
-89
-90
+      expect((service as any).factories.OrgUnit).toHaveBeenCalledWith(mockOrgUnit);
-91
+      expect(result).toBe('Bingo!');
-92
+    });
-93
-+
+    it(`should use the EPerson factory for EPerson objects`, () => {
-+
+      spyOn((service as any).factories, 'EPerson').and.returnValue('Bingo!');
-+
-+
+      const result = service.getName(mockEPerson);
-+
-+
+      expect((service as any).factories.EPerson).toHaveBeenCalledWith(mockEPerson);
-+
+      expect(result).toBe('Bingo!');
-+
+    });
-+
-103
+    it(`should use the Default factory for regular DSpaceObjects`, () => {
-104
+      spyOn((service as any).factories, 'Default').and.returnValue('Bingo!');
-105
-106
+      const result = service.getName(mockDSO);
-107
-108
+      expect((service as any).factories.Default).toHaveBeenCalledWith(mockDSO);
-109
+      expect(result).toBe('Bingo!');
-110
+    });
-111
+  });
-112
-133
+      it(`should return dc.title`, () => {
-134
+        const result = (service as any).factories.Person(mockPerson);
-135
+        expect(result).toBe(mockPersonName);
-136
+        expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.familyName');
-137
+        expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.givenName');
-138
+        expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('dc.title');
-139
+      });
-140
+    });
-141
+  });
-142
-+
+  describe(`factories.EPerson`, () => {
-+
+    describe(`with eperson.firstname and without eperson.lastname`, () => {
-+
+      beforeEach(() => {
-+
+        spyOn(mockEPerson, 'firstMetadataValue').and.returnValues(...mockEPersonName.split(' '));
-+
+      });
-+
-+
+      it(`should return 'eperson.firstname' and 'eperson.lastname'`, () => {
-+
+        const result = (service as any).factories.EPerson(mockEPerson);
-+
+        expect(result).toBe(mockEPersonName);
-+
+        expect(mockEPerson.firstMetadataValue).toHaveBeenCalledWith('eperson.firstname');
-+
+        expect(mockEPerson.firstMetadataValue).toHaveBeenCalledWith('eperson.lastname');
-+
+      });
-+
+    });
-+
-+
+    describe(` with eperson.firstname and without eperson.lastname`, () => {
-+
+      beforeEach(() => {
-+
+        spyOn(mockEPersonFirst, 'firstMetadataValue').and.returnValues(mockEPersonNameFirst, undefined);
-+
+      });
-+
-+
+      it(`should return 'eperson.firstname'`, () => {
-+
+        const result = (service as any).factories.EPerson(mockEPersonFirst);
-+
+        expect(result).toBe(mockEPersonNameFirst);
-+
+        expect(mockEPersonFirst.firstMetadataValue).toHaveBeenCalledWith('eperson.firstname');
-+
+        expect(mockEPersonFirst.firstMetadataValue).toHaveBeenCalledWith('eperson.lastname');
-+
+      });
-+
+    });
-+
+  });
-+
-+
-172
+  describe(`factories.OrgUnit`, () => {
-173
+    beforeEach(() => {
-174
+      spyOn(mockOrgUnit, 'firstMetadataValue').and.callThrough();
-175
+    });
-176
-177
+    it(`should return 'organization.legalName'`, () => {
-178
+      const result = (service as any).factories.OrgUnit(mockOrgUnit);
-179
+      expect(result).toBe(mockOrgUnitName);
-180
+      expect(mockOrgUnit.firstMetadataValue).toHaveBeenCalledWith('organization.legalName');
-181
+    });

Frontend

Commits

Jira Issues

Add shortcut