Merge pull request #836 from ironmansoftware/832

Fixes #810

src/.vscode/launch.json

@@ -0,0 +1,52 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "PowerShell Launch Current File",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "${file}",
+            "args": [],
+            "cwd": "${file}"
+        },
+        {
+            "name": "PowerShell Launch Current File in Temporary Console",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "${file}",
+            "args": [],
+            "cwd": "${file}",
+            "createTemporaryIntegratedConsole": true
+        },
+        {
+            "name": "PowerShell Launch Current File w/Args Prompt",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "${file}",
+            "args": [
+                "${command:SpecifyScriptArgs}"
+            ],
+            "cwd": "${file}"
+        },
+        {
+            "name": "PowerShell Attach to Host Process",
+            "type": "PowerShell",
+            "request": "attach"
+        },
+        {
+            "name": "PowerShell Interactive Session",
+            "type": "PowerShell",
+            "request": "launch",
+            "cwd": ""
+        },
+        {
+            "name": "PowerShell Attach Interactive Session Runspace",
+            "type": "PowerShell",
+            "request": "attach",
+            "processId": "current"
+        }
+    ]
+}

src/UniversalDashboard.Materialize/Scripts/grid.ps1

@@ -45,7 +45,7 @@ function New-UDGrid {
 
         if ($null -ne $Endpoint) {
             if ($Endpoint -is [scriptblock]) {
-                $Endpoint = New-UDEndpoint -Endpoint $Endpoint -Id $Id
+                $Endpoint = New-UDEndpoint -Endpoint $Endpoint -Id $Id -ArgumentList $ArgumentList
             }
             elseif ($Endpoint -isnot [UniversalDashboard.Models.Endpoint]) {
                 throw "Endpoint must be a script block or UDEndpoint"

src/UniversalDashboard/Cmdlets/NewEndpointCommand.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
+using System.Management.Automation.Language;
 using System.Text.RegularExpressions;
 using UniversalDashboard.Models;
 using UniversalDashboard.Services;
+using System.Linq;
 
 namespace UniversalDashboard.Cmdlets
 {
@@ -44,11 +46,34 @@ protected override void EndProcessing()
                 ArgumentList = ArgumentList
 		    };
 
+            callback.Variables = new Dictionary<string, object>();
+
+            try
+            {
+                var variables = Endpoint.Ast.FindAll(x => x is VariableExpressionAst, true).Cast<VariableExpressionAst>().Select(m => m.VariablePath.ToString());
+
+                foreach (var variableName in variables)
+                {
+                    var variable = SessionState.InvokeCommand.InvokeScript($"Get-Variable -Name '{variableName}' -ErrorAction SilentlyContinue").Select(m => m.BaseObject).OfType<PSVariable>().FirstOrDefault();
+                    if (variable != null && !variable.Options.HasFlag(ScopedItemOptions.Constant) && !variable.Options.HasFlag(ScopedItemOptions.ReadOnly))
+                    {
+                        if (!callback.Variables.ContainsKey(variable.Name))
+                            callback.Variables.Add(variable.Name, SessionState.PSVariable.GetValue(variable.Name));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                WriteWarning(ex.Message);
+            }
+
+
             if (EvaluateUrlAsRegex) {
                 callback.UrlRegEx = new Regex(Url);
             }
 
             callback.SessionId = SessionState.PSVariable.Get(Constants.SessionId)?.Value as string;
+            callback.Page = SessionState.PSVariable.Get(Constants.UDPage)?.Value as Page;
 
             if (callback.Schedule == null) 
             {