Fix empty values on validate

This commit is contained in:
Ildar Kamalov 2019-02-20 14:26:56 +03:00
parent 9c8e4c64ea
commit 4f45f2c3e3
2 changed files with 26 additions and 10 deletions

View File

@ -278,15 +278,13 @@ let Form = (props) => {
</div> </div>
</div> </div>
</div> </div>
{warning_validation &&
<div className="col-12"> <div className="col-12">
<p className="text-danger"> <p className="text-danger">
{ {warning_validation}
(certificateChain || privateKey)
&& warning_validation
&& warning_validation
}
</p> </p>
</div> </div>
}
</div> </div>
<div className="btn-list mt-2"> <div className="btn-list mt-2">

View File

@ -28,9 +28,27 @@ const encryption = handleActions({
[actions.validateTlsConfigRequest]: state => ({ ...state, processingValidate: true }), [actions.validateTlsConfigRequest]: state => ({ ...state, processingValidate: true }),
[actions.validateTlsConfigFailure]: state => ({ ...state, processingValidate: false }), [actions.validateTlsConfigFailure]: state => ({ ...state, processingValidate: false }),
[actions.validateTlsConfigSuccess]: (state, { payload }) => { [actions.validateTlsConfigSuccess]: (state, { payload }) => {
const {
issuer = '',
key_type = '',
not_after = '',
not_before = '',
subject = '',
warning_validation = '',
dns_names = '',
...values
} = payload;
const newState = { const newState = {
...state, ...state,
...payload, ...values,
issuer,
key_type,
not_after,
not_before,
subject,
warning_validation,
dns_names,
processingValidate: false, processingValidate: false,
}; };
return newState; return newState;