Merge tag '25.4.3' into develop

CEDAR Metadata fixes

Author: brianjgeiger

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": {

src/app/features/metadata/components/cedar-template-form/cedar-template-form.component.ts

@@ -25,9 +25,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';
 import {
@@ -71,6 +68,8 @@ export class CedarTemplateFormComponent {
   readonly downloadUrl = signal<string>('');
   readonly schemaName = signal<string>('');
 
+  readonly fileGuid = toSignal(this.route.params.pipe(map((params) => params['fileGuid'])) ?? of(undefined));
+
   shareItems = [
     {
       label: 'files.detail.actions.share.email',
@@ -123,7 +122,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 +183,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}`;

src/main.ts

@@ -3,6 +3,9 @@ import { bootstrapApplication } from '@angular/platform-browser';
 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],
 }).catch((err) =>

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";