clean up config file and set up correct defaults

MV88 · MV88 · commit 6187467fe868 · 2018-04-20T10:54:54.000+02:00
diff --git a/web/client/components/mapcontrols/search/SearchBar.jsx b/web/client/components/mapcontrols/search/SearchBar.jsx
@@ -100,7 +100,7 @@ class SearchBar extends React.Component {
         blurResetDelay: 300,
         autoFocusOnSelect: true,
         splitTools: true,
-        isSearchClickable: true,
+        isSearchClickable: false,
         hideOnBlur: true,
         typeAhead: true,
         searchText: ""
diff --git a/web/client/localConfig.json b/web/client/localConfig.json
@@ -158,7 +158,7 @@
             }, {
                 "name": "Search",
                 "cfg": {
-                    "withToggle": ["max-width: 768px", "min-width: 768px"]
+                  "withToggle": ["max-width: 768px", "min-width: 768px"]
                 }
             }, {
                 "name": "Toolbar",
@@ -299,7 +299,6 @@
             }, {
                 "name": "Search",
                 "cfg": {
-                  "isSearchClickable": false,
                   "withToggle": ["max-width: 768px", "min-width: 768px"]
                 }
             }, {
@@ -425,7 +424,7 @@
             }, {
                 "name": "Search",
                 "cfg": {
-                    "withToggle": ["max-width: 768px", "min-width: 768px"]
+                  "withToggle": ["max-width: 768px", "min-width: 768px"]
                 }
             }, {
                 "name": "Toolbar",
@@ -456,13 +455,7 @@
                 "className": "navbar shadow navbar-home"
             }
         }, "ManagerMenu", "Login", "Language", "Attribution", "ScrollTop", "Notifications"],
-        "maps": ["Header", "Fork",
-        {
-          "name": "MapSearch",
-          "cfg": {
-            "splitTools" : false
-          }
-        }, "HomeDescription", "ThemeSwitcher", "CreateNewMap",
+        "maps": ["Header", "Fork", "MapSearch", "HomeDescription", "ThemeSwitcher", "CreateNewMap",
           {
             "name": "Maps",
             "cfg": {
@@ -501,16 +494,6 @@
             "containerPosition": "columns"
           }
         }, "Dashboard"],
-        "manager": ["Header", "Redirect", {
-          "name": "UserManager",
-          "cfg": {
-            "splitTools" : false
-          }
-        },{
-          "name": "GroupManager",
-          "cfg": {
-            "splitTools" : false
-          }
-        }, "Home", "Manager", "Footer"]
+        "manager": ["Header", "Redirect", "UserManager", "GroupManager", "Home", "Manager", "Footer"]
     }
 }
diff --git a/web/client/plugins/MapSearch.jsx b/web/client/plugins/MapSearch.jsx
@@ -27,6 +27,8 @@ const SearchBar = connect((state) => ({
     hideOnBlur: false,
     placeholderMsgId: "maps.search",
     typeAhead: false,
+    splitTools: false,
+    isSearchClickable: true,
     start: state && state.maps && state.maps.start,
     limit: state && state.maps && state.maps.limit,
     searchText: state.maps && state.maps.searchText !== '*' && state.maps.searchText || ""
diff --git a/web/client/plugins/Search.jsx b/web/client/plugins/Search.jsx
@@ -156,6 +156,8 @@ const SearchPlugin = connect((state) => ({
 }))(
 class extends React.Component {
     static propTypes = {
+        splitTools: PropTypes.bool,
+        isSearchClickable: PropTypes.bool,
         fitResultsToMapSize: PropTypes.bool,
         searchOptions: PropTypes.object,
         resultsStyle: PropTypes.object,
@@ -171,6 +173,8 @@ class extends React.Component {
         searchOptions: {
             services: [{type: "nominatim"}]
         },
+        isSearchClickable: false,
+        splitTools: true,
         resultsStyle: {
             color: '#3388ff',
             weight: 4,
diff --git a/web/client/plugins/manager/GroupManager.jsx b/web/client/plugins/manager/GroupManager.jsx
@@ -39,6 +39,8 @@ class GroupManager extends React.Component {
     static defaultProps = {
         className: "user-search",
         hideOnBlur: false,
+        isSearchClickable: true,
+        splitTools: false,
         placeholderMsgId: "usergroups.searchGroups",
         typeAhead: false,
         searchText: "",
diff --git a/web/client/plugins/manager/UserManager.jsx b/web/client/plugins/manager/UserManager.jsx
@@ -39,6 +39,8 @@ class UserManager extends React.Component {
     static defaultProps = {
         className: "user-search",
         hideOnBlur: false,
+        isSearchClickable: true,
+        splitTools: false,
         placeholderMsgId: "users.searchUsers",
         typeAhead: false,
         searchText: "",
