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

change(ui) - checking for existing tenant using flag

Browse source
This commit is contained in:
Shekar Siri 2021-08-25 19:57:26 +05:30
parent 079e3add5e
commit fb9227797c
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/app/Router.js
View file

@ -69,6 +69,7 @@ const ONBOARDING_REDIRECT_PATH = routes.onboarding(OB_DEFAULT_TAB);
organisation: state.getIn([ 'user', 'client', 'name' ]),
tenantId: state.getIn([ 'user', 'client', 'tenantId' ]),
tenants: state.getIn(['user', 'tenants']),
existingTenant: state.getIn(['user', 'existingTenant']),
onboarding: state.getIn([ 'user', 'onboarding' ])
};
}, {
@ -95,7 +96,7 @@ class Router extends React.Component {
}
render() {
const { isLoggedIn, jwt, siteId, sites, loading, changePassword, location, tenants, onboarding } = this.props;
const { isLoggedIn, jwt, siteId, sites, loading, changePassword, location, existingTenant, onboarding } = this.props;
const siteIdList = sites.map(({ id }) => id).toJS();
const hideHeader = location.pathname && location.pathname.includes('/session/');
@ -147,7 +148,7 @@ class Router extends React.Component {
<Switch>
<Route exact strict path={ FORGOT_PASSWORD } component={ ForgotPassword } />
<Route exact strict path={ LOGIN_PATH } component={ changePassword ? UpdatePassword : Login } />
{ tenants.length === 0 && <Route exact strict path={ SIGNUP_PATH } component={ Signup } /> }
{ !existingTenant && <Route exact strict path={ SIGNUP_PATH } component={ Signup } /> }
<Redirect to={ LOGIN_PATH } />
</Switch>;
}

2
frontend/app/components/ForgotPassword/ForgotPassword.js
View file

@ -109,7 +109,7 @@ export default class ForgotPassword extends React.PureComponent {
</div>
</div>
<div className="w-6/12 flex items-center justify-center">
<form onSubmit={ this.onSubmit }>
<form onSubmit={ this.onSubmit } style={{ minWidth: '50%'}}>
<div className="mb-8">
<h2 className="text-center text-3xl mb-6">{`${resetting ? 'Create' : 'Reset'} Password`}</h2>
</div>

6
frontend/app/components/Login/Login.js
View file

@ -15,7 +15,7 @@ const recaptchaRef = React.createRef();
state => ({
errors: state.getIn([ 'user', 'loginRequest', 'errors' ]),
loading: state.getIn([ 'user', 'loginRequest', 'loading' ]),
tenants: state.getIn(['user', 'tenants'])
existingTenant: state.getIn(['user', 'existingTenant'])
}),
{ login, },
)
@ -45,7 +45,7 @@ export default class Login extends React.Component {
write = ({ target: { value, name } }) => this.setState({ [ name ]: value })
render() {
const { errors, loading, tenants } = this.props;
const { errors, loading, existingTenant } = this.props;
return (
<div className="flex" style={{ height: '100vh'}}>
<div className={cn("w-6/12", stl.left)}>
@ -63,7 +63,7 @@ export default class Login extends React.Component {
<form onSubmit={ this.onSubmit }>
<div className="mb-8">
<h2 className="text-center text-3xl mb-6">Login to OpenReplay</h2>
{ tenants.length === 0 && <div className="text-center text-xl">Don't have an account? <span className="link"><Link to={ SIGNUP_ROUTE }>Sign up</Link></span></div> }
{ !existingTenant && <div className="text-center text-xl">Don't have an account? <span className="link"><Link to={ SIGNUP_ROUTE }>Sign up</Link></span></div> }
</div>
<Loader loading={ loading }>
{ window.ENV.CAPTCHA_ENABLED && (

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

@ -31,6 +31,7 @@ const initialState = Map({
passwordRequestError: false,
passwordErrors: List(),
tenants: [],
existingTenant: true,
onboarding: false
});
@ -69,7 +70,8 @@ const reducer = (state = initialState, action = {}) => {
case FETCH_ACCOUNT.SUCCESS:
return state.set('account', Account(action.data)).set('passwordErrors', List());
case FETCH_TENANTS.SUCCESS:
return state.set('tenants', action.data.map(i => ({ text: i.name, value: i.tenantId})));
return state.set('existingTenant', action.data);
// return state.set('tenants', action.data.map(i => ({ text: i.name, value: i.tenantId})));
case UPDATE_PASSWORD.FAILURE:
return state.set('passwordErrors', List(action.errors))
case DELETE: