Fix issues

Author: isc-etamarch

cls/SourceControl/Git/DiscardState.cls

@@ -5,7 +5,7 @@ Property FullExternalName As %String(MAXLEN = "") [ Required ];
 
 Property Name As %String [ Required ];
 
-Property Contents As %Stream.GlobalCharacter(LOCATION = "^DiscardStateContents");
+Property Contents As %Stream.GlobalCharacter(LOCATION = "^SourceControl.Git.DiscardS");
 
 Property Username As %String [ Required ];
 
@@ -15,6 +15,8 @@ Property Timestamp As %TimeStamp [ Required ];
 
 Property ExternalFile As %Boolean [ Required ];
 
+Index BranchMap On Branch [ Type = bitmap ];
+
 Method RestoreToFileTree()
 {
     // Make sure directory for file exists
@@ -45,7 +47,7 @@ ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Statu
 
         if (InternalName = "") {
             // If not in IRIS
-            set externalName = ##class(%File).Construct($Get(^SYS("SourceControl","Git","settings","namespaceTemp")),name)
+            set externalName = ##class(%File).Construct(##class(SourceControl.Git.Utils).DefaultTempFolder(),name)
             set discardState.FullExternalName = externalName
             set discardState.Name = name
             set discardState.ExternalFile = 1

cls/SourceControl/Git/WebUIDriver.cls

@@ -139,7 +139,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 set handled = 1
             } elseif (pathStart = "discarded-states") {
                 set discardsInBranch = ##class(SourceControl.Git.DiscardState).DiscardStatesInBranch()
-                do %data.Write(discardsInBranch.%ToJSON())
+                do discardsInBranch.%ToJSON(%data)
                 set handled = 1
             } elseif (pathStart = "contexts") {
                 set contexts = ##class(SourceControl.Git.Utils).GetContexts()

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -1964,8 +1964,6 @@ webui.DiscardedView = function(mainView) {
         $('.restore-discarded').html('');
         $('.external-name').text('');
 
-
-        // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
             self.discarded = JSON.parse(discarded);
             if (self.discarded.length == 0) {
@@ -1978,8 +1976,6 @@ webui.DiscardedView = function(mainView) {
 
     }
 
-        
-
     self.populateUiWithDiscardedStates = function() {
         self.discarded.forEach((discardedState, ind) => {
             var discardedListEntry = $(

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -1964,8 +1964,6 @@ webui.DiscardedView = function(mainView) {
         $('.restore-discarded').html('');
         $('.external-name').text('');
 
-
-        // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
             self.discarded = JSON.parse(discarded);
             if (self.discarded.length == 0) {
@@ -1978,8 +1976,6 @@ webui.DiscardedView = function(mainView) {
 
     }
 
-        
-
     self.populateUiWithDiscardedStates = function() {
         self.discarded.forEach((discardedState, ind) => {
             var discardedListEntry = $(