Merge remote-tracking branch 'upstream/develop' into feature/verified-resource-linking

Author: adlius

CHANGELOG.md

@@ -4,6 +4,15 @@ 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.12.0] - 2025-06-13
+### Added
+- Google File Picker workflow
+- Misc. improvements
+
+## [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

app/config/environment.d.ts

@@ -141,6 +141,12 @@ declare const config: {
         doiUrlPrefix: string;
         dataciteTrackerRepoId: string;
         dataCiteTrackerUrl: string;
+        googleFilePicker: {
+            GOOGLE_FILE_PICKER_SCOPES: string;
+            GOOGLE_FILE_PICKER_CLIENT_ID: string;
+            GOOGLE_FILE_PICKER_API_KEY: string;
+            GOOGLE_FILE_PICKER_APP_ID: number;
+        }
     };
     social: {
         twitter: {

app/guid-node/files/provider/template.hbs

@@ -7,6 +7,7 @@
     >
         <div local-class='FileBrowser'>
             <FileBrowser
+                @configuredStorageAddon={{this.model.configuredStorageAddon}}
                 @manager={{manager}}
                 @selectable={{not this.model.providerTask.value.currentUser.viewOnlyToken}}
                 @enableUpload={{true}}

app/models/authorized-account.ts

@@ -1,4 +1,4 @@
-import Model, { attr } from '@ember-data/model';
+import Model, { attr} from '@ember-data/model';
 import { OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
 
 export enum ConnectedCapabilities {
@@ -36,7 +36,6 @@ export default class AuthorizedAccountModel extends Model {
         return;
     }
 
-
     async getItemInfo(this: AuthorizedAccountModel, _itemId: string) : Promise<any> {
         // To be implemented in child classes
         return;

app/models/authorized-storage-account.ts

@@ -1,13 +1,16 @@
-import { AsyncBelongsTo, belongsTo } from '@ember-data/model';
+import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
 import { waitFor } from '@ember/test-waiters';
 import { task } from 'ember-concurrency';
 import { ConnectedStorageOperationNames, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
+import ExternalStorageServiceModel from 'ember-osf-web/models/external-storage-service';
 
-import ExternalStorageServiceModel from './external-storage-service';
 import AuthorizedAccountModel from './authorized-account';
 import UserReferenceModel from './user-reference';
 
 export default class AuthorizedStorageAccountModel extends AuthorizedAccountModel {
+    @attr('fixstring') serializeOauthToken!: string;
+    @attr('fixstring') oauthToken!: string;
+
     @belongsTo('user-reference', { inverse: 'authorizedStorageAccounts' })
     readonly accountOwner!: AsyncBelongsTo<UserReferenceModel> & UserReferenceModel;
 

app/models/index-card-search.ts

@@ -10,7 +10,7 @@ export interface SearchFilter {
     filterType?: string;
 }
 
-export const ShareMoreThanTenThousand = 'https://share.osf.io/vocab/2023/trove/ten-thousands-and-more';
+export const ShareMoreThanTenThousand = 'trove:ten-thousands-and-more';
 
 export default class IndexCardSearchModel extends Model {
     @attr('string') cardSearchText!: string;

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;

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[];

app/models/search-result.ts

@@ -314,7 +314,7 @@ export default class SearchResultModel extends Model {
     }
 
     get isWithdrawn() {
-        return this.resourceMetadata.dateWithdrawn || this.resourceMetadata['https://osf.io/vocab/2022/withdrawal'];
+        return this.resourceMetadata.dateWithdrawn || this.resourceMetadata['osf:withdrawal'];
     }
 
     get configuredAddonNames() {

app/packages/addons-service/provider.ts

@@ -258,6 +258,7 @@ export default class Provider {
             accountOwner: this.userReference,
         });
         await newAccount.save();
+        newAccount.initiateOauth = null;
         return newAccount;
     }
 

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);

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>

config/environment.js

@@ -102,6 +102,13 @@ const {
     SHARE_SEARCH_URL: shareSearchUrl = 'http://localhost:8003/api/v2/search/creativeworks/_search',
     SOURCEMAPS_ENABLED: sourcemapsEnabled = true,
     SHOW_DEV_BANNER = false,
+
+    GOOGLE_FILE_PICKER_SCOPES,
+    /* eslint-disable-next-line max-len */
+    GOOGLE_FILE_PICKER_CLIENT_ID,
+    GOOGLE_FILE_PICKER_API_KEY,
+    GOOGLE_FILE_PICKER_APP_ID,
+
 } = { ...process.env, ...localConfig };
 
 module.exports = function(environment) {
@@ -224,6 +231,12 @@ module.exports = function(environment) {
             doiUrlPrefix: 'https://doi.org/',
             dataciteTrackerRepoId,
             dataCiteTrackerUrl,
+            googleFilePicker: {
+                GOOGLE_FILE_PICKER_SCOPES,
+                GOOGLE_FILE_PICKER_CLIENT_ID,
+                GOOGLE_FILE_PICKER_API_KEY,
+                GOOGLE_FILE_PICKER_APP_ID,
+            },
         },
         social: {
             twitter: {
@@ -316,6 +329,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: {

lib/osf-components/addon/components/activity-log/component.ts

@@ -4,7 +4,7 @@ export default class ActivityLogComponent extends Component {
     public loadEmbeds = {
         embed:
             [
-                'group', 'linked_node', 'linked_registration', 'original_node',
+                'linked_node', 'linked_registration', 'original_node',
                 'template_node', 'user',
             ],
     };

lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts

@@ -1,7 +1,10 @@
 import { action } from '@ember/object';
+import { waitFor } from '@ember/test-waiters';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { TaskInstance } from 'ember-concurrency';
+import { task, TaskInstance } from 'ember-concurrency';
+import { taskFor } from 'ember-concurrency-ts';
+
 
 import { Item, ItemType } from 'ember-osf-web/models/addon-operation-invocation';
 import AuthorizedAccountModel from 'ember-osf-web/models/authorized-account';
@@ -14,6 +17,7 @@ import ConfiguredCitationAddonModel from 'ember-osf-web/models/configured-citati
 import ConfiguredComputingAddonModel from 'ember-osf-web/models/configured-computing-addon';
 import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
 import ConfiguredStorageAddonModel from 'ember-osf-web/models/configured-storage-addon';
+import ExternalStorageServiceModel from 'ember-osf-web/models/external-storage-service';
 
 
 interface Args {
@@ -30,6 +34,9 @@ export default class ConfiguredAddonEdit extends Component<Args> {
     @tracked selectedItem = '';
     @tracked selectedItemDisplayName = '';
     @tracked selectedResourceType = '';
+    @tracked isWBGoogleDrive = false;
+    @tracked accountId!: string;
+
     originalName = this.displayName;
     originalRootFolder = this.selectedFolder;
     originalSelectedItem = this.selectedItem;
@@ -41,6 +48,7 @@ export default class ConfiguredAddonEdit extends Component<Args> {
         super(owner, args);
         if (this.args.configuredAddon) {
             if (this.args.configuredAddon instanceof ConfiguredStorageAddonModel) {
+                taskFor(this.loadExternalStorageService).perform();
                 this.defaultKwargs['itemType'] = ItemType.Folder;
             }
             if (this.args.configuredAddon instanceof ConfiguredCitationAddonModel) {
@@ -54,6 +62,7 @@ export default class ConfiguredAddonEdit extends Component<Args> {
         }
         if (this.args.authorizedAccount) {
             if (this.args.authorizedAccount instanceof AuthorizedStorageAccountModel) {
+                taskFor(this.loadExternalStorageService).perform();
                 this.defaultKwargs['itemType'] = ItemType.Folder;
             }
             if (this.args.authorizedAccount instanceof AuthorizedCitationAccountModel) {
@@ -71,13 +80,43 @@ export default class ConfiguredAddonEdit extends Component<Args> {
     }
 
     get requiresFilesWidget() {
+    /**
+     * This is called only to authorize because the current implementation will throw an
+     * error because the "root folder" is not yet set.
+     */
         return !(
             this.args.authorizedAccount instanceof AuthorizedComputingAccountModel
             ||
             this.args.configuredAddon instanceof ConfiguredComputingAddonModel
         );
     }
 
+    @task
+    @waitFor
+    async loadExternalStorageService() {
+        let external!: ExternalStorageServiceModel;
+        if (this.args.configuredAddon && this.args.configuredAddon instanceof ConfiguredStorageAddonModel) {
+            const baseAccount = await this.args.configuredAddon.baseAccount;
+            this.accountId = baseAccount?.id;
+            external = await this.args.configuredAddon.externalStorageService;
+        }
+        if (this.args.authorizedAccount && this.args.authorizedAccount instanceof AuthorizedStorageAccountModel) {
+            external = await this.args.authorizedAccount.externalStorageService;
+
+            this.accountId =  this.args.authorizedAccount.id;
+        }
+
+        this.isWBGoogleDrive = external?.wbKey === 'googledrive';
+    }
+
+    get isGoogleDrive(): boolean {
+        return this.isWBGoogleDrive;
+    }
+
+    get displayFileManager(): boolean {
+        return this.requiresFilesWidget && !this.isGoogleDrive;
+    }
+
     get invalidDisplayName() {
         return !this.displayName || this.displayName?.trim().length === 0;
     }

lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss

@@ -63,3 +63,8 @@
 .item-name {
     white-space: normal;
 }
+
+.picker-style {
+    white-space: pre-wrap;
+
+}

lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs

@@ -21,7 +21,7 @@
             </span>
         {{/if}}
     </div>
-    {{#if this.requiresFilesWidget }}
+    {{#if this.displayFileManager}}
         <div local-class='input-wrapper'>
             <b>
                 {{#if this.isLinkAddon}}
@@ -158,6 +158,13 @@
                 </tbody>
             </table>
         </AddonsService::FileManager>
+    {{else}}
+        <GoogleFilePickerWidget
+            @selectedFolderName={{this.selectedFolderDisplayName}}
+            @selectFolder={{action this.selectFolder}}
+            @isFolderPicker={{true}}
+            @accountId={{this.accountId}}
+        ></GoogleFilePickerWidget>
     {{/if}}
     {{#if this.isLinkAddon}}
         <label>

lib/osf-components/addon/components/addons-service/manager/component.ts

@@ -235,9 +235,8 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
     @waitFor
     async createAuthorizedAccount(arg: AccountCreationArgs) {
         if (this.selectedProvider) {
-            const newAccount = await taskFor(this.selectedProvider.createAuthorizedAccount)
+            return await taskFor(this.selectedProvider.createAuthorizedAccount)
                 .perform(arg);
-            return newAccount;
         }
         return undefined;
     }