Merge tag '25.04.0' into develop

Addons and gravyvalet
CenterForOpenScience · Feb 24, 2025 · b4dad5d · b4dad5d
2 parents 7005478 + b320c01
commit b4dad5d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
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.04.0] - 2025-02-24
+### Added
+- Addons and gravyvalet
+
 ## [25.03.0] - 2025-01-27
 ### Added
 - Preprint DOI Versioning

diff --git a/app/guid-node/files/provider/route.ts b/app/guid-node/files/provider/route.ts
@@ -23,7 +23,7 @@ export default class GuidNodeFilesProviderRoute extends Route.extend({}) {
     @waitFor
     async fileProviderTask(guidRouteModel: GuidRouteModel<NodeModel>, fileProviderId: string) {
         const node = await guidRouteModel.taskInstance;
-        await taskFor(node.getEnabledAddons).perform();
+        // await taskFor(node.getEnabledAddons).perform();
         try {
             const fileProviders = await node.queryHasMany(
                 'files',
@@ -61,20 +61,20 @@ export default class GuidNodeFilesProviderRoute extends Route.extend({}) {
         }
     }
 
-    model(params: { providerId: string }) {
+    async model(params: { providerId: string }) {
         const node = this.modelFor('guid-node');
-        let configuredStorageAddonTask;
+        let configuredStorageAddon;
         let fileProviderId = params.providerId;
         if(this.features.isEnabled('gravy_waffle')){
-            configuredStorageAddonTask = taskFor(this.configuredStorageAddonTask).perform(params.providerId);
+            configuredStorageAddon = await taskFor(this.configuredStorageAddonTask).perform(params.providerId);
             if (params.providerId === 'osfstorage'){
                 fileProviderId = node.guid + ':' + params.providerId;
             }
         } else {
             fileProviderId = node.guid + ':' + params.providerId;
         }
         return {
-            configuredStorageAddonTask,
+            configuredStorageAddon,
             node,
             providerName: params.providerId,
             providerTask: taskFor(this.fileProviderTask).perform(node, fileProviderId),

diff --git a/app/guid-node/files/provider/template.hbs b/app/guid-node/files/provider/template.hbs
@@ -2,7 +2,7 @@
     <StorageProviderManager::StorageManager
         @provider={{this.model.providerTask.value.provider}}
         @isViewOnly={{this.model.providerTask.value.currentUser.viewOnlyToken}}
-        @configuredStorageAddon={{this.model.configuredStorageAddonTask.value}}
+        @configuredStorageAddon={{this.model.configuredStorageAddon}}
         as |manager|
     >
         <div local-class='FileBrowser'>

diff --git a/app/packages/addons-service/provider.ts b/app/packages/addons-service/provider.ts
@@ -51,7 +51,7 @@ export default class Provider {
     @service intl!: Intl;
 
     @tracked node?: NodeModel;
-    @tracked serviceNode?: ResourceReferenceModel;
+    @tracked serviceNode?: ResourceReferenceModel | null;
 
     currentUser: CurrentUserService;
     @tracked userReference!: UserReferenceModel;
@@ -115,7 +115,7 @@ export default class Provider {
         currentUser: CurrentUserService,
         node?: NodeModel,
         allConfiguredAddons?: EmberArray<AllConfiguredAddonTypes>,
-        resourceReference?: ResourceReferenceModel,
+        resourceReference?: ResourceReferenceModel | null,
         userReference?: UserReferenceModel,
     ) {
         setOwner(this, getOwner(provider));
@@ -179,7 +179,7 @@ export default class Provider {
     @task
     @waitFor
     async getResourceReference() {
-        if (this.node && !this.serviceNode) {
+        if (this.node && this.serviceNode === undefined) {
             const resourceRefs = await this.store.query('resource-reference', {
                 filter: {resource_uri: this.node.links.iri?.toString()},
             });

diff --git a/lib/osf-components/addon/components/addons-service/manager/component.ts b/lib/osf-components/addon/components/addons-service/manager/component.ts
@@ -58,7 +58,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
     @service toast!: Toast;
 
     node = this.args.node;
-    @tracked addonServiceNode?: ResourceReferenceModel;
+    @tracked addonServiceNode?: ResourceReferenceModel | null;
     @tracked userReference?: UserReferenceModel;
 
     possibleFilterTypes = Object.values(FilterTypes);
@@ -341,8 +341,10 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
         const references = await this.store.query('resource-reference', {
             filter: {resource_uri: this.node.links.iri},
         });
-        if(references) {
-            this.addonServiceNode = references.firstObject;
+        if (references) {
+            this.addonServiceNode = references.firstObject || null;
+        } else {
+            this.addonServiceNode = null;
         }
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "25.03.0",
+  "version": "25.04.0",
   "private": true,
   "description": "Ember front-end for the Open Science Framework",
   "homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",