Skip to content

Commit 8b7a896

Browse files
atarix83atarix83
committed
Merge branch 'refs/heads/dspace-cris-2023_02_x' into task/ux-plus-2023_02_x/UXP-155-with-domino
# Conflicts: # src/app/app.module.ts # src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.html # src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts # src/assets/i18n/ar.json5 # src/assets/i18n/bn.json5 # src/assets/i18n/ca.json5 # src/assets/i18n/cs.json5 # src/assets/i18n/de.json5 # src/assets/i18n/el.json5 # src/assets/i18n/en.json5 # src/assets/i18n/es.json5 # src/assets/i18n/fi.json5 # src/assets/i18n/fr.json5 # src/assets/i18n/gd.json5 # src/assets/i18n/hi.json5 # src/assets/i18n/hu.json5 # src/assets/i18n/it.json5 # src/assets/i18n/ja.json5 # src/assets/i18n/kk.json5 # src/assets/i18n/lv.json5 # src/assets/i18n/nl.json5 # src/assets/i18n/pl.json5 # src/assets/i18n/pt-BR.json5 # src/assets/i18n/pt-PT.json5 # src/assets/i18n/sr-cyr.json5 # src/assets/i18n/sr-lat.json5 # src/assets/i18n/sv.json5 # src/assets/i18n/sw.json5 # src/assets/i18n/tr.json5 # src/assets/i18n/uk.json5 # src/assets/i18n/vi.json5 # src/environments/environment.test.ts
2 parents b17990e + f2e9450 commit 8b7a896

101 files changed

Lines changed: 1393 additions & 349 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/app/access-control/epeople-registry/epeople-registry.component.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import { RequestService } from '../../core/data/request.service';
2727
import { PaginationService } from '../../core/pagination/pagination.service';
2828
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
2929
import { FindListOptions } from '../../core/data/find-list-options.model';
30-
import { UUIDService } from '../../core/shared/uuid.service';
31-
import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock';
3230

3331
describe('EPeopleRegistryComponent', () => {
3432
let component: EPeopleRegistryComponent;
@@ -141,8 +139,7 @@ describe('EPeopleRegistryComponent', () => {
141139
{ provide: FormBuilderService, useValue: builderService },
142140
{ provide: Router, useValue: new RouterStub() },
143141
{ provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
144-
{ provide: PaginationService, useValue: paginationService },
145-
{ provide: UUIDService, useValue: getMockUUIDService() }
142+
{ provide: PaginationService, useValue: paginationService }
146143
],
147144
schemas: [NO_ERRORS_SCHEMA]
148145
}).compileComponents();

‎src/app/access-control/epeople-registry/epeople-registry.component.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { NoContent } from '../../core/shared/NoContent.model';
2323
import { PaginationService } from '../../core/pagination/pagination.service';
2424
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
2525
import { getEPersonEditRoute, getEPersonsRoute } from '../access-control-routing-paths';
26-
import { UUIDService } from '../../core/shared/uuid.service';
2726

2827
@Component({
2928
selector: 'ds-epeople-registry',
@@ -61,7 +60,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
6160
* Pagination config used to display the list of epeople
6261
*/
6362
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
64-
id: this.uuidService.generate(),
63+
id: 'elp',
6564
pageSize: 5,
6665
currentPage: 1
6766
});
@@ -92,8 +91,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
9291
private modalService: NgbModal,
9392
private paginationService: PaginationService,
9493
public requestService: RequestService,
95-
public dsoNameService: DSONameService,
96-
private uuidService: UUIDService) {
94+
public dsoNameService: DSONameService) {
9795
this.currentSearchQuery = '';
9896
this.currentSearchScope = 'metadata';
9997
this.searchForm = this.formBuilder.group(({

‎src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model
3535
import { ActivatedRoute, Router } from '@angular/router';
3636
import { RouterStub } from '../../../shared/testing/router.stub';
3737
import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
38-
import { UUIDService } from '../../../core/shared/uuid.service';
39-
import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock';
4038

4139
describe('EPersonFormComponent', () => {
4240
let component: EPersonFormComponent;
@@ -222,7 +220,6 @@ describe('EPersonFormComponent', () => {
222220
{ provide: EpersonRegistrationService, useValue: epersonRegistrationService },
223221
{ provide: ActivatedRoute, useValue: route },
224222
{ provide: Router, useValue: router },
225-
{ provide: UUIDService, useValue: getMockUUIDService() },
226223
EPeopleRegistryComponent
227224
],
228225
schemas: [NO_ERRORS_SCHEMA]

‎src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email
4040
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
4141
import { ActivatedRoute, Router } from '@angular/router';
4242
import { getEPersonsRoute } from '../../access-control-routing-paths';
43-
import { UUIDService } from '../../../core/shared/uuid.service';
4443

4544
@Component({
4645
selector: 'ds-eperson-form',
@@ -154,7 +153,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
154153
* Pagination config used to display the list of groups
155154
*/
156155
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
157-
id: this.uuidService.generate(),
156+
id: 'gem',
158157
pageSize: 5,
159158
currentPage: 1
160159
});
@@ -198,8 +197,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
198197
private epersonRegistrationService: EpersonRegistrationService,
199198
public dsoNameService: DSONameService,
200199
protected route: ActivatedRoute,
201-
protected router: Router,
202-
private uuidService: UUIDService
200+
protected router: Router
203201
) {
204202
this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
205203
this.epersonInitial = eperson;

‎src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic
3030
import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
3131
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
3232
import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
33-
import { UUIDService } from '../../../../core/shared/uuid.service';
34-
import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock';
3533

3634
describe('MembersListComponent', () => {
3735
let component: MembersListComponent;
@@ -138,7 +136,6 @@ describe('MembersListComponent', () => {
138136
{ provide: Router, useValue: new RouterMock() },
139137
{ provide: PaginationService, useValue: paginationService },
140138
{ provide: DSONameService, useValue: new DSONameServiceMock() },
141-
{ provide: UUIDService, useValue: getMockUUIDService() }
142139
],
143140
schemas: [NO_ERRORS_SCHEMA]
144141
}).compileComponents();

‎src/app/access-control/group-registry/group-form/members-list/members-list.component.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { NotificationsService } from '../../../../shared/notifications/notificat
2323
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
2424
import { PaginationService } from '../../../../core/pagination/pagination.service';
2525
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
26-
import { UUIDService } from '../../../../core/shared/uuid.service';
2726

2827
/**
2928
* Keys to keep track of specific subscriptions
@@ -102,15 +101,15 @@ export class MembersListComponent implements OnInit, OnDestroy {
102101
* Pagination config used to display the list of EPeople that are result of EPeople search
103102
*/
104103
configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
105-
id: this.uuidService.generate(),
104+
id: 'sml',
106105
pageSize: 5,
107106
currentPage: 1
108107
});
109108
/**
110109
* Pagination config used to display the list of EPerson Membes of active group being edited
111110
*/
112111
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
113-
id: this.uuidService.generate(),
112+
id: 'ml',
114113
pageSize: 5,
115114
currentPage: 1
116115
});
@@ -140,8 +139,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
140139
protected formBuilder: UntypedFormBuilder,
141140
protected paginationService: PaginationService,
142141
protected router: Router,
143-
public dsoNameService: DSONameService,
144-
protected uuidService: UUIDService
142+
public dsoNameService: DSONameService
145143
) {
146144
this.currentSearchQuery = '';
147145
}

‎src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ import { PaginationServiceStub } from '../../../../shared/testing/pagination-ser
3030
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
3131
import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
3232
import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock';
33-
import { UUIDService } from '../../../../core/shared/uuid.service';
34-
import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock';
3533

3634
describe('SubgroupsListComponent', () => {
3735
let component: SubgroupsListComponent;
@@ -146,7 +144,6 @@ describe('SubgroupsListComponent', () => {
146144
{ provide: FormBuilderService, useValue: builderService },
147145
{ provide: Router, useValue: routerStub },
148146
{ provide: PaginationService, useValue: paginationService },
149-
{ provide: UUIDService, useValue: getMockUUIDService() }
150147
],
151148
schemas: [NO_ERRORS_SCHEMA]
152149
}).compileComponents();

‎src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { NoContent } from '../../../../core/shared/NoContent.model';
1818
import { PaginationService } from '../../../../core/pagination/pagination.service';
1919
import { followLink } from '../../../../shared/utils/follow-link-config.model';
2020
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
21-
import { UUIDService } from '../../../../core/shared/uuid.service';
2221

2322
/**
2423
* Keys to keep track of specific subscriptions
@@ -59,15 +58,15 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
5958
* Pagination config used to display the list of groups that are result of groups search
6059
*/
6160
configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
62-
id: this.uuidService.generate(),
61+
id: 'ssgl',
6362
pageSize: 5,
6463
currentPage: 1
6564
});
6665
/**
6766
* Pagination config used to display the list of subgroups of currently active group being edited
6867
*/
6968
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
70-
id: this.uuidService.generate(),
69+
id: 'sgl',
7170
pageSize: 5,
7271
currentPage: 1
7372
});
@@ -90,8 +89,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
9089
private formBuilder: UntypedFormBuilder,
9190
private paginationService: PaginationService,
9291
private router: Router,
93-
public dsoNameService: DSONameService,
94-
private uuidService: UUIDService) {
92+
public dsoNameService: DSONameService) {
9593
this.currentSearchQuery = '';
9694
}
9795

‎src/app/access-control/group-registry/groups-registry.component.spec.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
3434
import { NoContent } from '../../core/shared/NoContent.model';
3535
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
3636
import { DSONameServiceMock, UNDEFINED_NAME } from '../../shared/mocks/dso-name.service.mock';
37-
import { UUIDService } from '../../core/shared/uuid.service';
38-
import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock';
3937

4038
describe('GroupsRegistryComponent', () => {
4139
let component: GroupsRegistryComponent;
@@ -184,8 +182,7 @@ describe('GroupsRegistryComponent', () => {
184182
{ provide: Router, useValue: new RouterMock() },
185183
{ provide: AuthorizationDataService, useValue: authorizationService },
186184
{ provide: PaginationService, useValue: paginationService },
187-
{ provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
188-
{ provide: UUIDService, useValue: getMockUUIDService() }
185+
{ provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) }
189186
],
190187
schemas: [NO_ERRORS_SCHEMA]
191188
}).compileComponents();

‎src/app/access-control/group-registry/groups-registry.component.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import { NoContent } from '../../core/shared/NoContent.model';
3838
import { PaginationService } from '../../core/pagination/pagination.service';
3939
import { followLink } from '../../shared/utils/follow-link-config.model';
4040
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
41-
import { UUIDService } from '../../core/shared/uuid.service';
4241

4342
@Component({
4443
selector: 'ds-groups-registry',
@@ -56,7 +55,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
5655
* Pagination config used to display the list of groups
5756
*/
5857
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
59-
id: this.uuidService.generate(),
58+
id: 'gl',
6059
pageSize: 5,
6160
currentPage: 1
6261
});
@@ -107,8 +106,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
107106
private authorizationService: AuthorizationDataService,
108107
private paginationService: PaginationService,
109108
public requestService: RequestService,
110-
public dsoNameService: DSONameService,
111-
private uuidService: UUIDService) {
109+
public dsoNameService: DSONameService,) {
112110
this.currentSearchQuery = '';
113111
this.searchForm = this.formBuilder.group(({
114112
query: this.currentSearchQuery,

0 commit comments

Comments
 (0)