From b36db9c05ef28af32305f0fe071c5079b311427e Mon Sep 17 00:00:00 2001 From: Andriy Sheredko Date: Thu, 19 Nov 2026 16:40:48 +0200 Subject: [PATCH 1/2] fix(collections): keep cedar metadata published after editing a section --- ...collection-metadata-step.component.spec.ts | 55 ++++++++++++++++++- .../collection-metadata-step.component.ts | 15 ++++- .../models/cedar-editor-element.model.ts | 4 ++ 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts index 0a65b99f0..1984d047c 100644 --- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts +++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.spec.ts @@ -4,7 +4,11 @@ import { Step, StepItem, StepPanel } from 'primeng/stepper'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { CedarMetadataRecordModel, CedarMetadataTemplateModel } from '@osf/features/metadata/models'; +import { + CedarEditorElement, + CedarMetadataRecordModel, + CedarMetadataTemplateModel, +} from '@osf/features/metadata/models'; import { MOCK_CEDAR_RECORD } from '@testing/data/collections/cedar-metadata.mock'; import { MOCK_CEDAR_METADATA_TEMPLATE } from '@testing/mocks/cedar-metadata-domain.mock'; @@ -26,6 +30,7 @@ describe('CollectionMetadataStepComponent', () => { stepperActiveValue?: number; targetStepValue?: number; isDisabled?: boolean; + editor?: CedarEditorElement; } = {} ) { TestBed.configureTestingModule({ @@ -36,6 +41,10 @@ describe('CollectionMetadataStepComponent', () => { fixture = TestBed.createComponent(CollectionMetadataStepComponent); component = fixture.componentInstance; + if (options.editor) { + vi.spyOn(component, 'cedarEditor').mockReturnValue({ nativeElement: options.editor } as never); + } + fixture.componentRef.setInput('stepperActiveValue', options.stepperActiveValue ?? 0); fixture.componentRef.setInput('targetStepValue', options.targetStepValue ?? 1); fixture.componentRef.setInput('isDisabled', options.isDisabled ?? false); @@ -121,6 +130,50 @@ describe('CollectionMetadataStepComponent', () => { expect(component.cedarFormData()).toEqual({ field: 'value' }); }); + it('should load template and existing record metadata together when step opens', () => { + const editor = {} as CedarEditorElement; + setup({ + cedarTemplate: mockCedarTemplate, + existingCedarRecord: MOCK_CEDAR_RECORD, + stepperActiveValue: 1, + editor, + }); + + expect(editor.templateAndInstanceObject).toEqual({ + templateObject: mockCedarTemplate.template, + instanceObject: { field: 'value' }, + }); + expect(editor.instanceObject).toBeUndefined(); + }); + + it('should load saved metadata together with template when step is reopened', () => { + const editor = {} as CedarEditorElement; + setup({ cedarTemplate: mockCedarTemplate, editor }); + + component.cedarFormData.set({ field: 'saved' }); + component.collectionMetadataSaved.set(true); + fixture.componentRef.setInput('stepperActiveValue', 1); + fixture.detectChanges(); + + expect(editor.templateAndInstanceObject).toEqual({ + templateObject: mockCedarTemplate.template, + instanceObject: { field: 'saved' }, + }); + }); + + it('should load existing record metadata together with template on discard', () => { + const editor = {} as CedarEditorElement; + setup({ cedarTemplate: mockCedarTemplate, existingCedarRecord: MOCK_CEDAR_RECORD, editor }); + + component.cedarFormData.set({ field: 'edited' }); + component.handleDiscardChanges(); + + expect(editor.templateAndInstanceObject).toEqual({ + templateObject: mockCedarTemplate.template, + instanceObject: { field: 'value' }, + }); + }); + it('should populate cedarFormData from existingCedarRecord', () => { setup({ cedarTemplate: mockCedarTemplate, diff --git a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts index d383908ec..5736ae540 100644 --- a/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts +++ b/src/app/features/collections/components/add-to-collection/collection-metadata-step/collection-metadata-step.component.ts @@ -69,7 +69,7 @@ export class CollectionMetadataStepComponent { handleDiscardChanges() { const record = this.existingCedarRecord(); this.cedarFormData.set(record?.metadata ? (record.metadata as Record) : {}); - this.syncCedarInstance(this.cedarEditor()?.nativeElement); + this.syncCedarEditor(); this.collectionMetadataSaved.set(false); } @@ -124,7 +124,7 @@ export class CollectionMetadataStepComponent { if (!record?.metadata && !saved) return; - this.syncCedarInstance(this.cedarEditor()?.nativeElement); + this.syncCedarEditor(); }); effect(() => { @@ -133,6 +133,17 @@ export class CollectionMetadataStepComponent { }); } + private syncCedarEditor(): void { + const editor = this.cedarEditor()?.nativeElement; + const template = this.cedarTemplate()?.template; + if (editor && template) { + editor.templateAndInstanceObject = { + templateObject: template, + instanceObject: untracked(() => this.cedarFormData()), + }; + } + } + private syncCedarInstance(element: CedarEditorElement | undefined): void { if (element) { element.instanceObject = untracked(() => this.cedarFormData()); diff --git a/src/app/features/metadata/models/cedar-editor-element.model.ts b/src/app/features/metadata/models/cedar-editor-element.model.ts index 1bba87eac..5cdfdf014 100644 --- a/src/app/features/metadata/models/cedar-editor-element.model.ts +++ b/src/app/features/metadata/models/cedar-editor-element.model.ts @@ -1,6 +1,10 @@ export interface CedarEditorElement extends HTMLElement { currentMetadata?: unknown; instanceObject?: unknown; + templateAndInstanceObject?: { + templateObject: unknown; + instanceObject: unknown; + }; dataQualityReport?: { isValid: boolean; }; From 5d94a5ccb6284a0bb87585265a88e9d03d37ed21 Mon Sep 17 00:00:00 2001 From: Andriy Sheredko Date: Thu, 19 Nov 2026 16:57:36 +0200 Subject: [PATCH 2/2] fix(metadata): keep cedar record published after editing it --- .../cedar-template-form.component.spec.ts | 42 +++++++++++++++++++ .../cedar-template-form.component.ts | 4 +- src/assets/i18n/en.json | 1 + 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts index 83bc459ae..72965fa3a 100644 --- a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts +++ b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.spec.ts @@ -4,6 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { CedarMetadataHelper } from '@osf/features/metadata/helpers'; +import { CedarEditorElement } from '@osf/features/metadata/models'; import { MOCK_CEDAR_METADATA_RECORD, MOCK_CEDAR_METADATA_TEMPLATE } from '@testing/mocks/cedar-metadata-domain.mock'; import { provideOSFCore } from '@testing/osf.testing.provider'; @@ -102,4 +103,45 @@ describe('CedarTemplateFormComponent', () => { expect(component.formData()).toEqual(initialFormData); }); + + it('should load template and record metadata together into the editor', () => { + const editor = {} as CedarEditorElement; + vi.spyOn(component, 'cedarEditor').mockReturnValue({ nativeElement: editor } as never); + + fixture.componentRef.setInput('existingRecord', mockRecord); + fixture.detectChanges(); + + expect(editor.templateAndInstanceObject).toEqual({ + templateObject: mockTemplate.template, + instanceObject: mockRecord.metadata, + }); + expect(editor.instanceObject).toBeUndefined(); + }); + + it('should publish on submit when the editor report is valid', () => { + const editor = { + currentMetadata: { field: 'value' }, + dataQualityReport: { isValid: true }, + } as unknown as CedarEditorElement; + vi.spyOn(component, 'cedarEditor').mockReturnValue({ nativeElement: editor } as never); + const emitSpy = vi.spyOn(component.emitData, 'emit'); + component.isValid = false; + + component.onSubmit(); + + expect(emitSpy).toHaveBeenCalledWith({ data: { field: 'value' }, id: mockTemplate.id, isPublished: true }); + }); + + it('should save as draft on submit when the editor report is not valid', () => { + const editor = { + currentMetadata: { field: 'value' }, + dataQualityReport: { isValid: false }, + } as unknown as CedarEditorElement; + vi.spyOn(component, 'cedarEditor').mockReturnValue({ nativeElement: editor } as never); + const emitSpy = vi.spyOn(component.emitData, 'emit'); + + component.onSubmit(); + + expect(emitSpy).toHaveBeenCalledWith({ data: { field: 'value' }, id: mockTemplate.id, isPublished: false }); + }); }); diff --git a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts index 3072ae81d..9764a686f 100644 --- a/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts +++ b/src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts @@ -113,7 +113,8 @@ export class CedarTemplateFormComponent { this.initializeFormData(); if (metadata) { - if (editor) editor.instanceObject = metadata; + const template = this.template()?.template; + if (editor && template) editor.templateAndInstanceObject = { templateObject: template, instanceObject: metadata }; if (viewer) viewer.instanceObject = metadata; } @@ -182,6 +183,7 @@ export class CedarTemplateFormComponent { onSubmit() { const editor = this.cedarEditor()?.nativeElement; if (editor && typeof editor.currentMetadata !== 'undefined') { + this.validateCedarMetadata(); const finalData = { data: editor.currentMetadata, id: this.template().id, isPublished: this.isValid }; this.formData.set(finalData); this.emitData.emit(finalData as CedarRecordDataBinding); diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index d741af54c..7f80fe1ea 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1827,6 +1827,7 @@ "publishedText": "This metadata has a status of 'Published' and is publicly viewable.", "recordCreatedSuccessfully": "Record created successfully", "recordUpdatedSuccessfully": "Record updated successfully", + "saveDraft": "Save draft", "select": "Select", "selectTemplate": "Select a Metadata Template", "title": "Add community metadata record",