fix ServiceProviderFile getFolderItems (CenterForOpenScience#2322)

adlius · Sep 12, 2024 · 8a429a0 · 8a429a0
1 parent 14ae25c
commit 8a429a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/app/packages/files/service-provider-file.ts b/app/packages/files/service-provider-file.ts
@@ -13,6 +13,7 @@ import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/captur
 import { ErrorDocument } from 'osf-api';
 import ConfiguredStorageAddonModel, { ConnectedCapabilities, ConnectedOperationNames}
     from 'ember-osf-web/models/configured-storage-addon';
+import ServiceFile from 'ember-osf-web/packages/files/service-file';
 
 export default class ServiceProviderFile {
     @tracked fileModel: FileProviderModel;
@@ -116,21 +117,18 @@ export default class ServiceProviderFile {
     }
 
     async getFolderItems(page: number, sort: FileSortKey, filter: string ) {
-        if (this.fileModel.isFolder) {
-            const queryResult = await this.fileModel.queryHasMany('files',
-                {
-                    page,
-                    sort,
-                    'filter[name]': filter,
-                });
-            this.totalFileCount = queryResult.meta.total;
-            return queryResult.map(fileModel => Reflect.construct(this.constructor, [
-                this.currentUser,
-                fileModel,
-                this.configuredStorageAddon,
-            ]));
-        }
-        return [];
+        const queryResult = await this.fileModel.queryHasMany('files',
+            {
+                page,
+                sort,
+                'filter[name]': filter,
+            });
+        this.totalFileCount = queryResult.meta.total;
+        return queryResult.map(fileModel => new ServiceFile(
+            this.currentUser,
+            fileModel,
+            this.configuredStorageAddon,
+        ));
     }
 
     handleFetchError(e: ErrorDocument) {

diff --git a/lib/osf-components/addon/components/storage-provider-manager/storage-manager/component.ts b/lib/osf-components/addon/components/storage-provider-manager/storage-manager/component.ts
@@ -132,7 +132,7 @@ export default class StorageManager extends Component<Args> {
     @restartableTask
     @waitFor
     async getRootFolderItems() {
-        if(this.args.provider) {
+        if (this.args.provider) {
             await taskFor(this.getRootFolder).perform();
             await taskFor(this.getCurrentFolderItems).perform();
         } else {