Merge branch 'release/24.05.0'

Author: adlius

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).
 
+## [24.05.0] - 2024-07-08
+### Added
+- Add subjects to project metadata editor
+- Preprints to EOW phase 2
+### Removed
+- Removed LawrXiv logo from OSF Preprints discover page
+
+
 ## [24.04.0] - 2024-04-30
 ### Added
 - Misc bug and a11y fixes
@@ -1980,6 +1988,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[24.05.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.05.0
+[24.04.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.04.0
 [24.03.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.03.0
 [24.02.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.02.0
 [24.01.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.01.0

app/adapters/contributor.ts

@@ -18,11 +18,14 @@ export default class ContributorAdapter extends OsfAdapter {
         if (requestType === 'findRecord') {
             const [objectId, userId] = (id || '').split('-');
             const node = this.store.peekRecord('node', objectId);
+            const preprint = this.store.peekRecord('preprint', objectId);
             const draft = this.store.peekRecord('draft-registration', objectId);
             let baseUrl;
             assert(`"contributorId" must be "objectId-userId": got ${objectId}-${userId}`, Boolean(objectId && userId));
             if (node) {
                 baseUrl = this.buildRelationshipURL((node as any)._internalModel.createSnapshot(), 'contributors');
+            } else if (preprint) {
+                baseUrl = this.buildRelationshipURL((preprint as any)._internalModel.createSnapshot(), 'contributors');
             } else {
                 baseUrl = this.buildRelationshipURL((draft as any)._internalModel.createSnapshot(), 'contributors');
             }
@@ -31,13 +34,21 @@ export default class ContributorAdapter extends OsfAdapter {
 
         if (snapshot && requestType === 'createRecord') {
             const node = snapshot.belongsTo('node');
+            const preprint = snapshot.belongsTo('preprint');
             const draftRegistration = snapshot.belongsTo('draftRegistration');
             const user = snapshot.belongsTo('users');
-            assert('"node" or "draftRegistration" relationship is needed to create a contributor',
-                Boolean(node || draftRegistration));
+            assert('"node" or "draftRegistration" or "preprint" relationship is needed to create a contributor',
+                Boolean(node || draftRegistration || preprint));
             assert('"users" relationship, "email" or "fullName" is needed to create a contributor',
                 Boolean(user || snapshot.attr('email') || snapshot.attr('fullName')));
             let baseUrl;
+
+            if (preprint) {
+                // if preprint relationship is defined
+                // we post to v2/preprints/<preprint_id>/contributors
+                baseUrl = this.buildRelationshipURL(preprint, 'contributors');
+            }
+
             if (node) {
                 // if node relationship is defined
                 // we post to v2/nodes/<node_id>/contributors

app/adapters/preprint-request.ts

@@ -0,0 +1,10 @@
+import ActionAdapter from './action';
+
+export default class PreprintRequestAdapter extends ActionAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'preprint-request': PreprintRequestAdapter;
+    } // eslint-disable-line semi
+}

app/models/file-provider.ts

@@ -1,4 +1,5 @@
 import { attr, belongsTo, AsyncBelongsTo, hasMany, AsyncHasMany } from '@ember-data/model';
+import PreprintModel from 'ember-osf-web/models/preprint';
 import { Link } from 'jsonapi-typescript';
 
 import AbstractNodeModel from './abstract-node';
@@ -24,7 +25,8 @@ export default class FileProviderModel extends BaseFileItem {
 
     @belongsTo('abstract-node', { inverse: 'files', polymorphic: true })
     target!: (AsyncBelongsTo<AbstractNodeModel> & AbstractNodeModel) |
-        (AsyncBelongsTo<DraftNodeModel> & DraftNodeModel);
+        (AsyncBelongsTo<DraftNodeModel> & DraftNodeModel) |
+        (AsyncBelongsTo<PreprintModel> & PreprintModel);
 
     // BaseFileItem override
     isProvider = true;

app/models/license.ts

@@ -9,6 +9,10 @@ export default class LicenseModel extends OsfModel {
     @attr('fixstring') url!: string;
     @attr('fixstring') text!: string;
     @attr('array') requiredFields!: Array<keyof NodeLicense>;
+
+    get hasRequiredFields(): boolean {
+        return this.requiredFields?.length > 0;
+    }
 }
 
 declare module 'ember-data/types/registries/model' {

app/models/node.ts

@@ -120,6 +120,8 @@ export default class NodeModel extends AbstractNodeModel.extend(Validations, Col
     @attr('boolean') currentUserCanComment!: boolean;
     @attr('boolean') wikiEnabled!: boolean;
 
+    @hasMany('subject', { inverse: null, async: false }) subjectsAcceptable?: SubjectModel[];
+
     // FE-only property to check enabled addons.
     // null until getEnabledAddons has been called
     @tracked addonsEnabled?: string[];

app/models/osf-model.ts

@@ -1,6 +1,6 @@
 import Model, { attr } from '@ember-data/model';
 import Store from '@ember-data/store';
-import EmberArray, { A } from '@ember/array';
+import EmberArray, { A, isArray } from '@ember/array';
 import { assert } from '@ember/debug';
 import { set } from '@ember/object';
 import { alias } from '@ember/object/computed';
@@ -226,6 +226,13 @@ export default class OsfModel extends Model {
         return this.modifyM2MRelationship('post', relationshipName, relatedModel);
     }
 
+    async removeM2MRelationship<T extends OsfModel>(
+        this: T,
+        relationshipName: RelationshipsFor<T> & string,
+    ) {
+        return this.modifyM2MRelationship('patch', relationshipName, []);
+    }
+
     async deleteM2MRelationship<T extends OsfModel>(
         this: T,
         relationshipName: RelationshipsFor<T> & string,
@@ -266,20 +273,26 @@ export default class OsfModel extends Model {
 
     async modifyM2MRelationship<T extends OsfModel>(
         this: T,
-        action: 'post' | 'delete',
+        action: 'post' | 'delete' | 'patch',
         relationshipName: RelationshipsFor<T> & string,
-        relatedModel: OsfModel,
+        relatedModel: OsfModel | [],
     ) {
         const apiRelationshipName = underscore(relationshipName);
         const url = getSelfHref(this.relationshipLinks[apiRelationshipName]);
 
-        const data = JSON.stringify({
-            data: [{
-                id: relatedModel.id,
-                type: relatedModel.apiType,
-            }],
+        let data = JSON.stringify({
+            data: [ ],
         });
 
+        if (!isArray(relatedModel)) {
+            data = JSON.stringify({
+                data: [{
+                    id: relatedModel?.id,
+                    type: relatedModel?.apiType,
+                }],
+            });
+        }
+
         if (!url) {
             throw new Error(`Couldn't find self link for ${apiRelationshipName} relationship`);
         }
@@ -353,7 +366,7 @@ export default class OsfModel extends Model {
      * });
      *
      * contributors.sparseModels.forEach(contrib => {
-     *     console.log(contrib.users.fullName);
+     *     console.info(contrib.users.fullName);
      * );
      * ```
      */

app/models/preprint-provider.ts

@@ -20,10 +20,13 @@ export default class PreprintProviderModel extends ProviderModel {
 
     @attr('fixstring') email_support!: string | null;
     @attr('array') subjectsAcceptable!: string[];
+    @attr('boolean') assertionsEnabled!: boolean;
     @attr('array') additionalProviders!: string[];
     @attr('string') shareSource!: string;
     @attr('string') preprintWord!: PreprintWord;
 
+    @attr('boolean', { defaultValue: true }) advertiseOnDiscoverPage!: boolean;
+
     // Reviews settings
     @attr('array') permissions!: ReviewPermissions[];
     @attr('boolean', { allowNull: true }) reviewsCommentsPrivate!: boolean | null;

app/models/preprint.ts

@@ -1,6 +1,7 @@
 import { attr, belongsTo, hasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
+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';
@@ -11,51 +12,63 @@ import FileModel from './file';
 import IdentifierModel from './identifier';
 import LicenseModel from './license';
 import NodeModel from './node';
-import OsfModel, { Permission } from './osf-model';
+import { Permission } from './osf-model';
 import PreprintProviderModel from './preprint-provider';
 import SubjectModel from './subject';
 
 export enum PreprintDataLinksEnum {
     AVAILABLE = 'available',
-    YES = 'yes',
     NO = 'no',
     NOT_APPLICABLE = 'not_applicable',
 }
 
 export enum PreprintPreregLinksEnum {
     AVAILABLE = 'available',
-    YES = 'yes',
     NO = 'no',
     NOT_APPLICABLE = 'not_applicable',
 }
 
-export default class PreprintModel extends OsfModel {
+export enum PreprintPreregLinkInfoEnum {
+    PREREG_EMPTY = '',
+    PREREG_DESIGNS = 'prereg_designs',
+    PREREG_ANALYSIS = 'prereg_analysis',
+    PREREG_BOTH = 'prereg_both',
+}
+
+export interface PreprintLicenseRecordModel {
+    copyright_holders: string[];
+    year: string;
+}
+
+export default class PreprintModel extends AbstractNodeModel {
     @attr('fixstring') title!: string;
     @attr('date') dateCreated!: Date;
     @attr('date') datePublished!: Date;
     @attr('date') dateWithdrawn!: Date;
     @attr('date') originalPublicationDate!: Date | null;
+    @attr('fixstring') customPublicationCitation!: string | null;
     @attr('date') dateModified!: Date;
     @attr('fixstring') doi!: string | null;
     @attr('boolean') public!: boolean;
     @attr('boolean') isPublished!: boolean;
     @attr('boolean') isPreprintOrphan!: boolean;
-    @attr('object') licenseRecord!: any;
+    @attr('object') licenseRecord!: PreprintLicenseRecordModel;
     @attr('string') reviewsState!: ReviewsState;
     @attr('string') description!: string;
     @attr('date') dateLastTransitioned!: Date;
     @attr('date') preprintDoiCreated!: Date;
     @attr('array') currentUserPermissions!: Permission[];
     @attr('fixstringarray') tags!: string[];
-    @attr('fixstring') withdrawalJustification!     : string;
+    @attr('fixstring') withdrawalJustification!: string;
     @attr('boolean') hasCoi!: boolean;
     @attr('string') hasDataLinks!: PreprintDataLinksEnum;
     @attr('string') hasPreregLinks!: PreprintPreregLinksEnum;
-    @attr('string') conflictOfInterestStatement!: string;
+    @attr('string') conflictOfInterestStatement!: string | null;
     @attr('array') dataLinks!: string[];
     @attr('array') preregLinks!: string[];
-    @attr('string') whyNoData!: string;
-    @attr('string') whyNoPrereg!: string;
+    @attr('string') whyNoData!: string | null;
+    @attr('string') whyNoPrereg!: string | null;
+    @attr('string') preregLinkInfo!: PreprintPreregLinkInfoEnum;
 
     @belongsTo('node', { inverse: 'preprints' })
     node!: AsyncBelongsTo<NodeModel> & NodeModel;
@@ -72,9 +85,6 @@ export default class PreprintModel extends OsfModel {
     @hasMany('review-action')
     reviewActions!: AsyncHasMany<ReviewActionModel>;
 
-    @hasMany('files', { inverse: 'target'})
-    files!: AsyncHasMany<FileModel> & FileModel;
-
     @hasMany('contributors', { inverse: 'preprint'})
     contributors!: AsyncHasMany<ContributorModel> & ContributorModel;
 
@@ -103,7 +113,7 @@ export default class PreprintModel extends OsfModel {
     @computed('license', 'licenseRecord')
     get licenseText(): string {
         const text = this.license.get('text') || '';
-        const { year = '', copyright_holders = [] } = this.licenseRecord; // eslint-disable-line camelcase
+        const { year = '', copyright_holders = [] } = this.licenseRecord;
 
         return text
             .replace(/({{year}})/g, year)

app/packages/registration-schema/validations.ts

@@ -11,6 +11,7 @@ import { RegistrationResponse } from 'ember-osf-web/packages/registration-schema
 import { SchemaBlockGroup } from 'ember-osf-web/packages/registration-schema/schema-block-group';
 import { validateFileList } from 'ember-osf-web/validators/validate-response-format';
 import SchemaResponseModel from 'ember-osf-web/models/schema-response';
+import PreprintModel from 'ember-osf-web/models/preprint';
 
 type LicensedContent = DraftRegistration | NodeModel;
 
@@ -131,7 +132,7 @@ export function validateNodeLicense() {
 }
 
 export function validateSubjects() {
-    return (_: unknown, __: unknown, ___: unknown, ____: unknown, content: DraftRegistration) => {
+    return (_: unknown, __: unknown, ___: unknown, ____: unknown, content: DraftRegistration | PreprintModel ) => {
         const subjects = content.hasMany('subjects').value();
         if (!subjects || subjects.length === 0) {
             return {