fix geosolutions-it#1151 fixed some warnings (geosolutions-it#1226)

* fix geosolutions-it#1151 fixed some warnings * fix * fix for setting icon in toc layer
saidaipparla · Nov 2, 2016 · add5fe5 · add5fe5
1 parent 47ed231
commit add5fe5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/web/client/components/TOC/fragments/settings/Display.jsx b/web/client/components/TOC/fragments/settings/Display.jsx
@@ -45,7 +45,7 @@ module.exports = React.createClass({
             <Label key="opacity-percent" >{Math.round(this.props.settings.options.opacity * 100) + "%"}</Label>
             </div>
             {this.props.element.type === "wms" ?
-                [(<div><input type="checkbox" key="transparent" checked={this.props.element && (this.props.element.transparent === undefined ? true : this.props.element.transparent)}
+                [(<div key="transparent-check"><input type="checkbox" key="transparent" checked={this.props.element && (this.props.element.transparent === undefined ? true : this.props.element.transparent)}
                 onChange={(event) => {this.props.onChange("transparent", event.target.checked); }}/>
             <label key="transparent-label" className="control-label">Transparent</label></div>)] : null}
         </div>);

diff --git a/web/client/components/maps/MapGrid.jsx b/web/client/components/maps/MapGrid.jsx
@@ -36,7 +36,7 @@ var MapGrid = React.createClass({
         deleteMap: React.PropTypes.func,
         resetCurrentMap: React.PropTypes.func,
         updatePermissions: React.PropTypes.func,
-        metadataModal: React.PropTypes.object
+        metadataModal: React.PropTypes.func
     },
     getDefaultProps() {
         return {
@@ -90,7 +90,7 @@ var MapGrid = React.createClass({
     renderMetadataModal() {
         if (this.props.metadataModal) {
             let MetadataModal = this.props.metadataModal;
-            return (<MetadataModal ref="metadataModal" show={this.props.currentMap && this.props.currentMap.displayMetadataEdit} onHide={this.props.resetCurrentMap}
+            return (<MetadataModal key="metadataModal" ref="metadataModal" show={this.props.currentMap && this.props.currentMap.displayMetadataEdit} onHide={this.props.resetCurrentMap}
                 onClose={this.props.resetCurrentMap}
                 map={this.props.currentMap}
                 onSaveAll={this.props.saveAll}

diff --git a/web/client/index.html b/web/client/index.html
@@ -18,7 +18,7 @@
         <script src="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js"></script>
         <script src="http://rawgit.com/Leaflet/Leaflet.draw/0.2.3/dist/leaflet.draw-src.js"></script>
         <script src="http://cdnjs.cloudflare.com/ajax/libs/ol3/3.10.1/ol.min.js"></script>
-        <script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>
+        <!--<script src="https://www.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=__API_KEY_MAPQUEST__"></script>-->
     </head>
     <body className="themed">
         <div id="container"></div>

diff --git a/web/client/localConfig.json b/web/client/localConfig.json
@@ -385,7 +385,7 @@
 					"closeGlyph": "1-close",
 					"submitConfig": {
 						"buttonConfig": {
-							"bsSize": "medium",
+							"bsSize": "small",
 							"bsStyle": "primary"
 						},
 						"glyph": ""

diff --git a/web/client/plugins/CreateNewMap.jsx b/web/client/plugins/CreateNewMap.jsx
@@ -51,6 +51,6 @@ const CreateNewMap = React.createClass({
 module.exports = {
     CreateNewMapPlugin: connect((state) => ({
         mapType: (state.maps && state.maps.mapType) || (state.home && state.home.mapType),
-        isLoggedIn: state && state.security && state.security.user
+        isLoggedIn: state && state.security && state.security.user && state.security.user.enabled && true || false
     }))(CreateNewMap)
 };
diff --git a/web/client/plugins/containers/ToolsContainer.jsx b/web/client/plugins/containers/ToolsContainer.jsx
@@ -100,7 +100,7 @@ const ToolsContainer = React.createClass({
         })(this.props.tool);
     },
     renderTools() {
-        return this.props.tools.map((tool) => {
+        return this.props.tools.map((tool, i) => {
             if (tool.element) {
                 return tool.element;
             }
@@ -110,7 +110,7 @@ const ToolsContainer = React.createClass({
             const Tool = this.getTool(tool);
 
             return this.addTooltip(
-                <Tool tooltip={tooltip} btnSize={this.props.toolSize} bsStyle={this.props.toolStyle} help={help} key={tool.name} mapType={this.props.mapType}
+                <Tool tooltip={tooltip} btnSize={this.props.toolSize} bsStyle={this.props.toolStyle} help={help} key={tool.name || ("tool" + i)} mapType={this.props.mapType}
                     {...tool.cfg} items={tool.items || []}>
                     {(tool.cfg && tool.cfg.glyph) ? <Glyphicon glyph={tool.cfg.glyph}/> : tool.icon}{help} {tool.text}
                 </Tool>,