From 0792ccab96805ffce6411c44860aa16e317775a9 Mon Sep 17 00:00:00 2001
From: Mike Talley <mtalley@hubspot.com>
Date: Fri, 13 Jan 2023 12:07:38 -0500
Subject: [PATCH 1/2] moved Create menu items into navigation menu

---
 package.json | 51 +++++++++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 0dfc5a8c..091adbb3 100644
--- a/package.json
+++ b/package.json
@@ -194,31 +194,31 @@
         "commands": [
             {
                 "command": "hubspot.create.module",
-                "title": "New module"
+                "title": "New Module..."
             },
             {
                 "command": "hubspot.create.section",
-                "title": "New section"
+                "title": "New Section..."
             },
             {
                 "command": "hubspot.create.template",
-                "title": "New page template"
+                "title": "New Page Template..."
             },
             {
                 "command": "hubspot.create.partial",
-                "title": "New partial"
+                "title": "New Partial..."
             },
             {
                 "command": "hubspot.create.globalPartial",
-                "title": "New global partial"
+                "title": "New Global Partial..."
             },
             {
                 "command": "hubspot.create.serverlessFunction",
-                "title": "New serverless function"
+                "title": "New Serverless Function..."
             },
             {
                 "command": "hubspot.create.serverlessFunctionFolder",
-                "title": "New serverless function folder"
+                "title": "New Serverless Function Folder..."
             },
             {
                 "command": "hubspot.config.selectDefaultAccount",
@@ -252,61 +252,52 @@
         ],
         "submenus": [
             {
-                "id": "hubspot.create",
-                "label": "Create"
-            },
-            {
-                "id": "hubspot.create.templateMenu",
-                "label": "Template"
+                "id": "hubspot.create.template",
+                "label": "New Template..."
             }
         ],
         "menus": {
             "explorer/context": [
-                {
-                    "submenu": "hubspot.create"
-                }
-            ],
-            "hubspot.create": [
                 {
                     "command": "hubspot.create.module",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "HubSpot"
+                    "group": "navigation@999"
                 },
                 {
-                    "submenu": "hubspot.create.templateMenu",
-                    "group": "HubSpot"
+                    "submenu": "hubspot.create.template",
+                    "group": "navigation@999"
                 },
                 {
                     "command": "hubspot.create.serverlessFunction",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "HubSpot"
+                    "group": "navigation@999"
                 },
                 {
                     "command": "hubspot.create.serverlessFunctionFolder",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "HubSpot"
+                    "group": "navigation@999"
                 }
             ],
-            "hubspot.create.templateMenu": [
+            "hubspot.create.template": [
                 {
                     "command": "hubspot.create.section",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "HubSpot"
+                    "group": "hubspot.create.template"
                 },
                 {
                     "command": "hubspot.create.template",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "HubSpot"
+                    "group": "hubspot.create.template"
                 },
                 {
                     "command": "hubspot.create.partial",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "HubSpot"
+                    "group": "hubspot.create.template"
                 },
                 {
                     "command": "hubspot.create.globalPartial",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "HubSpot"
+                    "group": "hubspot.create.template"
                 }
             ],
             "view/item/context": [
@@ -375,6 +366,10 @@
                 {
                     "command": "hubspot.modals.openFeedbackPanel",
                     "when": "false"
+                },
+                {
+                    "command": "hubspot.account.viewPersonalAccessKey",
+                    "when": "false"
                 }
             ]
         },

From a20315f9847d792870a42324cbaa088c8bf24535 Mon Sep 17 00:00:00 2001
From: Mike Talley <mtalley@hubspot.com>
Date: Fri, 13 Jan 2023 12:35:52 -0500
Subject: [PATCH 2/2] renamed hubspot.create.templateMenu to
 hubspot.submenus.template

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 091adbb3..814a9618 100644
--- a/package.json
+++ b/package.json
@@ -252,7 +252,7 @@
         ],
         "submenus": [
             {
-                "id": "hubspot.create.template",
+                "id": "hubspot.submenus.template",
                 "label": "New Template..."
             }
         ],
@@ -264,7 +264,7 @@
                     "group": "navigation@999"
                 },
                 {
-                    "submenu": "hubspot.create.template",
+                    "submenu": "hubspot.submenus.template",
                     "group": "navigation@999"
                 },
                 {
@@ -278,26 +278,26 @@
                     "group": "navigation@999"
                 }
             ],
-            "hubspot.create.template": [
+            "hubspot.submenus.template": [
                 {
                     "command": "hubspot.create.section",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "hubspot.create.template"
+                    "group": "hubspot.submenus.template"
                 },
                 {
                     "command": "hubspot.create.template",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "hubspot.create.template"
+                    "group": "hubspot.submenus.template"
                 },
                 {
                     "command": "hubspot.create.partial",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "hubspot.create.template"
+                    "group": "hubspot.submenus.template"
                 },
                 {
                     "command": "hubspot.create.globalPartial",
                     "when": "hubspot.configPath && explorerResourceIsFolder",
-                    "group": "hubspot.create.template"
+                    "group": "hubspot.submenus.template"
                 }
             ],
             "view/item/context": [