Merge branch 'release/25.12.0'

Author: adlius

CHANGELOG.md

@@ -4,6 +4,11 @@ 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

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/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

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

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: {

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',
             ],
     };