Merge branch 'main' into w2p-101289_1578_primaryBitstream-edit-implementation

This commit is contained in:
lotte
2023-05-25 14:36:39 +02:00
510 changed files with 18368 additions and 5648 deletions

View File

@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { map, switchMap, tap } from 'rxjs/operators';
import { combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
import { DynamicFormControlModel, DynamicFormGroupModel, DynamicFormLayout, DynamicFormService, DynamicInputModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { TranslateService } from '@ngx-translate/core';
import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
import cloneDeep from 'lodash/cloneDeep';
@@ -334,7 +334,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
/**
* The form group of this form
*/
formGroup: FormGroup;
formGroup: UntypedFormGroup;
/**
* The ID of the item the bitstream originates from
@@ -380,7 +380,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
private formService: DynamicFormService,
private translate: TranslateService,
private bitstreamService: BitstreamDataService,
private dsoNameService: DSONameService,
public dsoNameService: DSONameService,
private notificationsService: NotificationsService,
private bitstreamFormatService: BitstreamFormatDataService,
private bundleService: BundleDataService) {