Merge branch 'release/25.14.0'

Author: adlius

CHANGELOG.md

@@ -4,6 +4,11 @@ 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.14.0] - 2025-08-01
+### Added
+- Misc. improvements
+
 ## [25.13.0] - 2025-07-08
 ### Added
 - Verified Resource Linking project release - FE

app/decorators/check-auth.ts

@@ -37,10 +37,12 @@ export default function checkAuth<T extends ConcreteSubclass<Route>>(
             // Need to handle view-only links before checking auth, and this is the only reasonable place to do it.
             // This limitation points toward replacing this decorator with a service method meant to be
             // called in Route.beforeModel. Decorator mixins should probably be considered an anti-pattern.
-            const { viewOnlyToken = '' } = this.paramsFor('application') as Record<string, string>;
+            let { viewOnlyToken = '' } = this.paramsFor('application') as Record<string, string>;
 
             try {
                 if (!this.session.isAuthenticated || this.currentUser.viewOnlyToken !== viewOnlyToken) {
+                    // This is for ENG-8174 where occasionally a %2F or / is at the end of the viewOnlyToken
+                    viewOnlyToken = viewOnlyToken.replace(/(%2[fF]|\/)$/g, '');
                     this.currentUser.setProperties({ viewOnlyToken });
 
                     // Check whether user is actually logged in.

app/preprints/-components/preprint-metrics/component.ts

@@ -0,0 +1,48 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { task } from 'ember-concurrency';
+import { waitFor } from '@ember/test-waiters';
+import { taskFor } from 'ember-concurrency-ts';
+import Store from '@ember-data/store';
+import config from 'ember-osf-web/config/environment';
+import { BaseMeta } from 'osf-api';
+
+
+interface InputArgs {
+    guid: string;
+}
+
+export default class PreprintMetrics extends Component<InputArgs> {
+    @service store!: Store;
+    @tracked apiMeta!: BaseMeta;
+
+    metricsStartDate = config.OSF.metricsStartDate;
+
+    constructor(owner: unknown, args: InputArgs) {
+        super(owner, args);
+
+        taskFor(this.loadPreprintMetrics).perform();
+    }
+
+    @task
+    @waitFor
+    private async loadPreprintMetrics()  {
+        try {
+            const adapterOptions = Object({
+                query: {
+                    'metrics[views]': 'total',
+                    'metrics[downloads]': 'total',
+                },
+            });
+
+            const preprintMetrics = await this.store.findRecord('preprint', this.args.guid, {
+                reload: true,
+                adapterOptions,
+            });
+
+            this.apiMeta = preprintMetrics.apiMeta;
+        // eslint-disable-next-line
+        } catch (_){ }
+    }
+}

app/preprints/-components/preprint-metrics/template.hbs

@@ -0,0 +1,17 @@
+<div>
+    {{#if this.loadPreprintMetrics.isRunning}}
+        <LoadingIndicator data-test-loading-indicator @dark={{true}} />
+    {{else}} 
+        <span data-test-view-count-label>
+            {{t 'preprints.detail.share.views'}}:
+        </span>
+        <span data-test-view-count> {{this.apiMeta.metrics.views}} </span> |
+        <span data-test-download-count-label>
+            {{t 'preprints.detail.share.downloads'}}:
+        </span>
+        <span data-test-download-count>{{this.apiMeta.metrics.downloads}}</span>
+        <EmberTooltip>
+            {{t 'preprints.detail.share.metrics_disclaimer'}} {{moment-format this.metricsStartDate 'YYYY-MM-DD'}}
+        </EmberTooltip>
+    {{/if}}
+</div>

app/preprints/-components/preprint-status-banner/component.ts

@@ -22,6 +22,8 @@ const WITHDRAWN = 'withdrawn';
 const PRE_MODERATION = 'pre-moderation';
 const POST_MODERATION = 'post-moderation';
 
+const PROVIDER_OSF = 'provider-osf';
+
 const STATUS = Object({});
 STATUS[PENDING]= 'preprints.detail.status_banner.pending';
 STATUS[ACCEPTED]= 'preprints.detail.status_banner.accepted';
@@ -30,6 +32,7 @@ STATUS[PENDING_WITHDRAWAL]= 'preprints.detail.status_banner.pending_withdrawal';
 STATUS[WITHDRAWAL_REJECTED]= 'preprints.detail.status_banner.withdrawal_rejected';
 
 const MESSAGE = Object({});
+MESSAGE[PROVIDER_OSF] =  'preprints.detail.status_banner.message.provider_osf';
 MESSAGE[PRE_MODERATION] =  'preprints.detail.status_banner.message.pending_pre';
 MESSAGE[POST_MODERATION] =  'preprints.detail.status_banner.message.pending_post';
 MESSAGE[ACCEPTED] =  'preprints.detail.status_banner.message.accepted';
@@ -45,6 +48,7 @@ WORKFLOW[POST_MODERATION] = 'preprints.detail.status_banner.post_moderation';
 WORKFLOW[UNKNOWN] = 'preprints.detail.status_banner.post_moderation';
 
 const CLASS_NAMES = Object({});
+CLASS_NAMES[PROVIDER_OSF] = 'preprint-status-pending-pre';
 CLASS_NAMES[PRE_MODERATION] = 'preprint-status-pending-pre';
 CLASS_NAMES[POST_MODERATION] =  'preprint-status-pending-post';
 CLASS_NAMES[ACCEPTED] =  'preprint-status-accepted';
@@ -68,6 +72,7 @@ interface InputArgs {
     provider: PreprintProviderModel;
     latestWithdrawalRequest: PreprintRequestModel | null;
     latestAction: PreprintRequestActionModel | ReviewActionModel | null;
+    isOSFBanner: boolean | null;
 }
 
 export default class PreprintStatusBanner extends Component<InputArgs>{
@@ -104,7 +109,9 @@ export default class PreprintStatusBanner extends Component<InputArgs>{
     }
 
     public get getClassName(): string {
-        if (this.isPendingWithdrawal) {
+        if (this.args.isOSFBanner) {
+            return CLASS_NAMES[PROVIDER_OSF];
+        } else if (this.isPendingWithdrawal) {
             return CLASS_NAMES[PENDING_WITHDRAWAL];
         } else if (this.isWithdrawn) {
             return CLASS_NAMES[WITHDRAWN];
@@ -119,7 +126,12 @@ export default class PreprintStatusBanner extends Component<InputArgs>{
 
     public get bannerContent(): string {
         const { provider } = this.args;
-        if (this.isPendingWithdrawal) {
+        if (this.args.isOSFBanner) {
+            return this.intl.t(MESSAGE[PROVIDER_OSF], {
+                name: 'OSF',
+                documentType: provider.documentType.plural,
+            });
+        } else if (this.isPendingWithdrawal) {
             return this.intl.t(this.statusExplanation, { documentType: provider.documentType.singular });
         } else if (this.isWithdrawn) {
             return this.intl.t(MESSAGE[WITHDRAWN], { documentType: provider.documentType.singular });

app/preprints/-components/preprint-status-banner/template.hbs

@@ -4,10 +4,14 @@
     {{else}}
         <div local-class='preprint-banner-status {{this.getClassName}}'>
             <div local-class='display-container'>
-                {{#if this.isWithdrawn}}
+                {{#if @isOSFBanner}}
+                    <div>
+                        <strong>{{this.bannerContent}}</strong>
+                    </div>
+                {{else if this.isWithdrawn}}
                     <div>
                         <FaIcon @icon='{{this.icon}}' @prefix='fas' local-class='status-icon' aria-hidden='true'/>
-                        <span local-class='banner-content'>{{this.bannerContent}}</span>
+                        <span>{{this.bannerContent}}</span>
                     </div>
                 {{else}}
                     <div>

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

@@ -68,7 +68,6 @@
                             @manager={{@manager}}
                             @preprint={{@manager.preprint}}
                             @clickableElementId={{id}}
-                            @enable={{true}}
                             @dragEnter={{fn (mut this.dragging) true}}
                             @dragOver={{fn (mut this.dragging) true}}
                             @dragLeave={{fn (mut this.dragging) false}}

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

@@ -30,6 +30,7 @@ export default class PreprintUpload extends Component<PreprintUploadArgs> {
     rootFolder?: FileModel;
     primaryFile: FileModel | undefined;
     @tracked isUploadFileDisplayed = false;
+    @tracked isEnabled = false;
 
     constructor(owner: unknown, args: any) {
         super(owner, args);
@@ -75,6 +76,7 @@ export default class PreprintUpload extends Component<PreprintUploadArgs> {
 
         this.url = new URL( urlString );
         this.rootFolder = rootFolder;
+        this.isEnabled = true;
     }
 
     @action

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

@@ -12,7 +12,7 @@
                 @dragleave={{@dragLeave}}
                 @dragover={{@dragOver}}
                 @drop={{@drop}}
-                @enable={{@enable}}
+                @enable={{this.isEnabled}}
                 @id={{id}}
                 @clickable={{this.clickableElementSelectors}}
                 @preUpload={{perform this.preUpload}}

app/preprints/-components/submit/supplements/component.ts

@@ -69,6 +69,7 @@ export default class Supplements extends Component<SupplementsArgs>{
     @waitFor
     public async removeSelectedProject(): Promise<void> {
         try {
+            this.validate(false);
             await this.args.manager.preprint.removeM2MRelationship('node'); // Remove relationship
             // Remove relationship on the node side, this only clears the cache locally
             this.args.manager.preprint.node.get('preprints')
@@ -89,7 +90,7 @@ export default class Supplements extends Component<SupplementsArgs>{
     }
 
     @action
-    public validate(): void {
-        this.args.manager.validateSupplements(true);
+    public validate(isValid = true): void {
+        this.args.manager.validateSupplements(isValid);
     }
 }