From 6535fdf13c53da2bdcc153527dbaca11b5fb95e0 Mon Sep 17 00:00:00 2001 From: Fitz Elliott Date: Thu, 2 Jan 2025 08:12:13 -0500 Subject: [PATCH] don't show root folder for configured compute addons --- app/guid-node/addons/index/template.hbs | 22 ++++++++++--------- app/models/configured-addon.ts | 4 ++++ app/models/configured-computing-addon.ts | 5 +++++ .../configured-addon-edit/component.ts | 7 +++++- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/guid-node/addons/index/template.hbs b/app/guid-node/addons/index/template.hbs index 700882ccea..65dd67e301 100644 --- a/app/guid-node/addons/index/template.hbs +++ b/app/guid-node/addons/index/template.hbs @@ -194,16 +194,18 @@ -
- {{#if configuredAddon.rootFolder}} - {{configuredAddon.rootFolder}} - {{else}} - {{t 'addons.list.root-folder-not-set'}} - {{/if}} -
+ {{#if configuredAddon.hasRootFolder}} +
+ {{#if configuredAddon.rootFolder}} + {{configuredAddon.rootFolder}} + {{else}} + {{t 'addons.list.root-folder-not-set'}} + {{/if}} +
+ {{/if}}
{{t 'addons.list.connected-to-account'}} {{configuredAddon.baseAccount.displayName}}
diff --git a/app/models/configured-addon.ts b/app/models/configured-addon.ts index 176f620d7e..990bc3082d 100644 --- a/app/models/configured-addon.ts +++ b/app/models/configured-addon.ts @@ -37,4 +37,8 @@ export default class ConfiguredAddonModel extends Model { // To be implemented in child classes return; } + + get hasRootFolder() { + return true; + } } diff --git a/app/models/configured-computing-addon.ts b/app/models/configured-computing-addon.ts index 6c062e10fb..30c8b116fc 100644 --- a/app/models/configured-computing-addon.ts +++ b/app/models/configured-computing-addon.ts @@ -18,6 +18,11 @@ export default class ConfiguredComputingAddonModel extends ConfiguredAddonModel get externalServiceId() { return (this as ConfiguredComputingAddonModel).belongsTo('externalComputingService').id(); } + + get hasRootFolder() { + return false; + } + } declare module 'ember-data/types/registries/model' { 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 65ed54cf27..a05043e0ee 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,6 +7,7 @@ import { Item, ItemType } from 'ember-osf-web/models/addon-operation-invocation' import AuthorizedAccountModel from 'ember-osf-web/models/authorized-account'; import AuthorizedComputingAccountModel from 'ember-osf-web/models/authorized-computing-account'; import ConfiguredAddonModel from 'ember-osf-web/models/configured-addon'; +import ConfiguredComputingAddonModel from 'ember-osf-web/models/configured-computing-addon'; interface Args { @@ -25,7 +26,11 @@ export default class ConfiguredAddonEdit extends Component { }; get hasRootFolder() { - return !(this.args.authorizedAccount instanceof AuthorizedComputingAccountModel); + return !( + this.args.authorizedAccount instanceof AuthorizedComputingAccountModel + || + this.args.configuredAddon instanceof ConfiguredComputingAddonModel + ); } get invalidDisplayName() {