Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/guid-node/addons/index/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<div
data-test-configured-addon-name
local-class='configured-addon-display-name'
{{did-insert (perform configuredAddon.getRootFolderName)}}
{{did-insert (perform configuredAddon.getSelectedItemName)}}
>
<span>{{configuredAddon.displayName}}</span>
<span local-class='float-right'>
Expand Down
12 changes: 2 additions & 10 deletions app/models/configured-addon.ts
Original file line number Diff line number Diff line change
@@ -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';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any considerations for keeping this?

import { ConnectedStorageOperationNames, OperationKwargs } from './addon-operation-invocation';
import { ConnectedCapabilities } from './authorized-account';

Expand Down Expand Up @@ -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 = '';
}
12 changes: 11 additions & 1 deletion app/models/configured-citation-addon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
}
Comment on lines +55 to +60
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non-blocking: should we define this back in configured-addon.ts while overriding it in `configured-link-addon? In this way, we won't have duplicate code for storage and citation add-ons.

}

declare module 'ember-data/types/registries/model' {
Expand Down
5 changes: 1 addition & 4 deletions app/models/configured-link-addon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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;
}
Expand Down
10 changes: 9 additions & 1 deletion app/models/configured-storage-addon.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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' {
Expand Down