From 17e778b635d8c1378c87316104612422034ee3e4 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 19 Nov 2026 13:18:24 +0200 Subject: [PATCH 1/2] fix(metadata): updated logic for resource information --- ...tadata-resource-information.component.html | 56 +++-- ...ata-resource-information.component.spec.ts | 26 ++- ...metadata-resource-information.component.ts | 9 +- ...resource-information-dialog.component.html | 36 ++-- ...ource-information-dialog.component.spec.ts | 78 +++++-- .../resource-information-dialog.component.ts | 22 +- .../resource-tooltip-info.component.spec.ts | 20 +- .../resource-tooltip-info.component.ts | 6 +- .../features/metadata/metadata.component.html | 201 +++++++++--------- .../metadata/metadata.component.spec.ts | 148 +++++++------ .../features/metadata/metadata.component.ts | 136 +++++------- .../resource-type-general-options.const.ts | 5 +- src/assets/i18n/en.json | 4 +- 13 files changed, 406 insertions(+), 341 deletions(-) diff --git a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.html b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.html index 078aa4f40..ea63b8124 100644 --- a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.html +++ b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.html @@ -1,14 +1,24 @@ +@let language = customItemMetadata()?.language; +@let resourceTypeGeneral = customItemMetadata()?.resourceTypeGeneral; +

- {{ 'project.overview.metadata.resourceInformation' | translate }} - + {{ + (languageOnly() + ? 'project.overview.metadata.resourceLanguage' + : 'project.overview.metadata.resourceInformation' + ) | translate + }} + @if (!languageOnly()) { + + }

@if (!readonly()) { @@ -25,17 +35,29 @@

- @if (customItemMetadata()?.resourceTypeGeneral || customItemMetadata()?.language) { -
-

- {{ 'project.overview.metadata.resourceType' | translate }}: - {{ customItemMetadata()?.resourceTypeGeneral | resourceTypeGeneralLabel }} -

- + @if (languageOnly()) { + @if (language) {

- {{ 'project.overview.metadata.resourceLanguage' | translate }}: - {{ customItemMetadata()?.language | languageLabel }} + {{ language | languageLabel }}

+ } @else { +

{{ 'project.overview.metadata.languageNotProvided' | translate }}

+ } + } @else if (resourceTypeGeneral || language) { +
+ @if (resourceTypeGeneral) { +

+ {{ 'project.overview.metadata.resourceType' | translate }}: + {{ resourceTypeGeneral | resourceTypeGeneralLabel }} +

+ } + + @if (language) { +

+ {{ 'project.overview.metadata.resourceLanguage' | translate }}: + {{ language | languageLabel }} +

+ }
} @else {

{{ 'project.overview.metadata.noResourceInformation' | translate }}

diff --git a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.spec.ts b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.spec.ts index 8d4d8885b..aeceff0b3 100644 --- a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.spec.ts +++ b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.spec.ts @@ -1,4 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; import { CustomItemMetadataRecord } from '@osf/features/metadata/models'; @@ -12,7 +13,7 @@ describe('MetadataResourceInformationComponent', () => { const mockCustomItemMetadata: CustomItemMetadataRecord = { language: 'eng', - resourceTypeGeneral: 'dataset', + resourceTypeGeneral: 'Dataset', funders: [], }; @@ -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', () => { @@ -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); }); @@ -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', () => { @@ -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(); + }); }); diff --git a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts index 3c1625878..9c6bf4f41 100644 --- a/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts +++ b/src/app/features/metadata/components/metadata-resource-information/metadata-resource-information.component.ts @@ -19,9 +19,10 @@ import { BaseMetadataComponent } from '../base-metadata.component'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class MetadataResourceInformationComponent extends BaseMetadataComponent { - openEditResourceInformationDialog = output(); + readonly customItemMetadata = input.required(); + readonly readonly = input(false); + readonly languageOnly = input(false); - customItemMetadata = input.required(); - readonly = input(false); - showResourceInfo = output(); + readonly openEditResourceInformationDialog = output(); + readonly showResourceInfo = output(); } diff --git a/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html b/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html index 406d870f6..da586db21 100644 --- a/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html +++ b/src/app/features/metadata/dialogs/resource-information-dialog/resource-information-dialog.component.html @@ -1,21 +1,23 @@
-
- + @if (!languageOnly) { +
+ - -
+ +
+ }