Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
@let language = customItemMetadata()?.language;
@let resourceTypeGeneral = customItemMetadata()?.resourceTypeGeneral;

<p-card>
<div class="flex justify-content-between align-items-center">
<h2>
{{ 'project.overview.metadata.resourceInformation' | translate }}
<p-button
icon="fas fa-info-circle blue-icon"
severity="secondary"
text
(onClick)="showResourceInfo.emit()"
[ariaLabel]="'project.metadata.resourceInformation.tooltipDialog.header' | translate"
></p-button>
{{
(languageOnly()
? 'project.overview.metadata.resourceLanguage'
: 'project.overview.metadata.resourceInformation'
) | translate
}}
@if (!languageOnly()) {
<p-button
icon="fas fa-info-circle blue-icon"
severity="secondary"
text
(onClick)="showResourceInfo.emit()"
[ariaLabel]="'project.metadata.resourceInformation.tooltipDialog.header' | translate"
></p-button>
}
</h2>

@if (!readonly()) {
Expand All @@ -25,17 +35,29 @@ <h2>
</div>

<div class="mt-4">
@if (customItemMetadata()?.resourceTypeGeneral || customItemMetadata()?.language) {
<div class="flex-column flex gap-2">
<p class="inline-block font-bold" data-test-display-resource-type-general>
<span> {{ 'project.overview.metadata.resourceType' | translate }}: </span>
<span>{{ customItemMetadata()?.resourceTypeGeneral | resourceTypeGeneralLabel }}</span>
</p>

@if (languageOnly()) {
@if (language) {
<p class="inline-block font-bold" data-test-display-resource-language>
<span> {{ 'project.overview.metadata.resourceLanguage' | translate }}: </span>
<span>{{ customItemMetadata()?.language | languageLabel }}</span>
{{ language | languageLabel }}
</p>
} @else {
<p>{{ 'project.overview.metadata.languageNotProvided' | translate }}</p>
}
} @else if (resourceTypeGeneral || language) {
<div class="flex-column flex gap-2">
@if (resourceTypeGeneral) {
<p class="inline-block font-bold" data-test-display-resource-type-general>
<span> {{ 'project.overview.metadata.resourceType' | translate }}: </span>
<span>{{ resourceTypeGeneral | resourceTypeGeneralLabel }}</span>
</p>
}

@if (language) {
<p class="inline-block font-bold" data-test-display-resource-language>
<span> {{ 'project.overview.metadata.resourceLanguage' | translate }}: </span>
<span>{{ language | languageLabel }}</span>
</p>
}
</div>
} @else {
<p>{{ 'project.overview.metadata.noResourceInformation' | translate }}</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';

import { CustomItemMetadataRecord } from '@osf/features/metadata/models';

Expand All @@ -12,7 +13,7 @@ describe('MetadataResourceInformationComponent', () => {

const mockCustomItemMetadata: CustomItemMetadataRecord = {
language: 'eng',
resourceTypeGeneral: 'dataset',
resourceTypeGeneral: 'Dataset',
funders: [],
};

Expand All @@ -25,8 +26,9 @@ describe('MetadataResourceInformationComponent', () => {
fixture = TestBed.createComponent(MetadataResourceInformationComponent);
fixture.componentRef.setInput('customItemMetadata', mockCustomItemMetadata);
fixture.componentRef.setInput('readonly', false);

fixture.componentRef.setInput('languageOnly', false);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
Expand All @@ -35,12 +37,10 @@ describe('MetadataResourceInformationComponent', () => {

it('should initialize with default values', () => {
expect(component.readonly()).toBe(false);
expect(component.languageOnly()).toBe(false);
});

it('should set customItemMetadata input', () => {
fixture.componentRef.setInput('customItemMetadata', mockCustomItemMetadata);
fixture.detectChanges();

expect(component.customItemMetadata()).toEqual(mockCustomItemMetadata);
});

Expand All @@ -51,13 +51,13 @@ describe('MetadataResourceInformationComponent', () => {
expect(component.readonly()).toBe(true);
});

it('should set disabled inputs', () => {
it('should disable edit button when disabled', () => {
fixture.componentRef.setInput('disabled', true);
fixture.componentRef.setInput('disabledButtonTooltip', 'Editing is disabled');
fixture.detectChanges();

expect(component.disabled()).toBe(true);
expect(component.disabledButtonTooltip()).toBe('Editing is disabled');
const editButton = fixture.debugElement.query(By.css('[data-test-edit-resource-information-button]'));

expect(editButton.componentInstance.disabled).toBe(true);
});

it('should emit openEditResourceInformationDialog event', () => {
Expand All @@ -67,4 +67,12 @@ describe('MetadataResourceInformationComponent', () => {

expect(emitSpy).toHaveBeenCalled();
});

it('should emit showResourceInfo event', () => {
const emitSpy = vi.spyOn(component.showResourceInfo, 'emit');

component.showResourceInfo.emit();

expect(emitSpy).toHaveBeenCalled();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import { BaseMetadataComponent } from '../base-metadata.component';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MetadataResourceInformationComponent extends BaseMetadataComponent {
openEditResourceInformationDialog = output<void>();
readonly customItemMetadata = input.required<CustomItemMetadataRecord | null>();
readonly readonly = input<boolean>(false);
readonly languageOnly = input<boolean>(false);

customItemMetadata = input.required<CustomItemMetadataRecord | null>();
readonly = input<boolean>(false);
showResourceInfo = output<void>();
readonly openEditResourceInformationDialog = output<void>();
readonly showResourceInfo = output<void>();
}
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<form [formGroup]="resourceForm" (ngSubmit)="save()" class="flex flex-column gap-4">
<div class="flex flex-column gap-2">
<label for="resourceType">
{{ 'files.detail.resourceMetadata.fields.resourceType' | translate }}
</label>
@if (!languageOnly) {
<div class="flex flex-column gap-2">
<label for="resourceType">
{{ 'files.detail.resourceMetadata.fields.resourceType' | translate }}
</label>

<p-select
id="resourceType"
class="w-full"
appendTo="body"
data-test-select-resource-type
[formControl]="resourceForm.controls.resourceType"
[options]="resourceTypeOptions"
optionLabel="label"
optionValue="value"
[placeholder]="'common.buttons.select' | translate"
/>
</div>
<p-select
id="resourceType"
class="w-full"
appendTo="body"
data-test-select-resource-type
[formControl]="resourceForm.controls.resourceType"
[options]="resourceTypeOptions"
optionLabel="label"
optionValue="value"
[placeholder]="'common.buttons.select' | translate"
/>
</div>
}

<div class="flex flex-column gap-2">
<label for="resourceLanguage">
Expand All @@ -28,7 +30,7 @@
data-test-select-resource-language
appendTo="body"
[filter]="true"
filterBy="label"
filterBy="name"
[formControl]="resourceForm.controls.resourceLanguage"
[options]="languageOptions"
optionLabel="name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';

import { ComponentFixture, TestBed } from '@angular/core/testing';

import { STUDY_REGISTRATION_RESOURCE_TYPE } from '@osf/shared/constants/resource-type-general-options.const';

import { provideOSFCore } from '@testing/osf.testing.provider';
import { provideDynamicDialogRefMock } from '@testing/providers/dynamic-dialog-ref.mock';

Expand All @@ -13,33 +15,49 @@ describe('ResourceInformationDialogComponent', () => {
let component: ResourceInformationDialogComponent;
let fixture: ComponentFixture<ResourceInformationDialogComponent>;
let dialogRef: DynamicDialogRef;
let config: DynamicDialogConfig;

beforeEach(() => {
interface SetupOverrides {
customItemMetadata?: {
resourceTypeGeneral?: string;
language?: string;
};
languageOnly?: boolean;
}

function setup(overrides: SetupOverrides = {}) {
TestBed.configureTestingModule({
imports: [ResourceInformationDialogComponent],
providers: [provideOSFCore(), provideDynamicDialogRefMock(), MockProvider(DynamicDialogConfig)],
providers: [
provideOSFCore(),
provideDynamicDialogRefMock(),
MockProvider(DynamicDialogConfig, {
data: {
customItemMetadata: overrides.customItemMetadata,
languageOnly: overrides.languageOnly ?? false,
},
}),
],
});

dialogRef = TestBed.inject(DynamicDialogRef);
fixture = TestBed.createComponent(ResourceInformationDialogComponent);
component = fixture.componentInstance;
dialogRef = TestBed.inject(DynamicDialogRef);
config = TestBed.inject(DynamicDialogConfig);
});
fixture.detectChanges();
}

it('should create', () => {
setup();

expect(component).toBeTruthy();
});

it('should patch form values on init when metadata is provided', () => {
config.data = {
setup({
customItemMetadata: {
resourceTypeGeneral: 'Dataset',
language: 'eng',
},
};

component.ngOnInit();
});

expect(component.resourceForm.getRawValue()).toEqual({
resourceType: 'Dataset',
Expand All @@ -48,17 +66,33 @@ describe('ResourceInformationDialogComponent', () => {
});

it('should keep default empty values on init when metadata is not provided', () => {
config.data = {};

component.ngOnInit();
setup();

expect(component.resourceForm.getRawValue()).toEqual({
resourceType: '',
resourceLanguage: '',
});
});

it('should default resource type to StudyRegistration when languageOnly', () => {
setup({
languageOnly: true,
customItemMetadata: {
resourceTypeGeneral: 'Dataset',
language: 'eng',
},
});

expect(component.languageOnly).toBe(true);
expect(component.resourceForm.getRawValue()).toEqual({
resourceType: STUDY_REGISTRATION_RESOURCE_TYPE,
resourceLanguage: 'eng',
});
});

it('should close dialog with mapped payload on save when form is valid', () => {
setup();

component.resourceForm.setValue({
resourceType: 'JournalArticle',
resourceLanguage: 'deu',
Expand All @@ -72,7 +106,25 @@ describe('ResourceInformationDialogComponent', () => {
});
});

it('should close dialog with StudyRegistration resource type when languageOnly', () => {
setup({ languageOnly: true });

component.resourceForm.setValue({
resourceType: 'Dataset',
resourceLanguage: 'deu',
});

component.save();

expect(dialogRef.close).toHaveBeenCalledWith({
resourceTypeGeneral: STUDY_REGISTRATION_RESOURCE_TYPE,
language: 'deu',
});
});

it('should close dialog without payload on cancel', () => {
setup();

component.cancel();

expect(dialogRef.close).toHaveBeenCalledWith();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/cor
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';

import { LANGUAGE_CODES } from '@osf/shared/constants/language.const';
import { RESOURCE_TYPE_GENERAL_OPTIONS } from '@osf/shared/constants/resource-type-general-options.const';
import {
RESOURCE_TYPE_GENERAL_OPTIONS,
STUDY_REGISTRATION_RESOURCE_TYPE,
} from '@osf/shared/constants/resource-type-general-options.const';

import { ResourceInformationForm } from '../../models';

Expand All @@ -19,8 +22,9 @@ import { ResourceInformationForm } from '../../models';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class ResourceInformationDialogComponent implements OnInit {
dialogRef = inject(DynamicDialogRef);
config = inject(DynamicDialogConfig);
readonly dialogRef = inject(DynamicDialogRef);
readonly config = inject(DynamicDialogConfig);
readonly languageOnly = !!this.config.data?.languageOnly;

resourceForm = new FormGroup<ResourceInformationForm>({
resourceType: new FormControl(''),
Expand All @@ -33,18 +37,16 @@ export class ResourceInformationDialogComponent implements OnInit {
ngOnInit(): void {
const metadata = this.config.data?.customItemMetadata;

if (metadata) {
this.resourceForm.patchValue({
resourceType: metadata.resourceTypeGeneral || '',
resourceLanguage: metadata.language || '',
});
}
this.resourceForm.patchValue({
resourceType: this.languageOnly ? STUDY_REGISTRATION_RESOURCE_TYPE : metadata?.resourceTypeGeneral || '',
resourceLanguage: metadata?.language || '',
});
}

save(): void {
const formValue = this.resourceForm.getRawValue();
this.dialogRef.close({
resourceTypeGeneral: formValue.resourceType,
resourceTypeGeneral: this.languageOnly ? STUDY_REGISTRATION_RESOURCE_TYPE : formValue.resourceType,
language: formValue.resourceLanguage,
});
}
Expand Down
Loading
Loading