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

[CST-6174] Fix issue with bitstream access condition edit form when maxStartDate/maxEndDate are missing

Browse Source
This commit is contained in:
Giuseppe Digilio
2022-06-22 15:43:23 +02:00
parent eb662fc156
commit 5d130156e8
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,9 @@ import {
OR_OPERATOR OR_OPERATOR
} from '@ng-dynamic-forms/core'; } from '@ng-dynamic-forms/core';
import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model'; import {
WorkspaceitemSectionUploadFileObject
} from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service'; import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
import { import {
BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG, BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG,
@@ -43,10 +45,16 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { filter, mergeMap, take } from 'rxjs/operators'; import { filter, mergeMap, take } from 'rxjs/operators';
import { dateToISOFormat } from '../../../../../shared/date.util'; import { dateToISOFormat } from '../../../../../shared/date.util';
import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model'; import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
import { WorkspaceitemSectionUploadObject } from '../../../../../core/submission/models/workspaceitem-section-upload.model'; import {
WorkspaceitemSectionUploadObject
} from '../../../../../core/submission/models/workspaceitem-section-upload.model';
import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder'; import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service'; import {
import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner'; SubmissionJsonPatchOperationsService
} from '../../../../../core/submission/submission-json-patch-operations.service';
import {
JsonPatchOperationPathCombiner
} from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
import { SectionUploadService } from '../../section-upload.service'; import { SectionUploadService } from '../../section-upload.service';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
@@ -251,7 +259,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
endDateControl?.setValue(null); endDateControl?.setValue(null);
if (showGroups) { if (showGroups) {
if (accessCondition.hasStartDate) { if (accessCondition.hasStartDate && accessCondition.maxStartDate) {
const startDateModel = this.formBuilderService.findById( const startDateModel = this.formBuilderService.findById(
'startDate', 'startDate',
(model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel; (model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel;
@@ -263,7 +271,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
day: min.getUTCDate() day: min.getUTCDate()
}; };
} }
if (accessCondition.hasEndDate) { if (accessCondition.hasEndDate && accessCondition.maxEndDate) {
const endDateModel = this.formBuilderService.findById( const endDateModel = this.formBuilderService.findById(
'endDate', 'endDate',
(model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel; (model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel;
@@ -274,6 +282,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
month: max.getUTCMonth() + 1, month: max.getUTCMonth() + 1,
day: max.getUTCDate() day: max.getUTCDate()
}; };
} }
} }
} }