Skip to content

Commit 0eec88e

Browse files
atarix83atarix83
committed
Merge branch 'refs/heads/main-cris' into dspacecris-7-DSC-1451-main-merged
# Conflicts: # src/app/access-control/epeople-registry/epeople-registry.component.spec.ts # src/app/access-control/epeople-registry/epeople-registry.component.ts # src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts # src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts # src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts # src/app/access-control/group-registry/group-form/members-list/members-list.component.ts # src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts # src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts # src/app/access-control/group-registry/groups-registry.component.spec.ts # src/app/access-control/group-registry/groups-registry.component.ts # src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts # src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts # src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts # src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts # src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts # src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts # src/app/app.module.ts # src/app/audit-page/object-audit-overview/object-audit-overview.component.ts # src/app/core/data/lookup-relation.service.spec.ts # src/app/core/data/lookup-relation.service.ts # src/app/core/data/version-history-data.service.spec.ts # src/app/core/data/version-history-data.service.ts # src/app/core/shared/search/search.service.spec.ts # src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html # src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html # src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html # src/app/home-page/recent-item-list/recent-item-list.component.spec.ts # src/app/home-page/recent-item-list/recent-item-list.component.ts # 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 # 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 # src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts # src/app/item-page/full/field-components/file-section/full-file-section.component.ts # src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts # src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts # src/app/item-page/versions/item-versions.component.spec.ts # src/app/item-page/versions/item-versions.component.ts # src/app/my-dspace-page/my-dspace-configuration.service.spec.ts # src/app/my-dspace-page/my-dspace-configuration.service.ts # src/app/notifications/qa/events/quality-assurance-events.component.spec.ts # src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts # src/app/openaire/broker/events/openaire-broker-events.component.ts # src/app/openaire/broker/topics/openaire-broker-topics.component.spec.ts # src/app/openaire/broker/topics/openaire-broker-topics.component.ts # src/app/process-page/overview/process-overview.component.spec.ts # src/app/process-page/overview/process-overview.component.ts # src/app/shared/explore/section-component/counters-section/counters-section.component.ts # src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts # src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts # 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 # 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 # src/app/shared/form/builder/form-builder.service.ts # src/app/shared/loading/loading.component.ts # src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts # src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts # src/app/shared/search/item-export/item-export/item-export-list/item-export-list.component.spec.ts # src/app/shared/search/item-export/item-export/item-export-list/item-export-list.component.ts # src/app/shared/search/item-export/item-export/item-export.component.spec.ts # src/app/shared/search/item-export/item-export/item-export.component.ts # src/app/submission/import-external/submission-import-external.component.spec.ts # src/app/submission/import-external/submission-import-external.component.ts # src/app/subscriptions-page/subscriptions-page.component.spec.ts # src/app/subscriptions-page/subscriptions-page.component.ts # src/app/suggestions-page/suggestions-page.component.spec.ts # src/app/suggestions-page/suggestions-page.component.ts # src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts # src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts # src/config/default-app-config.ts
2 parents bcbe5cf + 8520b4c commit 0eec88e

103 files changed

Lines changed: 1097 additions & 455 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.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
"date-fns": "^2.29.3",
114114
"date-fns-tz": "^1.3.7",
115115
"deepmerge": "^4.3.1",
116+
"domino": "^2.1.6",
116117
"ejs": "^3.1.9",
117118
"express": "^4.18.2",
118119
"express-rate-limit": "^5.1.3",

‎server.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import * as express from 'express';
2525
import * as ejs from 'ejs';
2626
import * as compression from 'compression';
2727
import * as expressStaticGzip from 'express-static-gzip';
28+
import * as domino from 'domino';
2829
/* eslint-enable import/no-namespace */
2930
import axios from 'axios';
3031
import LRU from 'lru-cache';
@@ -79,6 +80,15 @@ let anonymousCache: LRU<string, any>;
7980
// extend environment with app config for server
8081
extendEnvironmentWithAppConfig(environment, appConfig);
8182

83+
// Create a DOM window object based on the template
84+
const _window = domino.createWindow(indexHtml);
85+
86+
// Assign the DOM window and document objects to the global object
87+
(_window as any).screen = {deviceXDPI: 0, logicalXDPI: 0};
88+
(global as any).window = _window;
89+
(global as any).document = _window.document;
90+
(global as any).navigator = _window.navigator;
91+
8292
// The Express app is exported so that it can be used by serverless Functions.
8393
export function app() {
8494

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import {
5353
} from '../../shared/testing/eperson.mock';
5454
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
5555
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
56+
import { FindListOptions } from '../../core/data/find-list-options.model';
5657
import { RouterStub } from '../../shared/testing/router.stub';
5758
import { EPeopleRegistryComponent } from './epeople-registry.component';
5859

@@ -160,7 +161,6 @@ describe('EPeopleRegistryComponent', () => {
160161
{ provide: Router, useValue: new RouterStub() },
161162
{ provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
162163
{ provide: PaginationService, useValue: paginationService },
163-
{ provide: UUIDService, useValue: getMockUUIDService() },
164164
],
165165
schemas: [NO_ERRORS_SCHEMA],
166166
}).compileComponents();

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ import { EPerson } from '../../core/eperson/models/eperson.model';
3333
import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
3434
import { PaginationService } from '../../core/pagination/pagination.service';
3535
import { NoContent } from '../../core/shared/NoContent.model';
36+
import { PaginationService } from '../../core/pagination/pagination.service';
37+
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
38+
import { getEPersonEditRoute, getEPersonsRoute } from '../access-control-routing-paths';
3639
import {
3740
getAllSucceededRemoteData,
3841
getFirstCompletedRemoteData,
@@ -84,7 +87,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
8487
* Pagination config used to display the list of epeople
8588
*/
8689
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
87-
id: this.uuidService.generate(),
90+
id: 'elp',
8891
pageSize: 5,
8992
currentPage: 1,
9093
});
@@ -115,8 +118,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
115118
private modalService: NgbModal,
116119
private paginationService: PaginationService,
117120
public requestService: RequestService,
118-
public dsoNameService: DSONameService,
119-
private uuidService: UUIDService) {
121+
public dsoNameService: DSONameService) {
120122
this.currentSearchQuery = '';
121123
this.currentSearchScope = 'metadata';
122124
this.searchForm = this.formBuilder.group(({

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic
6363
import { RouterStub } from '../../../shared/testing/router.stub';
6464
import { createPaginatedList } from '../../../shared/testing/utils.test';
6565
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
66+
import { ActivatedRoute, Router } from '@angular/router';
67+
import { RouterStub } from '../../../shared/testing/router.stub';
68+
import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
6669
import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
6770
import { EPeopleRegistryComponent } from '../epeople-registry.component';
6871
import { EPersonFormComponent } from './eperson-form.component';
@@ -255,7 +258,6 @@ describe('EPersonFormComponent', () => {
255258
{ provide: EpersonRegistrationService, useValue: epersonRegistrationService },
256259
{ provide: ActivatedRoute, useValue: route },
257260
{ provide: Router, useValue: router },
258-
{ provide: UUIDService, useValue: getMockUUIDService() },
259261
EPeopleRegistryComponent,
260262
],
261263
schemas: [NO_ERRORS_SCHEMA],

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
6464
import { followLink } from '../../../shared/utils/follow-link-config.model';
6565
import { getEPersonsRoute } from '../../access-control-routing-paths';
6666
import { ValidateEmailNotTaken } from './validators/email-taken.validator';
67+
import { Registration } from '../../../core/shared/registration.model';
68+
import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
69+
import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
70+
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
71+
import { ActivatedRoute, Router } from '@angular/router';
72+
import { getEPersonsRoute } from '../../access-control-routing-paths';
6773

6874
@Component({
6975
selector: 'ds-eperson-form',
@@ -182,7 +188,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
182188
* Pagination config used to display the list of groups
183189
*/
184190
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
185-
id: this.uuidService.generate(),
191+
id: 'gem',
186192
pageSize: 5,
187193
currentPage: 1,
188194
});
@@ -227,7 +233,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
227233
public dsoNameService: DSONameService,
228234
protected route: ActivatedRoute,
229235
protected router: Router,
230-
private uuidService: UUIDService,
231236
) {
232237
this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
233238
this.epersonInitial = eperson;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ import {
5959
import { GroupMock } from '../../../../shared/testing/group-mock';
6060
import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
6161
import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
62+
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
63+
import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
6264
import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
6365
import { MembersListComponent } from './members-list.component';
6466

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ import {
3434
} from '../../../../core/shared/operators';
3535
import { NotificationsService } from '../../../../shared/notifications/notifications.service';
3636
import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
37+
import { PaginationService } from '../../../../core/pagination/pagination.service';
38+
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
3739
import { getEPersonEditRoute } from '../../../access-control-routing-paths';
3840

3941
/**
@@ -113,15 +115,15 @@ export class MembersListComponent implements OnInit, OnDestroy {
113115
* Pagination config used to display the list of EPeople that are result of EPeople search
114116
*/
115117
configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
116-
id: uniqueId('sml'),
118+
id: 'sml',
117119
pageSize: 5,
118120
currentPage: 1,
119121
});
120122
/**
121123
* Pagination config used to display the list of EPerson Membes of active group being edited
122124
*/
123125
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
124-
id: uniqueId('ml'),
126+
id: 'ml',
125127
pageSize: 5,
126128
currentPage: 1,
127129
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
7676
* Pagination config used to display the list of groups that are result of groups search
7777
*/
7878
configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
79-
id: uniqueId('ssgl'),
79+
id: 'ssgl',
8080
pageSize: 5,
8181
currentPage: 1,
8282
});
8383
/**
8484
* Pagination config used to display the list of subgroups of currently active group being edited
8585
*/
8686
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
87-
id: uniqueId('sgl'),
87+
id: 'sgl',
8888
pageSize: 5,
8989
currentPage: 1,
9090
});

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ import {
6565
} from '../../shared/testing/group-mock';
6666
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
6767
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
68+
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
69+
import { NoContent } from '../../core/shared/NoContent.model';
70+
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
71+
import { DSONameServiceMock, UNDEFINED_NAME } from '../../shared/mocks/dso-name.service.mock';
6872
import { routeServiceStub } from '../../shared/testing/route-service.stub';
6973
import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
7074
import { GroupsRegistryComponent } from './groups-registry.component';
@@ -217,7 +221,6 @@ describe('GroupsRegistryComponent', () => {
217221
{ provide: AuthorizationDataService, useValue: authorizationService },
218222
{ provide: PaginationService, useValue: paginationService },
219223
{ provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
220-
{ provide: UUIDService, useValue: getMockUUIDService() },
221224
],
222225
schemas: [NO_ERRORS_SCHEMA],
223226
}).compileComponents();

0 commit comments

Comments
 (0)