Updates for a few bugs that I have found

CenterForOpenScience · Jun 3, 2024 · 5bf5ec8 · 5bf5ec8
1 parent 8f1aca1
commit 5bf5ec8
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 22 deletions.
diff --git a/app/models/preprint.ts b/app/models/preprint.ts
@@ -18,14 +18,12 @@ 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',
 }

diff --git a/app/preprints/-components/submit/author-assertions/component.ts b/app/preprints/-components/submit/author-assertions/component.ts
@@ -47,7 +47,7 @@ const AuthorAssertionsFormValidation: ValidationObject<AuthorAssertionsForm> = {
         type: 'empty',
     }),
     whyNoData: [(key: string, newValue: string, oldValue: string, changes: any, content: any) => {
-        if (changes['hasDataLinks'] !== PreprintDataLinksEnum.YES)  {
+        if (changes['hasDataLinks'] !== PreprintDataLinksEnum.AVAILABLE)  {
             return validatePresence({
                 presence: true,
                 ignoreBlank: true,
@@ -57,7 +57,7 @@ const AuthorAssertionsFormValidation: ValidationObject<AuthorAssertionsForm> = {
         return true;
     }],
     dataLinks: [(_key: string, newValue: string[], _oldValue: string[], changes: any, _content: any) => {
-        if (changes['hasDataLinks'] === PreprintDataLinksEnum.YES || newValue) {
+        if (changes['hasDataLinks'] === PreprintDataLinksEnum.AVAILABLE || newValue) {
             let isValid = false;
             if (newValue) {
                 isValid = true;
@@ -82,7 +82,7 @@ const AuthorAssertionsFormValidation: ValidationObject<AuthorAssertionsForm> = {
     }),
     whyNoPrereg: [(key: string, newValue: string, oldValue: string, changes: any, content: any) => {
         if (
-            changes['hasPreregLinks'] !== PreprintPreregLinksEnum.YES
+            changes['hasPreregLinks'] !== PreprintPreregLinksEnum.AVAILABLE
         ) {
             return validatePresence({
                 presence: true,
@@ -93,7 +93,7 @@ const AuthorAssertionsFormValidation: ValidationObject<AuthorAssertionsForm> = {
         return true;
     }],
     preregLinks: [(_key: string, newValue: string[], _oldValue: string[], changes: any, _content: any) => {
-        if (changes['hasPreregLinks'] === PreprintPreregLinksEnum.YES || newValue) {
+        if (changes['hasPreregLinks'] === PreprintPreregLinksEnum.AVAILABLE || newValue) {
             let isValid = false;
             if (newValue) {
                 isValid = true;
@@ -112,7 +112,7 @@ const AuthorAssertionsFormValidation: ValidationObject<AuthorAssertionsForm> = {
         }
     }],
     preregLinkInfo: [(key: string, newValue: string, oldValue: string, changes: any, content: any) => {
-        if (changes['hasPreregLinks'] === PreprintPreregLinksEnum.YES || newValue) {
+        if (changes['hasPreregLinks'] === PreprintPreregLinksEnum.AVAILABLE || newValue) {
             return validatePresence({
                 presence: true,
                 ignoreBlank: false,

diff --git a/app/preprints/-components/submit/author-assertions/link-widget/link/template.hbs b/app/preprints/-components/submit/author-assertions/link-widget/link/template.hbs
@@ -12,7 +12,7 @@
                 <form.text
                     data-test-link-input
                     @isRequired={{true}}
-                    {{on 'focusout' this.onUpdate}}
+                    @onKeyUp={{this.onUpdate}}
                     @placeholder={{ @placeholder }}
                     @valuePath={{'value'}}
                     local-class='input'

diff --git a/app/preprints/-components/submit/author-assertions/public-data/component.ts b/app/preprints/-components/submit/author-assertions/public-data/component.ts
@@ -27,7 +27,7 @@ export default class PublicData extends Component<PublicDataArgs>{
 
     publicDataOptions = [
         {
-            inputValue: PreprintDataLinksEnum.YES,
+            inputValue: PreprintDataLinksEnum.AVAILABLE,
             displayText: this.intl.t('general.available'),
         } as RadioButtonOption,
         {
@@ -49,7 +49,7 @@ export default class PublicData extends Component<PublicDataArgs>{
     public get displayPublicDataLinks(): boolean {
         return this.args.changeSet.get('hasDataLinks') === null ?
             false :
-            this.args.changeSet.get('hasDataLinks')  === PreprintDataLinksEnum.YES;
+            this.args.changeSet.get('hasDataLinks')  === PreprintDataLinksEnum.AVAILABLE;
     }
 
     @action
@@ -60,11 +60,11 @@ export default class PublicData extends Component<PublicDataArgs>{
 
     @action
     public updatePublicDataOptions(): void {
-        if (this.args.changeSet.get('hasDataLinks') === PreprintDataLinksEnum.YES) {
-            this.args.changeSet.set('whyNoData', '');
+        if (this.args.changeSet.get('hasDataLinks') === PreprintDataLinksEnum.AVAILABLE) {
+            this.args.changeSet.set('whyNoData', null);
             this.isPublicDataWhyNoStatementDisabled = false;
         } else if (this.args.changeSet.get('hasDataLinks') === PreprintDataLinksEnum.NO) {
-            this.args.changeSet.set('whyNoData', '');
+            this.args.changeSet.set('whyNoData', null);
             this.isPublicDataWhyNoStatementDisabled = false;
             this.placeholder = this.intl.t('preprints.submit.step-assertions.public-data-no-placeholder');
         } else {

diff --git a/app/preprints/-components/submit/author-assertions/public-data/template.hbs b/app/preprints/-components/submit/author-assertions/public-data/template.hbs
@@ -44,7 +44,7 @@
                     data-test-public-data-description-input
                     @disabled={{this.isPublicDataWhyNoStatementDisabled}}
                     @valuePath={{'whyNoData'}}
-                    {{on 'change' @validate}}
+                    @onKeyUp={{@validate}}
                     local-class='input-container textarea-container'
                     @placeholder={{this.placeholder}}
                 />

diff --git a/app/preprints/-components/submit/author-assertions/public-preregistration/component.ts b/app/preprints/-components/submit/author-assertions/public-preregistration/component.ts
@@ -52,7 +52,7 @@ export default class PublicPreregistration extends Component<PublicPreregistrati
 
     publicPreregistrationOptions = [
         {
-            inputValue: PreprintPreregLinksEnum.YES,
+            inputValue: PreprintPreregLinksEnum.AVAILABLE,
             displayText: this.intl.t('general.available'),
         } as RadioButtonOption,
         {
@@ -74,7 +74,7 @@ export default class PublicPreregistration extends Component<PublicPreregistrati
     public get displayPublicPreregistrationLinks(): boolean {
         return this.args.changeSet.get('hasPreregLinks') === null ?
             false :
-            this.args.changeSet.get('hasPreregLinks')  === PreprintPreregLinksEnum.YES;
+            this.args.changeSet.get('hasPreregLinks')  === PreprintPreregLinksEnum.AVAILABLE;
     }
 
     @action
@@ -85,11 +85,11 @@ export default class PublicPreregistration extends Component<PublicPreregistrati
 
     @action
     public updatePublicPreregistrationOptions(): void {
-        if (this.args.changeSet.get('hasPreregLinks') === PreprintPreregLinksEnum.YES) {
-            this.args.changeSet.set('whyNoPrereg', '');
+        if (this.args.changeSet.get('hasPreregLinks') === PreprintPreregLinksEnum.AVAILABLE) {
+            this.args.changeSet.set('whyNoPrereg', null);
             this.isPublicPreregistrationWhyNoStatementDisabled = false;
         } else if (this.args.changeSet.get('hasPreregLinks') === PreprintPreregLinksEnum.NO) {
-            this.args.changeSet.set('whyNoPrereg', '');
+            this.args.changeSet.set('whyNoPrereg', null);
             this.isPublicPreregistrationWhyNoStatementDisabled = false;
             this.placeholder = this.intl.t('preprints.submit.step-assertions.public-preregistration-no-placeholder');
         } else {

diff --git a/app/preprints/-components/submit/author-assertions/public-preregistration/template.hbs b/app/preprints/-components/submit/author-assertions/public-preregistration/template.hbs
@@ -63,8 +63,8 @@
                     data-test-public-preregistration-description-input
                     @disabled={{this.isPublicPreregistrationWhyNoStatementDisabled}}
                     @valuePath={{'whyNoPrereg'}}
-                    {{on 'change' @validate}}
                     local-class='input-container textarea-container'
+                    @onKeyUp={{@validate}}
                     @placeholder={{this.placeholder}}
                 />
             </div>

diff --git a/app/preprints/-components/submit/author-assertions/template.hbs b/app/preprints/-components/submit/author-assertions/template.hbs
@@ -43,7 +43,7 @@
                     data-test-coi-description-input
                     @disabled={{this.isConflictOfInterestStatementDisabled}}
                     @valuePath={{'conflictOfInterestStatement'}}
-                    {{on 'change' this.validate}}
+                    @onKeyUp={{this.validate}}
                     local-class='input-container textarea-container'
                     @placeholder={{t 'preprints.submit.step-assertions.conflict-of-interest-placeholder'}}
                 />

diff --git a/app/preprints/-components/submit/file/upload-file/template.hbs b/app/preprints/-components/submit/file/upload-file/template.hbs
@@ -1,4 +1,4 @@
-{{#if this.prepUrl.isRunning}}
+{{#if this.success.isRunning}}
     <LoadingIndicator data-test-loading-indicator @dark={{true}} />
 {{else}}
     <div ...attributes>