-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/prod-beta' into prod-stable
- Loading branch information
Showing
73 changed files
with
879 additions
and
1,829 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import axios from 'axios'; | ||
|
||
import { PagedLinks, PagedMetaData } from './api'; | ||
|
||
export interface AccountSettingsData { | ||
cost_type?: string; | ||
currency?: string; | ||
} | ||
|
||
export interface AccountSettings { | ||
meta: PagedMetaData; | ||
links?: PagedLinks; | ||
data: AccountSettingsData; | ||
} | ||
|
||
export function fetchAccountSettings() { | ||
const insights = (window as any).insights; | ||
if (insights && insights.chrome && insights.chrome.auth && insights.chrome.auth.getUser) { | ||
return insights.chrome.auth.getUser().then(() => { | ||
return axios.get<AccountSettings>(`account-settings/`); | ||
}); | ||
} else { | ||
return axios.get<AccountSettings>(`account-settings/`); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
import { AccountSettings } from 'api/accountSettings'; | ||
import { getUserAccessQuery } from 'api/queries/userAccessQuery'; | ||
import { UserAccess, UserAccessType } from 'api/userAccess'; | ||
import { AxiosError } from 'axios'; | ||
import React from 'react'; | ||
import { injectIntl, WrappedComponentProps } from 'react-intl'; | ||
import { connect } from 'react-redux'; | ||
import { accountSettingsActions, accountSettingsSelectors } from 'store/accountSettings'; | ||
import { createMapStateToProps, FetchStatus } from 'store/common'; | ||
import { userAccessQuery, userAccessSelectors } from 'store/userAccess'; | ||
import { CostTypes } from 'utils/localStorage'; | ||
|
||
interface AccountSettingsOwnProps { | ||
children?: React.ReactNode; | ||
} | ||
|
||
interface AccountSettingsDispatchProps { | ||
fetchAccountSettings?: typeof accountSettingsActions.fetchAccountSettings; | ||
} | ||
|
||
interface AccountSettingsStateProps { | ||
accountSettings: AccountSettings; | ||
accountSettingsError: AxiosError; | ||
accountSettingsFetchStatus?: FetchStatus; | ||
userAccess: UserAccess; | ||
userAccessError: AxiosError; | ||
userAccessFetchStatus: FetchStatus; | ||
userAccessQueryString: string; | ||
} | ||
|
||
interface AccountSettingsState { | ||
costType?: CostTypes; | ||
currency?: string; | ||
} | ||
|
||
type AccountSettingsProps = AccountSettingsOwnProps & | ||
AccountSettingsDispatchProps & | ||
AccountSettingsStateProps & | ||
WrappedComponentProps; | ||
|
||
class AccountSettingsBase extends React.Component<AccountSettingsProps> { | ||
protected defaultState: AccountSettingsState = { | ||
// TBD... | ||
}; | ||
public state: AccountSettingsState = { ...this.defaultState }; | ||
|
||
public componentDidMount() { | ||
this.updateAccountSettings(); | ||
} | ||
|
||
public componentDidUpdate(prevProps: AccountSettingsProps) { | ||
const { accountSettings } = this.props; | ||
|
||
if (prevProps.accountSettings !== accountSettings) { | ||
const costType = accountSettings ? accountSettings.data.cost_type : CostTypes.unblended; | ||
const currency = accountSettings ? accountSettings.data.currency : 'USD'; | ||
|
||
// Force update to render children | ||
this.setState({ | ||
costType, | ||
currency, | ||
}); | ||
} | ||
} | ||
|
||
private updateAccountSettings = () => { | ||
const { accountSettingsFetchStatus, fetchAccountSettings } = this.props; | ||
|
||
if (accountSettingsFetchStatus !== FetchStatus.inProgress) { | ||
fetchAccountSettings(); | ||
} | ||
}; | ||
|
||
public render() { | ||
const { accountSettingsFetchStatus, children } = this.props; | ||
|
||
return accountSettingsFetchStatus === FetchStatus.complete ? children : null; | ||
} | ||
} | ||
|
||
const mapStateToProps = createMapStateToProps<AccountSettingsOwnProps, AccountSettingsStateProps>(state => { | ||
const accountSettings = accountSettingsSelectors.selectAccountSettings(state); | ||
const accountSettingsError = accountSettingsSelectors.selectAccountSettingsError(state); | ||
const accountSettingsFetchStatus = accountSettingsSelectors.selectAccountSettingsFetchStatus(state); | ||
|
||
const userAccessQueryString = getUserAccessQuery(userAccessQuery); | ||
const userAccess = userAccessSelectors.selectUserAccess(state, UserAccessType.all, userAccessQueryString); | ||
const userAccessError = userAccessSelectors.selectUserAccessError(state, UserAccessType.all, userAccessQueryString); | ||
const userAccessFetchStatus = userAccessSelectors.selectUserAccessFetchStatus( | ||
state, | ||
UserAccessType.all, | ||
userAccessQueryString | ||
); | ||
|
||
return { | ||
accountSettings, | ||
accountSettingsError, | ||
accountSettingsFetchStatus, | ||
userAccess, | ||
userAccessError, | ||
userAccessFetchStatus, | ||
userAccessQueryString, | ||
}; | ||
}); | ||
|
||
const mapDispatchToProps: AccountSettingsDispatchProps = { | ||
fetchAccountSettings: accountSettingsActions.fetchAccountSettings, | ||
}; | ||
|
||
const CostTypeConnect = connect(mapStateToProps, mapDispatchToProps)(AccountSettingsBase); | ||
const AccountSettings = injectIntl(CostTypeConnect); | ||
|
||
export { AccountSettings }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export * from './accountSettings'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.