Merge branch 'release/25.07.0'

Author: brianjgeiger

CHANGELOG.md

@@ -4,6 +4,10 @@ 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.07.0] - 2025-04-07
+### Added
+- Bugfix and Improvements
+
 ## [25.06.0] - 2025-03-11
 ### Added
 - Bugfix and Improvements - FE Release

app/guid-node/template.hbs

@@ -56,48 +56,6 @@
             />
             {{#if this.onFilesRoute}}
                 <FileProviderMenu @node={{this.model.taskInstance.value}} />
-                {{!-- <div
-                    data-test-file-providers-list
-                    local-class='FileProvidersList'
-                >
-                    {{#each this.model.taskInstance.value.files as |provider|}}
-                        <div local-class='FileProvider'>
-                            <OsfLink
-                                data-test-files-provider-link={{provider.name}}
-                                data-analytics-name={{concat
-                                    'Files - '
-                                    provider.name
-                                }}
-                                @route='guid-node.files.provider'
-                                @models={{array
-                                    this.model.taskInstance.value.id
-                                    provider.name
-                                }}
-                            >
-                                {{t
-                                    (concat
-                                        'osf-components.file-browser.storage_providers.'
-                                        provider.name
-                                    )
-                                }}
-                            </OsfLink>
-                            {{#if (eq provider.name 'osfstorage')}}
-                                <span>
-                                    <FaIcon
-                                        local-class='FileProviderIcon'
-                                        @icon='globe'
-                                    />
-                                    <EmberTooltip @side='right'>
-                                        {{t
-                                            'osf-components.file-browser.storage_location'
-                                        }}
-                                        {{this.model.taskInstance.value.region.name}}
-                                    </EmberTooltip>
-                                </span>
-                            {{/if}}
-                        </div>
-                    {{/each}}
-                </div> --}}
             {{/if}}
             {{#if this.model.taskInstance.value.wikiEnabled}}
                 <leftNav.link

app/models/log.ts

@@ -1,15 +1,91 @@
 import { attr, belongsTo, AsyncBelongsTo } from '@ember-data/model';
+import RegistrationModel from 'ember-osf-web/models/registration';
+import { Link } from 'jsonapi-typescript';
 
 import NodeModel from './node';
 import OsfModel from './osf-model';
-import UserModel from './user';
+import UserModel, { UserLinks } from './user';
+
+export interface LogParamNodeModel {
+    id: string;
+    title: string;
+}
+
+export interface ContributorModel {
+    id: string;
+    fullName: string;
+    active: boolean;
+    unregisteredName?: string;
+  }
+
+export interface LogParamUrls {
+    view: Link;
+    download: Link;
+}
+
+export interface LogParamIdentifiersModel {
+    doi?: string;
+    ark?: string;
+}
+
+export interface LogParamNameUrlModel {
+    name: string;
+    url: string;
+}
+
+export interface LogParamInstitutionModel {
+    id: string;
+    name: string;
+}
+
+export interface LogParamSourceModel {
+    materialized: string;
+    addon: string;
+    url: string;
+}
+
+
+export interface LogParamModel {
+    addon: string;
+    anonymousLink: boolean;
+    contributors: ContributorModel[];
+    destination: LogParamSourceModel;
+    file: LogParamNameUrlModel;
+    githubUser: string;
+    guid: string;
+    identifiers: LogParamIdentifiersModel;
+    institution: LogParamInstitutionModel;
+    kind: string;
+    license: string;
+    pageId: string;
+    page: string;
+    oldPage: string;
+    paramsNode: LogParamNodeModel;
+    paramsProject: string;
+    path: string;
+    pathType: string;
+    pointer: string;
+    preprint: string;
+    preprintProvider: LogParamNameUrlModel;
+    source: LogParamSourceModel;
+    tag: string;
+    titleNew: string;
+    titleOriginal: string;
+    updatedFields: Object;
+    urls: UserLinks;
+    value: string;
+    version: string;
+    wiki: LogParamNameUrlModel;
+}
 
 export default class LogModel extends OsfModel {
     @attr('date') date!: Date;
     @attr('fixstring') action!: string;
-    @attr('object') params!: any;
+    // eslint-disable-next-line
+    // @ts-ignore
+    @attr('object', {snakifyForApi: true}) params!: LogParamModel;
 
-    @belongsTo('node', { inverse: null })
+    @belongsTo('node', { inverse: null})
     node!: AsyncBelongsTo<NodeModel> & NodeModel;
 
     @belongsTo('node', { polymorphic: true, inverse: 'logs' })
@@ -23,6 +99,9 @@ export default class LogModel extends OsfModel {
 
     @belongsTo('node', { inverse: null })
     templateNode!: AsyncBelongsTo<NodeModel> & NodeModel;
+
+    @belongsTo('registration', { inverse: null })
+    linkedRegistration!: AsyncBelongsTo<RegistrationModel> & RegistrationModel;
 }
 
 declare module 'ember-data/types/registries/model' {

app/models/preprint.ts

@@ -129,11 +129,8 @@ export default class PreprintModel extends AbstractNodeModel {
         return this.dateWithdrawn !== null;
     }
 
-    get verifiedDoi(): string {
-        if (this.preprintDoiCreated) {
-            return extractDoi(this.preprintDoiUrl) || '';
-        }
-        return '';
+    get extractedDoi(): string {
+        return extractDoi(this.preprintDoiUrl) || '';
     }
 
     @computed('license', 'licenseRecord')

app/models/user.ts

@@ -54,6 +54,7 @@ const Validations = buildValidations({
 });
 
 export interface UserLinks extends OsfLinks {
+    view: string;
     html: Link;
     profile_image: Link; // eslint-disable-line camelcase
 }

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

@@ -6,6 +6,9 @@ import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import { taskFor } from 'ember-concurrency-ts';
 import NodeModel from 'ember-osf-web/models/node';
+import Toast from 'ember-toastr/services/toast';
+import { inject as service } from '@ember/service';
+import Intl from 'ember-intl/services/intl';
 
 /**
  * The Supplements Args
@@ -18,6 +21,8 @@ interface SupplementsArgs {
  * The Supplements Component
  */
 export default class Supplements extends Component<SupplementsArgs>{
+    @service toast!: Toast;
+    @service intl!: Intl;
     @tracked displayExistingNodeWidget = false;
     @tracked isSupplementAttached = false;
     @tracked isModalOpen = false;
@@ -63,10 +68,14 @@ export default class Supplements extends Component<SupplementsArgs>{
     @task
     @waitFor
     public async removeSelectedProject(): Promise<void> {
-        await this.args.manager.preprint.removeM2MRelationship('node');
-        await this.args.manager.preprint.reload();
-        this.isSupplementAttached = false;
-        this.validate();
+        try {
+            await this.args.manager.preprint.removeM2MRelationship('node'); // Remove relationship
+            this.args.manager.preprint.set('node', null); // Ensure local cache is updated
+            this.isSupplementAttached = false;
+            this.validate();
+        } catch (error) {
+            this.toast.error(this.intl.t('preprints.submit.step-supplements.failed-removal'));
+        }
     }
 
     @action

app/preprints/-components/withdrawal-preprint/component-test.ts

@@ -10,7 +10,7 @@ import PreprintModel from 'ember-osf-web/models/preprint';
 import PreprintProviderModel from 'ember-osf-web/models/preprint-provider';
 import { ModelInstance } from 'ember-cli-mirage';
 
-interface ComopenntTestContext extends TestContext {
+interface ComponentTestContext extends TestContext {
     preprint: PreprintModel;
     provider: PreprintProviderModel;
     onWithdrawal: () => void;
@@ -21,7 +21,7 @@ module('Integration | Preprint | Component | withdrawal-preprint', hooks => {
     setupMirage(hooks);
     setupIntl(hooks);
 
-    test('it renders and shows appropriate text', async function(this: ComopenntTestContext, assert) {
+    test('it renders and shows appropriate text', async function(this: ComponentTestContext, assert) {
         this.store = this.owner.lookup('service:store');
         this.intl = this.owner.lookup('service:intl');
 

app/preprints/detail/controller.ts

@@ -87,7 +87,6 @@ export default class PrePrintsDetailController extends Controller {
     get showEditButton() {
         const providerIsPremod = this.model.provider.reviewsWorkflow === PreprintProviderReviewsWorkFlow.PRE_MODERATION;
         const preprintIsRejected = this.model.preprint.reviewsState === ReviewsState.REJECTED;
-        const preprintIsFirstVersion = this.model.preprint.version === 1;
 
         if (!this.userIsContrib) {
             return false;
@@ -105,8 +104,7 @@ export default class PrePrintsDetailController extends Controller {
                 return true;
             }
             // Edit and resubmit
-            if (preprintIsFirstVersion && preprintIsRejected
-                && this.model.preprint.currentUserIsAdmin) {
+            if (preprintIsRejected && this.model.preprint.currentUserIsAdmin) {
                 return true;
             }
         }

app/preprints/detail/route.ts

@@ -214,7 +214,7 @@ export default class PreprintsDetail extends Route {
         return {
             osfMetrics: {
                 itemGuid: preprint.id,
-                itemDoi: preprint.verifiedDoi,
+                itemDoi: preprint.extractedDoi,
             },
         };
     }

app/preprints/detail/template.hbs

@@ -181,7 +181,7 @@
                                 local-class='btn btn-primary'
                                 target='_blank'
                                 @href={{ this.fileDownloadUrl }}
-                                {{track-download this.model.preprint.id doi=this.model.preprint.verifiedDoi}}
+                                {{track-download this.model.preprint.id doi=this.model.preprint.extractedDoi}}
                             >
                                 {{t 'preprints.detail.share.download' documentType=this.model.provider.documentType.singular}}
                             </OsfLink>