[ENG-5168] User addon credentials

app/models/external-citation-service.ts

@@ -1,11 +1,11 @@
 import { attr } from '@ember-data/model';
 
 import OsfModel from './osf-model';
-import { CredentialsFormat, ExternalServiceLinks } from './external-storage-service';
+import { CredentialsFormat } from './external-storage-service';
 
 export default class ExternalCitationServiceModel extends OsfModel {
     @attr('fixstring') name!: string;
-    @attr('links') links!: ExternalServiceLinks;
+    @attr('string') iconUrl!: string;
     @attr('string') credentialsFormat!: CredentialsFormat;
     // TODO: actually need some attrs here for citation service options
 }

app/models/external-computing-service.ts

@@ -1,11 +1,11 @@
 import { attr } from '@ember-data/model';
 
 import OsfModel from './osf-model';
-import { CredentialsFormat, ExternalServiceLinks } from './external-storage-service';
+import { CredentialsFormat } from './external-storage-service';
 
 export default class ExternalComputingServiceModel extends OsfModel {
     @attr('fixstring') name!: string;
-    @attr('links') links!: ExternalServiceLinks;
+    @attr('string') iconUrl!: string;
     @attr('string') credentialsFormat!: CredentialsFormat;
     // TODO: actually need some attrs here for cloud computing options
 }

app/models/external-storage-service.ts

@@ -1,6 +1,6 @@
 import { attr } from '@ember-data/model';
 
-import OsfModel, { OsfLinks } from './osf-model';
+import OsfModel from './osf-model';
 
 export enum CredentialsFormat {
     OAUTH = 'oauth',
@@ -11,14 +11,10 @@ export enum CredentialsFormat {
     ACCESS_SECRET_KEYS = 'access_secret_keys',
 }
 
-export interface ExternalServiceLinks extends OsfLinks {
-    icon: string;
-}
-
 export default class ExternalStorageServiceModel extends OsfModel {
     @attr('fixstring') name!: string;
-    @attr('object') links!: ExternalServiceLinks;
     @attr('string') credentialsFormat!: CredentialsFormat;
+    @attr('string') iconUrl!: string;
     // TODO: combine these boolean scopes into a single array of strings from some enum
     @attr('boolean') readOnly!: boolean;
     @attr('boolean') supportsCopy!: boolean;

app/packages/addons-service/provider.ts

@@ -44,14 +44,18 @@ interface ProviderTypeMapper {
 
 
 export default class Provider {
-    @tracked node: NodeModel;
+    @tracked node?: NodeModel;
     @tracked serviceNode?: ResourceReferenceModel;
 
     currentUser: CurrentUserService;
-    @tracked userReference!: UserReferenceModel;
+    @tracked userReference?: UserReferenceModel;
     provider: AllProviderTypes;
     providerMap?: ProviderTypeMapper;
 
+    get name() {
+        return this.provider.name;
+    }
+
     providerTypeMapper: Record<string, ProviderTypeMapper>  = {
         externalStorageService: {
             getConfiguredAddon: taskFor(this.getConfiguredStorageAddon),
@@ -83,8 +87,8 @@ export default class Provider {
         return Boolean(this.configuredAddon);
     }
 
-    constructor(provider: any, currentUser: CurrentUserService, node: NodeModel) {
-        setOwner(this, getOwner(node));
+    constructor(provider: any, currentUser: CurrentUserService, node?: NodeModel) {
+        setOwner(this, getOwner(provider));
         this.node = node;
         this.currentUser = currentUser;
         this.provider = provider;
@@ -121,11 +125,13 @@ export default class Provider {
     @task
     @waitFor
     async getResourceReference() {
-        const serviceNode = this.store.peekRecord('resource-reference', this.node.id);
-        if (serviceNode) {
-            this.serviceNode = serviceNode;
-        } else {
-            this.serviceNode = await this.store.findRecord('resource-reference', this.node.id);
+        if (this.node) {
+            const serviceNode = this.store.peekRecord('resource-reference', this.node.id);
+            if (serviceNode) {
+                this.serviceNode = serviceNode;
+            } else {
+                this.serviceNode = await this.store.findRecord('resource-reference', this.node.id);
+            }
         }
     }
 
@@ -197,7 +203,7 @@ export default class Provider {
     }
 
     async userAddonAccounts() {
-        return await this.userReference.authorizedStorageAccounts;
+        return await this.userReference?.authorizedStorageAccounts;
     }
 
 

app/settings/addons/styles.scss

@@ -36,6 +36,19 @@
     }
 }
 
-.disconnect-button {
+.provider-list-wrapper {
+    flex-grow: 1;
+}
+
+.provider-list-item {
+    margin: 15px 10px;
+    border-bottom: solid 1px $color-border-gray;
+
+    &:first-child {
+        border-top: solid 1px $color-border-gray;
+    }
+}
+
+.float-right {
     float: right;
 }

app/settings/addons/template.hbs

@@ -5,57 +5,107 @@
     {{#if manager.currentListIsLoading}}
         <LoadingIndicator @dark={{true}} />
     {{else}}
-        <div local-class='addons-list-wrapper {{if this.isMobile 'mobile'}}'>
-            <div
-                data-analytics-scope='Addon List Filter'
-                local-class='filter-wrapper {{if this.isMobile 'mobile'}}'
+        {{#if manager.selectedProvider}}
+            <Button
+                data-test-cancel-account-setup
+                data-analytics-name='Cancel Account Setup'
+                local-class='float-right'
+                @layout='fake-link'
+                {{on 'click' manager.cancelAccountSetup}}
             >
-                <Input
-                    data-test-user-addon-list-filter-input
-                    placeholder={{t 'addons.list.filter-placeholder'}}
-                    @type='text'
-                    @value={{manager.filterText}}
+                {{t 'general.back'}}
+            </Button>
+            {{#if (eq manager.pageMode 'terms')}}
+                <h3 local-class='page-heading'>
+                    {{t 'addons.terms.heading' providerName=manager.selectedProvider.provider.name}}
+                </h3>
+                <Button
+                    {{on 'click' manager.acceptProviderTerms}}
+                >
+                    {{t 'general.ok'}}
+                </Button>
+            {{else if (eq manager.pageMode 'accountCreate')}}
+                <h3 local-class='page-heading'>
+                    {{t 'addons.accountSelect.new-account'}}
+                </h3>
+                <AddonsService::AccountSetupManager
+                    @provider={{manager.selectedProvider.provider}}
+                    @manager={{manager}}
+                    @onConnect={{manager.connectAccount}}
+                    @onInput={{manager.onCredentialsInput}}
                 />
-                {{#each manager.possibleFilterTypes as |type|}}
-                    <Button
-                        data-test-user-addon-list-filter={{type}}
-                        data-analytics-name={{t (concat 'addons.list.filter.' type)}}
-                        local-class='filter-button {{if (eq manager.activeFilterType type) 'active'}}'
-                        @layout='fake-link'
-                        {{on 'click' (fn manager.filterByAddonType type)}}
-                    >
-                        {{t (concat 'addons.list.filter.' type)}}
-                    </Button>
-                {{/each}}
+            {{/if}}
+        {{else}}
+            <div
+                data-analytics-scope='Addon List'
+                local-class='addons-list-wrapper'
+            >
+                <div
+                    data-analytics-scope='Addon List Filter'
+                    local-class='filter-wrapper {{if this.isMobile 'mobile'}}'
+                >
+                    <Input
+                        data-test-user-addon-list-filter-input
+                        placeholder={{t 'addons.list.filter-placeholder'}}
+                        @type='text'
+                        @value={{manager.filterText}}
+                    />
+                    {{#each manager.possibleFilterTypes as |type|}}
+                        <Button
+                            data-test-user-addon-list-filter={{type}}
+                            data-analytics-name={{t (concat 'addons.list.filter.' type)}}
+                            local-class='filter-button {{if (eq manager.activeFilterType type) 'active'}}'
+                            @layout='fake-link'
+                            {{on 'click' (fn manager.filterByAddonType type)}}
+                        >
+                            {{t (concat 'addons.list.filter.' type)}}
+                        </Button>
+                    {{/each}}
+                </div>
+                <div
+                    local-class='provider-list-wrapper'
+                >
+                    {{#each manager.filteredAddonProviders as |provider|}}
+                        <div
+                            data-test-provider={{provider.name}}
+                            local-class='provider-list-item'
+                        >
+                            {{provider.name}}
+                            <Button
+                                data-analytics-name='Connect Addon Button {{provider.name}}'
+                                local-class='float-right'
+                                @type='create'
+                                {{on 'click' (fn manager.selectProvider provider)}}
+                            >
+                                {{t 'addons.list.connect'}}
+                            </Button>
+                        </div>
+                    {{else}}
+                        {{t 'addons.list.no-results'}}
+                    {{/each}}
+                </div>
             </div>
-            <div>
-                {{#each manager.filteredAddonProviders as |provider|}}
-                    <div>
-                        {{provider.name}}
-                    </div>
+
+            <ul local-class='configured-addons-wrapper'>
+                {{#each manager.currentTypeAuthorizedAccounts as |account|}}
+                    <li>
+                        {{account.storageProvider.name}}
+                        {{account.externalUserDisplayName}}
+                        <Button
+                            data-test-disconnect-account-button
+                            data-analytics-name='Disconnect Addon Button {{account.storageProvider.name}}'
+                            @type='destroy'
+                            @disabled={{manager.disconnectAddon.isRunning}}
+                            local-class='float-right'
+                            {{on 'click' (perform manager.disconnectAddon account)}}
+                        >
+                            {{t 'addons.list.disconnect'}}
+                        </Button>
+                    </li>
                 {{else}}
-                    {{t 'addons.list.no-results'}}
+                    <li>{{t 'addons.list.no-authorized-accounts'}}</li>
                 {{/each}}
-            </div>
-        </div>
+            </ul>
+        {{/if}}
     {{/if}}
-
-    <ul local-class='configured-addons-wrapper'>
-        {{#each manager.currentTypeAuthorizedAccounts as |account|}}
-            <li>
-                {{account.storageProvider.name}}
-                {{account.externalUserDisplayName}}
-                <Button
-                    @type='destroy'
-                    @disabled={{manager.disconnectAddon.isRunning}}
-                    local-class='disconnect-button'
-                    {{on 'click' (perform manager.disconnectAddon account)}}
-                >
-                    {{t 'addons.list.disconnect'}}
-                </Button>
-            </li>
-        {{else}}
-            <li>{{t 'addons.list.no-authorized-accounts'}}</li>
-        {{/each}}
-    </ul>
 </AddonsService::UserAddonsManager>

lib/osf-components/addon/components/addon-card/component.ts

@@ -30,7 +30,7 @@ export default class AddonsCardComponent extends Component<Args> {
     }
 
     get assetLogo() {
-        return this.args.addon.provider.links.icon;
+        return this.args.addon.provider.iconUrl;
     }
 
     get addonIsConfigured() {

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

@@ -37,8 +37,8 @@
                 {{#if this.otherRepoSelected}}
                     <Input
                         local-class='auth-text-input-label'
+                        placeholder={{t 'addons.accountCreate.repo-other-placeholder'}}
                         @value={{this.otherRepo}}
-                        @placeholder={{t 'addons.accountCreate.repo-other-placeholder'}}
                         {{on 'keyup' this.onOtherRepoChange}}
                     />
                     {{#if this.repoOtherPostText}}
@@ -53,11 +53,11 @@
                     {{field.labelText}}
                     <Input
                         name={{field.name}}
+                        placeholder={{field.inputPlaceholder}}
+                        autocomplete={{field.autocomplete}}
                         @type={{field.inputType}}
                         @value={{field.inputValue}}
-                        @placeholder={{field.inputPlaceholder}}
                         {{on 'keyup' @onInput}}
-                        autocomplete={{field.autocomplete}}
                     />
                 </label>
                 {{field.postText}}