another batch of updates

Author: adlius

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}}
                         />

app/models/configured-addon.ts

@@ -5,13 +5,16 @@ 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';
 
 
 export interface ConfiguredAddonEditableAttrs {
     displayName: string;
     rootFolder: string;
+    targetId: string;
+    resourceType: SupportedResourceTypes;
 }
 
 export default class ConfiguredAddonModel extends Model {

app/models/configured-link-addon.ts

@@ -1,16 +1,19 @@
 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;
@@ -49,6 +52,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' {

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;
+        }
     }
 }

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,16 @@
             </table>
         </AddonsService::FileManager>
     {{/if}}
+    {{#if this.isLinkAddon}}
+        <PowerSelect
+            @options={{@supportedResourceTypes}}
+            @selected={{this.selectedResourceType}}
+            @onChange={{action (mut this.selectedResourceType)}}
+            as |resourceType|
+        >
+            {{resourceType}}
+        </PowerSelect>
+    {{/if}}
     <div local-class='footer-buttons-wrapper'>
         <Button
             data-test-root-folder-save

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);

lib/osf-components/addon/components/addons-service/file-manager/template.hbs

@@ -10,4 +10,5 @@
 
     isLoading=this.isLoading
     isError=this.isError
+    isLinkAddon=this.isLinkAddon
 )}}

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;
@@ -309,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) {

translations/en-us.yml

@@ -362,6 +362,7 @@ addons:
         heading: 'Configure {providerName}'
         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}'