Merge branch 'hotfix/24.05.2'

Author: adlius

CHANGELOG.md

@@ -1988,6 +1988,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[24.05.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.05.2
+[24.05.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.05.1
 [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

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/author-assertions/link-widget/link/component.ts

@@ -3,8 +3,9 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Intl from 'ember-intl/services/intl';
 import { ValidationObject } from 'ember-changeset-validations';
-import { validateFormat} from 'ember-changeset-validations/validators';
+
 import buildChangeset from 'ember-osf-web/utils/build-changeset';
+import { validateUrlWithProtocols } from 'ember-osf-web/validators/url-with-protocol';
 import { tracked } from '@glimmer/tracking';
 
 
@@ -31,9 +32,7 @@ export default class Link extends Component<LinkArgs>{
     @tracked linkFormChangeset: any = null;
 
     linkFormValidation: ValidationObject<LinkForm> = {
-        value: validateFormat({
-            allowBlank: false,
-            type: 'url',
+        value: validateUrlWithProtocols({
             translationArgs: { description: this.intl.t('validationErrors.description') },
         }),
     };

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

@@ -45,11 +45,22 @@ 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 isSelectProjectButtonDisplayed(): boolean {
+        return !this.args.manager.isEditFlow;
+    }
+
+    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 +88,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;
@@ -105,9 +115,13 @@ export default class PreprintFile extends Component<FileArgs>{
         this.validate(file);
     }
 
+    public get getSelectExplanationText(): string {
+        return this.intl.t('preprints.submit.step-file.project-select-explanation',
+            { singularPreprintWord: this.args.manager.provider.documentType.singularCapitalized });
+    }
+
     public get getUploadText(): string {
         return this.intl.t('preprints.submit.step-file.upload-title',
             { singularPreprintWord: this.args.manager.provider.documentType.singularCapitalized });
-
     }
 }

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

@@ -4,9 +4,14 @@
     >
         {{t 'preprints.submit.step-file.title'}}
     </h3>
+    {{#if this.isSelectProjectButtonDisplayed}}
+        <p>
+            {{t 'preprints.submit.step-file.upload-warning'}}
+        </p>
+    {{/if}}
     {{#if this.loadFiles.isRunning}}
         <LoadingIndicator data-test-loading-indicator @dark={{true}} />
-    {{else}} 
+    {{else}}
         {{#if this.isFileAttached}}
             <div local-class='file-container'>
                 <div local-class='file'>
@@ -33,16 +38,29 @@
                         disabled={{this.isButtonDisabled}}
                     >
                         {{ t 'preprints.submit.step-file.file-upload-label'}}
+                        <EmberTooltip>
+                            {{t 'preprints.submit.step-file.file-upload-help-text' singularPreprintWord=@manager.provider.documentType.singular}}
+                        </EmberTooltip>
                     </Button>
-                    <Button
-                        data-test-select-button
-                        data-analytics-name='Select button'
-                        {{on 'click' this.displayFileSelect}}
-                        local-class='btn'
-                        disabled={{this.isButtonDisabled}}
-                    >
-                        {{ t 'preprints.submit.step-file.file-select-label'}}
-                    </Button>
+                    {{#if this.isSelectProjectButtonDisplayed}}
+                        <Button
+                            data-test-select-button
+                            data-analytics-name='Select button'
+                            {{on 'click' this.displayFileSelect}}
+                            local-class='btn'
+                            disabled={{this.isSelectProjectButtonDisabled}}
+                        >
+                            {{ t 'preprints.submit.step-file.file-select-label'}}
+                            <EmberTooltip>
+                                {{t 'preprints.submit.step-file.file-select-help-text' singularPreprintWord=@manager.provider.documentType.singular}}
+                            </EmberTooltip>
+                            {{#if this.isEdit}}
+                                <EmberTooltip>
+                                    {{this.getSelectExplanationText}}
+                                </EmberTooltip>
+                            {{/if}}
+                        </Button>
+                    {{/if}}
                 </div>
                 {{#if this.isFileUploadDisplayed}}
                     {{#let (unique-id 'preprint-upload-files-dropzone') as |id|}}

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

@@ -89,7 +89,9 @@ export default class PreprintUpload extends Component<PreprintUploadArgs> {
     @waitFor
     async success(_: any, __:any, file: FileModel): Promise<void> {
         if (this.args.isEdit) {
-            await this.primaryFile?.rename(file.name);
+            if (file.name !== this.primaryFile?.name) {
+                await this.primaryFile?.rename(file.name);
+            }
         } else {
             const primaryFile = await this.rootFolder!.files;
             this.args.manager.preprint.set('primaryFile', primaryFile.firstObject);

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();
@@ -607,10 +613,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');
     }