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 'upstream/main' into themeable-section-upload-file

Browse Source
This commit is contained in:
Mark H. Wood
2023-05-19 13:31:05 -04:00
parent 6adc9a1742 724f1fe4d3
commit f466d0b67c
346 changed files with 17536 additions and 5209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import { SectionAccessesService } from './section-accesses.service';
import { Component, Inject, ViewChild } from '@angular/core';
import { FormControl } from '@angular/forms';
import { UntypedFormControl } from '@angular/forms';
import { filter, map, mergeMap, take } from 'rxjs/operators';
import { combineLatest, Observable, of, Subscription } from 'rxjs';
@@ -186,8 +186,8 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
if (event.model.id === FORM_ACCESS_CONDITION_TYPE_CONFIG.id) {
// Clear previous state when switching through different access conditions
const startDateControl: FormControl = event.control.parent.get('startDate') as FormControl;
const endDateControl: FormControl = event.control.parent.get('endDate') as FormControl;
const startDateControl: UntypedFormControl = event.control.parent.get('startDate') as UntypedFormControl;
const endDateControl: UntypedFormControl = event.control.parent.get('endDate') as UntypedFormControl;
startDateControl?.markAsUntouched();
endDateControl?.markAsUntouched();

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

@@ -1,4 +1,4 @@
<span class="mb-5" [innerHTML]="licenseText$ | async"></span>
<span class="mb-5 preserve-line-breaks" [innerHTML]="licenseText$ | async"></span>
<br> <br>
<ds-form *ngIf="formModel" #formRef="formComponent"
[formId]="formId"

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

@@ -1,5 +1,5 @@
import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
import { FormControl } from '@angular/forms';
import { UntypedFormControl } from '@angular/forms';
import {
DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER,
@@ -240,13 +240,13 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
* @param control
* The [[FormControl]] object
*/
public setOptions(model: DynamicFormControlModel, control: FormControl) {
public setOptions(model: DynamicFormControlModel, control: UntypedFormControl) {
let accessCondition: AccessConditionOption = null;
this.availableAccessConditionOptions.filter((element) => element.name === control.value)
.forEach((element) => accessCondition = element );
if (isNotEmpty(accessCondition)) {
const startDateControl: FormControl = control.parent.get('startDate') as FormControl;
const endDateControl: FormControl = control.parent.get('endDate') as FormControl;
const startDateControl: UntypedFormControl = control.parent.get('startDate') as UntypedFormControl;
const endDateControl: UntypedFormControl = control.parent.get('endDate') as UntypedFormControl;
// Clear previous state
startDateControl?.markAsUntouched();

4
src/app/submission/sections/upload/file/section-upload-file.component.html
View File

@@ -1,8 +1,8 @@
<ng-container *ngIf="fileData">
<div class="row">
<div class="col-md-2">
<!--ds-thumbnail [thumbnail]="bitstreamsList[bitstreamKey].url | async"></ds-thumbnail-->
<ds-thumbnail [thumbnail]="fileData?.thumbnail"></ds-thumbnail>
<!--ds-themed-thumbnail [thumbnail]="bitstreamsList[bitstreamKey].url | async"></ds-themed-thumbnail-->
<ds-themed-thumbnail [thumbnail]="fileData?.thumbnail"></ds-themed-thumbnail>
</div>
<div class="col-md-10">
<div class="float-left w-75">