diff --git a/superset-frontend/spec/javascripts/profile/UserInfo_spec.tsx b/superset-frontend/spec/javascripts/profile/UserInfo_spec.tsx index 57ae89156..9d8a904cb 100644 --- a/superset-frontend/spec/javascripts/profile/UserInfo_spec.tsx +++ b/superset-frontend/spec/javascripts/profile/UserInfo_spec.tsx @@ -18,7 +18,6 @@ */ import React from 'react'; import Gravatar from 'react-gravatar'; -import { Panel } from 'react-bootstrap'; import { mount } from 'enzyme'; import UserInfo from 'src/profile/components/UserInfo'; @@ -37,7 +36,7 @@ describe('UserInfo', () => { }); it('renders a Panel', () => { const wrapper = mount(); - expect(wrapper.find(Panel)).toExist(); + expect(wrapper.find('.panel')).toExist(); }); it('renders 5 icons', () => { const wrapper = mount(); diff --git a/superset-frontend/src/profile/components/UserInfo.tsx b/superset-frontend/src/profile/components/UserInfo.tsx index db38fde99..b6dcac022 100644 --- a/superset-frontend/src/profile/components/UserInfo.tsx +++ b/superset-frontend/src/profile/components/UserInfo.tsx @@ -19,17 +19,22 @@ import React from 'react'; import Gravatar from 'react-gravatar'; import moment from 'moment'; -import { Panel } from 'react-bootstrap'; -import { t } from '@superset-ui/core'; +import { t, styled } from '@superset-ui/core'; import { UserWithPermissionsAndRoles } from '../../types/bootstrapTypes'; interface UserInfoProps { user: UserWithPermissionsAndRoles; } +const StyledContainer = styled.div` + .panel { + padding: ${({ theme }) => theme.gridUnit * 6}px; + } +`; + export default function UserInfo({ user }: UserInfoProps) { return ( -
+
- - +
+

{user.firstName} {user.lastName} @@ -52,25 +57,25 @@ export default function UserInfo({ user }: UserInfoProps) {

{user.username}

-
-

- {t('joined')}{' '} - {moment(user.createdOn, 'YYYYMMDD').fromNow()} -

-

- {user.email} -

-

- {Object.keys(user.roles).join(', ')} -

-

- -   - {t('id:')}  - {user.userId} -

- - -

+
+
+

+ {t('joined')}{' '} + {moment(user.createdOn, 'YYYYMMDD').fromNow()} +

+

+ {user.email} +

+

+ {Object.keys(user.roles).join(', ')} +

+

+ +   + {t('id:')}  + {user.userId} +

+
+ ); }