Skip to content

Commit

Permalink
Make changes based on user feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianjgeiger
brianjgeiger committed May 24, 2024
1 parent b125353 commit 90a7386
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 187 deletions.
12 changes: 6 additions & 6 deletions app/settings/addons/template.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@
{{/each}}
</div>
<AriaTabs
@defaultIndex={{0}}
@selectedIndex={{manager.tabIndex}} @onSelect={{action manager.changeTab}}
as |tab|
>
<tab.tabList
local-class='tab-list'
as |tablist|
>
<tablist.tab data-analytics-name='All Addons Tab'>{{t 'addons.list.all-addons'}}</tablist.tab>
<tablist.tab data-analytics-name='Authorized Accounts Tab'>{{t 'addons.list.authorized-accounts'}}</tablist.tab>
<tablist.tab data-analytics-name='Connected Accounts Tab'>{{t 'addons.list.connected-accounts'}}</tablist.tab>
</tab.tabList>
<tab.tabPanel
data-test-all-addons-tab
Expand All @@ -122,7 +122,7 @@
@type='create'
{{on 'click' (fn manager.connectNewProviderAccount provider)}}
>
{{t 'general.authorize'}}
{{t 'addons.list.connect'}}
</Button>
</span>
</li>
Expand All @@ -132,8 +132,8 @@
</ul>
</tab.tabPanel>
<tab.tabPanel
data-test-authorized-accounts-tab
data-analytics-scope='Authorized accounts tab'
data-test-connected-accounts-tab
data-analytics-scope='Connected accounts tab'
local-class='addons-list-wrapper {{if (media 'isMobile') 'mobile'}}'
>
<ul local-class='configured-addons-wrapper'>
Expand Down Expand Up @@ -161,7 +161,7 @@
</span>
</li>
{{else}}
<li local-class='provider-list-item'>{{t 'addons.list.no-authorized-accounts'}}</li>
<li local-class='provider-list-item'>{{t 'addons.list.no-connected-accounts'}}</li>
{{/each}}
</ul>
</tab.tabPanel>
Expand Down
10 changes: 9 additions & 1 deletion lib/osf-components/addon/components/addons-service/addon-account-setup/styles.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
}

.auth-text-input-label {
margin-top: 20px;
display: block;
}

Expand All @@ -14,3 +13,12 @@
.connect-error {
color: $brand-danger;
}

.post-text {
display: block;
}

.input {
margin-bottom: 20px;
margin-top: 5px;
}
52 changes: 36 additions & 16 deletions lib/osf-components/addon/components/addons-service/addon-account-setup/template.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,20 @@
<div local-class='oauth-wrapper'>
{{t 'addons.accountCreate.oauth-description' providerName=@provider.name}}
{{#unless @reconnect}}
<label local-class='auth-text-input-label'>
{{t 'addons.accountCreate.display-name-label'}}
{{#let (unique-id 'display-name-label') as |displayNameId|}}
<label for={{displayNameId}} local-class='auth-text-input-label'>
{{t 'addons.accountCreate.display-name-label'}}
</label>
<div local-class='post-text'>
{{t 'addons.accountCreate.display-name-help'}}
</div>
<Input
local-class='input'
id={{displayNameId}}
placeholder={{t 'addons.accountCreate.display-name-placeholder'}}
@value={{@manager.displayName}}
/>
</label>
{{/let}}
{{/unless}}
<div local-class='button-wrapper'>
<Button
Expand Down Expand Up @@ -68,27 +75,40 @@
{{/if}}
{{/if}}
{{#each this.inputFields as |field|}}
<label local-class='auth-text-input-label'>
{{field.labelText}}
{{#let (unique-id (field.name)) as |id|}}
<label for={{id}} local-class='auth-text-input-label'>
{{field.labelText}}
</label>
<div local-class='post-text'>
{{field.postText}}
</div>
<Input
name={{field.name}}
placeholder={{field.inputPlaceholder}}
autocomplete={{field.autocomplete}}
@type={{field.inputType}}
@value={{field.inputValue}}
{{on 'keyup' @onInput}}
id={{id}}
local-class='input'
name={{field.name}}
placeholder={{field.inputPlaceholder}}
autocomplete={{field.autocomplete}}
@type={{field.inputType}}
@value={{field.inputValue}}
{{on 'keyup' @onInput}}
/>
</label>
{{field.postText}}
{{/let}}
{{/each}}
{{#unless @reconnect}}
<label local-class='auth-text-input-label'>
{{t 'addons.accountCreate.display-name-label'}}
{{#let (unique-id 'displayNameField') as |id|}}
<label for={{id}} local-class='auth-text-input-label'>
{{t 'addons.accountCreate.display-name-label'}}
</label>
<div local-class='post-text'>
{{t 'addons.accountCreate.display-name-help'}}
</div>
<Input
id={{id}}
local-class='input'
placeholder={{t 'addons.accountCreate.display-name-placeholder'}}
@value={{@manager.displayName}}
/>
</label>
{{/let}}
{{/unless}}
{{#if @manager.connectAccountError}}
<p local-class='connect-error'>
Expand Down
8 changes: 8 additions & 0 deletions lib/osf-components/addon/components/addons-service/user-addons-manager/component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export default class UserAddonManagerComponent extends Component<Args> {

user = this.args.user;
@tracked userReference!: UserReferenceModel;
@tracked tabIndex = 0;

possibleFilterTypes = Object.values(FilterTypes);
@tracked filterTypeMapper = {
Expand Down Expand Up @@ -96,6 +97,11 @@ export default class UserAddonManagerComponent extends Component<Args> {

@tracked pageMode?: UserSettingPageModes;

@action
changeTab(index: number) {
this.tabIndex = index;
}

@action
filterByAddonType(type: FilterTypes) {
if (this.activeFilterType !== type) {
Expand Down Expand Up @@ -307,6 +313,7 @@ export default class UserAddonManagerComponent extends Component<Args> {
await taskFor(this.selectedProvider!.createAuthorizedAccount)
.perform(this.credentialsObject, this.displayName);
this.cancelSetup();
this.changeTab(1);
await taskFor(this.getAuthorizedAccounts).perform();
this.toast.success(this.intl.t('addons.accountCreate.connect-success'));
} catch (e) {
Expand Down Expand Up @@ -348,6 +355,7 @@ export default class UserAddonManagerComponent extends Component<Args> {
@waitFor
async oauthFlowRefocus() {
this.cancelSetup();
this.changeTab(1);
await taskFor(this.getAuthorizedAccounts).perform();
}

Expand Down
3 changes: 2 additions & 1 deletion lib/osf-components/addon/components/addons-service/user-addons-manager/template.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
credentialsObject=this.credentialsObject
displayName=this.displayName
pageMode=this.pageMode

tabIndex=this.tabIndex
changeTab=this.changeTab
selectedProvider=this.selectedProvider
selectedAccount=this.selectedAccount
connectNewProviderAccount=this.connectNewProviderAccount
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"ember-ajax": "^5.0.0",
"ember-angle-bracket-invocation-polyfill": "^2.0.2",
"ember-animated": "^0.11.0",
"ember-aria-tabs": "^4.0.0",
"ember-aria-tabs": "^7.0.0",
"ember-auto-import": "^2.6.3",
"ember-changeset": "^4.1.2",
"ember-changeset-validations": "^4.1.1",
Expand Down
12 changes: 6 additions & 6 deletions translations/en-us.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,7 @@ addons:
remove-configured-addon-success: 'You have successfully removed this addon'
remove-configured-addon-error: 'There was a problem removing this addon'
list:
authorized-accounts-for-provider: 'Authorized accounts for {providerName}'
authorized-accounts: 'Authorized accounts'
connected-accounts-for-provider: 'Connected accounts for {providerName}'
connected-accounts: 'Connected Accounts'
connected-locations: 'Connected locations'
add-another-location: 'Add another location'
Expand All @@ -244,7 +243,7 @@ addons:
citation-manager: 'Citation Manager'
cloud-computing: 'Cloud Computing'
no-results: 'No results found'
no-authorized-accounts: 'No authorized accounts'
no-connected-accounts: 'No connected accounts'
connect: 'Connect'
disconnect: 'Disconnect'
reconnect: 'Reconnect'
Expand Down Expand Up @@ -300,10 +299,11 @@ addons:
new-account: 'Setup new account'
reconnect-account: 'Reconnect account'
existing-account: 'Choose existing account'
unauthenticated-account: 'Unauthenticated account'
unauthenticated-account: 'Unconnected account'
accountCreate:
display-name-label: 'Display name'
display-name-placeholder: 'Account name'
display-name-help: 'This is help text for the display name'
url-label: 'Host URL'
url-placeholder: 'owncloud.example.org'
owncloud-url-post-text: 'Only ownCloud instances supporting <a href="https://doc.owncloud.com/">WebDAV</a> and <a href"https://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7/">OCS v1.7</a> are supported.'
Expand Down Expand Up @@ -340,8 +340,8 @@ addons:
disconnect-error: 'Error disconnecting account'
confirm:
heading: 'Confirm {providerName} Account'
verify: 'Authorize the following account:'
authorizing: 'Authorizing…'
verify: 'Connect the following account:'
authorizing: 'Connecting…'
configure:
heading: 'Configure {providerName}'

Expand Down
Loading

0 comments on commit 90a7386

Please sign in to comment.