#1067 : Impossible to run scripts due to hanging debug session (ISE E…

…diting session)
SitecorePowerShell · Jun 2, 2024 · 8943f11 · 8943f11
1 parent f137972
commit 8943f11
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/Spe/Client/Applications/PowerShellIse.cs b/src/Spe/Client/Applications/PowerShellIse.cs
@@ -2,6 +2,7 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
+using System.Management.Automation.Runspaces;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
@@ -682,7 +683,6 @@ protected virtual void JobExecute(ClientPipelineArgs args)
         {
             args.Parameters.Add("message", "ise:execute");
             JobExecuteScript(args, Editor.Value, false);
-            ClearOutput();
         }
 
         [HandleMessage("ise:debug", true)]
@@ -719,6 +719,16 @@ protected virtual void JobExecuteScript(ClientPipelineArgs args, string scriptTo
                 ? ScriptSessionManager.NewSession(ApplicationNames.ISE, true)
                 : ScriptSessionManager.GetSession(sessionName, ApplicationNames.ISE, true);
 
+            ClearOutput();
+            if (scriptSession.State == RunspaceAvailability.AvailableForNestedCommand || scriptSession.State == RunspaceAvailability.Busy)
+            { 
+                var errorMessage =
+                    "A Script is already executing in this script session. Use another session or wait for the other script to finish.";
+                PrintSessionUpdate($"<span style='background:red; color:white'>{errorMessage}</span>");
+                SheerResponse.Eval(
+                    "spe.showSessionIDGallery();");
+                return;
+            }
             if (debug)
             {
                 scriptSession.DebugFile = FileUtil.MapPath(Settings.TempFolderPath) + "\\" +

diff --git a/src/Spe/Client/Commands/MenuItems/ExecutePowerShellScript.cs b/src/Spe/Client/Commands/MenuItems/ExecutePowerShellScript.cs
@@ -73,8 +73,6 @@ protected void Process(ClientPipelineArgs args)
             Assert.ArgumentNotNull(args, "args");
             if (args.IsPostBack)
             {
-                var item1 = ContentEditorForm.GetContextItem();
-                var item = Database.GetDatabase(itemDb).GetItem(itemId, Language.Parse(itemLang), Version.Parse(itemVer));
                 if (!args.HasResult || args.Result.IsNullOrEmpty()) return;
                 ScriptExecutionResult result = ScriptExecutionResult.Parse(args.Result);
                 result.ExecuteResults();

diff --git a/src/Spe/Core/Host/ScriptSession.cs b/src/Spe/Core/Host/ScriptSession.cs
@@ -547,7 +547,7 @@ public void Initialize()
             Initialize(false);
         }
 
-        public void Initialize(bool reinitialize)
+        private void Initialize(bool reinitialize)
         {
             lock (this)
             {
@@ -685,7 +685,7 @@ public void Abort()
             abortRequested = true;
         }
 
-        public static Command OutDefaultCommand
+        private static Command OutDefaultCommand
             => new Command("Out-Default")
             {
                 MergeUnclaimedPreviousCommandResults = PipelineResultTypes.Output | PipelineResultTypes.Error
@@ -709,7 +709,7 @@ public static Command OutHostCommand
         /// <remarks>
         /// "Out-Default" is not suitable for external apps, output goes to console.
         /// </remarks>
-        public static Command OutNullCommand
+        private static Command OutNullCommand
             => new Command("Out-Null")
             {
                 MergeUnclaimedPreviousCommandResults = PipelineResultTypes.Output | PipelineResultTypes.Error
@@ -882,7 +882,7 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        public void Close()
+        private void Close()
         {
             Runspace.DefaultRunspace = null;
             host.Runspace.Dispose();

diff --git a/src/Spe/sitecore modules/PowerShell/Scripts/ise.js b/src/Spe/sitecore modules/PowerShell/Scripts/ise.js
@@ -138,6 +138,11 @@
                 registerEventListenersForRibbonButtons();
             }
         };
+
+        spe.showSessionIDGallery = function () {
+            contextGalery = jQuery("#B0C784F542B464EE2B0BA72384125E123")
+            contextGalery.click();
+        };
 
         spe.updateRibbonNeeded = function () {
             clearTimeout(typingTimer);