From c2ae982a970c2ea4b686e3e051a71e55c02ec2e1 Mon Sep 17 00:00:00 2001 From: Artsiom Sadouski Date: Mon, 23 May 2022 18:21:39 +0300 Subject: [PATCH 1/4] EPMRPP-76889 || Registration form init data, table column style fix --- .../projectsPage/projectsGrid/projectsGrid.scss | 3 +++ .../registrationForm/registrationForm.jsx | 12 +++++++++++- .../outside/registrationPage/registrationPage.jsx | 10 +++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/src/pages/admin/projectsPage/projectsGrid/projectsGrid.scss b/app/src/pages/admin/projectsPage/projectsGrid/projectsGrid.scss index 27bf1c1fe8..5d29d44e19 100644 --- a/app/src/pages/admin/projectsPage/projectsGrid/projectsGrid.scss +++ b/app/src/pages/admin/projectsPage/projectsGrid/projectsGrid.scss @@ -43,6 +43,9 @@ > :nth-child(2) { max-width: 0; } + > :nth-child(4) { + max-width: 0; + } > :nth-child(7) { width: 12%; white-space: pre-wrap; diff --git a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx index 6d66cd39ac..b5c5ee5dcb 100644 --- a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx +++ b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx @@ -84,20 +84,30 @@ export class RegistrationForm extends Component { autofill: PropTypes.func.isRequired, email: PropTypes.string, loading: PropTypes.bool, + initData: PropTypes.object, }; static defaultProps = { submitForm: () => {}, email: '', loading: false, + initData: {}, }; componentDidMount = () => { - this.autofillEmail(); + this.autofillData(); }; autofillEmail = () => this.props.autofill('email', this.props.email); + autofillData = () => { + this.autofillEmail(); + this.props.autofill('login', this.props.initData.login); + this.props.autofill('name', this.props.initData.fullName); + this.props.autofill('password', this.props.initData.password); + this.props.autofill('confirmPassword', this.props.initData.password); + }; + resetForm = () => { this.props.reset(); this.autofillEmail(); diff --git a/app/src/pages/outside/registrationPage/registrationPage.jsx b/app/src/pages/outside/registrationPage/registrationPage.jsx index 3e4cba5d2b..e50afbbaed 100644 --- a/app/src/pages/outside/registrationPage/registrationPage.jsx +++ b/app/src/pages/outside/registrationPage/registrationPage.jsx @@ -46,6 +46,7 @@ export const RegistrationPage = ({ email, onRegistrationSubmit, loading, + initData, }) => { const backgroundClasses = { background: true, @@ -73,7 +74,12 @@ export const RegistrationPage = ({ {tokenProvided && tokenActive ? (
- +
) : ( @@ -89,6 +95,7 @@ RegistrationPage.propTypes = { email: PropTypes.string, onRegistrationSubmit: PropTypes.func, loading: PropTypes.bool, + initData: PropTypes.object, }; RegistrationPage.defaultProps = { tokenActive: false, @@ -96,6 +103,7 @@ RegistrationPage.defaultProps = { email: '', onRegistrationSubmit: () => {}, loading: false, + initData: {}, }; const TokenErrorSection = ({ tokenProvided }) => ( From 103fe7bfdea134be21ba6fa993dbef81c812588f Mon Sep 17 00:00:00 2001 From: Artsiom Sadouski Date: Mon, 23 May 2022 21:44:05 +0300 Subject: [PATCH 2/4] EPMRPP-76889 || Code review fixes - 1 --- .../registrationForm/registrationForm.jsx | 12 ++++++------ .../outside/registrationPage/registrationPage.jsx | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx index b5c5ee5dcb..5ddcf824c2 100644 --- a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx +++ b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx @@ -84,14 +84,14 @@ export class RegistrationForm extends Component { autofill: PropTypes.func.isRequired, email: PropTypes.string, loading: PropTypes.bool, - initData: PropTypes.object, + initialData: PropTypes.object, }; static defaultProps = { submitForm: () => {}, email: '', loading: false, - initData: {}, + initialData: {}, }; componentDidMount = () => { @@ -102,10 +102,10 @@ export class RegistrationForm extends Component { autofillData = () => { this.autofillEmail(); - this.props.autofill('login', this.props.initData.login); - this.props.autofill('name', this.props.initData.fullName); - this.props.autofill('password', this.props.initData.password); - this.props.autofill('confirmPassword', this.props.initData.password); + this.props.autofill('login', this.props.initialData.login); + this.props.autofill('name', this.props.initialData.fullName); + this.props.autofill('password', this.props.initialData.password); + this.props.autofill('confirmPassword', this.props.initialData.password); }; resetForm = () => { diff --git a/app/src/pages/outside/registrationPage/registrationPage.jsx b/app/src/pages/outside/registrationPage/registrationPage.jsx index e50afbbaed..50a42db1b9 100644 --- a/app/src/pages/outside/registrationPage/registrationPage.jsx +++ b/app/src/pages/outside/registrationPage/registrationPage.jsx @@ -46,7 +46,7 @@ export const RegistrationPage = ({ email, onRegistrationSubmit, loading, - initData, + initialData, }) => { const backgroundClasses = { background: true, @@ -78,7 +78,7 @@ export const RegistrationPage = ({ email={email} submitForm={onRegistrationSubmit} loading={loading} - initData={initData} + initialData={initialData} /> ) : ( @@ -95,7 +95,7 @@ RegistrationPage.propTypes = { email: PropTypes.string, onRegistrationSubmit: PropTypes.func, loading: PropTypes.bool, - initData: PropTypes.object, + initialData: PropTypes.object, }; RegistrationPage.defaultProps = { tokenActive: false, @@ -103,7 +103,7 @@ RegistrationPage.defaultProps = { email: '', onRegistrationSubmit: () => {}, loading: false, - initData: {}, + initialData: {}, }; const TokenErrorSection = ({ tokenProvided }) => ( From 6138764e84a0dd1733cc8fc97e5048f6e0307a5c Mon Sep 17 00:00:00 2001 From: Artsiom Sadouski Date: Tue, 24 May 2022 11:50:53 +0300 Subject: [PATCH 3/4] EPMRPP-76889 || Code review fixes - 2 --- .../registrationForm/registrationForm.jsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx index 5ddcf824c2..bf00bf32a2 100644 --- a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx +++ b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx @@ -82,6 +82,7 @@ export class RegistrationForm extends Component { intl: PropTypes.object.isRequired, handleSubmit: PropTypes.func.isRequired, autofill: PropTypes.func.isRequired, + initialize: PropTypes.func.isRequired, email: PropTypes.string, loading: PropTypes.bool, initialData: PropTypes.object, @@ -101,11 +102,13 @@ export class RegistrationForm extends Component { autofillEmail = () => this.props.autofill('email', this.props.email); autofillData = () => { + const initialData = this.props.initialData; + this.props.initialize({ + ...initialData, + name: initialData.fullName, + confirmPassword: initialData.password, + }); this.autofillEmail(); - this.props.autofill('login', this.props.initialData.login); - this.props.autofill('name', this.props.initialData.fullName); - this.props.autofill('password', this.props.initialData.password); - this.props.autofill('confirmPassword', this.props.initialData.password); }; resetForm = () => { From e1901d6f595a86c4bd2307368dd41c329a9966b8 Mon Sep 17 00:00:00 2001 From: Artsiom Sadouski Date: Tue, 24 May 2022 15:26:13 +0300 Subject: [PATCH 4/4] EPMRPP-76889 || Code review fixes - 3 --- .../registrationPage/registrationForm/registrationForm.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx index bf00bf32a2..de24e4ee73 100644 --- a/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx +++ b/app/src/pages/outside/registrationPage/registrationForm/registrationForm.jsx @@ -102,13 +102,12 @@ export class RegistrationForm extends Component { autofillEmail = () => this.props.autofill('email', this.props.email); autofillData = () => { - const initialData = this.props.initialData; + const { initialData } = this.props; this.props.initialize({ ...initialData, name: initialData.fullName, confirmPassword: initialData.password, }); - this.autofillEmail(); }; resetForm = () => {