Merge tag '25.11.0' into develop

cslzchen · cslzchen · commit e2b59bd3983a · 2025-06-11T16:08:15.000-04:00
Manual GUID &amp; DOI assignment during Preprint &amp; Registration Creation
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [25.11.0] - 2025-06-11
+### Added
+- Manual GUID and DOI assignment during Preprint and Registration Creation
+
 ## [25.10.0] - 2025-05-13
 ### Added
 - Re-enable view and download counts for preprints
diff --git a/app/models/preprint.ts b/app/models/preprint.ts
@@ -82,6 +82,8 @@ export default class PreprintModel extends AbstractNodeModel {
     @attr('string') preregLinkInfo!: PreprintPreregLinkInfoEnum;
     @attr('number') version!: number;
     @attr('boolean') isLatestVersion!: boolean;
+    @attr('string') manualDoi!: string;
+    @attr('string') manualGuid!: string;
 
     @belongsTo('node', { inverse: 'preprints' })
     node!: AsyncBelongsTo<NodeModel> & NodeModel;
diff --git a/app/models/registration.ts b/app/models/registration.ts
@@ -115,6 +115,8 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     @attr('boolean') hasAnalyticCode!: boolean;
     @attr('boolean') hasPapers!: boolean;
     @attr('boolean') hasSupplements!: boolean;
+    @attr('string') manualDoi!: string;
+    @attr('string') manualGuid!: string;
 
     // Write-only attributes
     @attr('array') includedNodeIds?: string[];
diff --git a/app/preprints/-components/submit/title-and-abstract/component.ts b/app/preprints/-components/submit/title-and-abstract/component.ts
@@ -2,10 +2,11 @@ import Component from '@glimmer/component';
 import PreprintStateMachine from 'ember-osf-web/preprints/-components/submit/preprint-state-machine/component';
 import { action } from '@ember/object';
 import { ValidationObject } from 'ember-changeset-validations';
-import { validatePresence, validateLength } from 'ember-changeset-validations/validators';
+import { validatePresence, validateLength, validateFormat } from 'ember-changeset-validations/validators';
 import buildChangeset from 'ember-osf-web/utils/build-changeset';
 import { inject as service } from '@ember/service';
 import Intl from 'ember-intl/services/intl';
+import { DOIRegex } from 'ember-osf-web/utils/doi';
 
 /**
  * The TitleAndAbstract Args
@@ -17,6 +18,8 @@ interface TitleAndAbstractArgs {
 interface TitleAndAbstractForm {
     title: string;
     description: string;
+    manualDoi: string;
+    manualGuid: string;
 }
 
 /**
@@ -45,6 +48,22 @@ export default class TitleAndAbstract extends Component<TitleAndAbstractArgs>{
                 },
             }),
         ],
+        manualDoi: validateFormat({
+            allowBlank: true,
+            allowNone: true,
+            ignoreBlank: true,
+            regex: DOIRegex,
+            type: 'invalid_doi',
+        }),
+        manualGuid: validateLength({
+            allowBlank: true,
+            min:5,
+            type: 'greaterThanOrEqualTo',
+            translationArgs: {
+                description: this.intl.t('preprints.submit.step-title.guid'),
+                gte: '5 characters',
+            },
+        }),
     };
 
     titleAndAbstractFormChangeset = buildChangeset(this.args.manager.preprint, this.titleAndAbstractFormValidation);
diff --git a/app/preprints/-components/submit/title-and-abstract/template.hbs b/app/preprints/-components/submit/title-and-abstract/template.hbs
@@ -48,6 +48,42 @@
                     @onKeyUp={{this.validate}}
                 />
             {{/let}}
+            {{#if (and (feature-flag 'manual_doi_and_guid') (not @manager.isEditFlow))}}
+                {{#let (unique-id 'manualDoi') as |manualDoiField|}}
+                    <label for={{manualDoiField}}
+                        data-test-manual-doi-label
+                    >
+                        {{t 'preprints.submit.step-title.doi'}}
+                        <span local-class='required'>*</span>
+                    </label>
+                    <form.text
+                        data-test-manual-doi-input
+                        @valuePath={{'manualDoi'}}
+                        @isRequired={{false}}
+                        {{on 'change' this.validate}}
+                        local-class='input-container'
+                        @uniqueID={{manualDoiField}} 
+                        @onKeyUp={{this.validate}}
+                    />
+                {{/let}}
+                {{#let (unique-id 'manualGuid') as |manualGuidField|}}
+                    <label for={{manualGuidField}}
+                        data-test-manudal-guid-label
+                    >
+                        {{t 'preprints.submit.step-title.guid'}}
+                        <span local-class='required'>*</span>
+                    </label>
+                    <form.text
+                        data-test-manual-guid-input
+                        @valuePath={{'manualGuid'}}
+                        @isRequired={{false}}
+                        {{on 'change' this.validate}}
+                        local-class='input-container'
+                        @uniqueID={{manualGuidField}} 
+                        @onKeyUp={{this.validate}}
+                    />
+                {{/let}}
+            {{/if}}
         </FormControls>
     </div>
 </div>
diff --git a/config/environment.js b/config/environment.js
@@ -316,6 +316,7 @@ module.exports = function(environment) {
             },
             storageI18n: 'storage_i18n',
             gravyWaffle: 'gravy_waffle',
+            manualDoiAndGuid: 'manual_doi_and_guid',
             enableInactiveSchemas: 'enable_inactive_schemas',
             verifyEmailModals: 'ember_verify_email_modals',
             ABTesting: {
diff --git a/lib/osf-components/addon/components/registries/finalize-registration-modal/manager/component.ts b/lib/osf-components/addon/components/registries/finalize-registration-modal/manager/component.ts
@@ -14,6 +14,10 @@ import RegistrationModel from 'ember-osf-web/models/registration';
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
 
 import DraftRegistrationManager from 'registries/drafts/draft/draft-registration-manager';
+import buildChangeset from 'ember-osf-web/utils/build-changeset';
+import { ValidationObject } from 'ember-changeset-validations';
+import { validateFormat, validateLength } from 'ember-changeset-validations/validators';
+import { DOIRegex } from 'ember-osf-web/utils/doi';
 import template from './template';
 
 export interface FinalizeRegistrationModalManager {
@@ -25,16 +29,44 @@ export interface FinalizeRegistrationModalManager {
     draftManager: DraftRegistrationManager;
 }
 
+interface ManualDoiAndGuidForm {
+    manualDoi: string;
+    manualGuid: string;
+}
+
 @layout(template)
 @tagName('')
 export default class FinalizeRegistrationModalManagerComponent extends Component
     implements FinalizeRegistrationModalManager {
     @service intl!: Intl;
     @service toast!: Toast;
 
+    // validationFunction() {
+    //     debugger;
+    // }
+    manualDoiAndGuidFormChangesetValidation: ValidationObject<ManualDoiAndGuidForm> = {
+        manualDoi: validateFormat({
+            allowBlank: true,
+            allowNone: true,
+            ignoreBlank: true,
+            regex: DOIRegex,
+            type: 'invalid_doi',
+        }),
+        // manualDoi: this.validationFunction,
+        manualGuid: validateLength({
+            allowBlank: true,
+            min:5,
+            type: 'greaterThanOrEqualTo',
+            translationArgs: {
+                description: this.intl.t('preprints.submit.step-title.guid'),
+                gte: '5 characters',
+            },
+        }),
+    };
     // Required arguments
     registration!: RegistrationModel;
     draftManager!: DraftRegistrationManager;
+    guidAndDoiFormChangeset!: any;
 
     // Optional arguments
     onSubmitRegistration?: (registrationId: string) => void;
@@ -67,6 +99,14 @@ export default class FinalizeRegistrationModalManagerComponent extends Component
 
     didReceiveAttrs() {
         assert('finalize-registration-modal::manager must have a registration', Boolean(this.registration));
+        this.guidAndDoiFormChangeset = buildChangeset(this.registration, this.manualDoiAndGuidFormChangesetValidation);
+    }
+
+    @action
+    validateManualDoiAndGuid() {
+        // debugger;
+        this.guidAndDoiFormChangeset.validate();
+        this.guidAndDoiFormChangeset.execute();
     }
 
     @action
diff --git a/lib/osf-components/addon/components/registries/finalize-registration-modal/manager/template.hbs b/lib/osf-components/addon/components/registries/finalize-registration-modal/manager/template.hbs
@@ -5,4 +5,6 @@
     hasEmbargoEndDate=this.hasEmbargoEndDate
     submittingRegistration=this.submittingRegistration
     draftManager=this.draftManager
+    guidAndDoiFormChangeset=this.guidAndDoiFormChangeset
+    validateManualDoiAndGuid=this.validateManualDoiAndGuid
 )}}
diff --git a/lib/osf-components/addon/components/registries/finalize-registration-modal/template.hbs b/lib/osf-components/addon/components/registries/finalize-registration-modal/template.hbs
@@ -43,6 +43,44 @@
                 />
             {{/if}}
         </div>
+        {{#if (feature-flag 'manual_doi_and_guid')}}
+            <FormControls
+                @changeset={{this.manager.guidAndDoiFormChangeset}}
+                data-test-form
+                as |form|
+            >
+                {{#let (unique-id 'manualDoi') as |manualDoiField|}}
+                    <label for={{manualDoiField}}
+                        data-test-manual-doi-label
+                    >
+                        {{t 'preprints.submit.step-title.doi'}}
+                    </label>
+                    <form.text
+                        data-test-manual-doi-input
+                        {{on 'change' this.manager.validateManualDoiAndGuid}}
+                        @valuePath={{'manualDoi'}}
+                        @isRequired={{false}}
+                        @uniqueID={{manualDoiField}} 
+                        @onKeyUp={{this.manager.validateManualDoiAndGuid}}
+                    />
+                {{/let}}
+                {{#let (unique-id 'manualGuid') as |manualGuidField|}}
+                    <label for={{manualGuidField}}
+                        data-test-manudal-guid-label
+                    >
+                        {{t 'preprints.submit.step-title.guid'}}
+                    </label>
+                    <form.text
+                        data-test-manual-guid-input
+                        {{on 'change' this.manager.validateManualDoiAndGuid}}
+                        @valuePath={{'manualGuid'}}
+                        @isRequired={{false}}
+                        @uniqueID={{manualGuidField}} 
+                        @onKeyUp={{this.manager.validateManualDoiAndGuid}}
+                    />
+                {{/let}}
+            </FormControls>
+        {{/if}}
     </dialog.main>
     <dialog.footer>
         <Button
diff --git a/lib/osf-components/package.json b/lib/osf-components/package.json
@@ -24,6 +24,7 @@
     "ember-intl": "*",
     "ember-radio-button": "*",
     "ember-responsive": "*",
-    "ember-in-viewport": "*"
+    "ember-in-viewport": "*",
+    "ember-feature-flags": "*"
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "25.10.0",
+  "version": "25.11.0",
   "private": true,
   "description": "Ember front-end for the Open Science Framework",
   "homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",
diff --git a/translations/en-us.yml b/translations/en-us.yml
@@ -1622,6 +1622,8 @@ preprints:
             title-input: 'Title'
             abstract-input: 'Abstract'
             abstract-input-error: '20 characters'
+            doi: 'DOI'
+            guid: 'Guid'
         step-file:
             delete-modal-button: 'Continue'
             delete-modal-button-tooltip: 'Version file'

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`"ember-intl": "*",`
`25`	`25`	`"ember-radio-button": "*",`
`26`	`26`	`"ember-responsive": "*",`
`27`		`- "ember-in-viewport": "*"`
	`27`	`+ "ember-in-viewport": "*",`
	`28`	`+ "ember-feature-flags": "*"`
`28`	`29`	`}`
`29`	`30`	`}`