From 76aa9a5e0a0dc31dabc6f89f9db9364c8a5466c5 Mon Sep 17 00:00:00 2001 From: merelendor Date: Mon, 4 Mar 2024 11:40:34 +0300 Subject: [PATCH 1/5] HOTFIX: remove sentry test message --- pages/components/Layout/Account/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/pages/components/Layout/Account/index.js b/pages/components/Layout/Account/index.js index 0e0ecd6..5f7bdbd 100644 --- a/pages/components/Layout/Account/index.js +++ b/pages/components/Layout/Account/index.js @@ -54,8 +54,6 @@ export default class AccountLayout extends React.Component scope.setTag("offstage", `${ auth.observer }`); scope.setUser({ email: user.email, phone: user.phone }); }); - - Sentry.captureMessage(`Sentry client test for ACC`); } }, 100); } From 99450790d2fd315783e8b1d40753dea1a07b7bec Mon Sep 17 00:00:00 2001 From: merelendor Date: Tue, 5 Mar 2024 16:10:19 +0300 Subject: [PATCH 2/5] HOTFIX: list of EDO accounts on 500 not more throw 500 to client --- pages/settings/digital.js | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/settings/digital.js b/pages/settings/digital.js index 4a44863..16a9505 100644 --- a/pages/settings/digital.js +++ b/pages/settings/digital.js @@ -69,7 +69,6 @@ class IndexPage extends React.Component }) .catch(() => { - this.setState({ message }) }); }) } From 1c35bf8c277d07f50f2c7907b2fd92b488f4cbc8 Mon Sep 17 00:00:00 2001 From: merelendor Date: Sun, 24 Mar 2024 02:18:14 +0300 Subject: [PATCH 3/5] HOTFIX: questionnaire identity_document.registration_address fix on first API request --- actions/questionnaireActions.js | 53 ++++++++++++++++--- .../forms/Form_4_Shareholders/index.js | 6 ++- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/actions/questionnaireActions.js b/actions/questionnaireActions.js index 1c72301..6c71b0e 100644 --- a/actions/questionnaireActions.js +++ b/actions/questionnaireActions.js @@ -72,6 +72,7 @@ export const getQuestionnaire = ({ dispatch, id }) => { //console.log("ACTION", "questionnaire", "getQuestionnaire()", "response", response.data); + /* DEPRECATED ? const founder_persons_template = { signatory_id: null, lastname: "", @@ -106,6 +107,17 @@ export const getQuestionnaire = ({ dispatch, id }) => } } }; + */ + + const citizenship_template = { + title: getCitizenshipTitleByCode(643), + code: 643, + }; + + const registration_address_template = { + title: null, + fias_id: null, + }; const identity_document_template = { @@ -117,14 +129,8 @@ export const getQuestionnaire = ({ dispatch, id }) => issueby: null, issueby_search_dadata: null, placebirth: null, - citizenship: { - title: getCitizenshipTitleByCode(643), - code: 643, - }, - registration_address: { - title: null, - fias_id: null, - } + citizenship: citizenship_template, + registration_address: registration_address_template }; const questionnaire = JSON.parse(JSON.stringify(global.store.getState().questionnaire)); @@ -149,6 +155,17 @@ export const getQuestionnaire = ({ dispatch, id }) => { questionnaire.head_person.identity_document = JSON.parse(JSON.stringify(identity_document_template)); } + else + { + if(questionnaire.head_person.identity_document.citizenship === undefined || questionnaire.head_person.identity_document.citizenship === null) + { + questionnaire.head_person.identity_document.citizenship = citizenship_template; + } + if(questionnaire.head_person.identity_document.registration_address === undefined || questionnaire.head_person.identity_document.registration_address === null) + { + questionnaire.head_person.identity_document.registration_address = registration_address_template; + } + } questionnaire.head_person.identity_document.citizenship = { title: response.data.head_person !== null && response.data.head_person.identity_document !== null ? getCitizenshipTitleByCode(response.data.head_person.identity_document.citizenship_code) : null, @@ -177,6 +194,17 @@ export const getQuestionnaire = ({ dispatch, id }) => { questionnaire.signatory_person.identity_document = JSON.parse(JSON.stringify(identity_document_template)); } + else + { + if(questionnaire.signatory_person.identity_document.citizenship === undefined || questionnaire.signatory_person.identity_document.citizenship === null) + { + questionnaire.signatory_person.identity_document.citizenship = citizenship_template; + } + if(questionnaire.signatory_person.identity_document.registration_address === undefined || questionnaire.signatory_person.identity_document.registration_address === null) + { + questionnaire.signatory_person.identity_document.registration_address = registration_address_template; + } + } questionnaire.signatory_person.identity_document.citizenship = { title: response.data.signatory_person !== null && response.data.signatory_person.identity_document !== null ? getCitizenshipTitleByCode(response.data.signatory_person.identity_document.citizenship_code) : null, @@ -216,6 +244,15 @@ export const getQuestionnaire = ({ dispatch, id }) => questionnaire.founder_persons[i].identity_document = JSON.parse(JSON.stringify(identity_document_template)); } + if(questionnaire.founder_persons[i].identity_document.citizenship === undefined || questionnaire.founder_persons[i].identity_document.citizenship === null) + { + questionnaire.founder_persons[i].identity_document.citizenship = citizenship_template; + } + if(questionnaire.founder_persons[i].identity_document.registration_address === undefined || questionnaire.founder_persons[i].identity_document.registration_address === null) + { + questionnaire.founder_persons[i].identity_document.registration_address = registration_address_template; + } + /* if(questionnaire.founder_persons[i].birthdate === null) { diff --git a/components/questionnaire/forms/Form_4_Shareholders/index.js b/components/questionnaire/forms/Form_4_Shareholders/index.js index d1f9434..0639ace 100644 --- a/components/questionnaire/forms/Form_4_Shareholders/index.js +++ b/components/questionnaire/forms/Form_4_Shareholders/index.js @@ -356,8 +356,8 @@ class ShareholderForm extends React.Component -1 ? "error" : "" } id={ `founder_persons[${ index }].identity_document.registration_address` } - value={ this._checkStrValue(shareholder.identity_document.registration_address.name) } - fias={ this._checkStrValue(shareholder.identity_document.registration_address.fias_id) } + value={ this._checkStrValue(shareholder.identity_document.registration_address?.name) } + fias={ this._checkStrValue(shareholder.identity_document.registration_address?.fias_id) } onChange={ (data) => { this._removeError("identity_document.registration_address.name"); this._handle_onTextFieldChange(`founder_persons[${ index }].identity_document.registration_address`, data) } } required={ true } disabled={ checking } @@ -629,6 +629,7 @@ class Form_4_Shareholders extends QuestionnaireForm componentDidMount() { const founder_persons_template = JSON.parse(JSON.stringify(this.state.founder_persons_template)); + traceDebug({ state: this.state }); if(this.state.founder_persons.length === 0) { @@ -919,6 +920,7 @@ class Form_4_Shareholders extends QuestionnaireForm const { checking } = this.props; const { founder_persons, client_contacts, loading, address, status, errors, } = this.state; console.log("Form_4_Shareholders", { errors }); + traceDebug({ state: this.state }); return (
{if (e.key === 'Enter') e.preventDefault() }} className={`questionnaire questionnaire_4 ${ checking && "disabled" }`}> From 4e0b92a59d05d276a763f45977fc40b33de76c5f Mon Sep 17 00:00:00 2001 From: merelendor Date: Mon, 1 Apr 2024 17:50:55 +0300 Subject: [PATCH 4/5] FIX: change questionnaire z-index autocomplete --- .../components/DealContractsSignEDO.js | 2 +- components/EDOSign/index.js | 2 +- components/questionnaire/AddressSuggests.js | 2 +- .../DocumentIssuerSuggestsInput.js | 2 +- components/questionnaire/SuggestsInput.js | 2 +- .../forms/AddressSuggestsSelect.js | 4 +- .../forms/DigitalCertificates.js | 1 + .../forms/Form_3_Signer/index.js | 10 ++--- .../forms/Form_4_Shareholders/index.js | 4 +- css/forms/style.css | 41 +++++++++---------- css/forms/style.less | 8 ++-- .../Comparison/components/SignEDO/index.js | 2 +- 12 files changed, 39 insertions(+), 41 deletions(-) diff --git a/components/DealsStatus/components/DealContractsSignEDO.js b/components/DealsStatus/components/DealContractsSignEDO.js index 9f19dc4..02dd057 100644 --- a/components/DealsStatus/components/DealContractsSignEDO.js +++ b/components/DealsStatus/components/DealContractsSignEDO.js @@ -508,7 +508,7 @@ class DealContractsSignEDO extends React.Component placeholder="Выберите доверенность" noOptionsMessage={ ({ inputValue }) => !inputValue ? "" :"Ничего не найдено" } isSearchable={ true } - className="autocomlete autocomlete_with_indicators" + className="autocomplete autocomplete_with_indicators" classNamePrefix="react-select" value={ document.attorney_selected } onChange={ (element) => { this._handle_onAttorneyChange(document.index, element) } } diff --git a/components/EDOSign/index.js b/components/EDOSign/index.js index d65bf06..f954057 100644 --- a/components/EDOSign/index.js +++ b/components/EDOSign/index.js @@ -496,7 +496,7 @@ class EDOSign extends React.Component placeholder="Выберите доверенность" noOptionsMessage={ ({ inputValue }) => !inputValue ? "" :"Ничего не найдено" } isSearchable={ true } - className="autocomlete autocomlete_with_indicators" + className="autocomplete autocomplete_with_indicators" classNamePrefix="react-select" value={ document.attorney_selected } onChange={ (element) => { this._handle_onAttorneyChange(document.index, element) } } diff --git a/components/questionnaire/AddressSuggests.js b/components/questionnaire/AddressSuggests.js index fd1258f..2d891b4 100644 --- a/components/questionnaire/AddressSuggests.js +++ b/components/questionnaire/AddressSuggests.js @@ -126,7 +126,7 @@ export default class AddressSuggests extends React.Component const { value, disabled, required, placeholder, className } = this.props; return ( -
+
+
+
-1 ?

Не соответствует ИНН

:

 

}

 

{ certificate.errors.indexOf("date") > -1 ?

{ certificate.errors.indexOf('date') > 1 ? "Срок действия закончился" : certificate.errors.indexOf('invalid') > 1 ? "Сертификат недействителен или нарушена цепочка сертификации" : null }

:

 

} + { certificate.errors.length === 1 && certificate.errors[0] === "invalid" && (

Сертификат недействителен или нарушена цепочка сертификации

) }
) }
diff --git a/components/questionnaire/forms/Form_3_Signer/index.js b/components/questionnaire/forms/Form_3_Signer/index.js index c3405e0..6bbc6f2 100644 --- a/components/questionnaire/forms/Form_3_Signer/index.js +++ b/components/questionnaire/forms/Form_3_Signer/index.js @@ -768,7 +768,7 @@ class Form_3_Signer extends QuestionnaireForm placeholder="Выберите тип документа" noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" } isSearchable={ false } - className="autocomlete" + className="autocomplete" classNamePrefix="react-select" value={ doctypes_personal.filter((type) => head_person.identity_document.doctype === type.value) } onChange={ (element) => this._handle_onDocumentTypeChange("head_person", element) } @@ -885,7 +885,7 @@ class Form_3_Signer extends QuestionnaireForm placeholder="Выберите страну" noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" } isSearchable={ true } - className="autocomlete" + className="autocomplete" classNamePrefix="react-select" value={ head_person_citizenship.code !== undefined && head_person_citizenship.code !== null ? head_person_citizenship : undefined } onChange={ (element) => { this._removeError("head_person.identity_document.citizenship"); this._handle_onCitizenshipChange(`head_person.identity_document.citizenship`, element.value) } } @@ -1278,7 +1278,7 @@ class Form_3_Signer extends QuestionnaireForm placeholder="Выберите тип документа" noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" } isSearchable={ false } - className="autocomlete" + className="autocomplete" classNamePrefix="react-select" value={ doctypes_personal.filter((type) => signatory_person.identity_document.doctype === type.value) } onChange={ (element) => this._handle_onDocumentTypeChange("signatory_person", element) } @@ -1393,7 +1393,7 @@ class Form_3_Signer extends QuestionnaireForm
-1 ? "autocomlete error" : "autocomlete" } + className={ errors.indexOf("signatory_person.signer_rule_basic") > -1 ? "autocomplete error" : "autocomplete" } id="signatory_person.signer_rule_basic" name="signatory_person.signer_rule_basic" options={ doctypes_corporate } diff --git a/components/questionnaire/forms/Form_4_Shareholders/index.js b/components/questionnaire/forms/Form_4_Shareholders/index.js index 0639ace..a5fe32f 100644 --- a/components/questionnaire/forms/Form_4_Shareholders/index.js +++ b/components/questionnaire/forms/Form_4_Shareholders/index.js @@ -197,7 +197,7 @@ class ShareholderForm extends React.Component placeholder="Выберите тип документа" noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" } isSearchable={ false } - className="autocomlete" + className="autocomplete" classNamePrefix="react-select" value={ doctypes_personal.filter((type) => shareholder.identity_document.doctype === type.value) } onChange={ (element) => { this._removeError("identity_document.doctype"); this._handle_onDocumentTypeChange(`founder_persons[${ index }]`, element); } } @@ -335,7 +335,7 @@ class ShareholderForm extends React.Component