Fixed eng-5941

Author: bp-cos

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

@@ -45,11 +45,18 @@ export default class PreprintFile extends Component<FileArgs>{
         if(file) {
             this.file = file;
             this.isFileAttached = true;
+            this.isEdit = true;
+            this.args.manager.validateFile(true);
         }
     }
 
+    public get isSelectProjectButtonDisabled(): boolean {
+        return this.isButtonDisabled || this.isEdit;
+    }
+
     @action
     public async validate(file: FileModel): Promise<void> {
+        this.isEdit = true;
         this.file = file;
         this.isFileAttached = true;
         this.isProjectSelectDisplayed = false;
@@ -77,7 +84,6 @@ export default class PreprintFile extends Component<FileArgs>{
 
     @action
     public async addNewfile(): Promise<void> {
-        this.isEdit = true;
         this.file = null;
         this.isFileAttached = false;
         this.isFileUploadDisplayed = false;

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

@@ -39,9 +39,14 @@
                         data-analytics-name='Select button'
                         {{on 'click' this.displayFileSelect}}
                         local-class='btn'
-                        disabled={{this.isButtonDisabled}}
+                        disabled={{this.isSelectProjectButtonDisabled}}
                     >
                         {{ t 'preprints.submit.step-file.file-select-label'}}
+                        {{#if this.isSelectProjectButtonDisabled}}
+                            <EmberTooltip>
+                                {{t 'preprints.submit.step-file.project-select-explanation'}}
+                            </EmberTooltip>
+                        {{/if}}
                     </Button>
                 </div>
                 {{#if this.isFileUploadDisplayed}}

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

@@ -229,20 +229,24 @@ export default class PreprintStateMachine extends Component<StateMachineArgs>{
             this.args.setPageDirty();
         }
         this.isNextButtonDisabled = true;
-        if (this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.titleAndAbstract) &&
+
+        if (
+            this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.titleAndAbstract) &&
             this.titleAndAbstractValidation
         ) {
             await this.saveOnStep();
             await this.preprint.files;
-            this.isNextButtonDisabled = !this.metadataValidation;
+            this.isNextButtonDisabled = !this.fileValidation;
             return;
-        } else if (this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.file) &&
+        } else if (
+            this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.file) &&
             this.fileValidation
         ) {
             await this.saveOnStep();
-            this.isNextButtonDisabled = !this.authorAssertionValidation;
+            this.isNextButtonDisabled = !this.metadataValidation;
             return;
-        } else if (this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.metadata) &&
+        } else if (
+            this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.metadata) &&
             this.metadataValidation
         ) {
             await this.saveOnStep();
@@ -252,13 +256,15 @@ export default class PreprintStateMachine extends Component<StateMachineArgs>{
                 this.isNextButtonDisabled = !this.supplementValidation;
             }
             return;
-        } else if (this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.authorAssertions) &&
+        } else if (
+            this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.authorAssertions) &&
             this.authorAssertionValidation
         ) {
             await this.saveOnStep();
             this.isNextButtonDisabled = !this.supplementValidation;
             return;
-        } else if (this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.supplements) &&
+        } else if (
+            this.statusFlowIndex === this.getTypeIndex(PreprintStatusTypeEnum.supplements) &&
             this.supplementValidation
         ) {
             await this.saveOnStep();

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

@@ -16,6 +16,9 @@
                 <div local-class='content-container'>
                     {{this.providerAgreement}}
                 </div>
+                <div local-class='content-container'>
+                    {{t 'preprints.submit.step-review.agreement-provider-two' htmlSafe=true}}
+                </div>
             {{/if}}
             <hr>
         </div>

translations/en-us.yml

@@ -1187,17 +1187,18 @@ preprints:
             abstract-input: 'Abstract'
             abstract-input-error: '20 characters'
         step-file:
-            title: 'File'
-            upload-title: 'Upload your {singularPreprintWord}'
+            delete-modal-button: 'Continue'
+            delete-modal-button-tooltip: 'Version file'
+            delete-modal-title: 'Add a new {singularPreprintWord} file'
+            delete-warning: 'This will allow a new version of the {singularPreprintWord} file to be uploaded to the {singularPreprintWord}. The existing file will be retained as a version of the {singularPreprintWord}.'
             uploaded-file-title: 'Attached {singularPreprintWord} file'
+            file-select-label: 'Select from an existing OSF project'
             file-upload-label: 'Upload from your computer'
             file-upload-label-one: 'Drag and drop files here to upload'
             file-upload-label-two: 'or click to browse for files.'
-            file-select-label: 'Select from an existing OSF project'
-            delete-modal-title: 'Add a new {singularPreprintWord} file'
-            delete-warning: 'This will allow a new version of the {singularPreprintWord} file to be uploaded to the {singularPreprintWord}. The existing file will be retained as a version of the {singularPreprintWord}.'
-            delete-modal-button: 'Continue'
-            delete-modal-button-tooltip: 'Version file'
+            project-select-explanation: 'A file from a project can only be selected once.'
+            title: 'File'
+            upload-title: 'Upload your {singularPreprintWord}'
         step-metadata:
             title: 'Metadata'
             contributors-input: 'Contributors'
@@ -1254,8 +1255,8 @@ 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:
-            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-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.'
+            agreement-provider-two: '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.</p>'
             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'