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

Merge remote-tracking branch 'origin/main' into poc-eslint-plugin-autofix-selectors

Browse Source
This commit is contained in:
Yury Bondarenko
2024-04-04 18:15:28 +02:00
parent b99d9030cd 7ebda4a7ed
commit ac48a49273
242 changed files with 7818 additions and 7268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/submission/sections/accesses/section-accesses.component.spec.ts
View File

@@ -24,6 +24,7 @@ import { SubmissionAccessesConfigDataService } from '../../../core/config/submis
import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
import { XSRFService } from '../../../core/xsrf/xsrf.service';
import { dsDynamicFormControlMapFn } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
import { DsDynamicTypeBindRelationService } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
@@ -120,6 +121,7 @@ describe('SubmissionSectionAccessesComponent', () => {
{ provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
{ provide: SubmissionObjectDataService, useValue: {} },
{ provide: SubmissionService, useValue: {} },
{ provide: XSRFService, useValue: {} },
{ provide: APP_CONFIG, useValue: environment },
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
{ provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
@@ -216,6 +218,7 @@ describe('SubmissionSectionAccessesComponent', () => {
{ provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
{ provide: SubmissionObjectDataService, useValue: {} },
{ provide: SubmissionService, useValue: {} },
{ provide: XSRFService, useValue: {} },
{ provide: APP_CONFIG, useValue: environment },
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
{ provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },

2
src/app/submission/sections/license/section-license.component.spec.ts
View File

@@ -38,6 +38,7 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso
import { Collection } from '../../../core/shared/collection.model';
import { License } from '../../../core/shared/license.model';
import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
import { XSRFService } from '../../../core/xsrf/xsrf.service';
import { dsDynamicFormControlMapFn } from '../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
@@ -191,6 +192,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
findById: () => observableOf(createSuccessfulRemoteDataObject(mockSubmissionObject)),
},
},
{ provide: XSRFService, useValue: {} },
SubmissionSectionLicenseComponent,
],
schemas: [NO_ERRORS_SCHEMA],

10
src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
View File

@@ -7,13 +7,13 @@ import {
Input,
OnInit,
} from '@angular/core';
import { find } from 'rxjs/operators';
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
import { RemoteData } from '../../../../core/data/remote-data';
import { GroupDataService } from '../../../../core/eperson/group-data.service';
import { Group } from '../../../../core/eperson/models/group.model';
import { ResourcePolicy } from '../../../../core/resource-policy/models/resource-policy.model';
import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
import { isEmpty } from '../../../../shared/empty.util';
/**
@@ -55,13 +55,15 @@ export class SubmissionSectionUploadAccessConditionsComponent implements OnInit
this.accessConditions.forEach((accessCondition: ResourcePolicy) => {
if (isEmpty(accessCondition.name)) {
this.groupService.findByHref(accessCondition._links.group.href).pipe(
find((rd: RemoteData<Group>) => !rd.isResponsePending && rd.hasSucceeded))
.subscribe((rd: RemoteData<Group>) => {
getFirstCompletedRemoteData(),
).subscribe((rd: RemoteData<Group>) => {
if (rd.hasSucceeded) {
const group: Group = rd.payload;
const accessConditionEntry = Object.assign({}, accessCondition);
accessConditionEntry.name = this.dsoNameService.getName(group);
this.accessConditionsList.push(accessConditionEntry);
});
}
});
} else {
this.accessConditionsList.push(accessCondition);
}

2
src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
View File

@@ -38,6 +38,7 @@ import { environment } from '../../../../../../environments/environment.test';
import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
import { dateToISOFormat } from '../../../../../shared/date.util';
import { DsDynamicTypeBindRelationService } from '../../../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
import { DynamicCustomSwitchModel } from '../../../../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
@@ -154,6 +155,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
{ provide: DsDynamicTypeBindRelationService, useValue: getMockDsDynamicTypeBindRelationService() },
{ provide: APP_CONFIG, useValue: environment },
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
{ provide: XSRFService, useValue: {} },
],
schemas: [NO_ERRORS_SCHEMA],
}).compileComponents().then();