Merge tag '23.15.2' into develop

Hotfix for see example link and plaudit widget
bp-cos · Dec 1, 2023 · f1a1d6d · f1a1d6d
2 parents 6320bc4 + daed496
commit f1a1d6d
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 5 deletions.
diff --git a/app/models/identifier.ts b/app/models/identifier.ts
@@ -2,13 +2,14 @@ import { attr, belongsTo, AsyncBelongsTo } from '@ember-data/model';
 
 import NodeModel from './node';
 import OsfModel from './osf-model';
+import PreprintModel from './preprint';
 
 export default class IdentifierModel extends OsfModel {
     @attr('fixstring') category!: string;
     @attr('fixstring') value!: string;
 
-    @belongsTo('node', { inverse: 'identifiers', polymorphic: true })
-    referent!: AsyncBelongsTo<NodeModel> & NodeModel;
+    @belongsTo('node', { polymorphic: true })
+    referent!: AsyncBelongsTo<NodeModel | PreprintModel> & (NodeModel | PreprintModel);
 }
 
 declare module 'ember-data/types/registries/model' {

diff --git a/app/models/preprint.ts b/app/models/preprint.ts
@@ -8,6 +8,7 @@ import ReviewActionModel from 'ember-osf-web/models/review-action';
 
 import ContributorModel from './contributor';
 import FileModel from './file';
+import IdentifierModel from './identifier';
 import LicenseModel from './license';
 import NodeModel from './node';
 import OsfModel, { Permission } from './osf-model';
@@ -89,6 +90,9 @@ export default class PreprintModel extends OsfModel {
     @hasMany('preprint-request', { inverse: 'target'})
     requests!: AsyncHasMany<PreprintRequestModel>;
 
+    @hasMany('identifiers')
+    identifiers!: AsyncHasMany<IdentifierModel>;
+
     @alias('links.doi') articleDoiUrl!: string | null;
     @alias('links.preprint_doi') preprintDoiUrl!: string;
 

diff --git a/app/preprints/index/template.hbs b/app/preprints/index/template.hbs
@@ -41,7 +41,8 @@
                             <OsfLink
                                 data-test-submission-see-submission-example
                                 data-analytics-name='See Submission Example'
-                                @href={{concat '/content/' (if this.theme.provider.example this.theme.provider.example 'khbvy')}}
+                                @route='resolve-guid'
+                                @models={{array (if this.theme.provider.example this.theme.provider.example 'khbvy')}}
                             >
                                 {{t 'preprints.header.example'}}
                             </OsfLink>

diff --git a/mirage/config.ts b/mirage/config.ts
@@ -352,6 +352,11 @@ export default function(this: Server) {
         defaultSortKey: 'index',
         relatedModelName: 'subject',
     });
+    osfNestedResource(this, 'preprint', 'identifiers', {
+        path: '/preprints/:parentID/identifiers/',
+        defaultSortKey: 'index',
+        relatedModelName: 'identifier',
+    });
     this.get('/preprints/:guid/citation/:citationStyleID', getCitation);
 
     /**

diff --git a/mirage/factories/identifier.ts b/mirage/factories/identifier.ts
@@ -1,4 +1,4 @@
-import { belongsTo, Factory } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
 import faker from 'faker';
 
 import Identifier from 'ember-osf-web/models/identifier';
@@ -8,7 +8,6 @@ export default Factory.extend<Identifier>({
     value() {
         return faker.fake('10.5555/{{company.bsNoun}}');
     },
-    referent: belongsTo({ polymorphic: true }),
 });
 
 declare module 'ember-cli-mirage/types/registries/schema' {

diff --git a/mirage/scenarios/preprints.ts b/mirage/scenarios/preprints.ts
@@ -59,6 +59,10 @@ function buildOSF(
         hasPreregLinks: PreprintPreregLinksEnum.NOT_APPLICABLE,
     });
 
+    const osfApprovedAdminIdentifier = server.create('identifier');
+
+    approvedAdminPreprint.update({ identifiers: [osfApprovedAdminIdentifier] });
+
     const notContributorPreprint = server.create('preprint', {
         provider: osf,
         id: 'osf-not-contributor',
@@ -200,6 +204,21 @@ function buildOSF(
         isPublished: false,
     }, 'acceptedWithdrawalComment');
 
+    const examplePreprint = server.create('preprint', {
+        provider: osf,
+        id: 'khbvy',
+        title: 'The "See Example" hard-coded preprint',
+        currentUserPermissions: [],
+        reviewsState: ReviewsState.ACCEPTED,
+        description: `${faker.lorem.sentence(200)}\n${faker.lorem.sentence(100)}`,
+        doi: '10.30822/artk.v1i1.79',
+        originalPublicationDate: new Date('2016-11-30T16:00:00.000000Z'),
+        preprintDoiCreated: new Date('2016-11-30T16:00:00.000000Z'),
+        hasCoi: true,
+        hasDataLinks: PreprintDataLinksEnum.NOT_APPLICABLE,
+        hasPreregLinks: PreprintPreregLinksEnum.NOT_APPLICABLE,
+    });
+
     const subjects = server.createList('subject', 7);
 
     osf.update({
@@ -212,6 +231,7 @@ function buildOSF(
         brand,
         moderators: [currentUserModerator],
         preprints: [
+            examplePreprint,
             rejectedAdminPreprint,
             approvedAdminPreprint,
             approvedPreprint,

diff --git a/mirage/serializers/preprint.ts b/mirage/serializers/preprint.ts
@@ -108,6 +108,14 @@ export default class PreprintSerializer extends ApplicationSerializer<PreprintMi
                     },
                 },
             },
+            identifiers: {
+                links: {
+                    related: {
+                        href: `${apiUrl}/v2/preprints/${model.id}/identifiers/`,
+                        meta: this.buildRelatedLinkMeta(model, 'identifiers'),
+                    },
+                },
+            },
         };
 
         if (model.license !== null) {