@kumologica/sdk 3.3.0-beta9 → 3.4.0-beta2

package/src/app/ui/editor-client/public/red/red.js

@@ -646,7 +646,7 @@ jQuery.propHooks.disabled = {
     RED.library.init();
     RED.keyboard.init();
     RED.palette.init();
-    RED.palette.navigator.init();
+    RED.palette.explorer.init();
     RED.palette.nodes.init();
     RED.eventLog.init();
     if (RED.settings.theme('palette.editable') !== false) {
@@ -5956,13 +5956,13 @@ RED.validators = {
         } else if (ptype === 'msg' || ptype === 'flow' || ptype === 'global' ) {
             return RED.utils.validatePropertyExpression(v);
         } else if (ptype === 'num') {
-            console.log('[validators] pType=num. v=', v);
+            // console.log('[validators] pType=num. v=', v);
             return /^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v);
         }
         return true;
     }},
     typedInputRules: function(ptypeName) { return function(v) {
-        console.log('[validators] TypedInput. v=', v);
+        // console.log('[validators] TypedInput. v=', v);
         let valid = true;
         if (Array.isArray(v)){
             v.forEach( rule => {
@@ -17038,7 +17038,6 @@ RED.h = handlers;
   var lastSelection = null;
 
   function updateSelection(ignoreEdit) {
-    console.log(`[view::updateSelection] invoked -  ignoreEdit=${ignoreEdit}`)
     var selection = {};
 
     var workspaceSelection = RED.workspaces.selection();
@@ -17164,13 +17163,11 @@ RED.h = handlers;
     }else{
       if (selectionJSON !== lastSelection) {
         lastSelection = selectionJSON;
-        console.log('[view::updateSelection] Selection has changed from lastSelection:\n', lastSelection);
-        console.log('[view::updateSelection] Selection has changed to selectionJSON:\n', selectionJSON);
-
         RED.editor.edit(selection);
       }else{
         // User has clicked on the canvas or link
-        console.log('[view::updateSelection] Selection has not changed. Ignore');
+        // console.log('[view::updateSelection] Selection has not changed. Ignore');
+        
         // Just close the sidebar
         RED.editor.resetEditor();
       }
@@ -26465,11 +26462,11 @@ RED.sidebar.azure = (function () {
         RED.palette.nodes.collapseAllPalette() 
       }
     },
-    navigator: {
-      header: 'palette-option-projectnav-a',
-      panel: 'palette-projectnav',
+    explorer: {
+      header: 'palette-option-explorer-a',
+      panel: 'palette-explorer',
       onSelect: () => {
-        RED.palette.navigator.refresh()
+        RED.palette.explorer.refresh()
       }
     }
   }
@@ -26479,15 +26476,17 @@ RED.sidebar.azure = (function () {
       deselectAll();
       select(options.nodes);
     });
-    $(`#${options.navigator.header}`).click(e=> {
+
+    $(`#${options.explorer.header}`).click(e=> {
       deselectAll();
-      select(options.navigator);
+      select(options.explorer);
     });
   }
 
   const deselectAll = () => {
     deselect(options.nodes);
-    deselect(options.navigator);
+    deselect(options.explorer);
+
   }
 
   const deselect = (option) => {
@@ -26506,7 +26505,7 @@ RED.sidebar.azure = (function () {
 
   const init = () => {
     // Preselection
-    deselect(options.navigator);
+    deselect(options.explorer);
     select(options.nodes);
 
     // Handle the click events
@@ -26518,50 +26517,214 @@ RED.sidebar.azure = (function () {
   };
   
 })();
-;RED.palette.navigator = (function () {
-  const init = () => {
-    let addTabBtn = `<div id="createTab" class="header-btn2"><i class="icofont-plus"></i></div>`;
-    $(addTabBtn).appendTo($('#projectbtnnav'));
+;RED.palette.explorer = (function () {
+  let workspacePreferences = window.__kumologica.settings.workspacePreferenceStore;
+  let path = window.__kumologica.libs.path;
+
+  const openProject = (projectLocation) => {
+    window.__kumologica.main.dispatch('modal-home:open-project-in-editor', { 
+      payload: { 
+        projectLocation 
+      } 
+    });
+  }
+  
+  const initCurrentProject = () => {
+     // Add Tab button
+     let addTabBtn = `<div id="createTab" class="header-btn2"><i class="icofont-plus"></i></div>`;
+     $(addTabBtn).appendTo($('#exp-open-project-createTab'));
+     RED.popover.tooltip($('#exp-open-project-createTab'), 'Create Tab...');
+
+     $('#createTab').on('click', event => {
+       event.stopPropagation();
+       window.__kumologica.main.dispatch('navigator:open-new-tab-dialog', null);
+     })
+ 
+     // Initialize the palette explorer with folder only
+     let data = [
+       {   id: '__root__',
+           name: 'OPEN PROJECT',
+           children: []
+       }
+     ];
+ 
+     try{
+       $('#exp-open-project').tree({
+         data:data,
+         autoOpen: true,
+         selectable: true,
+         onCanSelectNode: function(node) {
+           if (node.id === '__root__'){
+             $('#exp-open-project').tree('toggle', node);
+             return false;
+           } else { 
+             return true;
+           }
+           
+         },
+         usecontextmenu: true,
+         closedIcon: $('<i class="icofont-rounded-right"></i>'),
+         openedIcon: $('<i class="icofont-rounded-down"></i>'),
+         onCreateLi: function(node, $li) { }
+       });
+ 
+       // Add the context menu
+       $('#exp-open-project').jqTreeContextMenu({
+         menu: '#palette-explorer-context-menu',
+         onContextMenuItem: function(e, node, $el){
+           let operation = $el.data("item");
+           switch(operation) {
+             case "open": 
+               RED.workspaces.showSafe(node.id);
+               break;
+             case "delete": {
+               RED.actions.invoke('core:deploy');
+               RED.workspaces.remove(node.id);
+               RED.actions.invoke('core:deploy'); // save it so we can persist the tab straight away.
+               refresh();
+               break;
+             }
+             default: {}
+           }
+           
+         }
+       });
+     }catch(err) {
+       // HACK: case where a modal is using this module, which it has no biz on tree
+     }
+ 
+     let ipcRenderer = window.__kumologica.electron.ipcRenderer;
+     ipcRenderer.on('create-new-tab', (event, payload)=> {
+       let tabName = payload.tabName;
+       if (tabName){
+         createTabFn(tabName.toLowerCase());
+       }
+       
+     });
+ 
+     // On select tab option
+     $('#exp-open-project').on(
+       'tree.select',
+       function(event) {
+           event.stopImmediatePropagation();
+           if (event.node) {
+               // console.log(`[palette-navigator] Select Tab=(${event.node.id})`);
+               // node was selected
+               var node = event.node;
+               if (node.id){
+                 RED.workspaces.showSafe(node.id);
+               }
+           }
+           else {
+             var prevNode = event.previous_node
+             if (prevNode.id){
+               RED.workspaces.showSafe(prevNode.id);
+               selectTab(prevNode.id);
+             }
+           }
+       }
+     );
+    
+     refresh();
+  }
 
-    // Initialize the palette navigator with folder only
-    let data = [
-      {
-          name: 'Project',
+  const initWorkspaceProjects = () => {
+    // Add Tab button
+    let addProjectToWorkspaceBtn = `<div id="addProjectToWorkspace" class="header-btn2"><i class="icofont-plus"></i></div>`;
+    $(addProjectToWorkspaceBtn).appendTo($('#exp-workspace-addFolder'));
+    RED.popover.tooltip($('#exp-workspace-addFolder'), 'Add Project to Workspace...');
+    
+    // Add action to the add button
+    $('#addProjectToWorkspace').click((event) => {
+      console.log('[palette-explorer] addProjectToWorkspaceBtn clicked');
+
+      let currentWindow = window.__kumologica.electron.remote.getCurrentWindow()
+      let dialog = window.__kumologica.electron.remote.dialog;
+      let options = {
+        title: 'Select Projects to add to Workspace...',
+        properties: ['openDirectory', 'multiSelections'],
+      };
+      dialog.showOpenDialog(currentWindow, options).then((result) => {
+        if (!result.canceled){
+          let projects = result.filePaths;
+          console.log('[palette-explorer] projects=', projects);
+          projects.forEach(project => {
+            let valid = window.__kumologica.libs.findKumologicaFlowInDir(project); 
+            if (valid) {
+              workspacePreferences.addProjectToWorkspace(project);
+            } else {
+              RED.notifications.notify(`<b>Invalid Kumologica project directory:</b> ${project}`, 'error', undefined, 3000);
+            }
+          });
+          refreshWorkspaceProjects();
+        }
+        console.log('[palette-explorer] result=', result);
+      });
+    });
+
+     // Initialize the projects in workspace
+     let data = [
+      {   id: '__root__',
+          name: 'WORKSPACE PROJECTS',
           children: []
       }
     ];
 
     try{
-      $('#projectnav').tree({
+      $('#exp-workspace').tree({
         data:data,
         autoOpen: true,
         selectable: true,
+        onCanSelectNode: function(node) {
+          if (node.id === '__root__'){
+            $('#exp-workspace').tree('toggle', node);
+            return false;
+          } else { 
+            const el = $(node.element);
+            const selectionRequired = !el.hasClass('jqtree-selected');
+            // Deselect all nodes
+            $('#exp-workspace').find('.jqtree-selected').removeClass('jqtree-selected');
+
+            if (selectionRequired) {
+              el.addClass('jqtree-selected');
+            }
+            
+            return false;
+          }
+          
+        },
         usecontextmenu: true,
         closedIcon: $('<i class="icofont-rounded-right"></i>'),
         openedIcon: $('<i class="icofont-rounded-down"></i>'),
         onCreateLi: function(node, $li) {
-          // if (node.name === 'Project'){
-          //   $li.find('.jqtree-element').append(``);
-          // } else {
-            // $li.find('.jqtree-element').addClass(selector);
-            // $li.find('.jqtree-element').attr('id', selector);
-          //}
+          if (node.id !== '__root__'){
+            RED.popover.tooltip(
+              $li.find('.jqtree-title'),
+              node.path
+            );
+            $li.find('.jqtree-title').before('<span class="icon" style="position: relative; left: 14px; font-size: 13px; color: #8b3ff8"><i class="fa fa-folder"></i></span>');
+          }
         }
       });
+
       // Add the context menu
-      $('#projectnav').jqTreeContextMenu({
-        menu: '#palette-context-menu',
+      $('#exp-workspace').jqTreeContextMenu({
+        menu: '#palette-workspace-context-menu',
         onContextMenuItem: function(e, node, $el){
+          
           let operation = $el.data("item");
+          let projectLocation = node.path;
+
           switch(operation) {
             case "open": 
-              RED.workspaces.showSafe(node.id);
+              openProject(projectLocation);
               break;
-            case "delete": {
-              RED.actions.invoke('core:deploy');
-              RED.workspaces.remove(node.id);
-              RED.actions.invoke('core:deploy'); // save it so we can persist the tab straight away.
-              refresh();
+            case "openLocation":
+              window.__kumologica.libs.openFolder(projectLocation);
+              break;
+            case "removeFromWorkspace": {
+              workspacePreferences.removeProjectFromWorkspace(projectLocation);
+              refreshWorkspaceProjects();
               break;
             }
             default: {}
@@ -26573,50 +26736,25 @@ RED.sidebar.azure = (function () {
       // HACK: case where a modal is using this module, which it has no biz on tree
     }
 
-    // Add tab button
-    $('#createTab').on('click', event => {
-      event.stopPropagation();
-      window.__kumologica.main.dispatch('navigator:open-new-tab-dialog', null);
-    })
-
-    let ipcRenderer = window.__kumologica.electron.ipcRenderer;
-    ipcRenderer.on('create-new-tab', (event, payload)=> {
-      let tabName = payload.tabName;
-      if (tabName){
-        createTabFn(tabName.toLowerCase());
-      }
-      
-    });
-
+    // On double click project ...
     // On select tab option
-    $('#projectnav').on(
-      'tree.select',
+    $('#exp-workspace').on(
+      'tree.dblclick',
       function(event) {
           event.stopImmediatePropagation();
-          if (event.node) {
-              // console.log(`[palette-navigator] Select Tab=(${event.node.id})`);
-              // node was selected
-              var node = event.node;
-              if (node.id){
-                RED.workspaces.showSafe(node.id);
-                // selectTab(node.id);
-              }
-              // let ws = RED.nodes.workspace(node.id);
-              // RED.workspaces.add(ws);
-              // RED.workspaces.show(ws.id);
-              
-          }
-          else {
-            var prevNode = event.previous_node
-            if (prevNode.id){
-              RED.workspaces.showSafe(prevNode.id);
-              selectTab(prevNode.id);
-            }
+          if (event.node && event.node.path) {
+                openProject(event.node.path)
           }
       }
     );
-   
-    refresh();
+
+  }
+
+
+
+  const init = () => {
+    initCurrentProject();
+    initWorkspaceProjects();
   }
 
   const createTabFn = (newTabName) => {
@@ -26632,18 +26770,21 @@ RED.sidebar.azure = (function () {
   }
 
   const selectTab = (nodeId) => {
-    const tnode = $('#projectnav').tree('getNodeById', nodeId);
-    $('#projectnav').tree('selectNode', tnode);
+    const tnode = $('#exp-open-project').tree('getNodeById', nodeId);
+    $('#exp-open-project').tree('selectNode', tnode);
     // Hack to maintain the focus on the selected tab
     $('#workspace-tabs').addClass('workspace-focussed');
   }
-  const refresh = () => {
+
+  const refreshTabs = () => {
     if (!RED.workspaces.tabs() || RED.workspaces.tabs().length === 0) return;
-    // console.log('[palette-navigator#refresh] RED.workspaces.tabs()=',RED.workspaces.tabs());
+    
     const tabs = RED.nodes.listWorkspaces();
+    const currentProjectName = RED.projectInfo.getWorkspaceInfo()[0].name;
     let data = [
       {
-          name: 'Project',
+          id: '__root__',
+          name: currentProjectName,
           children: []
       }
     ];
@@ -26652,7 +26793,49 @@ RED.sidebar.azure = (function () {
       data[0].children.push({ id: tabs[key].id, name: tabs[key].label })
     }
 
-    $('#projectnav').tree('loadData', data);
+    $('#exp-open-project').tree('loadData', data);
+  }
+
+  const refreshWorkspaceProjects = () => {  
+    let projects = workspacePreferences.getWorkspaceProjects();
+
+    // Initialize the tree with empty data
+    let data = [
+      {
+          id: '__root__',
+          name: 'WORKSPACE PROJECTS',
+          children: []
+      }
+    ];
+    
+    
+    // Update the data with info from workspace preferences
+    if (projects){
+      projects.forEach((project, index) => {
+        let projectName = path.basename(project);
+        data[0].children.push({ id: name, name: projectName, path: project });
+      })
+    }
+    
+    // Render the tree
+    $('#exp-workspace').tree('loadData', data);
+
+    // Hack to add style to the title if no projects are added. As this element is not considered a folder
+    if (!projects || projects.length === 0){
+      const elements = $('.jqtree-title-button-left');
+      const maxElements = elements.length;
+      for(let i = 0; i < maxElements; i++){
+        if ($(elements[i]).text() === 'WORKSPACE PROJECTS'){
+          $(elements[i]).addClass('jqtree-title-emptyfolder');
+          break;
+        }
+      }
+    }
+  }
+
+  const refresh = () => {
+   refreshTabs();
+   refreshWorkspaceProjects();
   }
 
   return {
@@ -33515,9 +33698,15 @@ RED.eventLog = (function() {
                 },
                 close: function(e) {
                     if (popover) {
+                        console.log(popover);
                         popover.close(true);
                         currentPopoverError = null;
                     }
+                    // Otherwise for some fucking reason the screen gets moved to the top...
+                    $('#main-container').hide();
+                    window.setTimeout(()=> { 
+                        $('#main-container').show() 
+                    }, 10);
                 }
             });
 
@@ -33659,6 +33848,8 @@ RED.eventLog = (function() {
         if (disabled) {
             return;
         }
+        RED.actions.invoke('core:search:close');
+
         dialogContainer.empty();
         dialogContainer.append($(importNodesDialog));
         dialogContainer.i18n();
@@ -34865,6 +35056,10 @@ RED.notifications = (function() {
     });
   }
 
+  /**
+   * User search when typing it the search box...
+   * @param {string} val 
+   */
   function search(val) {
     searchResults.editableList('empty');
     var typeFilter;
@@ -34874,11 +35069,42 @@ RED.notifications = (function() {
       typeFilter = m[1];
     }
 
-    val = val.trim();
-
     selected = -1;
+
+    if (val && (val.length > 0 || typeFilter)) {
+      let results = searchNodes(val, typeFilter);
+      if (results.length > 0) {
+        // Excluding tabs
+        // results = results.filter((r) => r.node.type !== 'tab');
+        for (i = 0; i < Math.min(results.length, 25); i++) {
+          searchResults.editableList('addItem', results[i]);
+        }
+      } else {
+        searchResults.editableList('addItem', {});
+      }
+    } else {
+      let commands = searchCommands();
+      commands.forEach(c=> {
+        searchResults.editableList('addItem', c);
+      });
+
+      let results = $('#search-result-list');
+      $('<div class="searchSeparator"></div>').appendTo(results);
+
+      
+      let allNodes = searchNodes();
+      
+      allNodes.forEach(n => {
+        searchResults.editableList('addItem', n);
+      })
+
+    }
+  }
+
+  function searchNodes(val, typeFilter){
     results = [];
-    if (val.length > 0 || typeFilter) {
+    if (val) {
+      val = val.trim();
       val = val.toLowerCase();
       var i;
       var j;
@@ -34909,16 +35135,47 @@ RED.notifications = (function() {
       for (i = 0; i < list.length; i++) {
         results.push(nodes[list[i]]);
       }
-      if (results.length > 0) {
-        // Excluding tabs
-        // results = results.filter((r) => r.node.type !== 'tab');
-        for (i = 0; i < Math.min(results.length, 25); i++) {
-          searchResults.editableList('addItem', results[i]);
-        }
-      } else {
-        searchResults.editableList('addItem', {});
+    } else {
+      let setResults = new Set()
+      for (const i in index) {
+        index[i].forEach(n => {
+          if (setResults.has(n.node.id)) return;
+          else {
+            setResults.add(n.node.id);
+            if (n.node.type === 'tab'){
+              results.push({ label:n.node.label, node: n.node});
+            }else {
+              results.push({ label:n.node.name, node: n.node});
+            }
+          }
+        })
       }
+
     }
+    return results;
+
+  }
+  /**
+   * Returns a list of commands that will be added to the search window when it is opened
+   */
+  function searchCommands() {
+    return [
+      { type: 'command', title: 'Open Settings', action: 'core:settings:open', shortcut: `${CtrlOrCmd()} ,` },
+      { type: 'command', title: 'Show Project Info', action: 'core:project-info' },
+      { type: 'command', title: 'Run Test...', cb: () => { 
+        if (!$('.sidebar-test').is(':visible')){
+          $('#red-ui-tab-test-link-button').click();
+        }
+        
+        $('#test-sidebar-run-btn').click();
+      } },
+      { type: 'command', title: 'Import Flow', action: 'core:show-import-dialog', shortcut: `${CtrlOrCmd()} I` },
+      { type: 'command', title: 'Export Flow', action: 'core:show-export-dialog', shortcut: `${CtrlOrCmd()} E` },
+    ]
+  }
+
+  function CtrlOrCmd() {
+    return window.__kumologica.settings.platform.isMac? "⌘": "Ctrl";
   }
 
   function ensureSelectedIsVisible() {
@@ -34949,7 +35206,7 @@ RED.notifications = (function() {
       dialog
     );
     searchInput = $(
-      '<input type="text" placeholder="Find (Nodes and Tabs)">'
+      '<input type="text" placeholder="Search nodes and tabs by name or type">'
     )
       .appendTo(searchDiv)
       .searchBox({
@@ -35009,14 +35266,55 @@ RED.notifications = (function() {
         addButton: false,
         addItem: function (container, i, object) {
           var node = object.node;
-          console.log(`[search] node = `, node);
 
-          if (node === undefined) {
+          // If node === undefined and object is object => object is the command 
+          // If node === undefiend and object is empty => user search yield no results
+          // otherwise is a normal search ...
+
+          if (node === undefined && !object ) {
+            // case of user search yield no results
             $('<div>', { class: 'red-ui-search-empty' })
               .text('No matches found')
               .appendTo(container);
-          // } else if (node.type === 'tab') {
-          // }
+          } else if (node === undefined && object) {
+            // case of initial display of options (commands & tabs ) ... (object is a command)
+            if (object.type === 'command') {
+
+              // Main result container
+              var div = $('<a>', {
+                href: '#',
+                class: 'red-ui-search-result',
+              }).appendTo(container);
+
+              // Command title here
+              var contentDescription = $('<div>', {
+                class: 'red-ui-search-result-description',
+              }).appendTo(div);
+
+              $('<div>', { class: 'red-ui-search-result-command-label', style: 'width:95%' })
+              .text(object.title)
+              .appendTo(contentDescription);
+
+              // Type of object (command)
+              $('<div>', { class: 'red-ui-search-result-command-shortcut' })
+                .text(object.shortcut)
+                .appendTo(div);
+
+              div.click(function (evt) {
+                evt.preventDefault();
+                if (object.action){
+                  hide();
+                  window.setTimeout( ()=> {
+                    RED.actions.invoke(object.action)}, 10)
+                } else {
+                  hide();
+                  window.setTimeout( ()=> {
+                    object.cb() }, 10)
+                }
+                
+              });
+            }
+
           } else {
             var def = node._def;
             var div = $('<a>', {
@@ -35024,54 +35322,53 @@ RED.notifications = (function() {
               class: 'red-ui-search-result',
             }).appendTo(container);
 
-            var nodeDiv = $('<div>', {
-              class: 'red-ui-search-result-node',
+            // ::: Part of the description
+            var contentDescription = $('<div>', {
+              class: 'red-ui-search-result-description',
             }).appendTo(div);
+
+            // ::: Part of the icon here... 
+            var nodeDiv = $('<div>', {
+              class: 'ui-search-result-node',
+            }).appendTo(contentDescription);
+
             var colour = RED.utils.getNodeColor(node.type, def);
             var icon_url = RED.utils.getNodeIcon(def, node);
+            
             if (node.type === 'tab') {
-              // colour = '#C0DEED';
               var iconContainer = $('<div/>', {
                 class: 'palette_icon_container',
               }).appendTo(nodeDiv);
               RED.utils.createIconElement('icons/kumologica-core/kumologica-tab.png', iconContainer, true);
-            }else{
-              // Disable the background color, we want it transparent now
-              //nodeDiv.css('backgroundColor', colour);
+            } else {
               var iconContainer = $('<div/>', {
                 class: 'palette_icon_container',
               }).appendTo(nodeDiv);
               RED.utils.createIconElement(icon_url, iconContainer, true);
             }
-            
-
-            
 
-            var contentDiv = $('<div>', {
-              class: 'red-ui-search-result-description',
-            }).appendTo(div);
             if (node.z) {
               var workspace = RED.nodes.workspace(node.z);
               if (!workspace) {
                 workspace = RED.nodes.subflow(node.z);
                 workspace = 'subflow:' + workspace.name;
               } else {
-                workspace = 'tab:' + workspace.label; //'flow:' + workspace.label
+                workspace = workspace.label; //'flow:' + workspace.label
               }
               $('<div>', { class: 'red-ui-search-result-node-flow' })
                 .text(workspace)
-                .appendTo(contentDiv);
+                .appendTo(div);
             }
 
             $('<div>', { class: 'red-ui-search-result-node-label' })
               .text(object.label || node.id)
-              .appendTo(contentDiv);
+              .appendTo(contentDescription);
             $('<div>', { class: 'red-ui-search-result-node-type' })
               .text(node.type)
-              .appendTo(contentDiv);
+              .appendTo(contentDescription);
             $('<div>', { class: 'red-ui-search-result-node-id' })
               .text(node.id)
-              .appendTo(contentDiv);
+              .appendTo(contentDescription);
 
             div.click(function (evt) {
               evt.preventDefault();
@@ -35081,11 +35378,6 @@ RED.notifications = (function() {
         },
         scrollOnAdd: false,
       });
-
-    // Hint to how to close the search panel
-    $(`
-    <div style="text-align:center; padding: 3px 0 5px 0">Press <span class="escape-key">Esc</span> to close</div>
-    `).appendTo(dialog);
   }
 
   function reveal(node) {
@@ -35104,11 +35396,6 @@ RED.notifications = (function() {
     RED.actions.invoke('core:project-info:close');
     RED.actions.invoke('core:settings:close');
 
-    console.log('[search] disabled=', disabled);
-    if (disabled) {
-      return;
-    }
-    console.log('[search] visible=', visible);
     if (!visible) {
       RED.keyboard.add('*', 'escape', function () {
         hide();
@@ -35127,8 +35414,15 @@ RED.notifications = (function() {
       searchInput.searchBox('value', v);
       RED.events.emit('search:open');
       visible = true;
+      window.setTimeout(()=> {
+        searchInput.focus() 
+      }, 50);
+
+      // Populate search results with commands and tabs at least
+      search();
     }
-    searchInput.focus();
+
+    
   }
 
   function hide() {
@@ -35309,11 +35603,6 @@ RED.notifications = (function() {
       hide();
     });
 
-    // Hint to how to close the search panel
-    $(`
-    <div style="text-align:center; padding: 11px 0 11px 0">Press <span class="escape-key">Esc</span> to close</div>
-    `).appendTo(dialog);
-
     if (config) {
       setValues(config);
     }
@@ -35355,6 +35644,12 @@ RED.notifications = (function() {
     RED.view.reveal(node.id);
   }
 
+  function getWorkspaceInfo() {
+    return [
+      { name: projectName, path: projectDir }
+    ]
+  }
+
   function show(v) {
     // Disable the search dialog if opened
     RED.actions.invoke('core:search:close');
@@ -35404,9 +35699,10 @@ RED.notifications = (function() {
   }
 
   return {
-    init: init,
-    show: show,
-    hide: hide,
+    init,
+    show,
+    hide,
+    getWorkspaceInfo
   };
 })();
 ;RED.uiSettings = (function(){
@@ -35809,7 +36105,7 @@ RED.notifications = (function() {
         //console.log(`lineCount: ${cmInstance.lineCount()}`)
         // Set the cursor at the end of existing content
         cmInstance.setCursor(cmInstance.lineCount(), 0);
-        let codeMirrorHeight = totalHeightAvailable - 300;
+        let codeMirrorHeight = totalHeightAvailable - 400;
 
         cmInstance.setSize(null, codeMirrorHeight);
         // cmInstance.refresh();
@@ -43869,65 +44165,27 @@ RED.touch.radialMenu = (function() {
     initImportExport();
     initShelvesFromHeader();
     initSettingsButtonFromHeader();
-    initSearchBtn();
     initDeployBtn();
     initProjectIndicator();
   }
 
   function initProjectIndicator() {
     $('#projectIndicator').click((e) => {
-      e.preventDefault();
-      if ($('#red-ui-project-info').is(':visible')) {
-        RED.actions.invoke('core:project-info:close');
-      } else {
-        RED.actions.invoke('core:project-info');
-      }
-    });
-    $('#projectInfoExpand').click((e) => {
-      e.preventDefault();
-      if ($('#red-ui-project-info').is(':visible')) {
-        RED.actions.invoke('core:project-info:close');
-      } else {
-        RED.actions.invoke('core:project-info');
-      }
-    });
-    $('#projectIndicator').hover(
-      () => {
-        $('#projectInfoExpand').css('color', '#999');
-      },
-      () => {
-        $('#projectInfoExpand').css('color', '#ecebeb');
-      }
-    );
-    $('#projectInfoExpand').hover(
-      () => {
-        $('#projectInfoExpand').css('color', '#999');
-      },
-      () => {
-        $('#projectInfoExpand').css('color', '#ecebeb');
-      }
-    );
-  }
-
-  function initSearchBtn() {
-    $('#btn-search').click((e) => {
       e.preventDefault();
       if ($('#red-ui-search').is(':visible')) {
-        console.log('[header] closing search panel')
         RED.actions.invoke('core:search:close');
       } else {
-        console.log('[header] opening search panel')
         RED.actions.invoke('core:search');
       }
     });
   }
 
-
   function initDeployBtn() {
     RED.actions.add('core:deploy', deployFlow);
 
     $('#btn-deploy').click((e) => {
-     RED.actions.invoke('core:deploy');
+      e.stopPropagation();
+      RED.actions.invoke('core:deploy');
     });
 
     // RED.popover.tooltip($('#btn-deploy'), 'Save & Deploy');