From 017148d575de8405a70331b1f5412680d2c14211 Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Thu, 17 Apr 2025 01:56:35 -0400
Subject: [PATCH 1/9] [ENG-7739] Add query params for routing (#2539)

* add query params for routing

* fix tests

* fix stuck tests
---
 app/guid-node/addons/index/controller.ts      | 10 ++++++++++
 app/guid-node/addons/index/template.hbs       | 10 +++++++---
 .../addons-service/manager/component.ts       | 19 +++++++++++++------
 .../addons-service/manager/component-test.ts  |  5 +++++
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/app/guid-node/addons/index/controller.ts b/app/guid-node/addons/index/controller.ts
index 5e176c24dc4..a545b79f617 100644
--- a/app/guid-node/addons/index/controller.ts
+++ b/app/guid-node/addons/index/controller.ts
@@ -1,9 +1,19 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import Media from 'ember-responsive';
+import { tracked } from 'tracked-built-ins';
 
+enum FilterTypes {
+    STORAGE = 'additional-storage',
+    CITATION_MANAGER = 'citation-manager',
+    // CLOUD_COMPUTING = 'cloud-computing', // disabled because BOA is down
+}
 export default class GuidNodeAddonsController extends Controller {
     @service media!: Media;
+    @tracked tabIndex = 0;
+    @tracked activeFilterType = FilterTypes.STORAGE;
+
+    queryParams = ['tabIndex', 'activeFilterType'];
 
     get isMobile() {
         return this.media.isMobile;
diff --git a/app/guid-node/addons/index/template.hbs b/app/guid-node/addons/index/template.hbs
index 005c1543a8b..c18dcc59d08 100644
--- a/app/guid-node/addons/index/template.hbs
+++ b/app/guid-node/addons/index/template.hbs
@@ -3,6 +3,9 @@
 <div local-class='addon-page-wrapper'>
     <AddonsService::Manager
         @node={{this.model}}
+        @activeFilterType={{this.activeFilterType}}
+        @updateActiveFilterType={{fn (mut this.activeFilterType)}}
+        @updateTabIndex={{fn (mut this.tabIndex)}}
         as |manager|
     >
         {{#if manager.selectedProvider}}
@@ -282,7 +285,8 @@
             {{/let}}
         {{else}}
             <AriaTabs
-                @defaultIndex={{0}}
+                @selectedIndex={{this.tabIndex}}
+                @onSelect={{action (mut this.tabIndex)}}
                 local-class='tabs'
                 as |tab|
             >
@@ -324,7 +328,7 @@
                                 <Button
                                     data-test-addon-list-filter={{type}}
                                     data-analytics-name={{t (concat 'addons.list.filter.' type)}}
-                                    local-class='filter-button {{if (eq manager.activeFilterType type) 'active'}}'
+                                    local-class='filter-button {{if (eq this.activeFilterType type) 'active'}}'
                                     @layout='fake-link'
                                     {{on 'click' (fn manager.filterByAddonType type)}}
                                 >
@@ -364,7 +368,7 @@
                                 <Button
                                     data-test-addon-list-filter={{type}}
                                     data-analytics-name={{t (concat 'addons.list.filter.' type)}}
-                                    local-class='filter-button {{if (eq manager.activeFilterType type) 'active'}}'
+                                    local-class='filter-button {{if (eq this.activeFilterType type) 'active'}}'
                                     @layout='fake-link'
                                     {{on 'click' (fn manager.filterByAddonType type)}}
                                 >
diff --git a/lib/osf-components/addon/components/addons-service/manager/component.ts b/lib/osf-components/addon/components/addons-service/manager/component.ts
index 2e82a342fef..e876f9fd516 100644
--- a/lib/osf-components/addon/components/addons-service/manager/component.ts
+++ b/lib/osf-components/addon/components/addons-service/manager/component.ts
@@ -49,6 +49,9 @@ export enum FilterTypes {
 
 interface Args {
     node: NodeModel;
+    activeFilterType: FilterTypes;
+    updateActiveFilterType: (type: string) => void;
+    updateTabIndex: (type: number) => void;
 }
 
 export default class AddonsServiceManagerComponent extends Component<Args> {
@@ -84,7 +87,6 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
     };
     filterTypeMapper = new TrackedObject(this.mapper);
     @tracked filterText = '';
-    @tracked activeFilterType: FilterTypes = FilterTypes.STORAGE;
 
     @tracked confirmRemoveConnectedLocation = false;
     @tracked _pageMode?: PageMode;
@@ -95,10 +97,10 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
 
     @action
     filterByAddonType(type: FilterTypes) {
-        if (this.activeFilterType !== type) {
+        if (this.args.activeFilterType !== type) {
             this.filterText = '';
         }
-        this.activeFilterType = type;
+        this.args.updateActiveFilterType(type);
         const activeFilterObject = this.filterTypeMapper[type];
         if (activeFilterObject.list.length === 0) {
             activeFilterObject.task.perform();
@@ -116,7 +118,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
     }
 
     get filteredConfiguredProviders() {
-        const activeFilterObject = this.filterTypeMapper[this.activeFilterType];
+        const activeFilterObject = this.filterTypeMapper[this.args.activeFilterType];
         const possibleProviders = activeFilterObject.list;
         const textFilteredAddons = possibleProviders.filter(
             (provider: any) => provider.provider.displayName.toLowerCase().includes(this.filterText.toLowerCase()),
@@ -128,7 +130,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
     }
 
     get filteredAddonProviders() {
-        const activeFilterObject = this.filterTypeMapper[this.activeFilterType];
+        const activeFilterObject = this.filterTypeMapper[this.args.activeFilterType];
         const possibleProviders = activeFilterObject.list;
         const textFilteredAddons = possibleProviders.filter(
             (provider: any) => provider.provider.displayName.toLowerCase().includes(this.filterText.toLowerCase()),
@@ -138,7 +140,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
     }
 
     get currentListIsLoading() {
-        const activeFilterObject = this.filterTypeMapper[this.activeFilterType];
+        const activeFilterObject = this.filterTypeMapper[this.args.activeFilterType];
         return activeFilterObject.task.isRunning || taskFor(this.initialize).isRunning;
     }
 
@@ -278,6 +280,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
         this.selectedConfiguration = undefined;
         this.selectedAccount = undefined;
         this.confirmRemoveConnectedLocation = false;
+        this.args.updateTabIndex(0);
     }
 
     @task
@@ -333,6 +336,10 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
             taskFor(this.getServiceNode).perform(),
         ]);
         await taskFor(this.getStorageAddonProviders).perform();
+        const activeFilterObject = this.filterTypeMapper[this.args.activeFilterType];
+        if (activeFilterObject.list.length === 0) {
+            activeFilterObject.task.perform();
+        }
     }
 
     @task
diff --git a/tests/integration/components/addons-service/manager/component-test.ts b/tests/integration/components/addons-service/manager/component-test.ts
index ad6e98295c6..2f58463a26d 100644
--- a/tests/integration/components/addons-service/manager/component-test.ts
+++ b/tests/integration/components/addons-service/manager/component-test.ts
@@ -27,9 +27,14 @@ module('Integration | Component | addons-service | manager', hooks => {
             { id: mirageNode.id, configuredStorageAddons: [] });
         server.create('user-reference', { id: user.id });
         this.set('node', node);
+        this.set('activeFilterType', 'additional-storage');
+        this.set('tabIndex', 0);
         await render(hbs`
 <AddonsService::Manager
     @node={{this.node}}
+    @activeFilterType={{this.activeFilterType}}
+    @updateActiveFilterType={{fn (mut this.activeFilterType)}}
+    @updateTabIndex={{fn (mut this.tabIndex)}}
     as |manager|
 >
     {{#if manager.currentListIsLoading}}

From a6842404dec6a46d442bb59a5592211e375cbec8 Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Thu, 24 Apr 2025 11:21:31 -0400
Subject: [PATCH 2/9] add VRL models (#2549)

---
 app/adapters/authorized-link-account.ts    | 10 ++++
 app/adapters/configured-link-addon.ts      | 10 ++++
 app/adapters/external-link-service.ts      | 10 ++++
 app/models/addon-operation-invocation.ts   |  6 +++
 app/models/authorized-link-account.ts      | 47 ++++++++++++++++++
 app/models/configured-link-addon.ts        | 58 ++++++++++++++++++++++
 app/models/external-link-service.ts        | 48 ++++++++++++++++++
 app/models/resource-reference.ts           |  4 ++
 app/models/user-reference.ts               |  5 ++
 app/serializers/authorized-link-account.ts | 10 ++++
 app/serializers/configured-link-addon.ts   | 10 ++++
 app/serializers/external-link-service.ts   | 10 ++++
 12 files changed, 228 insertions(+)
 create mode 100644 app/adapters/authorized-link-account.ts
 create mode 100644 app/adapters/configured-link-addon.ts
 create mode 100644 app/adapters/external-link-service.ts
 create mode 100644 app/models/authorized-link-account.ts
 create mode 100644 app/models/configured-link-addon.ts
 create mode 100644 app/models/external-link-service.ts
 create mode 100644 app/serializers/authorized-link-account.ts
 create mode 100644 app/serializers/configured-link-addon.ts
 create mode 100644 app/serializers/external-link-service.ts

diff --git a/app/adapters/authorized-link-account.ts b/app/adapters/authorized-link-account.ts
new file mode 100644
index 00000000000..b90f11ff323
--- /dev/null
+++ b/app/adapters/authorized-link-account.ts
@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class AuthorizedLinkAccountAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'authorized-link-account': AuthorizedLinkAccountAdapter;
+    } // eslint-disable-line semi
+}
diff --git a/app/adapters/configured-link-addon.ts b/app/adapters/configured-link-addon.ts
new file mode 100644
index 00000000000..4518c6d0f52
--- /dev/null
+++ b/app/adapters/configured-link-addon.ts
@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ConfiguredLinkAddonAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'configured-link-addon': ConfiguredLinkAddonAdapter;
+    } // eslint-disable-line semi
+}
diff --git a/app/adapters/external-link-service.ts b/app/adapters/external-link-service.ts
new file mode 100644
index 00000000000..36304069c7c
--- /dev/null
+++ b/app/adapters/external-link-service.ts
@@ -0,0 +1,10 @@
+import AddonServiceAdapter from './addon-service';
+
+export default class ExternalLinkServiceAdapter extends AddonServiceAdapter {
+}
+
+declare module 'ember-data/types/registries/adapter' {
+    export default interface AdapterRegistry {
+        'external-link-service': ExternalLinkServiceAdapter;
+    } // eslint-disable-line semi
+}
diff --git a/app/models/addon-operation-invocation.ts b/app/models/addon-operation-invocation.ts
index 19eaef0173a..245120b0ca7 100644
--- a/app/models/addon-operation-invocation.ts
+++ b/app/models/addon-operation-invocation.ts
@@ -17,6 +17,12 @@ export enum ConnectedCitationOperationNames {
     GetItemInfo = 'get_item_info',
 }
 
+export enum ConnectedLinkOperationNames {
+    ListRootItems = 'list_root_items',
+    ListChildItems = 'list_child_items',
+    GetItemInfo = 'get_item_info',
+}
+
 export interface OperationKwargs {
     itemId?: string;
     itemType?: ItemType;
diff --git a/app/models/authorized-link-account.ts b/app/models/authorized-link-account.ts
new file mode 100644
index 00000000000..b83863211a4
--- /dev/null
+++ b/app/models/authorized-link-account.ts
@@ -0,0 +1,47 @@
+import { AsyncBelongsTo, belongsTo } from '@ember-data/model';
+import { waitFor } from '@ember/test-waiters';
+import { task } from 'ember-concurrency';
+import { ConnectedLinkOperationNames, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
+
+import ExternalLinkServiceModel from 'ember-osf-web/models/external-link-service';
+import AuthorizedAccountModel from './authorized-account';
+import UserReferenceModel from './user-reference';
+
+export default class AuthorizedLinkAccountModel extends AuthorizedAccountModel {
+    @belongsTo('user-reference', { inverse: 'authorizedLinkAccounts' })
+    readonly accountOwner!: AsyncBelongsTo<UserReferenceModel> & UserReferenceModel;
+
+    @belongsTo('external-link-service')
+    externalLinkService!: AsyncBelongsTo<ExternalLinkServiceModel> & ExternalLinkServiceModel;
+
+    @task
+    @waitFor
+    async getFolderItems(this: AuthorizedAccountModel, kwargs?: OperationKwargs) {
+        const operationKwargs = kwargs || {};
+        const operationName = operationKwargs.itemId ? ConnectedLinkOperationNames.ListChildItems :
+            ConnectedLinkOperationNames.ListRootItems;
+        const newInvocation = this.store.createRecord('addon-operation-invocation', {
+            operationName,
+            operationKwargs,
+            thruAccount: this,
+        });
+        return await newInvocation.save();
+    }
+
+    @task
+    @waitFor
+    async getItemInfo(this: AuthorizedAccountModel, itemId: string) {
+        const newInvocation = this.store.createRecord('addon-operation-invocation', {
+            operationName: ConnectedLinkOperationNames.GetItemInfo,
+            operationKwargs: { itemId },
+            thruAccount: this,
+        });
+        return await newInvocation.save();
+    }
+}
+
+declare module 'ember-data/types/registries/model' {
+    export default interface ModelRegistry {
+        'authorized-link-account': AuthorizedLinkAccountModel;
+    } // eslint-disable-line semi
+}
diff --git a/app/models/configured-link-addon.ts b/app/models/configured-link-addon.ts
new file mode 100644
index 00000000000..467e5a1edf4
--- /dev/null
+++ b/app/models/configured-link-addon.ts
@@ -0,0 +1,58 @@
+import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
+import { waitFor } from '@ember/test-waiters';
+import { task } from 'ember-concurrency';
+import { ConnectedLinkOperationNames, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
+import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
+
+import ExternalLinkServiceModel from 'ember-osf-web/models/external-link-service';
+import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
+import ConfiguredAddonModel from './configured-addon';
+
+
+export default class ConfiguredLinkAddonModel extends ConfiguredAddonModel {
+    @attr('number') concurrentUploads!: number;
+
+    @belongsTo('external-link-service', { inverse: null })
+    externalLinkService!: AsyncBelongsTo<ExternalLinkServiceModel> & ExternalLinkServiceModel;
+
+    @belongsTo('authorized-storage-account')
+    baseAccount!: AsyncBelongsTo<AuthorizedLinkAccountModel> & AuthorizedLinkAccountModel;
+
+    @belongsTo('resource-reference', { inverse: 'configuredLinkAddons' })
+    authorizedResource!: AsyncBelongsTo<ResourceReferenceModel> & ResourceReferenceModel;
+
+    get externalServiceId() {
+        return (this as ConfiguredLinkAddonModel).belongsTo('externalLinkService').id();
+    }
+
+    @task
+    @waitFor
+    async getFolderItems(this: ConfiguredAddonModel, kwargs?: OperationKwargs) {
+        const operationKwargs = kwargs || {};
+        const operationName = operationKwargs.itemId ? ConnectedLinkOperationNames.ListChildItems :
+            ConnectedLinkOperationNames.ListRootItems;
+        const newInvocation = this.store.createRecord('addon-operation-invocation', {
+            operationName,
+            operationKwargs,
+            thruAddon: this,
+        });
+        return await newInvocation.save();
+    }
+
+    @task
+    @waitFor
+    async getItemInfo(this: ConfiguredAddonModel, itemId: string) {
+        const newInvocation = this.store.createRecord('addon-operation-invocation', {
+            operationName: ConnectedLinkOperationNames.GetItemInfo,
+            operationKwargs: { itemId },
+            thruAddon: this,
+        });
+        return await newInvocation.save();
+    }
+}
+
+declare module 'ember-data/types/registries/model' {
+    export default interface ModelRegistry {
+        'configured-link-addon': ConfiguredLinkAddonModel;
+    } // eslint-disable-line semi
+}
diff --git a/app/models/external-link-service.ts b/app/models/external-link-service.ts
new file mode 100644
index 00000000000..360c48ab6c6
--- /dev/null
+++ b/app/models/external-link-service.ts
@@ -0,0 +1,48 @@
+import { attr } from '@ember-data/model';
+
+import ExternalServiceModel from './external-service';
+
+export enum SupportedResourceTypes {
+    AUDIOVISUAL = 'AUDIOVISUAL',
+    AWARD = 'AWARD',
+    BOOK = 'BOOK',
+    BOOK_CHAPTER = 'BOOK_CHAPTER',
+    COLLECTION = 'COLLECTION',
+    COMPUTATIONAL_NOTEBOOK = 'COMPUTATIONAL_NOTEBOOK',
+    CONFERENCE_PAPER = 'CONFERENCE_PAPER',
+    CONFERENCE_PROCEEDING = 'CONFERENCE_PROCEEDING',
+    DATA_PAPER = 'DATA_PAPER',
+    DATASET = 'DATASET',
+    DISSERTATION = 'DISSERTATION',
+    EVENT = 'EVENT',
+    IMAGE = 'IMAGE',
+    INSTRUMENT = 'INSTRUMENT',
+    INTERACTIVE_RESOURCE = 'INTERACTIVE_RESOURCE',
+    JOURNAL = 'JOURNAL',
+    JOURNAL_ARTICLE = 'JOURNAL_ARTICLE',
+    MODEL = 'MODEL',
+    OUTPUT_MANAGEMENT_PLAN = 'OUTPUT_MANAGEMENT_PLAN',
+    PEER_REVIEW = 'PEER_REVIEW',
+    PHYSICAL_OBJECT = 'PHYSICAL_OBJECT',
+    PREPRINT = 'PREPRINT',
+    PROJECT = 'PROJECT',
+    REPORT = 'REPORT',
+    SERVICE = 'SERVICE',
+    SOFTWARE = 'SOFTWARE',
+    SOUND = 'SOUND',
+    STANDARD = 'STANDARD',
+    STUDY_REGISTRATION = 'STUDY_REGISTRATION',
+    TEXT = 'TEXT',
+    WORKFLOW = 'WORKFLOW',
+    OTHER = 'OTHER',
+}
+
+export default class ExternalLinkServiceModel extends ExternalServiceModel {
+    @attr('array') supportedResourceTypes!: SupportedResourceTypes[];
+}
+
+declare module 'ember-data/types/registries/model' {
+    export default interface ModelRegistry {
+        'external-link-service': ExternalLinkServiceModel;
+    } // eslint-disable-line semi
+}
diff --git a/app/models/resource-reference.ts b/app/models/resource-reference.ts
index 9adf8334abf..1f458fbae7d 100644
--- a/app/models/resource-reference.ts
+++ b/app/models/resource-reference.ts
@@ -1,5 +1,6 @@
 import Model, { AsyncHasMany, attr, hasMany } from '@ember-data/model';
 
+import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
 import ConfiguredStorageAddonModel from './configured-storage-addon';
 import ConfiguredCitationAddonModel from './configured-citation-addon';
 import ConfiguredComputingAddonModel from './configured-computing-addon';
@@ -18,6 +19,9 @@ export default class ResourceReferenceModel extends Model {
     @hasMany('configured-computing-addon', { inverse: 'authorizedResource' })
     configuredComputingAddons!: AsyncHasMany<ConfiguredComputingAddonModel>
         & ConfiguredComputingAddonModel[];
+
+    @hasMany('configured-link-addon', { inverse: 'authorizedResource' })
+    configuredLinkAddons!: AsyncHasMany<ConfiguredLinkAddonModel> & ConfiguredLinkAddonModel[];
 }
 
 declare module 'ember-data/types/registries/model' {
diff --git a/app/models/user-reference.ts b/app/models/user-reference.ts
index 4cf3d589ee6..7efa721118e 100644
--- a/app/models/user-reference.ts
+++ b/app/models/user-reference.ts
@@ -1,5 +1,6 @@
 import Model, { AsyncHasMany, attr, hasMany } from '@ember-data/model';
 
+import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
 import AuthorizedStorageAccountModel from './authorized-storage-account';
 import AuthorizedCitationAccountModel from './authorized-citation-account';
 import AuthorizedComputingAccountModel from './authorized-computing-account';
@@ -19,6 +20,10 @@ export default class UserReferenceModel extends Model {
     authorizedComputingAccounts!: AsyncHasMany<AuthorizedComputingAccountModel>
         & AuthorizedComputingAccountModel[];
 
+    @hasMany('authorized-link-account', { inverse: 'accountOwner' })
+    authorizedLinkAccounts!: AsyncHasMany<AuthorizedLinkAccountModel>
+        & AuthorizedLinkAccountModel[];
+
     @hasMany('resource-reference')
     configuredResources!: AsyncHasMany<ResourceReferenceModel> & ResourceReferenceModel[];
 }
diff --git a/app/serializers/authorized-link-account.ts b/app/serializers/authorized-link-account.ts
new file mode 100644
index 00000000000..c658155e5a7
--- /dev/null
+++ b/app/serializers/authorized-link-account.ts
@@ -0,0 +1,10 @@
+import GravyValetSerializer from './gravy-valet-serializer';
+
+export default class AuthorizedLinkAccountSerializer extends GravyValetSerializer {
+}
+
+declare module 'ember-data/types/registries/serializer' {
+    export default interface SerializerRegistry {
+        'authorized-link-account': AuthorizedLinkAccountSerializer;
+    } // eslint-disable-line semi
+}
diff --git a/app/serializers/configured-link-addon.ts b/app/serializers/configured-link-addon.ts
new file mode 100644
index 00000000000..5b97c9f2ee0
--- /dev/null
+++ b/app/serializers/configured-link-addon.ts
@@ -0,0 +1,10 @@
+import ConfiguredAddonSerializer from './configured-addon';
+
+export default class ConfiguredLinkAddonSerializer extends ConfiguredAddonSerializer {
+}
+
+declare module 'ember-data/types/registries/serializer' {
+    export default interface SerializerRegistry {
+        'configured-link-addon': ConfiguredLinkAddonSerializer;
+    } // eslint-disable-line semi
+}
diff --git a/app/serializers/external-link-service.ts b/app/serializers/external-link-service.ts
new file mode 100644
index 00000000000..3306c07224e
--- /dev/null
+++ b/app/serializers/external-link-service.ts
@@ -0,0 +1,10 @@
+import GravyValetSerializer from './gravy-valet-serializer';
+
+export default class ExternalLinkServiceSerializer extends GravyValetSerializer {
+}
+
+declare module 'ember-data/types/registries/serializer' {
+    export default interface SerializerRegistry {
+        'external-link-service': ExternalLinkServiceSerializer;
+    } // eslint-disable-line semi
+}

From a28878b4875ded4930e1f6850199ec0dae69ea30 Mon Sep 17 00:00:00 2001
From: Oleh Paduchak <158075011+opaduchak@users.noreply.github.com>
Date: Mon, 5 May 2025 14:47:02 +0300
Subject: [PATCH 3/9] fixed supportedResourceType enum to be consistent with
 Datacite's resourceTypeGeneral (#2555)

---
 app/models/external-link-service.ts | 64 ++++++++++++++---------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/models/external-link-service.ts b/app/models/external-link-service.ts
index 360c48ab6c6..7c66b163704 100644
--- a/app/models/external-link-service.ts
+++ b/app/models/external-link-service.ts
@@ -3,38 +3,38 @@ import { attr } from '@ember-data/model';
 import ExternalServiceModel from './external-service';
 
 export enum SupportedResourceTypes {
-    AUDIOVISUAL = 'AUDIOVISUAL',
-    AWARD = 'AWARD',
-    BOOK = 'BOOK',
-    BOOK_CHAPTER = 'BOOK_CHAPTER',
-    COLLECTION = 'COLLECTION',
-    COMPUTATIONAL_NOTEBOOK = 'COMPUTATIONAL_NOTEBOOK',
-    CONFERENCE_PAPER = 'CONFERENCE_PAPER',
-    CONFERENCE_PROCEEDING = 'CONFERENCE_PROCEEDING',
-    DATA_PAPER = 'DATA_PAPER',
-    DATASET = 'DATASET',
-    DISSERTATION = 'DISSERTATION',
-    EVENT = 'EVENT',
-    IMAGE = 'IMAGE',
-    INSTRUMENT = 'INSTRUMENT',
-    INTERACTIVE_RESOURCE = 'INTERACTIVE_RESOURCE',
-    JOURNAL = 'JOURNAL',
-    JOURNAL_ARTICLE = 'JOURNAL_ARTICLE',
-    MODEL = 'MODEL',
-    OUTPUT_MANAGEMENT_PLAN = 'OUTPUT_MANAGEMENT_PLAN',
-    PEER_REVIEW = 'PEER_REVIEW',
-    PHYSICAL_OBJECT = 'PHYSICAL_OBJECT',
-    PREPRINT = 'PREPRINT',
-    PROJECT = 'PROJECT',
-    REPORT = 'REPORT',
-    SERVICE = 'SERVICE',
-    SOFTWARE = 'SOFTWARE',
-    SOUND = 'SOUND',
-    STANDARD = 'STANDARD',
-    STUDY_REGISTRATION = 'STUDY_REGISTRATION',
-    TEXT = 'TEXT',
-    WORKFLOW = 'WORKFLOW',
-    OTHER = 'OTHER',
+    AUDIOVISUAL = 'Audiovisual',
+    AWARD = 'Award',
+    BOOK = 'Book',
+    BOOK_CHAPTER = 'BookChapter',
+    COLLECTION = 'Collection',
+    COMPUTATIONAL_NOTEBOOK = 'ComputationalNotebook',
+    CONFERENCE_PAPER = 'ConferencePaper',
+    CONFERENCE_PROCEEDING = 'ConferenceProceeding',
+    DATA_PAPER = 'DataPaper',
+    DATASET = 'Dataset',
+    DISSERTATION = 'Dissertation',
+    EVENT = 'Event',
+    IMAGE = 'Image',
+    INSTRUMENT = 'Instrument',
+    INTERACTIVE_RESOURCE = 'InteractiveResource',
+    JOURNAL = 'Journal',
+    JOURNAL_ARTICLE = 'JournalArticle',
+    MODEL = 'Model',
+    OUTPUT_MANAGEMENT_PLAN = 'OutputManagementPlan',
+    PEER_REVIEW = 'PeerReview',
+    PHYSICAL_OBJECT = 'PhysicalObject',
+    PREPRINT = 'Preprint',
+    PROJECT = 'Project',
+    REPORT = 'Report',
+    SERVICE = 'Service',
+    SOFTWARE = 'Software',
+    SOUND = 'Sound',
+    STANDARD = 'Standard',
+    STUDY_REGISTRATION = 'StudyRegistration',
+    TEXT = 'Text',
+    WORKFLOW = 'Workflow',
+    OTHER = 'Other',
 }
 
 export default class ExternalLinkServiceModel extends ExternalServiceModel {

From 99a6b14a3f3fde7206d6498f6bd101d596a68d78 Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Tue, 13 May 2025 11:54:58 -0400
Subject: [PATCH 4/9] [ENG-7576] Linked service settings page (#2560)

* preliminary

* another batch of updates

* moar

* fix tests

* settings page

* CR followup
---
 app/guid-node/addons/index/controller.ts      |  1 +
 app/guid-node/addons/index/template.hbs       |  1 +
 app/models/configured-addon.ts                |  3 +
 app/models/configured-link-addon.ts           | 24 ++++++--
 app/packages/addons-service/provider.ts       | 60 ++++++++++++++++++-
 .../configured-addon-edit/component.ts        | 55 ++++++++++++-----
 .../configured-addon-edit/styles.scss         |  1 +
 .../configured-addon-edit/template.hbs        | 54 +++++++++++------
 .../addons-service/file-manager/component.ts  |  5 ++
 .../addons-service/file-manager/template.hbs  |  1 +
 .../addons-service/manager/component.ts       | 28 +++++++++
 .../terms-of-service/component.ts             | 13 +++-
 .../user-addons-manager/component.ts          | 38 ++++++++++++
 tests/acceptance/guid-node/addons-test.ts     |  2 +-
 .../configured-addon-edit/component-test.ts   |  3 +-
 translations/en-us.yml                        |  4 ++
 16 files changed, 251 insertions(+), 42 deletions(-)

diff --git a/app/guid-node/addons/index/controller.ts b/app/guid-node/addons/index/controller.ts
index a545b79f617..36d1e19a7b9 100644
--- a/app/guid-node/addons/index/controller.ts
+++ b/app/guid-node/addons/index/controller.ts
@@ -6,6 +6,7 @@ import { tracked } from 'tracked-built-ins';
 enum FilterTypes {
     STORAGE = 'additional-storage',
     CITATION_MANAGER = 'citation-manager',
+    VERIFIED_LINK = 'verified-link',
     // CLOUD_COMPUTING = 'cloud-computing', // disabled because BOA is down
 }
 export default class GuidNodeAddonsController extends Controller {
diff --git a/app/guid-node/addons/index/template.hbs b/app/guid-node/addons/index/template.hbs
index c18dcc59d08..f3e88d7f28e 100644
--- a/app/guid-node/addons/index/template.hbs
+++ b/app/guid-node/addons/index/template.hbs
@@ -277,6 +277,7 @@
                         <AddonsService::ConfiguredAddonEdit
                             @configuredAddon={{manager.selectedConfiguration}}
                             @authorizedAccount={{manager.selectedAccount}}
+                            @supportedResourceTypes={{manager.selectedProvider.provider.supportedResourceTypes}}
                             @onSave={{perform manager.saveOrCreateConfiguration}}
                             @onCancel={{manager.cancelSetup}}
                         />
diff --git a/app/models/configured-addon.ts b/app/models/configured-addon.ts
index a0e9d738724..354cd3cce44 100644
--- a/app/models/configured-addon.ts
+++ b/app/models/configured-addon.ts
@@ -5,6 +5,7 @@ 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 { ConnectedStorageOperationNames, OperationKwargs } from './addon-operation-invocation';
 import { ConnectedCapabilities } from './authorized-account';
 
@@ -12,6 +13,8 @@ import { ConnectedCapabilities } from './authorized-account';
 export interface ConfiguredAddonEditableAttrs {
     displayName: string;
     rootFolder: string;
+    targetId: string;
+    resourceType: SupportedResourceTypes;
 }
 
 export default class ConfiguredAddonModel extends Model {
diff --git a/app/models/configured-link-addon.ts b/app/models/configured-link-addon.ts
index 467e5a1edf4..1ac7750ba1b 100644
--- a/app/models/configured-link-addon.ts
+++ b/app/models/configured-link-addon.ts
@@ -1,21 +1,24 @@
 import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
 import { waitFor } from '@ember/test-waiters';
 import { task } from 'ember-concurrency';
-import { ConnectedLinkOperationNames, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
+import { ConnectedLinkOperationNames, Item, OperationKwargs } from 'ember-osf-web/models/addon-operation-invocation';
 import ResourceReferenceModel from 'ember-osf-web/models/resource-reference';
 
-import ExternalLinkServiceModel from 'ember-osf-web/models/external-link-service';
+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';
 
 
 export default class ConfiguredLinkAddonModel extends ConfiguredAddonModel {
-    @attr('number') concurrentUploads!: number;
+    @attr('string') targetId!: string;
+    @attr('string') resourceType!: SupportedResourceTypes;
 
     @belongsTo('external-link-service', { inverse: null })
     externalLinkService!: AsyncBelongsTo<ExternalLinkServiceModel> & ExternalLinkServiceModel;
 
-    @belongsTo('authorized-storage-account')
+    @belongsTo('authorized-link-account')
     baseAccount!: AsyncBelongsTo<AuthorizedLinkAccountModel> & AuthorizedLinkAccountModel;
 
     @belongsTo('resource-reference', { inverse: 'configuredLinkAddons' })
@@ -25,6 +28,10 @@ export default class ConfiguredLinkAddonModel extends ConfiguredAddonModel {
         return (this as ConfiguredLinkAddonModel).belongsTo('externalLinkService').id();
     }
 
+    get hasRootFolder() {
+        return false;
+    }
+
     @task
     @waitFor
     async getFolderItems(this: ConfiguredAddonModel, kwargs?: OperationKwargs) {
@@ -49,6 +56,15 @@ export default class ConfiguredLinkAddonModel extends ConfiguredAddonModel {
         });
         return await newInvocation.save();
     }
+
+    @tracked targetItemName = '';
+
+    @task
+    @waitFor
+    async getTargetItemName(this: ConfiguredLinkAddonModel) {
+        const response = await taskFor(this.getItemInfo).perform(this.targetId);
+        this.targetItemName = (response.operationResult as Item).itemName;
+    }
 }
 
 declare module 'ember-data/types/registries/model' {
diff --git a/app/packages/addons-service/provider.ts b/app/packages/addons-service/provider.ts
index 602aa683fbe..69ba9a72c4c 100644
--- a/app/packages/addons-service/provider.ts
+++ b/app/packages/addons-service/provider.ts
@@ -25,19 +25,25 @@ import ExternalComputingServiceModel from 'ember-osf-web/models/external-computi
 import ExternalCitationServiceModel from 'ember-osf-web/models/external-citation-service';
 import { notifyPropertyChange } from '@ember/object';
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
+import ExternalLinkServiceModel from 'ember-osf-web/models/external-link-service';
+import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
+import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
 
 export type AllProviderTypes =
     ExternalStorageServiceModel |
     ExternalComputingServiceModel |
-    ExternalCitationServiceModel;
+    ExternalCitationServiceModel |
+    ExternalLinkServiceModel;
 export type AllAuthorizedAccountTypes =
     AuthorizedStorageAccountModel |
     AuthorizedCitationAccountModel |
-    AuthorizedComputingAccountModel;
+    AuthorizedComputingAccountModel |
+    AuthorizedLinkAccountModel;
 export type AllConfiguredAddonTypes =
     ConfiguredStorageAddonModel |
     ConfiguredCitationAddonModel |
-    ConfiguredComputingAddonModel;
+    ConfiguredComputingAddonModel |
+    ConfiguredLinkAddonModel;
 
 interface ProviderTypeMapper {
     getAuthorizedAccounts: Task<any, any>;
@@ -82,6 +88,11 @@ export default class Provider {
             createAuthorizedAccount: taskFor(this.createAuthorizedCitationAccount),
             createConfiguredAddon: taskFor(this.createConfiguredCitationAddon),
         },
+        externalLinkService: {
+            getAuthorizedAccounts: taskFor(this.getAuthorizedLinkAccounts),
+            createAuthorizedAccount: taskFor(this.createAuthorizedLinkAccount),
+            createConfiguredAddon: taskFor(this.createConfiguredLinkAddon),
+        },
     };
 
     @tracked configuredAddon?: AllConfiguredAddonTypes;
@@ -134,6 +145,8 @@ export default class Provider {
             this.providerMap = this.providerTypeMapper.externalComputingService;
         } else if (provider instanceof ExternalCitationServiceModel) {
             this.providerMap = this.providerTypeMapper.externalCitationService;
+        } else if (provider instanceof ExternalLinkServiceModel) {
+            this.providerMap = this.providerTypeMapper.externalLinkService;
         }
         taskFor(this.initialize).perform();
     }
@@ -211,6 +224,14 @@ export default class Provider {
             .filterBy('externalComputingService.id', this.provider.id).toArray();
     }
 
+    @task
+    @waitFor
+    async getAuthorizedLinkAccounts() {
+        const authorizedLinkAccounts = await this.userReference.authorizedLinkAccounts;
+        this.authorizedAccounts = authorizedLinkAccounts
+            .filterBy('externalLinkService.id', this.provider.id).toArray();
+    }
+
     @task
     @waitFor
     async getAuthorizedAccounts() {
@@ -278,6 +299,25 @@ export default class Provider {
         return newAccount;
     }
 
+    @task
+    @waitFor
+    private async createAuthorizedLinkAccount(arg: AccountCreationArgs) {
+        const { credentials, apiBaseUrl, displayName, initiateOauth } = arg;
+        const newAccount = this.store.createRecord('authorized-link-account', {
+            credentials,
+            apiBaseUrl,
+            initiateOauth,
+            externalUserId: this.currentUser.user?.id,
+            authorizedCapabilities: ['ACCESS', 'UPDATE'],
+            scopes: [],
+            externalLinkService: this.provider,
+            accountOwner: this.userReference,
+            displayName,
+        });
+        await newAccount.save();
+        return newAccount;
+    }
+
     @task
     @waitFor
     public async createAuthorizedAccount(arg: AccountCreationArgs) {
@@ -339,6 +379,20 @@ export default class Provider {
         return await configuredComputingAddon.save();
     }
 
+    @task
+    @waitFor
+    private async createConfiguredLinkAddon(account: AuthorizedComputingAccountModel) {
+        const configuredLinkAddon = this.store.createRecord('configured-link-addon', {
+            externalLinkService: this.provider,
+            accountOwner: this.userReference,
+            authorizedResourceUri: this.node!.links.iri,
+            baseAccount: account,
+            connectedCapabilities: ['ACCESS', 'UPDATE'],
+        });
+        return await configuredLinkAddon.save();
+    }
+
+
     @task
     @waitFor
     public async createConfiguredAddon(account: AllAuthorizedAccountTypes) {
diff --git a/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts b/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts
index 6b55e01e763..6564d445e38 100644
--- a/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts
+++ b/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts
@@ -7,10 +7,12 @@ import { Item, ItemType } from 'ember-osf-web/models/addon-operation-invocation'
 import AuthorizedAccountModel from 'ember-osf-web/models/authorized-account';
 import AuthorizedCitationAccountModel from 'ember-osf-web/models/authorized-citation-account';
 import AuthorizedComputingAccountModel from 'ember-osf-web/models/authorized-computing-account';
+import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
 import AuthorizedStorageAccountModel from 'ember-osf-web/models/authorized-storage-account';
 import ConfiguredAddonModel from 'ember-osf-web/models/configured-addon';
 import ConfiguredCitationAddonModel from 'ember-osf-web/models/configured-citation-addon';
 import ConfiguredComputingAddonModel from 'ember-osf-web/models/configured-computing-addon';
+import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
 import ConfiguredStorageAddonModel from 'ember-osf-web/models/configured-storage-addon';
 
 
@@ -25,9 +27,15 @@ export default class ConfiguredAddonEdit extends Component<Args> {
     @tracked selectedFolder = this.args.configuredAddon?.rootFolder;
     @tracked selectedFolderDisplayName = this.args.configuredAddon?.rootFolderName;
     @tracked currentItems: Item[] = [];
+    @tracked selectedItem = (this.args.configuredAddon as ConfiguredLinkAddonModel).targetId;
+    @tracked selectedItemDisplayName = (this.args.configuredAddon as ConfiguredLinkAddonModel).targetItemName;
+    @tracked selectedResourceType = (this.args.configuredAddon as ConfiguredLinkAddonModel).resourceType;
 
     originalName = this.displayName;
     originalRootFolder = this.selectedFolder;
+    originalSelectedItem = this.selectedItem;
+    originalResourceType = this.selectedResourceType;
+
     defaultKwargs: any = {};
 
     constructor(owner: unknown, args: Args) {
@@ -39,6 +47,9 @@ export default class ConfiguredAddonEdit extends Component<Args> {
             if (this.args.configuredAddon instanceof ConfiguredCitationAddonModel) {
                 this.defaultKwargs['filterItems'] = ItemType.Collection;
             }
+            if (this.args.configuredAddon instanceof ConfiguredLinkAddonModel) {
+                // noop
+            }
         }
         if (this.args.authorizedAccount) {
             if (this.args.authorizedAccount instanceof AuthorizedStorageAccountModel) {
@@ -47,10 +58,17 @@ export default class ConfiguredAddonEdit extends Component<Args> {
             if (this.args.authorizedAccount instanceof AuthorizedCitationAccountModel) {
                 this.defaultKwargs['filterItems'] = ItemType.Collection;
             }
+            if (this.args.authorizedAccount instanceof AuthorizedLinkAccountModel) {
+                // noop
+            }
         }
     }
 
-    get requiresRootFolder() {
+    get isLinkAddon() {
+        return this.args.configuredAddon instanceof ConfiguredLinkAddonModel;
+    }
+
+    get requiresFilesWidget() {
         return !(
             this.args.authorizedAccount instanceof AuthorizedComputingAccountModel
             ||
@@ -64,33 +82,40 @@ export default class ConfiguredAddonEdit extends Component<Args> {
 
     get disableSave() {
         const displayNameUnchanged = this.displayName === this.originalName;
-        const rootFolderUnchanged = this.requiresRootFolder && this.selectedFolder === this.originalRootFolder;
-        const needsRootFolder = this.requiresRootFolder && !this.selectedFolder;
+        const rootFolderUnchanged = this.requiresFilesWidget && !this.isLinkAddon
+            && this.selectedFolder === this.originalRootFolder;
+        const targetIdUnchanged = this.isLinkAddon && this.originalSelectedItem === this.selectedItem;
+        const resourceTypeUnchanged = this.originalResourceType === this.selectedResourceType;
+        const needsResourceType = this.isLinkAddon && !this.selectedResourceType;
+        const needsTargetId = this.isLinkAddon && !this.selectedItem;
+        const needsRootFolder = this.requiresFilesWidget && !this.isLinkAddon && !this.selectedFolder;
 
-        if (this.invalidDisplayName || needsRootFolder) {
+        if (this.invalidDisplayName || needsRootFolder || needsResourceType || needsTargetId) {
             return true;
         }
+        if (this.isLinkAddon) {
+            return targetIdUnchanged && resourceTypeUnchanged || this.args.onSave.isRunning;
+        }
         return (rootFolderUnchanged && displayNameUnchanged) || this.args.onSave.isRunning;
     }
 
-    get nameValid() {
-        return !this.invalidDisplayName && this.displayName !== this.originalName;
-    }
-
-    get folderValid() {
-        return !this.requiresRootFolder && this.selectedFolder && this.selectedFolder !== this.originalRootFolder;
-    }
-
     get onSaveArgs() {
         return {
             displayName: this.displayName,
             rootFolder: this.selectedFolder,
+            targetId: this.selectedItem,
+            resourceType: this.selectedResourceType,
         };
     }
 
     @action
-    selectFolder(folder: Item) {
-        this.selectedFolder = folder.itemId;
-        this.selectedFolderDisplayName = folder.itemName;
+    selectItem(item: Item) {
+        if (this.isLinkAddon) {
+            this.selectedItem = item.itemId;
+            this.selectedItemDisplayName = item.itemName;
+        } else {
+            this.selectedFolder = item.itemId;
+            this.selectedFolderDisplayName = item.itemName;
+        }
     }
 }
diff --git a/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss b/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss
index 3dc6c476d5d..6274c4e2656 100644
--- a/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss
+++ b/lib/osf-components/addon/components/addons-service/configured-addon-edit/styles.scss
@@ -19,6 +19,7 @@
     width: 100%;
     border: solid 1px $color-border-gray;
     border-collapse: collapse;
+    margin-bottom: 1rem;
 
     thead {
         border-bottom: solid 1px $color-border-gray;
diff --git a/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs b/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs
index 4d40bc76e44..28ff4d060c0 100644
--- a/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs
+++ b/lib/osf-components/addon/components/addons-service/configured-addon-edit/template.hbs
@@ -21,14 +21,20 @@
             </span>
         {{/if}}
     </div>
-    {{#if this.requiresRootFolder }}
+    {{#if this.requiresFilesWidget }}
         <div local-class='input-wrapper'>
             <b>
-                {{t 'addons.configure.selected-folder'}}
+                {{#if this.isLinkAddon}}
+                    {{t 'addons.configure.linked-item'}}
+                {{else}}
+                    {{t 'addons.configure.selected-folder'}}
+                {{/if}}
             </b>
             <span>
                 {{#if this.selectedFolderDisplayName}}
                     {{this.selectedFolderDisplayName}}
+                {{else if this.selectedItemDisplayName}}
+                    {{this.selectedItemDisplayName}}
                 {{else}}
                     {{t 'addons.configure.no-folder-selected'}}
                 {{/if}}
@@ -81,48 +87,48 @@
                             <td colspan='2'>{{t 'addons.configure.error-loading-items'}}</td>
                         </tr>
                     {{else}}
-                        {{#each fileManager.currentItems as |folder|}}
+                        {{#each fileManager.currentItems as |item|}}
                             <tr>
                                 <td>
-                                    {{#if folder.mayContainRootCandidates}}
+                                    {{#if (or item.mayContainRootCandidates fileManager.isLinkAddon)}}
                                         <Button
-                                            data-test-folder-link='{{folder.itemName}}'
+                                            data-test-folder-link='{{item.itemName}}'
                                             data-analytics-name='Go to folder'
                                             @layout='fake-link'
-                                            aria-label={{t 'addons.configure.go-to-folder' folderName=folder.itemName}}
-                                            {{on 'click' (fn fileManager.goToFolder folder)}}
+                                            aria-label={{t 'addons.configure.go-to-folder' folderName=item.itemName}}
+                                            {{on 'click' (fn fileManager.goToFolder item)}}
                                         >
                                             <span local-class='item-name'>
-                                                {{#if (or (eq folder.itemType 'FOLDER') (eq folder.itemType 'COLLECTION'))}}
+                                                {{#if (or (eq item.itemType 'FOLDER') (eq item.itemType 'COLLECTION'))}}
                                                     <FaIcon @icon='folder' />
                                                 {{else}}
                                                     <FaIcon @icon='file' />
                                                 {{/if}}
-                                                {{folder.itemName}}
+                                                {{item.itemName}}
                                             </span>
                                         </Button>
                                     {{else}}
                                         <span local-class='item-name'>
-                                            {{#if (or (eq folder.itemType 'FOLDER') (eq folder.itemType 'COLLECTION'))}}
+                                            {{#if (or (eq item.itemType 'FOLDER') (eq item.itemType 'COLLECTION'))}}
                                                 <FaIcon @icon='folder' />
                                             {{else}}
                                                 <FaIcon @icon='file' />
                                             {{/if}}
-                                            {{folder.itemName}}
+                                            {{item.itemName}}
                                         </span>
                                     {{/if}}
                                 </td>
                                 <td>
-                                    {{#if folder.canBeRoot}}
+                                    {{#if (or item.canBeRoot fileManager.isLinkAddon)}}
                                         <input
-                                            data-test-root-folder-option='{{folder.itemName}}'
+                                            data-test-root-folder-option='{{item.itemName}}'
                                             data-analytics-name='Select folder'
                                             type='radio'
                                             name='folder'
-                                            value={{folder.itemName}}
-                                            checked={{eq folder.itemId this.selectedFolder}}
-                                            aria-label={{t 'addons.configure.select-folder' folderName=folder.itemName}}
-                                            {{on 'change'(fn this.selectFolder folder)}}
+                                            value={{item.itemName}}
+                                            checked={{eq item.itemId this.selectedFolder}}
+                                            aria-label={{t 'addons.configure.select-folder' folderName=item.itemName}}
+                                            {{on 'change'(fn this.selectItem item)}}
                                         >
                                     {{/if}}
                                 </td>
@@ -151,6 +157,20 @@
             </table>
         </AddonsService::FileManager>
     {{/if}}
+    {{#if this.isLinkAddon}}
+        <label>
+            {{t 'addons.configure.resource-type'}}
+            <PowerSelect
+                @options={{@supportedResourceTypes}}
+                @selected={{this.selectedResourceType}}
+                @onChange={{action (mut this.selectedResourceType)}}
+                @placeholder={{t 'addons.configure.resource-type-placeholder'}}
+                as |resourceType|
+            >
+                {{resourceType}}
+            </PowerSelect>
+        </label>
+    {{/if}}
     <div local-class='footer-buttons-wrapper'>
         <Button
             data-test-root-folder-save
diff --git a/lib/osf-components/addon/components/addons-service/file-manager/component.ts b/lib/osf-components/addon/components/addons-service/file-manager/component.ts
index 2551164e582..b7d6fd00136 100644
--- a/lib/osf-components/addon/components/addons-service/file-manager/component.ts
+++ b/lib/osf-components/addon/components/addons-service/file-manager/component.ts
@@ -13,6 +13,7 @@ import { Item, ListItemsResult, OperationKwargs } from 'ember-osf-web/models/add
 import AuthorizedAccountModel from 'ember-osf-web/models/authorized-account';
 import ConfiguredAddonModel from 'ember-osf-web/models/configured-addon';
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
+import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
 
 interface Args {
     configuredAddon?: ConfiguredAddonModel;
@@ -46,6 +47,10 @@ export default class FileManager extends Component<Args> {
             taskFor(this.getStartingFolder).lastPerformed?.error;
     }
 
+    get isLinkAddon() {
+        return this.operationInvocableModel instanceof ConfiguredLinkAddonModel;
+    }
+
     constructor(owner: unknown, args: Args) {
         super(owner, args);
         assert('Must provide a configuredAddon or authorizedAccount', args.configuredAddon || args.authorizedAccount);
diff --git a/lib/osf-components/addon/components/addons-service/file-manager/template.hbs b/lib/osf-components/addon/components/addons-service/file-manager/template.hbs
index 44054a036d0..5781171a08e 100644
--- a/lib/osf-components/addon/components/addons-service/file-manager/template.hbs
+++ b/lib/osf-components/addon/components/addons-service/file-manager/template.hbs
@@ -10,4 +10,5 @@
 
     isLoading=this.isLoading
     isError=this.isError
+    isLinkAddon=this.isLinkAddon
 )}}
diff --git a/lib/osf-components/addon/components/addons-service/manager/component.ts b/lib/osf-components/addon/components/addons-service/manager/component.ts
index e876f9fd516..59540c7e4d0 100644
--- a/lib/osf-components/addon/components/addons-service/manager/component.ts
+++ b/lib/osf-components/addon/components/addons-service/manager/component.ts
@@ -23,6 +23,7 @@ import { AccountCreationArgs} from 'ember-osf-web/models/authorized-account';
 import AuthorizedStorageAccountModel from 'ember-osf-web/models/authorized-storage-account';
 import ConfiguredCitationAddonModel from 'ember-osf-web/models/configured-citation-addon';
 import UserReferenceModel from 'ember-osf-web/models/user-reference';
+import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
 
 interface FilterSpecificObject {
     modelName: string;
@@ -44,6 +45,7 @@ enum PageMode {
 export enum FilterTypes {
     STORAGE = 'additional-storage',
     CITATION_MANAGER = 'citation-manager',
+    VERIFIED_LINK = 'verified-link',
     // CLOUD_COMPUTING = 'cloud-computing', // disabled because BOA is down
 }
 
@@ -78,6 +80,12 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
             list: A([]),
             configuredAddons: A([]),
         },
+        [FilterTypes.VERIFIED_LINK]: {
+            modelName: 'external-link-service',
+            task: taskFor(this.getLinkAddonProviders),
+            list: A([]),
+            configuredAddons: A([]),
+        },
         // [FilterTypes.CLOUD_COMPUTING]: {
         //     modelName: 'external-computing-service',
         //     task: taskFor(this.getComputingAddonProviders),
@@ -302,6 +310,10 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
                 this.toast.success(this.intl.t('addons.configure.success', {
                     configurationName: this.selectedConfiguration.displayName,
                 }));
+            } else if (this.selectedConfiguration && this.selectedConfiguration instanceof ConfiguredLinkAddonModel) {
+                this.selectedConfiguration.targetId = args.targetId;
+                this.selectedConfiguration.resourceType = args.resourceType;
+                await this.selectedConfiguration.save();
             }
             this.cancelSetup();
         } catch(e) {
@@ -403,6 +415,22 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
         activeFilterObject.list = serviceCitationProviders.sort(this.providerSorter);
     }
 
+    @task
+    @waitFor
+    async getLinkAddonProviders() {
+        const activeFilterObject = this.filterTypeMapper[FilterTypes.VERIFIED_LINK];
+
+        if (this.addonServiceNode) {
+            const configuredAddons = await this.addonServiceNode.configuredLinkAddons;
+            activeFilterObject.configuredAddons = A(configuredAddons.toArray());
+        }
+
+        const serviceCitationProviders: Provider[] =
+            await taskFor(this.getExternalProviders)
+                .perform(activeFilterObject.modelName, activeFilterObject.configuredAddons);
+        activeFilterObject.list = serviceCitationProviders.sort(this.providerSorter);
+    }
+
     providerSorter(a: Provider, b: Provider) {
         return a.provider.displayName.localeCompare(b.provider.displayName);
     }
diff --git a/lib/osf-components/addon/components/addons-service/terms-of-service/component.ts b/lib/osf-components/addon/components/addons-service/terms-of-service/component.ts
index f9acd68acf6..a783dc3730e 100644
--- a/lib/osf-components/addon/components/addons-service/terms-of-service/component.ts
+++ b/lib/osf-components/addon/components/addons-service/terms-of-service/component.ts
@@ -7,6 +7,7 @@ import { ExternalServiceCapabilities } from 'ember-osf-web/models/external-servi
 import ExternalStorageServiceModel from 'ember-osf-web/models/external-storage-service';
 import ExternalComputingServiceModel from 'ember-osf-web/models/external-computing-service';
 import ExternalCitationServiceModel from 'ember-osf-web/models/external-citation-service';
+import ExternalLinkServiceModel from 'ember-osf-web/models/external-link-service';
 
 interface Args {
     provider: AllProviderTypes;
@@ -21,7 +22,7 @@ type CapabilityCategory =
     ExternalServiceCapabilities.REGISTERING |
     ExternalServiceCapabilities.FILE_VERSIONS;
 
-type ServiceTranslationKey = 'storage' | 'computing' | 'citation';
+type ServiceTranslationKey = 'storage' | 'computing' | 'citation' | 'link';
 
 
 const capabilitiesToLabelKeyMap: Record<CapabilityCategory, string> = {
@@ -92,6 +93,11 @@ const capabilitiesToTextKeyMap: Record<ServiceTranslationKey, Partial<Record<Cap
             partial: 'addons.terms.computing.registering-partial',
         },
     },
+    link: {
+        [ExternalServiceCapabilities.FORKING]: {
+            partial: 'addons.terms.computing.forking-partial',
+        },
+    },
 };
 
 
@@ -130,6 +136,11 @@ export default class TermsOfServiceComponent extends Component<Args> {
                 ExternalServiceCapabilities.REGISTERING,
             ];
             this.baseTranslationKey = 'citation';
+        } else if (args.provider instanceof ExternalLinkServiceModel) {
+            this.applicableCapabilities = [
+                ExternalServiceCapabilities.FORKING,
+            ];
+            this.baseTranslationKey = 'link';
         }
     }
 
diff --git a/lib/osf-components/addon/components/addons-service/user-addons-manager/component.ts b/lib/osf-components/addon/components/addons-service/user-addons-manager/component.ts
index 3be4f39fc2d..3ba47e5d3fd 100644
--- a/lib/osf-components/addon/components/addons-service/user-addons-manager/component.ts
+++ b/lib/osf-components/addon/components/addons-service/user-addons-manager/component.ts
@@ -25,6 +25,8 @@ import ExternalCitationServiceModel from 'ember-osf-web/models/external-citation
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
 import getHref from 'ember-osf-web/utils/get-href';
 
+import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
+import ExternalLinkServiceModel from 'ember-osf-web/models/external-link-service';
 import { FilterTypes } from '../manager/component';
 
 enum UserSettingPageModes {
@@ -65,6 +67,14 @@ export default class UserAddonManagerComponent extends Component<Args> {
             authorizedAccounts: [] as AuthorizedCitationAccountModel[],
             authorizedServiceIds: [] as string[],
         },
+        [FilterTypes.VERIFIED_LINK]: {
+            modelName: 'external-link-service',
+            fetchProvidersTask: taskFor(this.getLinkAddonProviders),
+            list: A([]) as EmberArray<Provider>,
+            getAuthorizedAccountsTask: taskFor(this.getAuthorizedLinkAccounts),
+            authorizedAccounts: [] as AuthorizedLinkAccountModel[],
+            authorizedServiceIds: [] as string[],
+        },
         // [FilterTypes.CLOUD_COMPUTING]: {
         //     modelName: 'external-computing-service',
         //     fetchProvidersTask: taskFor(this.getComputingAddonProviders),
@@ -230,6 +240,17 @@ export default class UserAddonManagerComponent extends Component<Args> {
         notifyPropertyChange(this, 'filterTypeMapper');
     }
 
+    @task
+    @waitFor
+    async getAuthorizedLinkAccounts() {
+        const { userReference } = this;
+        const mappedObject = this.filterTypeMapper[FilterTypes.VERIFIED_LINK];
+        const accounts = (await userReference.authorizedLinkAccounts).toArray();
+        mappedObject.authorizedAccounts = accounts;
+        mappedObject.authorizedServiceIds = accounts.map(account => account.externalLinkService.get('id'));
+        notifyPropertyChange(this, 'filterTypeMapper');
+    }
+
     @task
     @waitFor
     async getAuthorizedAccounts() {
@@ -289,6 +310,23 @@ export default class UserAddonManagerComponent extends Component<Args> {
             ));
     }
 
+    @task
+    @waitFor
+    async getLinkAddonProviders() {
+        const activeFilterObject = this.filterTypeMapper[FilterTypes.VERIFIED_LINK];
+        const serviceCitationProviders = await taskFor(this.getExternalProviders)
+            .perform(activeFilterObject.modelName) as ExternalLinkServiceModel[];
+        activeFilterObject.list = serviceCitationProviders.sort(this.providerSorter)
+            .map(provider => new Provider(
+                provider,
+                this.currentUser,
+                undefined,
+                undefined,
+                undefined,
+                this.userReference,
+            ));
+    }
+
     @task
     @waitFor
     async getAddonProviders() {
diff --git a/tests/acceptance/guid-node/addons-test.ts b/tests/acceptance/guid-node/addons-test.ts
index 85ff5f29a9c..c9728956a89 100644
--- a/tests/acceptance/guid-node/addons-test.ts
+++ b/tests/acceptance/guid-node/addons-test.ts
@@ -45,7 +45,7 @@ module('Acceptance | guid-node/addons', hooks => {
             .hasAttribute('aria-selected', 'true', 'All addons tab is selected');
 
         // check additonal storage providers
-        assert.dom('[data-test-addon-list-filter]').exists({ count: 2 }, '2 addon filters are present');
+        assert.dom('[data-test-addon-list-filter]').exists({ count: 3 }, '3 addon filters are present');
         assert.dom('[data-test-addon-list-filter="additional-storage"]')
             .hasClass(styles.active, 'Additional storage filter is active');
         assert.dom('[data-test-addon-card-connect]').exists({ count: 9 }, '9 storage addons are present');
diff --git a/tests/integration/components/addons-service/configured-addon-edit/component-test.ts b/tests/integration/components/addons-service/configured-addon-edit/component-test.ts
index c8f9455ae01..6bc019b5745 100644
--- a/tests/integration/components/addons-service/configured-addon-edit/component-test.ts
+++ b/tests/integration/components/addons-service/configured-addon-edit/component-test.ts
@@ -92,8 +92,9 @@ module('Integration | Component | addons-service | configured-addon-edit', funct
         const args = {
             rootFolder: 'root-1-1',
             displayName: 'My configured addon',
+            resourceType: undefined,
+            targetId: undefined,
         };
-
         assert.ok(this.onSave.calledOnceWith(args), 'Save action was called with selected folder id');
     });
 });
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 78b043bdc62..8d628068d58 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -257,6 +257,7 @@ addons:
             additional-storage: 'Additional Storage'
             citation-manager: 'Citation Manager'
             cloud-computing: 'Cloud Computing'
+            verified-link: 'Linked Services'
         no-results: 'No results found'
         no-connected-accounts: 'No connected accounts'
         connect: 'Connect'
@@ -359,8 +360,11 @@ addons:
         authorizing: 'Connecting…'
     configure:
         heading: 'Configure {providerName}'
+        resource-type: 'Resource type'
+        resource-type-placeholder: 'Choose a resource type'
         display-name: 'Display name'
         selected-folder: 'Selected folder:'
+        linked-item: 'Linked item:'
         no-folder-selected: 'No folder selected'
         go-to-root: 'Go to home folder'
         go-to-folder: 'Go to folder {folderName}'

From aa75b429e6eb546fbf72d5c90d1bec0bc693dfa4 Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Fri, 16 May 2025 11:47:29 -0400
Subject: [PATCH 5/9] add leftnav link for linked services (#2561)

---
 app/guid-node/links/template.hbs | 3 +++
 app/guid-node/template.hbs       | 7 +++++++
 app/router.ts                    | 1 +
 translations/en-us.yml           | 1 +
 4 files changed, 12 insertions(+)
 create mode 100644 app/guid-node/links/template.hbs

diff --git a/app/guid-node/links/template.hbs b/app/guid-node/links/template.hbs
new file mode 100644
index 00000000000..4f71c87389a
--- /dev/null
+++ b/app/guid-node/links/template.hbs
@@ -0,0 +1,3 @@
+<p>
+    {{!-- Placeholder for the links page --}}
+</p>
\ No newline at end of file
diff --git a/app/guid-node/template.hbs b/app/guid-node/template.hbs
index 4a5e4eea2aa..5e229e2ce42 100644
--- a/app/guid-node/template.hbs
+++ b/app/guid-node/template.hbs
@@ -99,6 +99,13 @@
                     @label={{t 'node.left_nav.registrations'}}
                 />
             {{/unless}}
+            <leftNav.link
+                data-test-verified-links-link
+                data-analytics-name='Linked services'
+                @route='guid-node.links'
+                @icon='link'
+                @label={{t 'node.left_nav.links'}}
+            />
             {{#unless this.currentUser.viewOnlyToken}}
                 {{#if (and (not this.viewOnly) this.model.taskInstance.value.userHasReadPermission)}}
                     <leftNav.link
diff --git a/app/router.ts b/app/router.ts
index 1133ca47537..83ed6beefb1 100644
--- a/app/router.ts
+++ b/app/router.ts
@@ -106,6 +106,7 @@ Router.map(function() {
                 this.route('configure');
             });
         });
+        this.route('links');
     });
 
     this.route(
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 8d628068d58..69fb32d0a6f 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -1049,6 +1049,7 @@ node:
         components: Components
         add-ons: Add-ons
         settings: Settings
+        links: Linked Services
     projects:
         search-placeholder: 'Find project by name'
         select-placeholder: 'Click to select project'

From 5b2bbcd228a219e6f1943b0a2913daba7c94beea Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Wed, 28 May 2025 09:39:40 -0400
Subject: [PATCH 6/9] [ENG-7784][ENG-8043] Linked services project page + bug
 fixes (#2564)

* linked services project page + bug fixes

* add edit button

* fix tests
---
 app/guid-node/links/controller.ts             |  8 ++++
 app/guid-node/links/route.ts                  | 17 +++++++++
 app/guid-node/links/styles.scss               | 24 ++++++++++++
 app/guid-node/links/template.hbs              | 38 +++++++++++++++++--
 app/models/configured-link-addon.ts           |  1 +
 app/models/resource-reference.ts              |  1 -
 .../configured-addon-edit/component.ts        | 11 +++---
 .../configured-addon-edit/component-test.ts   |  4 +-
 translations/en-us.yml                        |  9 ++++-
 9 files changed, 101 insertions(+), 12 deletions(-)
 create mode 100644 app/guid-node/links/controller.ts
 create mode 100644 app/guid-node/links/route.ts
 create mode 100644 app/guid-node/links/styles.scss

diff --git a/app/guid-node/links/controller.ts b/app/guid-node/links/controller.ts
new file mode 100644
index 00000000000..ffb123a27c1
--- /dev/null
+++ b/app/guid-node/links/controller.ts
@@ -0,0 +1,8 @@
+import Controller from '@ember/controller';
+import { Permission } from 'ember-osf-web/models/osf-model';
+
+export default class GuidNodeLinksController extends Controller {
+    get currentUserCanEdit() {
+        return this.model.node.currentUserPermissions.includes(Permission.Write);
+    }
+}
diff --git a/app/guid-node/links/route.ts b/app/guid-node/links/route.ts
new file mode 100644
index 00000000000..fab5b78c419
--- /dev/null
+++ b/app/guid-node/links/route.ts
@@ -0,0 +1,17 @@
+import Route from '@ember/routing/route';
+import Store from '@ember-data/store';
+import { inject as service } from '@ember/service';
+
+export default class GuidNodeLinks extends Route {
+    @service store!: Store;
+
+    async model() {
+        const node = await this.modelFor('guid-node').taskInstance;
+        const resourceReferences = await this.store.query('resource-reference', {
+            filter: {resource_uri: node.links.iri?.toString()},
+        });
+        const resourceReference = resourceReferences.firstObject;
+        const configuredLinkAddons = await resourceReference.configuredLinkAddons;
+        return await {node, configuredLinkAddons};
+    }
+}
diff --git a/app/guid-node/links/styles.scss b/app/guid-node/links/styles.scss
new file mode 100644
index 00000000000..3c10baeda7b
--- /dev/null
+++ b/app/guid-node/links/styles.scss
@@ -0,0 +1,24 @@
+.table {
+    width: 100%;
+    text-align: left;
+    border-collapse: collapse;
+}
+
+.table-header {
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+
+.table-row {
+    border-bottom: 1px solid $color-border-gray;
+}
+
+.table-cell {
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+
+.logo {
+    max-width: 50px;
+    max-height: 50px;
+}
diff --git a/app/guid-node/links/template.hbs b/app/guid-node/links/template.hbs
index 4f71c87389a..248dc4c304c 100644
--- a/app/guid-node/links/template.hbs
+++ b/app/guid-node/links/template.hbs
@@ -1,3 +1,35 @@
-<p>
-    {{!-- Placeholder for the links page --}}
-</p>
\ No newline at end of file
+<h2>{{t 'links.linked-services'}}</h2>
+
+<table local-class='table'>
+    <thead>
+        <tr local-class='table-row'>
+            <th local-class='table-header'>{{t 'links.linked-service'}}</th>
+            <th local-class='table-header'>{{t 'links.display-name'}}</th>
+            <th local-class='table-header'>{{t 'links.resource-type'}}</th>
+            <th local-class='table-header'>
+                {{#if this.currentUserCanEdit}}
+                    <OsfLink
+                        @route='guid-node.addons'
+                        @queryParams={{hash activeFilterType='verified-link'}}
+                        @models={{array this.model.node.id}}
+                    >
+                        {{t 'links.edit'}}
+                    </OsfLink>
+                {{/if}}
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+        {{#each this.model.configuredLinkAddons as |configuredLinkAddon|}}
+            <tr local-class='table-row'>
+                <td local-class='table-cell'>
+                    <img alt={{t 'links.logo'}} local-class='logo' src={{configuredLinkAddon.externalLinkService.iconUrl}}>
+                    <span>{{configuredLinkAddon.externalLinkService.displayName}}</span>
+                </td>
+                <td local-class='table-cell'>{{configuredLinkAddon.displayName}}</td>
+                <td local-class='table-cell'>{{configuredLinkAddon.resourceType}}</td>
+                <td local-class='table-cell'><a href={{configuredLinkAddon.targetUrl}}>{{t 'links.link'}}</a></td>
+            </tr>
+        {{/each}}
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/app/models/configured-link-addon.ts b/app/models/configured-link-addon.ts
index 1ac7750ba1b..76cf0bbdcf5 100644
--- a/app/models/configured-link-addon.ts
+++ b/app/models/configured-link-addon.ts
@@ -13,6 +13,7 @@ import ConfiguredAddonModel from './configured-addon';
 
 export default class ConfiguredLinkAddonModel extends ConfiguredAddonModel {
     @attr('string') targetId!: string;
+    @attr('string') targetUrl!: string;
     @attr('string') resourceType!: SupportedResourceTypes;
 
     @belongsTo('external-link-service', { inverse: null })
diff --git a/app/models/resource-reference.ts b/app/models/resource-reference.ts
index 1f458fbae7d..93d4c87c1b3 100644
--- a/app/models/resource-reference.ts
+++ b/app/models/resource-reference.ts
@@ -6,7 +6,6 @@ import ConfiguredCitationAddonModel from './configured-citation-addon';
 import ConfiguredComputingAddonModel from './configured-computing-addon';
 
 export default class ResourceReferenceModel extends Model {
-
     @attr('fixstring') resourceUri!: string;
 
     @hasMany('configured-storage-addon', { inverse: 'authorizedResource' })
diff --git a/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts b/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts
index 6564d445e38..c4adb56629a 100644
--- a/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts
+++ b/lib/osf-components/addon/components/addons-service/configured-addon-edit/component.ts
@@ -27,10 +27,9 @@ export default class ConfiguredAddonEdit extends Component<Args> {
     @tracked selectedFolder = this.args.configuredAddon?.rootFolder;
     @tracked selectedFolderDisplayName = this.args.configuredAddon?.rootFolderName;
     @tracked currentItems: Item[] = [];
-    @tracked selectedItem = (this.args.configuredAddon as ConfiguredLinkAddonModel).targetId;
-    @tracked selectedItemDisplayName = (this.args.configuredAddon as ConfiguredLinkAddonModel).targetItemName;
-    @tracked selectedResourceType = (this.args.configuredAddon as ConfiguredLinkAddonModel).resourceType;
-
+    @tracked selectedItem = '';
+    @tracked selectedItemDisplayName = '';
+    @tracked selectedResourceType = '';
     originalName = this.displayName;
     originalRootFolder = this.selectedFolder;
     originalSelectedItem = this.selectedItem;
@@ -48,7 +47,9 @@ export default class ConfiguredAddonEdit extends Component<Args> {
                 this.defaultKwargs['filterItems'] = ItemType.Collection;
             }
             if (this.args.configuredAddon instanceof ConfiguredLinkAddonModel) {
-                // noop
+                this.selectedItem = (this.args.configuredAddon as ConfiguredLinkAddonModel).targetId;
+                this.selectedItemDisplayName = (this.args.configuredAddon as ConfiguredLinkAddonModel).targetItemName;
+                this.selectedResourceType = (this.args.configuredAddon as ConfiguredLinkAddonModel).resourceType;
             }
         }
         if (this.args.authorizedAccount) {
diff --git a/tests/integration/components/addons-service/configured-addon-edit/component-test.ts b/tests/integration/components/addons-service/configured-addon-edit/component-test.ts
index 6bc019b5745..321e4d9624a 100644
--- a/tests/integration/components/addons-service/configured-addon-edit/component-test.ts
+++ b/tests/integration/components/addons-service/configured-addon-edit/component-test.ts
@@ -92,8 +92,8 @@ module('Integration | Component | addons-service | configured-addon-edit', funct
         const args = {
             rootFolder: 'root-1-1',
             displayName: 'My configured addon',
-            resourceType: undefined,
-            targetId: undefined,
+            resourceType: '',
+            targetId: '',
         };
         assert.ok(this.onSave.calledOnceWith(args), 'Save action was called with selected folder id');
     });
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 69fb32d0a6f..a468f91cb4b 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -376,7 +376,14 @@ addons:
         error-loading-items: 'Error loading items'
         success: 'Successfully updated {configurationName}'
         error: 'Error updating {configurationName}'
-
+links:
+    linked-services: 'Linked Services'
+    linked-service: 'Linked Service'
+    display-name: 'Display Name'
+    resource-type: 'Resource Type'
+    link: 'Link'
+    edit: 'Edit'
+    icon: '{addonName} icon'
 metadata:
     tab-title: 'Metadata'
     main-tab: 'OSF'

From e050955fd218cfafccf61b2c0d43cf834c9baadf Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Wed, 28 May 2025 10:25:20 -0400
Subject: [PATCH 7/9] add tabIndex queryparam (#2565)

---
 app/guid-node/links/template.hbs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/guid-node/links/template.hbs b/app/guid-node/links/template.hbs
index 248dc4c304c..530347c928b 100644
--- a/app/guid-node/links/template.hbs
+++ b/app/guid-node/links/template.hbs
@@ -10,7 +10,10 @@
                 {{#if this.currentUserCanEdit}}
                     <OsfLink
                         @route='guid-node.addons'
-                        @queryParams={{hash activeFilterType='verified-link'}}
+                        @queryParams={{hash
+                            activeFilterType='verified-link'
+                            tabIndex='1'
+                        }}
                         @models={{array this.model.node.id}}
                     >
                         {{t 'links.edit'}}

From 7a499e8ef7599011a338e73f12eea6265a9cf3a0 Mon Sep 17 00:00:00 2001
From: Oleh Paduchak <158075011+opaduchak@users.noreply.github.com>
Date: Fri, 13 Jun 2025 22:05:29 +0300
Subject: [PATCH 8/9] [ENG-8078] Show a dedicated empty linked services page
 when no LINK add-on is configured (#2574)

---
 app/guid-node/links/styles.scss               |  5 ++
 app/guid-node/links/template.hbs              | 85 ++++++++++---------
 .../addons-service/file-manager/component.ts  |  4 +-
 translations/en-us.yml                        |  2 +
 4 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/app/guid-node/links/styles.scss b/app/guid-node/links/styles.scss
index 3c10baeda7b..c904e51f0fb 100644
--- a/app/guid-node/links/styles.scss
+++ b/app/guid-node/links/styles.scss
@@ -22,3 +22,8 @@
     max-width: 50px;
     max-height: 50px;
 }
+
+.links-page-wrapper {
+    margin: 20px;
+}
+
diff --git a/app/guid-node/links/template.hbs b/app/guid-node/links/template.hbs
index 530347c928b..51fd1f3bac9 100644
--- a/app/guid-node/links/template.hbs
+++ b/app/guid-node/links/template.hbs
@@ -1,38 +1,47 @@
-<h2>{{t 'links.linked-services'}}</h2>
-
-<table local-class='table'>
-    <thead>
-        <tr local-class='table-row'>
-            <th local-class='table-header'>{{t 'links.linked-service'}}</th>
-            <th local-class='table-header'>{{t 'links.display-name'}}</th>
-            <th local-class='table-header'>{{t 'links.resource-type'}}</th>
-            <th local-class='table-header'>
-                {{#if this.currentUserCanEdit}}
-                    <OsfLink
-                        @route='guid-node.addons'
-                        @queryParams={{hash
-                            activeFilterType='verified-link'
-                            tabIndex='1'
-                        }}
-                        @models={{array this.model.node.id}}
-                    >
-                        {{t 'links.edit'}}
-                    </OsfLink>
-                {{/if}}
-            </th>
-        </tr>
-    </thead>
-    <tbody>
-        {{#each this.model.configuredLinkAddons as |configuredLinkAddon|}}
-            <tr local-class='table-row'>
-                <td local-class='table-cell'>
-                    <img alt={{t 'links.logo'}} local-class='logo' src={{configuredLinkAddon.externalLinkService.iconUrl}}>
-                    <span>{{configuredLinkAddon.externalLinkService.displayName}}</span>
-                </td>
-                <td local-class='table-cell'>{{configuredLinkAddon.displayName}}</td>
-                <td local-class='table-cell'>{{configuredLinkAddon.resourceType}}</td>
-                <td local-class='table-cell'><a href={{configuredLinkAddon.targetUrl}}>{{t 'links.link'}}</a></td>
-            </tr>
-        {{/each}}
-    </tbody>
-</table>
\ No newline at end of file
+<div local-class='links-page-wrapper'>
+    <h2>{{t 'links.linked-services'}}</h2>
+    {{#if this.model.configuredLinkAddons}}
+        <table local-class='table'>
+            <thead>
+                <tr local-class='table-row'>
+                    <th local-class='table-header'>{{t 'links.linked-service'}}</th>
+                    <th local-class='table-header'>{{t 'links.display-name'}}</th>
+                    <th local-class='table-header'>{{t 'links.resource-type'}}</th>
+                    <th local-class='table-header'>
+                        {{#if this.currentUserCanEdit}}
+                            <OsfLink
+                                @route='guid-node.addons'
+                                @queryParams={{hash
+                                activeFilterType='verified-link'
+                                tabIndex='1'
+                            }}
+                                @models={{array this.model.node.id}}
+                            >
+                                {{t 'links.edit'}}
+                            </OsfLink>
+                        {{/if}}
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                {{#each this.model.configuredLinkAddons as |configuredLinkAddon|}}
+                    <tr local-class='table-row'>
+                        <td local-class='table-cell'>
+                            <img alt={{t 'links.logo'}} local-class='logo'
+                                 src={{configuredLinkAddon.externalLinkService.iconUrl}}>
+                            <span>{{configuredLinkAddon.externalLinkService.displayName}}</span>
+                        </td>
+                        <td local-class='table-cell'>{{configuredLinkAddon.displayName}}</td>
+                        <td local-class='table-cell'>{{configuredLinkAddon.resourceType}}</td>
+                        <td local-class='table-cell'><a href={{configuredLinkAddon.targetUrl}}>{{t 'links.link'}}</a></td>
+                    </tr>
+                {{/each}}
+            </tbody>
+        </table>
+    {{else}}
+        <p>{{t 'links.empty-screen-message'}}</p>
+        {{#if this.currentUserCanEdit}}
+            <p> {{t 'links.point-to-addons-message'}} <a href='/{{this.model.node.id}}/addons?activeFilterType=verified-link'>{{t 'addons.heading'}}</a></p>
+        {{/if}}
+    {{/if}}
+</div>
diff --git a/lib/osf-components/addon/components/addons-service/file-manager/component.ts b/lib/osf-components/addon/components/addons-service/file-manager/component.ts
index b7d6fd00136..bf8d45ded1f 100644
--- a/lib/osf-components/addon/components/addons-service/file-manager/component.ts
+++ b/lib/osf-components/addon/components/addons-service/file-manager/component.ts
@@ -14,6 +14,7 @@ import AuthorizedAccountModel from 'ember-osf-web/models/authorized-account';
 import ConfiguredAddonModel from 'ember-osf-web/models/configured-addon';
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
 import ConfiguredLinkAddonModel from 'ember-osf-web/models/configured-link-addon';
+import AuthorizedLinkAccountModel from 'ember-osf-web/models/authorized-link-account';
 
 interface Args {
     configuredAddon?: ConfiguredAddonModel;
@@ -48,7 +49,8 @@ export default class FileManager extends Component<Args> {
     }
 
     get isLinkAddon() {
-        return this.operationInvocableModel instanceof ConfiguredLinkAddonModel;
+        return this.operationInvocableModel instanceof ConfiguredLinkAddonModel ||
+            this.operationInvocableModel instanceof AuthorizedLinkAccountModel ;
     }
 
     constructor(owner: unknown, args: Args) {
diff --git a/translations/en-us.yml b/translations/en-us.yml
index a468f91cb4b..e62ad177ba4 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -381,6 +381,8 @@ links:
     linked-service: 'Linked Service'
     display-name: 'Display Name'
     resource-type: 'Resource Type'
+    empty-screen-message: 'This project has no configured linked services at a moment '
+    point-to-addons-message: 'In order to add linked service visit'
     link: 'Link'
     edit: 'Edit'
     icon: '{addonName} icon'

From 4284f8bd10ae25cdacf370bd2e7dc37d737ba1f0 Mon Sep 17 00:00:00 2001
From: Oleh Paduchak <158075011+opaduchak@users.noreply.github.com>
Date: Fri, 13 Jun 2025 22:08:18 +0300
Subject: [PATCH 9/9] [ENG-8080] More FE update due to recent mock-up changes
 from PO (#2575)

---
 app/guid-node/template.hbs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/guid-node/template.hbs b/app/guid-node/template.hbs
index 5e229e2ce42..6f5b3a33e96 100644
--- a/app/guid-node/template.hbs
+++ b/app/guid-node/template.hbs
@@ -99,13 +99,6 @@
                     @label={{t 'node.left_nav.registrations'}}
                 />
             {{/unless}}
-            <leftNav.link
-                data-test-verified-links-link
-                data-analytics-name='Linked services'
-                @route='guid-node.links'
-                @icon='link'
-                @label={{t 'node.left_nav.links'}}
-            />
             {{#unless this.currentUser.viewOnlyToken}}
                 {{#if (and (not this.viewOnly) this.model.taskInstance.value.userHasReadPermission)}}
                     <leftNav.link
@@ -136,6 +129,15 @@
                         />
                     {{/if}}
                 {{/if}}
+            {{/unless}}
+            <leftNav.link
+                data-test-verified-links-link
+                data-analytics-name='Linked services'
+                @route='guid-node.links'
+                @icon='link'
+                @label={{t 'node.left_nav.links'}}
+            />
+            {{#unless this.currentUser.viewOnlyToken}}
                 {{#if (and (not this.viewOnly) this.model.taskInstance.value.userHasReadPermission)}}
                     <leftNav.link
                         data-test-settings-link