Merge branch 'master' of tig:PowerShell/GraphicalTools into master

Author: tig

Build.ps1

@@ -1,2 +1,3 @@
 Invoke-Build Build
-pwsh -noprofile -command "Import-Module '$PSScriptRoot/module/Microsoft.PowerShell.GraphicalTools'; Get-Process | Out-GridView -PassThru"
+pwsh -noprofile -command "Import-Module -verbose '$PSScriptRoot/module/Microsoft.PowerShell.GraphicalTools'; Get-Process | Out-GridView -PassThru"
+pwsh -noprofile -command "Import-Module -verbose '$PSScriptRoot/module/Microsoft.PowerShell.ConsoleGuiTools'; Get-Process | Out-ConsoleGridView -OutputMode Single"

docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md

@@ -127,7 +127,7 @@ $parameters = @{
   LongDescription = 'Show History using Out-ConsoleGridView'
   ScriptBlock = {
     param($key, $arg)   # The arguments are ignored in this example
-    $history = Get-History -Count 100 | Out-ConsoleGridView -Title "Select Command" -OutputMode Single
+    $history = Get-History -Count 100 | Sort-Object -Property Id -Descending | Out-ConsoleGridView -Title "Select Command" -OutputMode Single
     if (-Not [string]::IsNullOrWhiteSpace($history)){
         [Microsoft.PowerShell.PSConsoleReadLine]::Insert($history)
     }

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -27,8 +27,9 @@ public HashSet<int> Start(ApplicationData applicationData)
             _applicationData = applicationData;
             _gridViewDetails = new GridViewDetails
             {
-                // If we have an OutputMode, then we want to make them selectable. If we make them selectable,
-                // they have a 8 character addition of a checkbox ("     [ ]") that we have to factor in.
+                // If OutputMode is Single or Multiple, then we make items selectable. If we make them selectable,
+                // they have a 8 character addition of a checkbox (".....[ ]" or ".....( )")
+                // that we have to factor in.
                 ListViewOffset = _applicationData.OutputMode != OutputModeOption.None ? 8 : 4
             };
 
@@ -68,11 +69,13 @@ public HashSet<int> Start(ApplicationData applicationData)
             return selectedIndexes;
         }
 
-        private void Accept(){
+        private void Accept()
+        {
             Application.RequestStop();
         }
 
-        private void Close(){
+        private void Close()
+        {
             _cancelled = true;
             Application.RequestStop();
         }
@@ -97,22 +100,33 @@ private void AddStatusBar()
         {
             var statusBar = new StatusBar(
                     _applicationData.OutputMode != OutputModeOption.None
-                    ? new StatusItem []
+                    ? new StatusItem[]
                     {
                         // Use Key.Unknown for SPACE with no delegate because ListView already
                         // handles SPACE
                         new StatusItem(Key.Unknown, "~SPACE~ Mark Item", null),
-                        new StatusItem(Key.Enter, "~ENTER~ Accept", () => { 
-                            if (Application.Top.MostFocused == _listView){
+                        new StatusItem(Key.Enter, "~ENTER~ Accept", () =>
+                        {
+                            if (Application.Top.MostFocused == _listView)
+                            {
+                                // If nothing was explicitly marked, we return the item that was selected
+                                // when ENTER is pressed in Single mode. If something was previously selected
+                                // (using SPACE) then honor that as the single item to return
+                                if (_applicationData.OutputMode == OutputModeOption.Single &&
+                                    _itemSource.GridViewRowList.Find(i => i.IsMarked) == null)
+                                {
+                                    _listView.MarkUnmarkRow();
+                                }
                                 Accept();
                             }
-                            else if (Application.Top.MostFocused == _filterField){
+                            else if (Application.Top.MostFocused == _filterField)
+                            {
                                 _listView.SetFocus();
                             }
                         }),
                         new StatusItem(Key.Esc, "~ESC~ Close", () => Close())
                     }
-                    : new StatusItem []
+                    : new StatusItem[]
                     {
                         new StatusItem(Key.Esc, "~ESC~ Close",  () => Close())
                     }
@@ -293,6 +307,7 @@ private void AddRows(Window win)
                 Width = Dim.Fill(2),
                 Height = Dim.Fill(2),
                 AllowsMarking = _applicationData.OutputMode != OutputModeOption.None,
+                AllowsMultipleSelection = _applicationData.OutputMode == OutputModeOption.Multiple,
             };
 
             win.Add(_listView);

src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.psd1

@@ -9,7 +9,7 @@
 RootModule = 'Microsoft.PowerShell.ConsoleGuiTools.dll'
 
 # Version number of this module.
-ModuleVersion = '0.4.1'
+ModuleVersion = '0.5.0'
 
 # Supported PSEditions
 CompatiblePSEditions = @( 'Core' )
@@ -106,6 +106,15 @@ PrivateData = @{
         # ReleaseNotes of this module
         ReleaseNotes = '# Release Notes
 
+## v0.5.0
+
+`Out-ConsoleGridView` has been totally refactored!
+
+First off, no more silly F9 menu to accept!
+All you have to do is hit `ENTER` to accept your selection or `ESC` to cancel.
+
+Also, `-OutputMode` works as expected now. `Single` lets you only select one item. `Multiple` is the default.
+
 ## v0.4.1
 
 * Fix filter indexing to return correct selected objects

src/Microsoft.PowerShell.ConsoleGuiTools/OutConsoleGridviewCmdletCommand.cs

@@ -7,12 +7,9 @@
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 using OutGridView.Models;
-using System.Runtime.InteropServices;
 
 namespace OutGridView.Cmdlet
 {
-    /// Enum for SelectionMode parameter.
-    /// </summary>
     [Cmdlet(VerbsData.Out, "ConsoleGridView")]
     [Alias("ocgv")]
     public class OutConsoleGridViewCmdletCommand : PSCmdlet, IDisposable
@@ -62,7 +59,7 @@ protected override void BeginProcessing()
                     ErrorCategory.NotImplemented,
                     null);
 
-                this.ThrowTerminatingError(error);
+                ThrowTerminatingError(error);
             }
         }
 
@@ -74,8 +71,7 @@ protected override void ProcessRecord()
                 return;
             }
 
-            IDictionary dictionary = InputObject.BaseObject as IDictionary;
-            if (dictionary != null)
+            if (InputObject.BaseObject is IDictionary dictionary)
             {
                 // Dictionaries should be enumerated through because the pipeline does not enumerate through them.
                 foreach (DictionaryEntry entry in dictionary)
@@ -106,7 +102,7 @@ baseObject is PSReference ||
                     ErrorCategory.InvalidType,
                     null);
 
-                this.ThrowTerminatingError(error);
+                ThrowTerminatingError(error);
             }
 
             _psObjects.Add(input);
@@ -135,15 +131,14 @@ protected override void EndProcessing()
 
 
             var selectedIndexes = _consoleGui.Start(applicationData);
-
             foreach (int idx in selectedIndexes)
             {
                 var selectedObject = _psObjects[idx];
                 if (selectedObject == null)
                 {
                     continue;
                 }
-                this.WriteObject(selectedObject, false);
+                WriteObject(selectedObject, false);
             }
         }