Skip to content

Commit d29390e

Browse files
committed
refactor(SimilarSeriesForm): extract SimilarSeriesFormView component.
Part of #1405
1 parent 89ba68c commit d29390e

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

src/main/frontend/src/components/SimilarSeriesForm.js

+25-8
Original file line numberDiff line numberDiff line change
@@ -76,40 +76,57 @@ class SimilarSeriesForm extends React.PureComponent {
7676
}
7777

7878
render() {
79-
const hasValidationErrors = this.state.validationErrors.length > 0;
79+
return (
80+
<SimilarSeriesFormView
81+
l10n={this.props.l10n}
82+
handleChange={this.handleChange}
83+
handleSubmit={this.handleSubmit}
84+
similarSeriesId={this.state.similarSeriesId}
85+
isDisabled={this.state.isDisabled}
86+
hasServerError={this.state.hasServerError}
87+
validationErrors={this.state.validationErrors}
88+
/>
89+
)
90+
}
91+
}
92+
93+
class SimilarSeriesFormView extends React.PureComponent {
94+
render() {
95+
const {similarSeriesId, hasServerError, isDisabled, validationErrors, handleChange, handleSubmit} = this.props;
96+
const hasValidationErrors = validationErrors.length > 0;
8097

8198
return (
8299
<div className="row">
83100
<div id="mark-similar-series-failed-msg"
84-
className={`alert alert-danger text-center col-sm-8 col-sm-offset-2 ${this.state.hasServerError ? '' : 'hidden'}`}>
101+
className={ `alert alert-danger text-center col-sm-8 col-sm-offset-2 ${hasServerError ? '' : 'hidden'}` }>
85102
{ this.props.l10n['t_server_error'] || 'Server error' }
86103
</div>
87104

88105
<div className="col-sm-9 col-sm-offset-3">
89106
<form id="mark-similar-series-form"
90107
className={`form-inline ${hasValidationErrors ? 'has-error' : ''}`}
91-
onSubmit={this.handleSubmit}>
108+
onSubmit={ handleSubmit }>
92109

93110
<div className="form-group form-group-sm">
94111
<input id="similar-id"
95112
type="text"
96113
className="form-control"
97114
required="required"
98115
placeholder={ this.props.l10n['t_similar_series_id'] || 'Similar series ID' }
99-
value={this.state.similarSeriesId}
100-
onChange={this.handleChange}
101-
disabled={this.state.isDisabled} />
116+
value={ similarSeriesId }
117+
onChange={ handleChange }
118+
disabled={ isDisabled } />
102119
</div>
103120

104121
<div className="form-group form-group-sm">
105122
<button type="submit"
106123
className="btn btn-primary btn-sm"
107-
disabled={this.state.isDisabled}>
124+
disabled={ isDisabled }>
108125
{ this.props.l10n['t_mark_as_similar'] || 'Mark as similar' }
109126
</button>
110127
</div>
111128
<span id="similar-id.errors" className={`help-block ${hasValidationErrors ? '' : 'hidden'}`}>
112-
{ this.state.validationErrors.join(', ') }
129+
{ validationErrors.join(', ') }
113130
</span>
114131

115132
</form>

src/main/java/ru/mystamps/web/feature/site/ResourceUrl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public final class ResourceUrl {
3232
public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
3333

3434
// MUST be updated when any of our resources were modified
35-
public static final String RESOURCES_VERSION = "v0.4.3.6";
35+
public static final String RESOURCES_VERSION = "v0.4.3.7";
3636

3737
// CheckStyle: ignore LineLength for next 15 lines
3838
private static final String CATALOG_UTILS_JS = "/public/js/" + RESOURCES_VERSION + "/CatalogUtils.min.js";

0 commit comments

Comments
 (0)