From d324f7f67122885735d77537d7f687e36cffa6e0 Mon Sep 17 00:00:00 2001 From: nsemets Date: Wed, 10 Dec 2025 16:13:34 +0200 Subject: [PATCH 1/5] fix(cedar-template): fixed import of cedar library --- .../cedar-template-form.component.ts | 27 +++++++++---------- src/main.ts | 2 ++ 2 files changed, 15 insertions(+), 14 deletions(-) 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 16a562e69..4faf1a9cd 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 @@ -26,7 +26,6 @@ import { ActivatedRoute } from '@angular/router'; import { ENVIRONMENT } from '@core/provider/environment.provider'; import 'cedar-artifact-viewer'; -import 'cedar-embeddable-editor'; import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '../../constants'; import { CedarMetadataHelper } from '../../helpers'; @@ -71,6 +70,8 @@ export class CedarTemplateFormComponent { readonly downloadUrl = signal(''); readonly schemaName = signal(''); + readonly fileGuid = toSignal(this.route.params.pipe(map((params) => params['fileGuid'])) ?? of(undefined)); + shareItems = [ { label: 'files.detail.actions.share.email', @@ -123,7 +124,17 @@ export class CedarTemplateFormComponent { this.validateCedarMetadata(); } - readonly fileGuid = toSignal(this.route.params.pipe(map((params) => params['fileGuid'])) ?? of(undefined)); + private initializeFormData(): void { + const template = this.template()?.attributes?.template; + if (!template) return; + const metadata = this.existingRecord()?.attributes?.metadata; + if (this.existingRecord()) { + const structuredMetadata = CedarMetadataHelper.buildStructuredMetadata(metadata); + this.formData.set(structuredMetadata); + } else { + this.formData.set(CedarMetadataHelper.buildEmptyMetadata()); + } + } downloadMetadadaRecord() { if (this.fileGuid()) { @@ -174,18 +185,6 @@ export class CedarTemplateFormComponent { } } - private initializeFormData(): void { - const template = this.template()?.attributes?.template; - if (!template) return; - const metadata = this.existingRecord()?.attributes?.metadata; - if (this.existingRecord()) { - const structuredMetadata = CedarMetadataHelper.buildStructuredMetadata(metadata); - this.formData.set(structuredMetadata); - } else { - this.formData.set(CedarMetadataHelper.buildEmptyMetadata()); - } - } - handleEmailShare(): void { const url = window.location.href; window.location.href = `mailto:?subject=${this.schemaName()}&body=${url}`; diff --git a/src/main.ts b/src/main.ts index e005d74a2..1285e5af0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,6 +3,8 @@ import { bootstrapApplication } from '@angular/platform-browser'; import { AppComponent } from '@osf/app.component'; import { appConfig } from '@osf/app.config'; +import 'cedar-embeddable-editor'; + bootstrapApplication(AppComponent, { providers: [...appConfig.providers], }).catch((err) => From c903b2e0529f171d798f16a3eeab6f8db224183d Mon Sep 17 00:00:00 2001 From: nsemets Date: Wed, 10 Dec 2025 19:28:28 +0200 Subject: [PATCH 2/5] fix(cedar-import): updated import for viewer --- .../cedar-template-form/cedar-template-form.component.ts | 2 -- src/main.ts | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) 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 4faf1a9cd..96891e1e6 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 @@ -25,8 +25,6 @@ import { ActivatedRoute } from '@angular/router'; import { ENVIRONMENT } from '@core/provider/environment.provider'; -import 'cedar-artifact-viewer'; - import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '../../constants'; import { CedarMetadataHelper } from '../../helpers'; import { diff --git a/src/main.ts b/src/main.ts index 1285e5af0..f2cc9c774 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,7 @@ import { AppComponent } from '@osf/app.component'; import { appConfig } from '@osf/app.config'; import 'cedar-embeddable-editor'; +import 'cedar-artifact-viewer'; bootstrapApplication(AppComponent, { providers: [...appConfig.providers], From a981be2b7a4824d7cddf364c873634839c5b8d7e Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 11 Dec 2025 16:46:15 +0200 Subject: [PATCH 3/5] fix(cedar): fixed cedar styles --- angular.json | 1 + .../cedar-template-form/cedar-template-form.component.ts | 2 ++ src/styles/styles.scss | 5 ----- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/angular.json b/angular.json index 5108d40ce..351627358 100644 --- a/angular.json +++ b/angular.json @@ -50,6 +50,7 @@ "styles": [ "src/styles/styles.scss", "node_modules/primeflex/primeflex.css", + "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css" ], "stylePreprocessorOptions": { 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 96891e1e6..4faf1a9cd 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 @@ -25,6 +25,8 @@ import { ActivatedRoute } from '@angular/router'; import { ENVIRONMENT } from '@core/provider/environment.provider'; +import 'cedar-artifact-viewer'; + import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '../../constants'; import { CedarMetadataHelper } from '../../helpers'; import { diff --git a/src/styles/styles.scss b/src/styles/styles.scss index a51b536b8..f192f1d5d 100644 --- a/src/styles/styles.scss +++ b/src/styles/styles.scss @@ -7,11 +7,6 @@ @use "base"; @use "icons"; -@use "@fortawesome/fontawesome-free/scss/fontawesome.scss"; -@use "@fortawesome/fontawesome-free/scss/solid.scss"; -@use "@fortawesome/fontawesome-free/scss/brands.scss"; -@use "@fortawesome/fontawesome-free/scss/regular.scss"; - @use "./components/md-editor"; @use "./components/preprints"; @use "./components/collections"; From 08efaad68fbaa63e4d0c9d9de1d8ca7cb77086d2 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 11 Dec 2025 16:50:50 +0200 Subject: [PATCH 4/5] fix(cedar): removed import --- src/main.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index f2cc9c774..1285e5af0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,7 +4,6 @@ import { AppComponent } from '@osf/app.component'; import { appConfig } from '@osf/app.config'; import 'cedar-embeddable-editor'; -import 'cedar-artifact-viewer'; bootstrapApplication(AppComponent, { providers: [...appConfig.providers], From 6c8b06a34ef9749397a3243b6f1635dce0bc2763 Mon Sep 17 00:00:00 2001 From: nsemets Date: Thu, 11 Dec 2025 17:20:03 +0200 Subject: [PATCH 5/5] fix(cedar): returned import --- .../cedar-template-form/cedar-template-form.component.ts | 2 -- src/main.ts | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) 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 4faf1a9cd..96891e1e6 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 @@ -25,8 +25,6 @@ import { ActivatedRoute } from '@angular/router'; import { ENVIRONMENT } from '@core/provider/environment.provider'; -import 'cedar-artifact-viewer'; - import { CEDAR_CONFIG, CEDAR_VIEWER_CONFIG } from '../../constants'; import { CedarMetadataHelper } from '../../helpers'; import { diff --git a/src/main.ts b/src/main.ts index 1285e5af0..f2cc9c774 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,7 @@ import { AppComponent } from '@osf/app.component'; import { appConfig } from '@osf/app.config'; import 'cedar-embeddable-editor'; +import 'cedar-artifact-viewer'; bootstrapApplication(AppComponent, { providers: [...appConfig.providers],