Merge branch 'release/24.06.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).
 
+## [24.06.0] - 2024-08-21
+### Added
+- Misc bug and a11y fixes
+- Added route for My Preprints page
+
 ## [24.05.0] - 2024-07-08
 ### Added
 - Add subjects to project metadata editor

app/models/abstract-node.ts

@@ -1,9 +1,9 @@
 import { hasMany, AsyncHasMany, attr } from '@ember-data/model';
-
+import { PromiseManyArray } from '@ember-data/store/-private';
 import BaseFileItem from 'ember-osf-web/models/base-file-item';
 import DraftRegistrationModel from 'ember-osf-web/models/draft-registration';
 import FileProviderModel from 'ember-osf-web/models/file-provider';
-
+import ReviewActionModel from 'ember-osf-web/models/review-action';
 import { Permission } from './osf-model';
 
 export default class AbstractNodeModel extends BaseFileItem {
@@ -15,6 +15,9 @@ export default class AbstractNodeModel extends BaseFileItem {
 
     @attr('array') currentUserPermissions!: Permission[];
 
+    @hasMany('review-action', { inverse: 'target' })
+    reviewActions!: PromiseManyArray<ReviewActionModel>;
+
 }
 
 declare module 'ember-data/types/registries/model' {

app/models/preprint.ts

@@ -5,7 +5,6 @@ import AbstractNodeModel from 'ember-osf-web/models/abstract-node';
 import CitationModel from 'ember-osf-web/models/citation';
 import PreprintRequestModel from 'ember-osf-web/models/preprint-request';
 import { ReviewsState } from 'ember-osf-web/models/provider';
-import ReviewActionModel from 'ember-osf-web/models/review-action';
 
 import ContributorModel from './contributor';
 import FileModel from './file';
@@ -82,9 +81,6 @@ export default class PreprintModel extends AbstractNodeModel {
     @belongsTo('preprint-provider', { inverse: 'preprints' })
     provider!: AsyncBelongsTo<PreprintProviderModel> & PreprintProviderModel;
 
-    @hasMany('review-action')
-    reviewActions!: AsyncHasMany<ReviewActionModel>;
-
     @hasMany('contributors', { inverse: 'preprint'})
     contributors!: AsyncHasMany<ContributorModel> & ContributorModel;
 

app/models/registration.ts

@@ -3,7 +3,7 @@ import { buildValidations, validator } from 'ember-cp-validations';
 
 import DraftRegistrationModel from 'ember-osf-web/models/draft-registration';
 import ResourceModel from 'ember-osf-web/models/resource';
-import ReviewActionModel, { ReviewActionTrigger } from 'ember-osf-web/models/review-action';
+import { ReviewActionTrigger } from 'ember-osf-web/models/review-action';
 import SchemaResponseModel, { RevisionReviewStates } from 'ember-osf-web/models/schema-response';
 import { RegistrationResponse } from 'ember-osf-web/packages/registration-schema';
 
@@ -149,9 +149,6 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     @hasMany('institution', { inverse: 'registrations' })
     affiliatedInstitutions!: AsyncHasMany<InstitutionModel> | InstitutionModel[];
 
-    @hasMany('review-action', { inverse: 'target' })
-    reviewActions!: AsyncHasMany<ReviewActionModel> | ReviewActionModel[];
-
     @hasMany('schema-response', { inverse: 'registration' })
     schemaResponses!: AsyncHasMany<SchemaResponseModel> | SchemaResponseModel[];
 

app/models/review-action.ts

@@ -63,7 +63,7 @@ export default class ReviewActionModel extends Action {
     @attr('string') fromState!: RegistrationReviewStates;
     @attr('string') toState!: RegistrationReviewStates;
 
-    @belongsTo('registration', { inverse: 'reviewActions', polymorphic: true })
+    @belongsTo('abstract-node', { inverse: 'reviewActions', polymorphic: true })
     target!: (AsyncBelongsTo<RegistrationModel> & RegistrationModel
         ) | (AsyncBelongsTo<PreprintModel> & PreprintModel);
 

app/preprints/-components/submit/preprint-state-machine/component.ts

@@ -201,19 +201,19 @@ export default class PreprintStateMachine extends Component<StateMachineArgs>{
     @waitFor
     public async onSubmit(): Promise<void> {
         this.args.resetPageDirty();
-        if (!this.isEditFlow) {
-            if (this.provider.reviewsWorkflow) {
-                const reviewAction = this.store.createRecord('review-action', {
-                    actionTrigger: 'submit',
-                    target: this.preprint,
-                });
-                await reviewAction.save();
-            } else {
-                this.preprint.isPublished = true;
-                await this.preprint.save();
-            }
+        if (this.provider.reviewsWorkflow) {
+            const reviewAction = this.store.createRecord('review-action', {
+                actionTrigger: 'submit',
+                target: this.preprint,
+            });
+            await reviewAction.save();
+        } else {
+            this.preprint.isPublished = true;
+            await this.preprint.save();
         }
 
+        await this.preprint.reload();
+
         await this.router.transitionTo('preprints.detail', this.provider.id, this.preprint.id);
     }
 

app/preprints/my-preprints/template.hbs

@@ -0,0 +1,3 @@
+<div data-analytics-scope='my-preprints'>
+    {{outlet}}
+</div>

app/router.ts

@@ -34,6 +34,7 @@ Router.map(function() {
         this.route('submit', { path: '/:provider_id/submit' });
         this.route('edit', { path: '/:provider_id/edit/:guid' });
         this.route('select');
+        this.route('my-preprints');
     });
 
 

mirage/config.ts

@@ -46,6 +46,7 @@ import {
     claimUnregisteredUser,
     userNodeList,
     userRegistrationList,
+    userPreprintList,
 } from './views/user';
 import { updatePassword } from './views/user-password';
 import * as userSettings from './views/user-setting';
@@ -312,6 +313,7 @@ export default function(this: Server) {
     this.get('/users/:id/nodes', userNodeList);
     this.get('/sparse/users/:id/nodes', userNodeList);
     this.get('/users/:id/registrations', userRegistrationList);
+    this.get('/users/:id/preprints', userPreprintList);
     osfNestedResource(this, 'user', 'draftRegistrations', {
         only: ['index'],
     });

mirage/views/user.ts

@@ -30,6 +30,23 @@ export function userRegistrationList(this: HandlerContext, schema: Schema, reque
     return json;
 }
 
+export function userPreprintList(this: HandlerContext, schema: Schema, request: Request) {
+    const user = schema.users.find(request.params.id);
+    const preprints = [];
+    const { contributorIds } = user;
+
+    for (const contributorId of contributorIds as string[]) {
+        const contributor = schema.contributors.find(contributorId);
+        const preprint = contributor.preprint;
+        if (preprint && filter(preprint, request)) {
+            preprints.push(this.serialize(preprint).data);
+        }
+    }
+
+    const json = process(schema, request, this, preprints, { defaultSortKey: 'last_logged' });
+    return json;
+}
+
 export function claimUnregisteredUser(this: HandlerContext) {
     return new Response(204);
 }