fixes on Lorenzo's commnets

kappu · kappu · commit efb1ef923886 · 2018-05-14T10:55:08.000+02:00
diff --git a/web/client/components/manager/rulesmanager/RoiCql.jsx b/web/client/components/manager/rulesmanager/RoiCql.jsx
@@ -49,7 +49,7 @@ class RoiCql extends React.Component {
                             lineNumbers: true,
                             lineWrapping: true
                         }}/>
-                        <Button style={{"float": "rigth"}} disabled={this.props.wkt === this.state.cql} text={LocaleUtils.getMessageById(this.context.messages, "rulesmanager.apply")} onClick={this.apply}/>
+                        <Button disabled={this.props.wkt === this.state.cql} text={LocaleUtils.getMessageById(this.context.messages, "rulesmanager.apply")} onClick={this.apply}/>
                 </div>}
             </ContainerDimensions>);
     }
diff --git a/web/client/components/manager/rulesmanager/SimpleSpatialFilter.jsx b/web/client/components/manager/rulesmanager/SimpleSpatialFilter.jsx
@@ -100,7 +100,8 @@ class SpatialFilter extends React.Component {
             </div>
         );
     };
-    renderSpatialPanel = (drawLabel) => {
+    renderSpatialPanel = () => {
+        const showLabel = this.getMethodFromId(this.props.spatialField.method) && this.props.spatialField.method !== "CQL" && !this.props.spatialField.geometry;
         return (
             <Panel className="spatial-panel">
                 {this.props.spatialMethodOptions.length > 1 ? this.renderSpatialHeader() : <span/>}
@@ -109,7 +110,13 @@ class SpatialFilter extends React.Component {
                 )}
                 <Row>
                     <Col xs={12}>
-                        {drawLabel}
+                        {showLabel && (
+                            <span>
+                                <div className="m-label m-caption text-center">
+                                    <I18N.Message msgId={"queryform.spatialfilter.draw_start_label"}/>
+                                </div>
+                            </span>)
+                        }
                     </Col>
                 </Row>
             </Panel>
@@ -128,10 +135,6 @@ class SpatialFilter extends React.Component {
         return buttons;
     };
     render() {
-        let drawLabel = null;
-        if ( this.getMethodFromId(this.props.spatialField.method) && this.props.spatialField.method !== "CQL" && !this.props.spatialField.geometry) {
-            drawLabel = (<span><div className="m-label m-caption text-center"><I18N.Message msgId={"queryform.spatialfilter.draw_start_label"}/></div></span>);
-        }
         return (
             <div className="query-filter-container">
                 <SwitchPanel
@@ -142,7 +145,7 @@ class SpatialFilter extends React.Component {
                     expanded={this.props.spatialPanelExpanded}
                     onSwitch={(expanded) => this.props.actions.onExpandSpatialFilterPanel(expanded)}
                     >
-                    {this.renderSpatialPanel(drawLabel)}
+                    {this.renderSpatialPanel()}
                 </SwitchPanel>
             </div>
         );
diff --git a/web/client/components/map/enhancers/withDraw.js b/web/client/components/map/enhancers/withDraw.js
@@ -18,7 +18,12 @@ state.draw || {}, {
     onDrawStopped: drawStopped,
     setCurrentStyle: setCurrentStyle
 });
-
+/**
+ * Add the draw tool to base-map. The draw support is already present in plugins but It needs
+ * to be connected and added to tools to work.
+ * It's possible to pass a connect function to override default connection to state and action
+ * @param {function} connectFunction connect function to override default connection of the draw tool.
+ */
 module.exports = (connectFunction = defaultDrawConnect) => withPropsOnChange(
     ['plugins'],
     ({plugins}= {}) => {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class RoiCql extends React.Component {`
`49`	`49`	`lineNumbers: true,`
`50`	`50`	`lineWrapping: true`
`51`	`51`	`}}/>`
`52`		`- <Button style={{"float": "rigth"}} disabled={this.props.wkt === this.state.cql} text={LocaleUtils.getMessageById(this.context.messages, "rulesmanager.apply")} onClick={this.apply}/>`
	`52`	`+ <Button disabled={this.props.wkt === this.state.cql} text={LocaleUtils.getMessageById(this.context.messages, "rulesmanager.apply")} onClick={this.apply}/>`
`53`	`53`	`</div>}`
`54`	`54`	`</ContainerDimensions>);`
`55`	`55`	`}`