From a7e3548f22d2c64229363b3203d980606173b300 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 28 Jun 2022 11:54:51 +0100
Subject: [PATCH] List welcome tours in help sidebar under node-red section

---
 .../editor-client/locales/en-US/editor.json   |  5 ++--
 .../editor-client/src/js/ui/tab-help.js       | 28 ++++++++++---------
 .../editor-client/src/js/ui/tour/tourGuide.js |  9 ++----
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
index e6fe4a4af..7ecd6f640 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -685,7 +685,8 @@
             "showHelp": "Show help",
             "showInOutline": "Show in outline",
             "showTopics": "Show topics",
-            "noHelp": "No help topic selected"
+            "noHelp": "No help topic selected",
+            "changeLog": "Change Log"
         },
         "config": {
             "name": "Configuration nodes",
@@ -1159,7 +1160,7 @@
         "takeATour": "Take a tour",
         "start": "Start",
         "next": "Next",
-	"tours": "Tours"
+        "welcomeTours": "Welcome Tours"
     },
     "diagnostics": {
         "title": "System Info"
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
index 09a67e338..e5199b5bc 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
@@ -20,10 +20,8 @@ RED.sidebar.help = (function() {
     var helpSection;
     var panels;
     var panelRatio;
-    var helpTopics = [];
     var treeList;
     var tocPanel;
-    var helpIndex = {};
 
     function resizeStack() {
         var h = $(content).parent().height() - toolbar.outerHeight();
@@ -192,7 +190,6 @@ RED.sidebar.help = (function() {
     }
 
     function refreshHelpIndex() {
-        helpTopics = [];
         var modules = RED.nodes.registry.getModuleList();
         var moduleNames = Object.keys(modules);
         moduleNames.sort();
@@ -204,23 +201,28 @@ RED.sidebar.help = (function() {
         };
         var tours = RED.tourGuide.list().map(function (item) {
             return {
-                icon: "fa fa-repeat",
+                icon: "fa fa-play-circle-o",
                 label: item.label,
                 tour: item.path,
             };
         });
         var helpData = [
             {
-                id: 'changelog',
-                label: "Node-RED v"+RED.settings.version,
-                content: getChangelog
-            },
-            nodeHelp,
-            {
-                id: "tours",
-                label: RED._("tourGuide.tours"),
-                children: tours
+                label: "Node-RED",
+                children: [
+                    {
+                        id: 'changelog',
+                        label: RED._("sidebar.help.changeLog"),
+                        content: getChangelog
+                    },
+                    {
+                        label: RED._("tourGuide.welcomeTours"),
+                        children: tours
+                    }
+
+                ]
             },
+            nodeHelp
         ];
         var subflows = RED.nodes.registry.getNodeTypes().filter(function(t) {return /subflow/.test(t)});
         if (subflows.length > 0) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js
index 49b960402..adf7f4212 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js
@@ -437,7 +437,7 @@ RED.tourGuide = (function() {
         return [
             {
                 id: "2_3",
-                label: "3.0.0-beta.3 (latest)",
+                label: "3.0.0-beta.3",
                 path: "./tours/welcome.js"
             },
             {
@@ -449,12 +449,7 @@ RED.tourGuide = (function() {
                 id: "2_1",
                 label: "2.1.0",
                 path: "./tours/2.1/welcome.js"
-            },
-            {
-                id: "first_flow",
-                label: "First flow",
-                path: "./tours/first-flow.js"
-            },
+            }
         ];
     }