Skip to content

Convert EmailVerificationView to function component #2401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Convert EmailVerificationView to function component #2401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58aa3d0
Conver EmailVerificationView to function component
vijayabhaskar-ev Sep 10, 2023
9eedeff
Fixed import error
vijayabhaskar-ev Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 34 additions & 77 deletions client/modules/User/pages/EmailVerificationView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,51 @@
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { withTranslation } from 'react-i18next';
import { Helmet } from 'react-helmet';
import browserHistory from '../../../browserHistory';
import { verifyEmailConfirmation } from '../actions';
import RootPage from '../../../components/RootPage';
import Nav from '../../IDE/components/Header/Nav';
import { React, useEffect } from 'react';

class EmailVerificationView extends React.Component {
static defaultProps = {
emailVerificationTokenState: null
};

componentWillMount() {
const verificationToken = this.verificationToken();
function EmailVerificationView({ emailVerificationTokenState, verifyEmailConfirmation, t, location }) {
useEffect(() => {
const verificationToken = verificationToken();
Copy link
Collaborator

@lindapaiste lindapaiste Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this will work due to using the same variable name for both the constant and the function.

if (verificationToken != null) {
this.props.verifyEmailConfirmation(verificationToken);
verifyEmailConfirmation(verificationToken);
}
}
}, []);

verificationToken = () => {
const { location } = this.props;
const verificationToken = () => {
const searchParams = new URLSearchParams(location.search);
return searchParams.get('t');
};

render() {
let status = null;
const { emailVerificationTokenState } = this.props;

if (this.verificationToken() == null) {
status = <p>{this.props.t('EmailVerificationView.InvalidTokenNull')}</p>;
} else if (emailVerificationTokenState === 'checking') {
status = <p>{this.props.t('EmailVerificationView.Checking')}</p>;
} else if (emailVerificationTokenState === 'verified') {
status = <p>{this.props.t('EmailVerificationView.Verified')}</p>;
setTimeout(() => browserHistory.push('/'), 1000);
} else if (emailVerificationTokenState === 'invalid') {
status = <p>{this.props.t('EmailVerificationView.InvalidState')}</p>;
}

return (
<RootPage>
<Nav layout="dashboard" />
<div className="form-container">
<Helmet>
<title>{this.props.t('EmailVerificationView.Title')}</title>
</Helmet>
<div className="form-container__content">
<h2 className="form-container__title">
{this.props.t('EmailVerificationView.Verify')}
</h2>
{status}
</div>
</div>
</RootPage>
);
let status = null;

if (verificationToken() == null) {
status = <p>{t('EmailVerificationView.InvalidTokenNull')}</p>;
} else if (emailVerificationTokenState === 'checking') {
status = <p>{t('EmailVerificationView.Checking')}</p>;
} else if (emailVerificationTokenState === 'verified') {
status = <p>{t('EmailVerificationView.Verified')}</p>;
setTimeout(() => browserHistory.push('/'), 1000);
} else if (emailVerificationTokenState === 'invalid') {
status = <p>{t('EmailVerificationView.InvalidState')}</p>;
}
}

function mapStateToProps(state) {
return {
emailVerificationTokenState: state.user.emailVerificationTokenState
};
}

function mapDispatchToProps(dispatch) {
return bindActionCreators(
{
verifyEmailConfirmation
},
dispatch
return (
<RootPage>
<Nav layout="dashboard" />
<div className="form-container">
<Helmet>
<title>{t('EmailVerificationView.Title')}</title>
</Helmet>
<div className="form-container__content">
<h2 className="form-container__title">
{t('EmailVerificationView.Verify')}
</h2>
{status}
</div>
</div>
</RootPage>
);
}

EmailVerificationView.propTypes = {
emailVerificationTokenState: PropTypes.oneOf([
'checking',
'verified',
'invalid'
]),
verifyEmailConfirmation: PropTypes.func.isRequired,
t: PropTypes.func.isRequired,
location: PropTypes.shape({
search: PropTypes.string.isRequired
}).isRequired
};

export default withTranslation()(
connect(mapStateToProps, mapDispatchToProps)(EmailVerificationView)
);
export default EmailVerificationView;