Skip to content

Commit aea44b7

Browse files
authored
[ENG-8235] Fix "Linked Item" during addon reconfiguration (#2586)
1 parent f617801 commit aea44b7

File tree

5 files changed

+24
-17
lines changed

5 files changed

+24
-17
lines changed

app/guid-node/addons/index/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<div
170170
data-test-configured-addon-name
171171
local-class='configured-addon-display-name'
172-
{{did-insert (perform configuredAddon.getRootFolderName)}}
172+
{{did-insert (perform configuredAddon.getSelectedItemName)}}
173173
>
174174
<span>{{configuredAddon.displayName}}</span>
175175
<span local-class='float-right'>

app/models/configured-addon.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import Model, { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
2-
import { waitFor } from '@ember/test-waiters';
3-
import { task } from 'ember-concurrency';
42

53
import UserReferenceModel from 'ember-osf-web/models/user-reference';
64
import { tracked } from 'tracked-built-ins';
7-
import { taskFor } from 'ember-concurrency-ts';
85
import { SupportedResourceTypes } from 'ember-osf-web/models/external-link-service';
6+
// import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
97
import { ConnectedStorageOperationNames, OperationKwargs } from './addon-operation-invocation';
108
import { ConnectedCapabilities } from './authorized-account';
119

@@ -53,11 +51,5 @@ export default class ConfiguredAddonModel extends Model {
5351
}
5452

5553
@tracked rootFolderName = '';
56-
57-
@task
58-
@waitFor
59-
async getRootFolderName(this: ConfiguredAddonModel) {
60-
const response = await taskFor(this.getItemInfo).perform(this.rootFolder);
61-
this.rootFolderName = response.operationResult.itemName;
62-
}
54+
@tracked targetItemName = '';
6355
}

app/models/configured-citation-addon.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import { AsyncBelongsTo, belongsTo } from '@ember-data/model';
33
import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
44
import { task } from 'ember-concurrency';
55
import { waitFor } from '@ember/test-waiters';
6-
import { ConnectedCitationOperationNames, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
6+
import {
7+
ConnectedCitationOperationNames, Item, OperationKwargs,
8+
} from 'ember-osf-web/models/addon-operation-invocation';
9+
import { taskFor } from 'ember-concurrency-ts';
710
import AuthorizedCitationAccountModel from './authorized-citation-account';
811
import ExternalCitationServiceModel from './external-citation-service';
912
import ConfiguredAddonModel from './configured-addon';
@@ -48,6 +51,13 @@ export default class ConfiguredCitationAddonModel extends ConfiguredAddonModel {
4851
});
4952
return await newInvocation.save();
5053
}
54+
55+
@task
56+
@waitFor
57+
async getSelectedItemName(this: ConfiguredCitationAddonModel) {
58+
const response = await taskFor(this.getItemInfo).perform(this.rootFolder);
59+
this.rootFolderName = (response.operationResult as Item).itemName;
60+
}
5161
}
5262

5363
declare module 'ember-data/types/registries/model' {

app/models/configured-link-addon.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
66

77
import ExternalLinkServiceModel, { SupportedResourceTypes } from 'ember-osf-web/models/external-link-service';
88
import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
9-
import { tracked } from 'tracked-built-ins';
109
import { taskFor } from 'ember-concurrency-ts';
1110
import ConfiguredAddonModel from './configured-addon';
1211

@@ -58,11 +57,9 @@ export default class ConfiguredLinkAddonModel extends ConfiguredAddonModel {
5857
return await newInvocation.save();
5958
}
6059

61-
@tracked targetItemName = '';
62-
6360
@task
6461
@waitFor
65-
async getTargetItemName(this: ConfiguredLinkAddonModel) {
62+
async getSelectedItemName(this: ConfiguredLinkAddonModel) {
6663
const response = await taskFor(this.getItemInfo).perform(this.targetId);
6764
this.targetItemName = (response.operationResult as Item).itemName;
6865
}

app/models/configured-storage-addon.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
22
import { waitFor } from '@ember/test-waiters';
33
import { task } from 'ember-concurrency';
4-
import { ConnectedStorageOperationNames, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
4+
import { ConnectedStorageOperationNames, Item, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
55
import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
66

7+
import { taskFor } from 'ember-concurrency-ts';
78
import AuthorizedStorageAccountModel from './authorized-storage-account';
89
import ConfiguredAddonModel from './configured-addon';
910
import ExternalStorageServiceModel from './external-storage-service';
@@ -49,6 +50,13 @@ export default class ConfiguredStorageAddonModel extends ConfiguredAddonModel {
4950
});
5051
return await newInvocation.save();
5152
}
53+
54+
@task
55+
@waitFor
56+
async getSelectedItemName(this: ConfiguredStorageAddonModel) {
57+
const response = await taskFor(this.getItemInfo).perform(this.rootFolder);
58+
this.rootFolderName = (response.operationResult as Item).itemName;
59+
}
5260
}
5361

5462
declare module 'ember-data/types/registries/model' {

0 commit comments

Comments
 (0)