From 1b89169eef59ffbcf55eb148a6db64f6b72b41db Mon Sep 17 00:00:00 2001
From: David Quartey <42542676+DavidQuartz@users.noreply.github.com>
Date: Fri, 26 Nov 2021 14:51:43 +0000
Subject: [PATCH]  Make "Create new" a primary button and reorder menu items
 (#628)

---
 .../client/js/components/Menu/Menu.js               |  2 +-
 .../client/static/mapstore/configs/localConfig.json | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/geonode_mapstore_client/client/js/components/Menu/Menu.js b/geonode_mapstore_client/client/js/components/Menu/Menu.js
index 4d6495c927..9e3db19647 100644
--- a/geonode_mapstore_client/client/js/components/Menu/Menu.js
+++ b/geonode_mapstore_client/client/js/components/Menu/Menu.js
@@ -44,7 +44,7 @@ const Menu = forwardRef(({
                     return (
                         <li key={idx}>
                             <MenuItem
-                                variant={variant}
+                                variant={item.variant || variant}
                                 item={{ ...item, id: item.id || idx }}
                                 size={size}
                                 alignRight={alignRight}
diff --git a/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json
index 7ff466a69a..8de0a56dce 100644
--- a/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json
+++ b/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json
@@ -311,6 +311,7 @@
                     "labelId": "gnhome.createNew",
                     "authenticated": true,
                     "type": "dropdown",
+                    "variant": "primary",
                     "perms": [
                         {
                             "type": "user",
@@ -332,10 +333,10 @@
                             ]
                         },
                         {
-                            "labelId": "gnhome.createDataset",
-                            "value": "layer",
+                            "labelId": "gnhome.uploadDocument",
+                            "value": "document",
                             "type": "link",
-                            "href": "/createlayer/",
+                            "href": "/documents/upload",
                             "authenticated": true,
                             "perms": [
                                 {
@@ -345,10 +346,10 @@
                             ]
                         },
                         {
-                            "labelId": "gnhome.uploadDocument",
-                            "value": "document",
+                            "labelId": "gnhome.createDataset",
+                            "value": "layer",
                             "type": "link",
-                            "href": "/documents/upload",
+                            "href": "/createlayer/",
                             "authenticated": true,
                             "perms": [
                                 {