Merge branch 'release/25.09.0'

Author: brianjgeiger

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [25.09.0] - 2025-05-02
+### Added
+- Bugfix and Improvements
+
+## [25.08.0] - 2025-04-21
+### Added
+- Bugfix and Improvements
+
 ## [25.07.0] - 2025-04-07
 ### Added
 - Bugfix and Improvements

app/guid-file/route.ts

@@ -26,6 +26,7 @@ import S3File from 'ember-osf-web/packages/files/s3-file';
 import CurrentUserService from 'ember-osf-web/services/current-user';
 import RegistrationModel from 'ember-osf-web/models/registration';
 import CustomFileMetadataRecordModel from 'ember-osf-web/models/custom-file-metadata-record';
+import ContributorModel from 'ember-osf-web/models/contributor';
 
 export default class GuidFile extends Route {
     @service('head-tags') headTagsService!: HeadTagsService;
@@ -45,6 +46,7 @@ export default class GuidFile extends Route {
         const dateCreated = model.dateCreated;
         const dateModified = model.dateModified;
         const institutions = await model.target.get('affiliatedInstitutions');
+        const contributors = await model.target.get('bibliographicContributors');
         const metaTagsData = {
             title: this.metadata.title ? this.metadata.title : model.name,
             identifier: model.guid,
@@ -55,6 +57,14 @@ export default class GuidFile extends Route {
                 this.metadata.description :
                 this.intl.t('general.presented_by_osf'),
             language: this.metadata.language ? this.metadata.language : undefined,
+            contributors: (contributors as ContributorModel[]).map(
+                (contrib: ContributorModel) => (
+                    {
+                        givenName: contrib.users.get('givenName'),
+                        familyName: contrib.users.get('familyName'),
+                    }
+                ),
+            ),
         };
         this.set('headTags', this.metaTags.getHeadTags(metaTagsData));
         this.headTagsService.collectHeadTags();

app/models/search-result.ts

@@ -7,18 +7,16 @@ import { languageFromLanguageCode } from 'osf-components/components/file-metadat
 
 import IndexCardModel from './index-card';
 
-const textMatchEvidenceType = 'https://share.osf.io/vocab/2023/trove/TextMatchEvidence';
-
 export interface IriMatchEvidence {
-    '@type': [string];
     matchingIri: string;
     osfmapPropertyPath: string[];
+    propertyPathKey: string;
 }
 
 export interface TextMatchEvidence {
-    '@type': [string];
     matchingHighlight: string;
     osfmapPropertyPath: string[];
+    propertyPathKey: string;
 }
 
 export const CardLabelTranslationKeys = {
@@ -50,9 +48,11 @@ export default class SearchResultModel extends Model {
         if (this.matchEvidence) {
             const matchEvidenceString = this.matchEvidence.reduce(
                 (acc, current) => acc.concat(
-                    `${current.osfmapPropertyPath[0]}: ${current['@type'][0] === textMatchEvidenceType
-                        ? (current as TextMatchEvidence).matchingHighlight
-                        : (current as IriMatchEvidence).matchingIri}; `,
+                    `${current.propertyPathKey}: ${
+                        ('matchingHighlight' in current)
+                            ? current.matchingHighlight
+                            : current.matchingIri
+                    }`,
                 ),
                 '',
             );

app/preprints/-components/submit/file/upload-file/component.ts

@@ -9,6 +9,7 @@ import FileModel from 'ember-osf-web/models/file';
 import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import { taskFor } from 'ember-concurrency-ts';
+import { tracked } from '@glimmer/tracking';
 
 interface PreprintUploadArgs {
     manager: PreprintStateMachine;
@@ -28,6 +29,7 @@ export default class PreprintUpload extends Component<PreprintUploadArgs> {
     url?: URL;
     rootFolder?: FileModel;
     primaryFile: FileModel | undefined;
+    @tracked isUploadFileDisplayed = false;
 
     constructor(owner: unknown, args: any) {
         super(owner, args);
@@ -99,4 +101,11 @@ export default class PreprintUpload extends Component<PreprintUploadArgs> {
         }
         this.args.validate(file);
     }
+
+    @task
+    @waitFor
+    async preUpload(): Promise<void> {
+        this.isUploadFileDisplayed = true;
+    }
+
 }

app/preprints/-components/submit/file/upload-file/template.hbs

@@ -1,4 +1,4 @@
-{{#if (or this.preUrl.isRunning this.success.isRunning)}}
+{{#if (or this.preUrl.isRunning this.success.isRunning this.isUploadFileDisplayed)}}
     <LoadingIndicator data-test-loading-indicator @dark={{true}} />
 {{else}}
     <div ...attributes>
@@ -15,7 +15,7 @@
                 @enable={{@enable}}
                 @id={{id}}
                 @clickable={{this.clickableElementSelectors}}
-                @preUpload={{this.preUpload}}
+                @preUpload={{perform this.preUpload}}
                 @success={{perform this.success}}
             >
                 {{yield}}

app/preprints/detail/route.ts

@@ -14,7 +14,7 @@ import Identifier from 'ember-osf-web/models/identifier';
 import LicenseModel from 'ember-osf-web/models/license';
 import { ReviewsState } from 'ember-osf-web/models/provider';
 import { SparseModel } from 'ember-osf-web/utils/sparse-fieldsets';
-import MetaTags, { HeadTagDef } from 'ember-osf-web/services/meta-tags';
+import MetaTags, { HeadTagDef, MetaTagsData } from 'ember-osf-web/services/meta-tags';
 import Ready from 'ember-osf-web/services/ready';
 import Theme from 'ember-osf-web/services/theme';
 import captureException from 'ember-osf-web/utils/capture-exception';
@@ -63,12 +63,14 @@ export default class PreprintsDetail extends Route {
             const preprint = await this.store.findRecord('preprint', guid, {
                 reload: true,
                 include: embeddableFields,
+                /*
                 adapterOptions: {
                     query: {
                         'metrics[views]': 'total',
                         'metrics[downloads]': 'total',
                     },
                 },
+                */
             });
 
             const provider = await preprint?.get('provider');
@@ -154,7 +156,7 @@ export default class PreprintsDetail extends Route {
             ] = await all([
                 preprint.sparseLoadAll(
                     'bibliographicContributors',
-                    { contributor: ['users', 'index'], user: ['fullName'] },
+                    { contributor: ['users', 'index'], user: ['given_name', 'family_name'] },
                 ),
                 preprint.license,
                 preprint.identifiers,
@@ -180,10 +182,10 @@ export default class PreprintsDetail extends Route {
                 keywords: preprint.tags,
                 siteName: 'OSF',
                 license: license && (license as LicenseModel).name,
-                author: (contributors as SparseModel[]).map(
-                    contrib => (contrib.users as { fullName: string }).fullName,
+                contributors: (contributors as SparseModel[]).map(
+                    (contrib: SparseModel) => (contrib.users as { givenName: string, familyName: string }),
                 ),
-            };
+            } as MetaTagsData;
 
             const allTags: HeadTagDef[] = this.metaTags.getHeadTags(metaTagsData);