Migrate UserAccount

Summary: Migrated UserAccount.js to UserAccount.tsx

Reviewed By: passy

Differential Revision: D16668833

fbshipit-source-id: 723f2c2d7e68cda0076dd46aebe4b8e6ba392c24
This commit is contained in:
Benjamin Elo
2019-08-08 05:55:39 -07:00
committed by Facebook Github Bot
parent 3597f56c94
commit 48db6b7b58
2 changed files with 33 additions and 17 deletions

View File

@@ -33,7 +33,7 @@ import React from 'react';
import NotificationsHub from '../NotificationsHub.js'; import NotificationsHub from '../NotificationsHub.js';
import {selectPlugin} from '../reducers/connections.js'; import {selectPlugin} from '../reducers/connections.js';
import {setActiveSheet} from '../reducers/application.js'; import {setActiveSheet} from '../reducers/application.js';
import UserAccount from './UserAccount.js'; import UserAccount from './UserAccount.tsx';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
const ListItem = styled('div')(({active}) => ({ const ListItem = styled('div')(({active}) => ({

View File

@@ -5,15 +5,16 @@
* @format * @format
*/ */
import type {User} from '../reducers/user'; import {User} from '../reducers/user';
import type {ActiveSheet} from '../reducers/application'; import {ActiveSheet} from '../reducers/application';
import {styled, PureComponent, FlexRow, Glyph, Text, colors} from 'flipper'; import {styled, FlexRow, Glyph, Text, colors} from 'flipper';
import {logout} from '../reducers/user'; import {logout} from '../reducers/user';
import {setActiveSheet, ACTIVE_SHEET_SIGN_IN} from '../reducers/application.js'; import {setActiveSheet, ACTIVE_SHEET_SIGN_IN} from '../reducers/application.js';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import electron from 'electron'; import electron from 'electron';
import {findDOMNode} from 'react-dom'; import {findDOMNode} from 'react-dom';
import React, {PureComponent} from 'react';
const Container = styled(FlexRow)({ const Container = styled(FlexRow)({
alignItems: 'center', alignItems: 'center',
@@ -40,16 +41,22 @@ const UserName = styled(Text)({
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
}); });
type UserAccountProps = {| type OwnProps = {};
user: User,
type DispatchFromProps = {
logout: () => void, logout: () => void,
setActiveSheet: (activeSheet: ActiveSheet) => void, setActiveSheet: (activeSheet: ActiveSheet) => void,
|}; };
class UserAccount extends PureComponent<UserAccountProps> { type StateFromProps = {
_ref: ?Element; user: User,
};
setRef = (ref: React.ElementRef<*>) => { type Props = OwnProps & DispatchFromProps & StateFromProps;
class UserAccount extends PureComponent<Props> {
_ref: Element | null | undefined;
setRef = (ref: React.ReactInstance) => {
const element = findDOMNode(ref); const element = findDOMNode(ref);
if (element instanceof HTMLElement) { if (element instanceof HTMLElement) {
this._ref = element; this._ref = element;
@@ -57,7 +64,7 @@ class UserAccount extends PureComponent<UserAccountProps> {
}; };
showDetails = () => { showDetails = () => {
const menuTemplate: Array<MenuItemConstructorOptions> = [ const menuTemplate: Array<Electron.MenuItemConstructorOptions> = [
{ {
label: 'Sign Out', label: 'Sign Out',
click: this.props.logout, click: this.props.logout,
@@ -65,19 +72,26 @@ class UserAccount extends PureComponent<UserAccountProps> {
]; ];
const menu = electron.remote.Menu.buildFromTemplate(menuTemplate); const menu = electron.remote.Menu.buildFromTemplate(menuTemplate);
const {bottom, left} = this._ref ? this._ref.getBoundingClientRect() : {}; const {bottom = null, left = null} = this._ref
? this._ref.getBoundingClientRect()
: {};
menu.popup({ menu.popup({
window: electron.remote.getCurrentWindow(), window: electron.remote.getCurrentWindow(),
// @ts-ignore async is not part of public api in electron menu popup
async: true, async: true,
x: parseInt(left, 10), x: left || 10,
y: parseInt(bottom, 10) + 8, y: (bottom || 10) + 8,
}); });
}; };
render() { render() {
return this.props.user?.name ? ( const {user} = this.props;
const name = user ? user.name : null;
return name ? (
<Container innerRef={this.setRef} onClick={this.showDetails}> <Container innerRef={this.setRef} onClick={this.showDetails}>
<ProfilePic src={this.props.user.profile_picture?.uri} /> <ProfilePic
src={user.profile_picture ? user.profile_picture.uri : null}
/>
<UserName>{this.props.user.name}</UserName> <UserName>{this.props.user.name}</UserName>
<Glyph name="chevron-down" size={10} variant="outline" /> <Glyph name="chevron-down" size={10} variant="outline" />
</Container> </Container>
@@ -96,7 +110,9 @@ class UserAccount extends PureComponent<UserAccountProps> {
} }
} }
export default connect<UserAccountProps, {||}, _, _, _, _>( // @TODO: TS_MIGRATION
type Store = any;
export default connect<StateFromProps, DispatchFromProps, OwnProps, Store>(
({user}) => ({ ({user}) => ({
user, user,
}), }),