diff --git a/app/guid-node/addons/index/template.hbs b/app/guid-node/addons/index/template.hbs
index f3e88d7f28..56b67152bb 100644
--- a/app/guid-node/addons/index/template.hbs
+++ b/app/guid-node/addons/index/template.hbs
@@ -169,7 +169,7 @@
{{configuredAddon.displayName}}
diff --git a/app/models/configured-addon.ts b/app/models/configured-addon.ts
index 354cd3cce4..21882f2a9e 100644
--- a/app/models/configured-addon.ts
+++ b/app/models/configured-addon.ts
@@ -1,11 +1,9 @@
import Model, { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
-import { waitFor } from '@ember/test-waiters';
-import { task } from 'ember-concurrency';
import UserReferenceModel from 'ember-osf-web/models/user-reference';
import { tracked } from 'tracked-built-ins';
-import { taskFor } from 'ember-concurrency-ts';
import { SupportedResourceTypes } from 'ember-osf-web/models/external-link-service';
+// import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
import { ConnectedStorageOperationNames, OperationKwargs } from './addon-operation-invocation';
import { ConnectedCapabilities } from './authorized-account';
@@ -53,11 +51,5 @@ export default class ConfiguredAddonModel extends Model {
}
@tracked rootFolderName = '';
-
- @task
- @waitFor
- async getRootFolderName(this: ConfiguredAddonModel) {
- const response = await taskFor(this.getItemInfo).perform(this.rootFolder);
- this.rootFolderName = response.operationResult.itemName;
- }
+ @tracked targetItemName = '';
}
diff --git a/app/models/configured-citation-addon.ts b/app/models/configured-citation-addon.ts
index 25764947aa..3556e8ace1 100644
--- a/app/models/configured-citation-addon.ts
+++ b/app/models/configured-citation-addon.ts
@@ -3,7 +3,10 @@ import { AsyncBelongsTo, belongsTo } from '@ember-data/model';
import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
import { task } from 'ember-concurrency';
import { waitFor } from '@ember/test-waiters';
-import { ConnectedCitationOperationNames, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
+import {
+ ConnectedCitationOperationNames, Item, OperationKwargs,
+} from 'ember-osf-web/models/addon-operation-invocation';
+import { taskFor } from 'ember-concurrency-ts';
import AuthorizedCitationAccountModel from './authorized-citation-account';
import ExternalCitationServiceModel from './external-citation-service';
import ConfiguredAddonModel from './configured-addon';
@@ -48,6 +51,13 @@ export default class ConfiguredCitationAddonModel extends ConfiguredAddonModel {
});
return await newInvocation.save();
}
+
+ @task
+ @waitFor
+ async getSelectedItemName(this: ConfiguredCitationAddonModel) {
+ const response = await taskFor(this.getItemInfo).perform(this.rootFolder);
+ this.rootFolderName = (response.operationResult as Item).itemName;
+ }
}
declare module 'ember-data/types/registries/model' {
diff --git a/app/models/configured-link-addon.ts b/app/models/configured-link-addon.ts
index 76cf0bbdcf..17ce68003e 100644
--- a/app/models/configured-link-addon.ts
+++ b/app/models/configured-link-addon.ts
@@ -6,7 +6,6 @@ import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
import ExternalLinkServiceModel, { SupportedResourceTypes } from 'ember-osf-web/models/external-link-service';
import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
-import { tracked } from 'tracked-built-ins';
import { taskFor } from 'ember-concurrency-ts';
import ConfiguredAddonModel from './configured-addon';
@@ -58,11 +57,9 @@ export default class ConfiguredLinkAddonModel extends ConfiguredAddonModel {
return await newInvocation.save();
}
- @tracked targetItemName = '';
-
@task
@waitFor
- async getTargetItemName(this: ConfiguredLinkAddonModel) {
+ async getSelectedItemName(this: ConfiguredLinkAddonModel) {
const response = await taskFor(this.getItemInfo).perform(this.targetId);
this.targetItemName = (response.operationResult as Item).itemName;
}
diff --git a/app/models/configured-storage-addon.ts b/app/models/configured-storage-addon.ts
index 31defc9bbd..81c36de4f5 100644
--- a/app/models/configured-storage-addon.ts
+++ b/app/models/configured-storage-addon.ts
@@ -1,9 +1,10 @@
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 { ConnectedStorageOperationNames, Item, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
+import { taskFor } from 'ember-concurrency-ts';
import AuthorizedStorageAccountModel from './authorized-storage-account';
import ConfiguredAddonModel from './configured-addon';
import ExternalStorageServiceModel from './external-storage-service';
@@ -49,6 +50,13 @@ export default class ConfiguredStorageAddonModel extends ConfiguredAddonModel {
});
return await newInvocation.save();
}
+
+ @task
+ @waitFor
+ async getSelectedItemName(this: ConfiguredStorageAddonModel) {
+ const response = await taskFor(this.getItemInfo).perform(this.rootFolder);
+ this.rootFolderName = (response.operationResult as Item).itemName;
+ }
}
declare module 'ember-data/types/registries/model' {