Skip to content

Commit f297357

Browse files
authored
Fix/resource bug (#467)
* fix(resource): fixed resource bug * fix(files): fixed file metadata edit
1 parent 0b2c1c2 commit f297357

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/app/features/files/components/edit-file-metadata-dialog/edit-file-metadata-dialog.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ export class EditFileMetadataDialogComponent {
3939
this.fileMetadataForm.patchValue({
4040
title: fileMetadata.title,
4141
description: fileMetadata.description,
42-
resourceType: fileMetadata.resourceTypeGeneral,
43-
resourceLanguage: fileMetadata.language,
42+
resourceType: fileMetadata.resourceTypeGeneral.length ? fileMetadata.resourceTypeGeneral : null,
43+
resourceLanguage: fileMetadata.language.length ? fileMetadata.language : null,
4444
});
4545
}
4646

src/app/features/files/components/file-metadata/file-metadata.component.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ <h2>{{ 'files.detail.fileMetadata.title' | translate }}</h2>
44

55
@if (!hasViewOnly()) {
66
<div class="flex gap-2">
7-
<p-button severity="secondary" class="btn-icon-only" icon="fas fa-download" (click)="downloadFileMetadata()" />
7+
<p-button
8+
severity="secondary"
9+
class="btn-icon-only"
10+
icon="fas fa-download"
11+
(onClick)="downloadFileMetadata()"
12+
/>
813

914
<p-button
1015
severity="secondary"

src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
55
import { Select } from 'primeng/select';
66

77
import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core';
8-
import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
8+
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
99

1010
import { languageCodes } from '@osf/shared/constants';
1111
import { LanguageCodeModel } from '@osf/shared/models';
@@ -24,10 +24,7 @@ export class ResourceInformationDialogComponent implements OnInit {
2424
config = inject(DynamicDialogConfig);
2525

2626
resourceForm = new FormGroup<ResourceInformationForm>({
27-
resourceType: new FormControl('', {
28-
nonNullable: true,
29-
validators: [Validators.required],
30-
}),
27+
resourceType: new FormControl(''),
3128
resourceLanguage: new FormControl(''),
3229
});
3330

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FormControl } from '@angular/forms';
22

33
export interface ResourceInformationForm {
4-
resourceType: FormControl<string>;
4+
resourceType: FormControl<string | null>;
55
resourceLanguage: FormControl<string | null>;
66
}

0 commit comments

Comments
 (0)