jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

label overlap in errors

Browse source
This commit is contained in:
Shekar Siri 2021-05-06 12:49:26 +05:30
parent 55074f391d
commit ee643c1f40
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/app/Router.js
View file

@ -55,14 +55,14 @@ const ONBOARDING_PATH = routes.onboarding();
const jwt = state.get('jwt');
const changePassword = state.getIn([ 'user', 'account', 'changePassword' ]);
const userInfoLoading = state.getIn([ 'user', 'fetchUserInfoRequest', 'loading' ]);
const fetchingTenants = state.get('user', 'fetchTenantsRequest', 'loading');
// const fetchingTenants = state.get('user', 'fetchTenantsRequest', 'loading');
return {
jwt,
siteId,
changePassword,
sites: state.getIn([ 'user', 'client', 'sites' ]),
isLoggedIn: jwt !== null && !changePassword,
loading: siteId === null || userInfoLoading || fetchingTenants,
loading: siteId === null || userInfoLoading,
email: state.getIn([ 'user', 'account', 'email' ]),
account: state.getIn([ 'user', 'account' ]),
organisation: state.getIn([ 'user', 'client', 'name' ]),

16
frontend/app/components/Errors/Error/DistributionBar.js
View file

@ -1,5 +1,5 @@
import cn from 'classnames';
import { Popup } from 'UI';
import { Popup, TextEllipsis } from 'UI';
import { Styles } from '../../Dashboard/Widgets/common';
import cls from './distributionBar.css';
import { colorScale } from 'App/utils';
@ -15,11 +15,15 @@ function DistributionBar({ className, title, partitions }) {
return (
<div className={ className } >
<div className="flex justify-between text-sm mb-1">
<span className="capitalize">{ title }</span>
<span>
<span className="font-thin capitalize">{ partitions[0].label }</span>
<span className="ml-2">{ `${ Math.round(partitions[0].prc) }% ` }</span>
</span>
<div className="capitalize">{ title }</div>
<div className="flex items-center">
<div className="font-thin capitalize" style={{ maxWidth: '80px', height: '19px'}}>
<TextEllipsis
text={ partitions[0].label }
/>
</div>
<div className="ml-2">{ `${ Math.round(partitions[0].prc) }% ` }</div>
</div>
</div>
<div className={ cn("border-radius-3 overflow-hidden flex", cls.bar) }>
{ partitions.map((p, index) =>

3
frontend/app/duck/user.js
View file

@ -87,11 +87,10 @@ export default withRequestState({
updatePasswordRequest: UPDATE_PASSWORD,
requestResetPassowrd: REQUEST_RESET_PASSWORD,
resetPassword: RESET_PASSWORD,
fetchUserInfoRequest: [ FETCH_ACCOUNT, FETCH_CLIENT ],
fetchUserInfoRequest: [ FETCH_ACCOUNT, FETCH_CLIENT, FETCH_TENANTS ],
putClientRequest: PUT_CLIENT,
updateAccountRequest: UPDATE_ACCOUNT,
updateAppearance: UPDATE_APPEARANCE,
fetchTenantsRequest: FETCH_TENANTS,
}, reducer);
export const login = params => dispatch => dispatch({