Fixes for eng-5940 and eng-5942

Author: bp-cos

app/models/provider.ts

@@ -21,7 +21,7 @@ export interface Assets {
     wide_white: string;
 }
 
-export enum PreprintProviderReviewsWorkFlow{
+export enum PreprintProviderReviewsWorkFlow {
     PRE_MODERATION = 'pre-moderation',
     POST_MODERATION = 'post-moderation'
 }

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

@@ -607,10 +607,12 @@ export default class PreprintStateMachine extends Component<StateMachineArgs>{
     @task
     @waitFor
     public async addProjectFile(file: FileModel): Promise<void>{
-        await file.copy(this.preprint, '/', 'osfstorage');
+        await file.copy(this.preprint, '/', 'osfstorage', {
+            conflict: 'replace',
+        });
         const theFiles = await this.preprint.files;
         const rootFolder = await theFiles.firstObject!.rootFolder;
         const primaryFile = await rootFolder!.files;
-        this.preprint.set('primaryFile', primaryFile.firstObject);
+        this.preprint.set('primaryFile', primaryFile.lastObject);
     }
 }

app/preprints/-components/submit/preprint-state-machine/status-flow/status-flow-display/styles.scss

@@ -10,9 +10,6 @@
     background-color: inherit;
     z-index: 1;
 
-    &.cursor {
-        cursor: pointer;
-    }
 
     &.selected {
         width: 193px;
@@ -57,6 +54,11 @@
             font-weight: bold;
         }
 
+        &.cursor {
+            cursor: pointer;
+        }
+
+
         .finished {
             color: $brand-success;
         }

app/preprints/-components/submit/preprint-state-machine/status-flow/status-flow-display/template.hbs

@@ -1,7 +1,6 @@
 {{#if this.shouldDisplayStatusType}}
     <div local-class='status-container
         {{if this.isSelected 'selected'}}
-        {{if this.isFinished 'cursor'}}
         {{if (is-mobile) 'mobile'}}'
     >
         <div local-class='graphics-container'>
@@ -20,7 +19,9 @@
                 />
             {{/if}}
         </div>
-        <div local-class='link-container'>
+        <div local-class='link-container
+            {{if this.isFinished 'cursor'}}'
+        >
             {{#if this.isFinished}}
                 <Button
                     local-class='btn finished'

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

@@ -8,6 +8,8 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import moment from 'moment-timezone';
 import Intl from 'ember-intl/services/intl';
+import { PreprintProviderReviewsWorkFlow } from 'ember-osf-web/models/provider';
+import { SafeString } from '@ember/template/-private/handlebars';
 
 /**
  * The Review Args
@@ -27,6 +29,8 @@ export default class Review extends Component<ReviewArgs>{
     @tracked contributors?: any;
     @tracked subjects?: any;
     @service intl!: Intl;
+    @tracked displayProviderAgreement = false;
+    @tracked providerAgreement: string | SafeString = '';
 
     constructor(owner: unknown, args: ReviewArgs) {
         super(owner, args);
@@ -37,7 +41,25 @@ export default class Review extends Component<ReviewArgs>{
     @task
     @waitFor
     private async loadPreprint()  {
-        this.provider = this.preprint.provider.content;
+        this.provider = await this.preprint.provider.content;
+        if (
+            this.provider.reviewsWorkflow === PreprintProviderReviewsWorkFlow.PRE_MODERATION ||
+            this.provider.reviewsWorkflow === PreprintProviderReviewsWorkFlow.POST_MODERATION
+        ) {
+            this.displayProviderAgreement = true;
+
+            const moderationType = this.provider.reviewsWorkflow ===
+                PreprintProviderReviewsWorkFlow.PRE_MODERATION ?
+                PreprintProviderReviewsWorkFlow.PRE_MODERATION :
+                PreprintProviderReviewsWorkFlow.POST_MODERATION;
+            this.providerAgreement = this.intl.t('preprints.submit.step-review.agreement-provider',
+                {
+                    providerName : this.provider.name,
+                    moderationType,
+                    htmlSafe: true,
+                });
+        }
+
         this.license = this.preprint.license;
         this.subjects = await this.preprint.queryHasMany('subjects');
     }

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

@@ -2,6 +2,23 @@
     {{#if this.loadPreprint.isRunning}}
         <LoadingIndicator data-test-loading-indicator @dark={{true}} />
     {{else}} 
+        <div local-class='step-container'>
+            <h3 local-class='title'
+                data-test-user-agreement-title
+            >
+                {{t 'preprints.submit.step-review.agreement-title'}}
+            </h3>
+
+            <div local-class='content-container'>
+                {{t 'preprints.submit.step-review.agreement-user'}}
+            </div>
+            {{#if this.displayProviderAgreement}}
+                <div local-class='content-container'>
+                    {{this.providerAgreement}}
+                </div>
+            {{/if}}
+            <hr>
+        </div>
         <div local-class='step-container'>
             <h3 local-class='title'
                 data-test-title-step-title

translations/en-us.yml

@@ -1254,19 +1254,23 @@ preprints:
             delete-modal-title: 'Disconnect supplemental material'
             delete-warning: 'This will disconnect the selected project. You can select new supplemental material or re-add the same supplemental material at a later date.'
         step-review:
-            title: 'Review'
+            agreement-provider: '{providerName} uses {moderationType}. If your preprint is accepted, it will be assigned a DOI and become publicly accessible via OSF. The preprint file cannot be deleted but it can be updated or modified. You can read more about 
+            <a href="https://help.osf.io/article/592-preprint-moderation" target="_blank">OSF preprints moderation policies on</a> the OSF support center.'
+            agreement-title: 'Consent to publish'
+            agreement-user: 'By submitting this preprint you confirm that all contributors agree with sharing it and that you have the right to share this preprint.'
+            conflict-of-interest: 'Conflict of Interest'
+            contributors: 'Contributors'
+            no-conflict-of-interest: 'Author asserted no Conflict of Interest.'
             preprint-service: '{singularPreprintWord} Service'
             preprint-title: 'Title'
-            contributors: 'Contributors'
+            publication-citation: 'Publication Citation'
             publication-date: 'Publication Date'
             publication-doi: 'Publication DOI'
-            publication-citation: 'Publication Citation'
-            conflict-of-interest: 'Conflict of Interest'
-            no-conflict-of-interest: 'Author asserted no Conflict of Interest.'
             public-data: 'Public Data'
             public-preregistration: 'Public Preregistration'
-            supplement-title: 'OSF Project'
             supplement-na: 'Author did not add any supplements for this {singularPreprintWord}'
+            supplement-title: 'OSF Project'
+            title: 'Review'
         data-analytics: 'Goto {statusType} tab'
         status-flow:
             step-title-and-abstract: 'Title and Abstract'