From f699812b029b6a6ca9a9a1f70da17e7dee1d68ff Mon Sep 17 00:00:00 2001
From: Marc Bernard <59966492+mbtools@users.noreply.github.com>
Date: Wed, 28 Oct 2020 01:46:53 -0400
Subject: [PATCH] UI: Adjustments to Command Palette (#4080)

- Add prefix for utilities and help commands
- Remove leading spaces

Co-authored-by: Lars Hvam <larshp@hotmail.com>
---
 src/ui/zabapgit_js_common.w3mi.data.js          | 9 +++++++--
 src/ui/zcl_abapgit_gui_page_main.clas.abap      | 2 ++
 src/ui/zcl_abapgit_gui_page_repo_view.clas.abap | 2 ++
 src/ui/zcl_abapgit_gui_page_tutorial.clas.abap  | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/ui/zabapgit_js_common.w3mi.data.js b/src/ui/zabapgit_js_common.w3mi.data.js
index 70f2c3fba..fc8b73730 100644
--- a/src/ui/zabapgit_js_common.w3mi.data.js
+++ b/src/ui/zabapgit_js_common.w3mi.data.js
@@ -2022,7 +2022,12 @@ function enumerateToolbarActions() {
       if (item.nodeName !== "LI") continue; // unexpected node
       if (item.children.length >=2 && item.children[1].nodeName === "UL") {
         // submenu detected
-        processUL(item.children[1], item.children[0].innerText);
+        var menutext = item.children[0].innerText;
+        // special treatment for menus without text
+        if (!menutext) {
+          menutext = item.children[0].getAttribute("title");
+        }
+        processUL(item.children[1], menutext);
       } else if (item.firstElementChild && item.firstElementChild.nodeName === "A") {
         var anchor = item.firstElementChild;
         if (anchor.href && anchor.href !== "#") items.push([anchor, prefix]);
@@ -2042,7 +2047,7 @@ function enumerateToolbarActions() {
     var prefix = item[1];
     return {
       action:    anchor.href.replace("sapevent:", ""),
-      title:     (prefix ? prefix + ": " : "") + anchor.innerText
+      title:     (prefix ? prefix + ": " : "") + anchor.innerText.trim()
     };
   });
 
diff --git a/src/ui/zcl_abapgit_gui_page_main.clas.abap b/src/ui/zcl_abapgit_gui_page_main.clas.abap
index 45e42e0b7..fb5497715 100644
--- a/src/ui/zcl_abapgit_gui_page_main.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_main.clas.abap
@@ -53,9 +53,11 @@ CLASS zcl_abapgit_gui_page_main IMPLEMENTATION.
       iv_act = zif_abapgit_definitions=>c_action-go_settings
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>advanced( )
+      iv_title = 'Utilities'
       io_sub = zcl_abapgit_gui_chunk_lib=>advanced_submenu( )
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>help( )
+      iv_title = 'Help'
       io_sub = zcl_abapgit_gui_chunk_lib=>help_submenu( ) ).
 
   ENDMETHOD.
diff --git a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
index b257f970b..cce753885 100644
--- a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
@@ -430,9 +430,11 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
       iv_act = zif_abapgit_definitions=>c_action-go_settings
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>advanced( )
+      iv_title = 'Utilities'
       io_sub = zcl_abapgit_gui_chunk_lib=>advanced_submenu( )
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>help( )
+      iv_title = 'Help'
       io_sub = zcl_abapgit_gui_chunk_lib=>help_submenu( ) ).
 
   ENDMETHOD.
diff --git a/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap b/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap
index 81508399c..1fda5ba0c 100644
--- a/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap
@@ -46,9 +46,11 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_TUTORIAL IMPLEMENTATION.
       iv_act = zif_abapgit_definitions=>c_action-go_settings
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>advanced( )
+      iv_title = 'Utilities'
       io_sub = zcl_abapgit_gui_chunk_lib=>advanced_submenu( )
     )->add(
       iv_txt = zcl_abapgit_gui_buttons=>help( )
+      iv_title = 'Help'
       io_sub = zcl_abapgit_gui_chunk_lib=>help_submenu( ) ).
 
   ENDMETHOD.