Skip to content

Commit df398ac

Browse files
committed
fix(resource-information): fixed comments
1 parent b616ba7 commit df398ac

4 files changed

Lines changed: 14 additions & 22 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,6 @@ describe('ResourceInformationDialogComponent', () => {
7272
});
7373
});
7474

75-
it('should not close dialog on save when form is invalid', () => {
76-
component.resourceForm.setErrors({ invalid: true });
77-
78-
component.save();
79-
80-
expect(dialogRef.close).not.toHaveBeenCalled();
81-
});
82-
8375
it('should close dialog without payload on cancel', () => {
8476
component.cancel();
8577

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ export class ResourceInformationDialogComponent implements OnInit {
4242
}
4343

4444
save(): void {
45-
if (this.resourceForm.valid) {
46-
const formValue = this.resourceForm.getRawValue();
47-
this.dialogRef.close({
48-
resourceTypeGeneral: formValue.resourceType,
49-
language: formValue.resourceLanguage,
50-
});
51-
}
45+
const formValue = this.resourceForm.getRawValue();
46+
this.dialogRef.close({
47+
resourceTypeGeneral: formValue.resourceType,
48+
language: formValue.resourceLanguage,
49+
});
5250
}
5351

5452
cancel(): void {

src/app/features/project/overview/components/project-overview-metadata/project-overview-metadata.component.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@let resource = currentProject();
22

33
@if (resource) {
4+
@let customMetadata = customItemMetadata();
5+
46
<div class="metadata flex flex-column gap-5">
57
<div class="metadata-header flex align-items-center justify-content-between">
68
<h2>{{ 'common.labels.metadata' | translate }}</h2>
@@ -33,8 +35,8 @@ <h3>{{ 'project.overview.metadata.resourceType' | translate }}</h3>
3335

3436
<p data-test-project-overview-metadata-resource-type>
3537
{{
36-
customItemMetadata()?.resourceTypeGeneral
37-
? (customItemMetadata()?.resourceTypeGeneral | resourceTypeGeneralLabel)
38+
customMetadata?.resourceTypeGeneral
39+
? (customMetadata?.resourceTypeGeneral | resourceTypeGeneralLabel)
3840
: ('project.overview.metadata.noResourceType' | translate)
3941
}}
4042
</p>
@@ -98,16 +100,16 @@ <h3>{{ 'project.overview.metadata.supplements' | translate }}</h3>
98100
<div class="flex flex-column gap-2">
99101
<h3>{{ 'project.overview.metadata.funderNames' | translate }}</h3>
100102

101-
<osf-funders-list [funders]="customItemMetadata()?.funders" [isLoading]="isCustomItemMetadataLoading()" />
103+
<osf-funders-list [funders]="customMetadata?.funders" [isLoading]="isCustomItemMetadataLoading()" />
102104
</div>
103105

104106
<div class="flex flex-column gap-2">
105107
<h3>{{ 'common.labels.language' | translate }}</h3>
106108

107109
<p data-test-project-overview-metadata-resource-language>
108110
{{
109-
customItemMetadata()?.language
110-
? (customItemMetadata()?.language | languageLabel)
111+
customMetadata?.language
112+
? (customMetadata?.language | languageLabel)
111113
: ('project.overview.metadata.noLanguage' | translate)
112114
}}
113115
</p>

0 commit comments

Comments
 (0)