Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add manage usage route to user menu #4501

Merged
merged 4 commits into from
Jun 22, 2023
Merged

Add manage usage route to user menu #4501

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38cf422
Add link to account usage to the user menu
srartese Jun 16, 2023
cce2367
added icon
srartese Jun 16, 2023
dac3fdc
fixed linting errors
srartese Jun 16, 2023
4f9c09e
Merge branch 'feature/usage-limits' into feature/add-manage-usage-route
srartese Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 22 additions & 9 deletions jsapp/js/components/header.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;import React from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import reactMixin from 'react-mixin';
import { observer } from 'mobx-react';
Expand Down Expand Up @@ -52,7 +52,7 @@ const MainHeader = class MainHeader extends Reflux.Component {

componentDidMount() {
// On initial load use the possibly stored asset.
this.setState({asset: assetStore.getAsset(this.currentAssetID())})
this.setState({asset: assetStore.getAsset(this.currentAssetID())});

this.unlisteners.push(
assetStore.listen(this.onAssetLoad),
Expand Down Expand Up @@ -117,9 +117,16 @@ const MainHeader = class MainHeader extends Reflux.Component {
});
}

accountUsage() {
// verifyLogin also refreshes stored profile data
actions.auth.verifyLogin.triggerAsync().then(() => {
this.props.router.navigate(ACCOUNT_ROUTES.USAGE);
});
}

languageChange(evt) {
evt.preventDefault();
let langCode = $(evt.target).data('key');
const langCode = $(evt.target).data('key');
if (langCode) {
// use .always (instead of .done) here since Django 1.8 redirects the request
dataInterface.setLanguage({language: langCode}).always(() => {
Expand Down Expand Up @@ -183,11 +190,11 @@ const MainHeader = class MainHeader extends Reflux.Component {
langs = envStore.data.interface_languages;
}
if (sessionStore.isLoggedIn) {
var accountName = sessionStore.currentAccount.username;
var accountEmail = sessionStore.currentAccount.email;
const accountName = sessionStore.currentAccount.username;
const accountEmail = sessionStore.currentAccount.email;

var initialsStyle = {background: `#${stringToColor(accountName)}`};
var accountMenuLabel = <bem.AccountBox__initials style={initialsStyle}>{accountName.charAt(0)}</bem.AccountBox__initials>;
const initialsStyle = {background: `#${stringToColor(accountName)}`};
const accountMenuLabel = <bem.AccountBox__initials style={initialsStyle}>{accountName.charAt(0)}</bem.AccountBox__initials>;

return (
<bem.AccountBox>
Expand Down Expand Up @@ -235,6 +242,12 @@ const MainHeader = class MainHeader extends Reflux.Component {
</ul>
}
</bem.AccountBox__menuLI>
<bem.AccountBox__menuLI>
<bem.AccountBox__menuLink onClick={this.accountUsage}>
<i className='k-icon k-icon-archived' />
{t('Manage your account usage')}
</bem.AccountBox__menuLink>
</bem.AccountBox__menuLI>
<bem.AccountBox__menuLI m={'logout'} key='4'>
<bem.AccountBox__menuLink onClick={this.logout}>
<i className='k-icon k-icon-logout' />
Expand All @@ -252,7 +265,7 @@ const MainHeader = class MainHeader extends Reflux.Component {

renderGitRevInfo() {
if (sessionStore.currentAccount && sessionStore.currentAccount.git_rev) {
var gitRev = sessionStore.currentAccount.git_rev;
const gitRev = sessionStore.currentAccount.git_rev;
return (
<bem.GitRev>
<bem.GitRev__item>
Expand Down Expand Up @@ -339,7 +352,7 @@ const MainHeader = class MainHeader extends Reflux.Component {
</bem.MainHeader>
);
}
}
};

reactMixin(MainHeader.prototype, Reflux.ListenerMixin);
reactMixin(MainHeader.prototype, mixins.contextRouter);
Expand Down