Merge branch 'minui' into fix_121_filter_input

Author: tig

Build.ps1

@@ -8,4 +8,4 @@ Invoke-Build Build -ModuleName Microsoft.PowerShell.ConsoleGuiTools
 
 # Run what was built...
 # pwsh -noprofile -command "Import-Module -verbose '$PSScriptRoot/module/Microsoft.PowerShell.GraphicalTools'; Get-Module -all | Out-GridView -OutputMode Single -Title 'Imported Modules' 
-pwsh -noprofile -command "Import-Module -verbose '$PSScriptRoot/module/Microsoft.PowerShell.ConsoleGuiTools'; Get-Module -all | Out-ConsoleGridView -OutputMode Single -Title 'Imported Modules' -Filter power"
+pwsh -noprofile -command "Import-Module -verbose '$PSScriptRoot/module/Microsoft.PowerShell.ConsoleGuiTools'; Get-Module -all | Out-ConsoleGridView -OutputMode Single -Title 'Imported Modules' -Filter power"

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -19,10 +19,10 @@ internal class ConsoleGui : IDisposable
         // Width of Terminal.Gui ListView selection/check UI elements (old == 4, new == 2)
         private const int CHECK_WIDTH = 4;
         private bool _cancelled;
-        private GridViewDataSource _itemSource;
         private Label _filterLabel;
         private TextField _filterField;
         private ListView _listView;
+        private GridViewDataSource _itemSource;
         private ApplicationData _applicationData;
         private GridViewDetails _gridViewDetails;
 
@@ -37,22 +37,36 @@ public HashSet<int> Start(ApplicationData applicationData)
                 ListViewOffset = _applicationData.OutputMode != OutputModeOption.None ? MARGIN_LEFT + CHECK_WIDTH : MARGIN_LEFT
             };
 
-            Window win = AddTopLevelWindow();
-            AddStatusBar();
+            Window win = CreateTopLevelWindow();
 
-            // GridView header logic
+            // Create the headers and calculate column widths based on the DataTable
             List<string> gridHeaders = _applicationData.DataTable.DataColumns.Select((c) => c.Label).ToList();
             CalculateColumnWidths(gridHeaders);
 
-            AddFilter(win);
-            AddHeaders(win, gridHeaders);
+            // Copy DataTable into the ListView's DataSource
+            _itemSource = LoadData();
+
+            // Add Filter UI
+            if (!_applicationData.MinUI)
+            {
+                AddFilter(win);
+            }
+
+            // Add Header UI
+            if (!_applicationData.MinUI)
+            {
+                AddHeaders(win, gridHeaders);
+            }
+
+            // Add ListView
+            AddListView(win);
+
+            // Status bar is where our key-bindings are handled
+            AddStatusBar(!_applicationData.MinUI);
 
-            // GridView row logic
-            LoadData();
-            AddRows(win);
+            // If -Filter parameter is set, apply it. 
+            ApplyFilter();
 
-            _filterField.Text = _applicationData.Filter ?? string.Empty;
-            _filterField.CursorPosition = _filterField.Text.Length;
             // Run the GUI.
             Application.Run();
             Application.Shutdown();
@@ -78,6 +92,40 @@ public HashSet<int> Start(ApplicationData applicationData)
             return selectedIndexes;
         }
 
+        private GridViewDataSource LoadData()
+        {
+            var items = new List<GridViewRow>();
+            int newIndex = 0;
+            for (int i = 0; i < _applicationData.DataTable.Data.Count; i++)
+            {
+                var dataTableRow = _applicationData.DataTable.Data[i];
+                var valueList = new List<string>();
+                foreach (var dataTableColumn in _applicationData.DataTable.DataColumns)
+                {
+                    string dataValue = dataTableRow.Values[dataTableColumn.ToString()].DisplayValue;
+                    valueList.Add(dataValue);
+                }
+
+                string displayString = GridViewHelpers.GetPaddedString(valueList, 0, _gridViewDetails.ListViewColumnWidths);
+
+                items.Add(new GridViewRow
+                {
+                    DisplayString = displayString,
+                    OriginalIndex = i
+                });
+
+                newIndex++;
+            }
+
+            return new GridViewDataSource(items);
+        }
+
+        private void ApplyFilter(){
+            List<GridViewRow> itemList = GridViewHelpers.FilterData(_itemSource.GridViewRowList, _applicationData.Filter ?? string.Empty);
+            // Set the ListView to show only the subset defined by the filter
+            _listView.Source = new GridViewDataSource(itemList);
+        }
+
         private void Accept()
         {
             Application.RequestStop();
@@ -89,23 +137,28 @@ private void Close()
             Application.RequestStop();
         }
 
-        private Window AddTopLevelWindow()
+        private Window CreateTopLevelWindow()
         {
             // Creates the top-level window to show
             var win = new Window(_applicationData.Title)
             {
-                X = 0,
-                Y = 0,
+                X = _applicationData.MinUI ? -1 : 0,
+                Y = _applicationData.MinUI ? -1 : 0,
+
                 // By using Dim.Fill(), it will automatically resize without manual intervention
-                Width = Dim.Fill(),
-                Height = Dim.Fill(1)
+                Width = Dim.Fill(_applicationData.MinUI ? -1 : 0),
+                Height = Dim.Fill(_applicationData.MinUI ? -1 : 1)
             };
-
+            
+            if (_applicationData.MinUI) {
+                win.Border.BorderStyle = BorderStyle.None;
+            } 
+            
             Application.Top.Add(win);
             return win;
         }
 
-        private void AddStatusBar()
+        private void AddStatusBar(bool visible)
         {
             var statusBar = new StatusBar(
                     _applicationData.OutputMode != OutputModeOption.None
@@ -140,7 +193,7 @@ private void AddStatusBar()
                         new StatusItem(Key.Esc, "~ESC~ Close",  () => Close())
                     }
             );
-
+            statusBar.Visible = visible;
             Application.Top.Add(statusBar);
         }
 
@@ -197,10 +250,11 @@ private void AddFilter(Window win)
         {
             _filterLabel = new Label(FILTER_LABEL)
             {
-                X = MARGIN_LEFT
+                X = MARGIN_LEFT,
+                Y = 0
             };
 
-            _filterField = new TextField(string.Empty)
+            _filterField = new TextField(_applicationData.Filter ?? string.Empty)
             {
                 X = Pos.Right(_filterLabel) + 1,
                 Y = Pos.Top(_filterLabel),
@@ -225,9 +279,9 @@ private void AddFilter(Window win)
                     filterErrorLabel.Text = " ";
                     filterErrorLabel.ColorScheme = Colors.Base;
                     filterErrorLabel.Redraw(filterErrorLabel.Bounds);
+                    _applicationData.Filter = filterText;
+                    ApplyFilter();
 
-                    List<GridViewRow> itemList = GridViewHelpers.FilterData(_itemSource.GridViewRowList, filterText);
-                    _listView.Source = new GridViewDataSource(itemList);
                 }
                 catch (Exception ex)
                 {
@@ -246,12 +300,16 @@ private void AddHeaders(Window win, List<string> gridHeaders)
             var header = new Label(GridViewHelpers.GetPaddedString(
                 gridHeaders,
                 _gridViewDetails.ListViewOffset,
-                _gridViewDetails.ListViewColumnWidths))
+                _gridViewDetails.ListViewColumnWidths));
+            header.X = 0;
+            if (_applicationData.MinUI)
             {
-                X = 0,
-                Y = 2
-            };
-
+                header.Y = 0;
+            }
+            else
+            {
+                header.Y = 2;
+            }
             win.Add(header);
 
             // This renders dashes under the header to make it more clear what is header and what is data
@@ -269,54 +327,32 @@ private void AddHeaders(Window win, List<string> gridHeaders)
                 }
             }
 
-            var headerLine = new Label(headerLineText.ToString())
-            {
-                X = 0,
-                Y = 3
-            };
-
-            win.Add(headerLine);
-        }
-
-        private void LoadData()
-        {
-            var items = new List<GridViewRow>();
-            int newIndex = 0;
-            for (int i = 0; i < _applicationData.DataTable.Data.Count; i++)
-            {
-                var dataTableRow = _applicationData.DataTable.Data[i];
-                var valueList = new List<string>();
-                foreach (var dataTableColumn in _applicationData.DataTable.DataColumns)
-                {
-                    string dataValue = dataTableRow.Values[dataTableColumn.ToString()].DisplayValue;
-                    valueList.Add(dataValue);
-                }
-
-                string displayString = GridViewHelpers.GetPaddedString(valueList, 0, _gridViewDetails.ListViewColumnWidths);
-
-                items.Add(new GridViewRow
+            if (!_applicationData.MinUI){
+                var headerLine = new Label(headerLineText.ToString())
                 {
-                    DisplayString = displayString,
-                    OriginalIndex = i
-                });
-
-                newIndex++;
+                    X = 0,
+                    Y = Pos.Bottom(header)
+                };
+                win.Add(headerLine);
             }
-
-            _itemSource = new GridViewDataSource(items);
         }
 
-        private void AddRows(Window win)
+        private void AddListView(Window win)
         {
-            _listView = new ListView(_itemSource)
+            _listView = new ListView(_itemSource);
+            _listView.X = MARGIN_LEFT;
+            if (!_applicationData.MinUI)
             {
-                X = Pos.Left(_filterLabel),
-                Y = Pos.Bottom(_filterLabel) + 3, // 1 for space, 1 for header, 1 for header underline
-                Width = Dim.Fill(2),
-                Height = Dim.Fill(),
-                AllowsMarking = _applicationData.OutputMode != OutputModeOption.None,
-                AllowsMultipleSelection = _applicationData.OutputMode == OutputModeOption.Multiple,
-            };
+                _listView.Y = Pos.Bottom(_filterLabel) + 3; // 1 for space, 1 for header, 1 for header underline
+            } 
+            else
+            {
+                _listView.Y = 1; // 1 for space, 1 for header, 1 for header underline
+            }
+            _listView.Width = Dim.Fill(2);
+            _listView.Height = Dim.Fill();
+            _listView.AllowsMarking = _applicationData.OutputMode != OutputModeOption.None;
+            _listView.AllowsMultipleSelection = _applicationData.OutputMode == OutputModeOption.Multiple;
 
             win.Add(_listView);
         }

src/Microsoft.PowerShell.ConsoleGuiTools/OutConsoleGridviewCmdletCommand.cs

@@ -52,6 +52,12 @@ public class OutConsoleGridViewCmdletCommand : PSCmdlet, IDisposable
         [Parameter()]
         public string Filter { set; get; }
 
+        /// <summary>
+        /// gets or sets the whether "minimum UI" mode will be enabled
+        /// </summary>
+        [Parameter()]
+        public SwitchParameter MinUI { set; get; }
+
         #endregion Input Parameters
 
         // This method gets called once for each cmdlet in the pipeline when the pipeline starts executing
@@ -133,6 +139,7 @@ protected override void EndProcessing()
                 Title = Title ?? "Out-ConsoleGridView",
                 OutputMode = OutputMode,
                 Filter = Filter,
+                MinUI = MinUI,
                 DataTable = dataTable
             };
 

src/Microsoft.PowerShell.OutGridView.Models/ApplicationData.cs

@@ -12,6 +12,7 @@ public class ApplicationData
         public OutputModeOption OutputMode { get; set; }
         public bool PassThru { get; set; }
         public string Filter { get; set; }
+        public bool MinUI { get; set; }
         public DataTable DataTable { get; set; }
     }
 }