Zowe Suite v2.1.0

zowe · Jun 1, 2022 · 46a00ab · 46a00ab
2 parents 9c9be17 + 4579feb
commit 46a00ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/webClient/src/app/core/menu-bar/menu-bar.component.ts b/webClient/src/app/core/menu-bar/menu-bar.component.ts
@@ -178,6 +178,7 @@ export class MenuBarComponent implements OnInit, OnDestroy {
       this.hideFileMenus();
     })
 
+    // TODO: Undoing Close All has a regression in it that breaks tabs
     this.editorControl.undoCloseAllFiles.subscribe(() => {
       if (this.previousSessionData.fileCount) {
         this.fileCount = this.previousSessionData.fileCount;
@@ -573,12 +574,13 @@ export class MenuBarComponent implements OnInit, OnDestroy {
       closeAllRef = this.snackBar.open('No tabs are open.', 'Close', { duration: MessageDuration.Short, panelClass: 'center' });
     } else {
       this.editorControl.closeAllFiles.next();
-      closeAllRef = this.snackBar.open('Closed.', 'Undo?', { duration: MessageDuration.Medium, panelClass: 'center' })
+      // closeAllRef = this.snackBar.open('Closed.', 'Undo?', { duration: MessageDuration.Medium, panelClass: 'center' })
     }
 
-    closeAllRef.onAction().subscribe(() => {
-      this.editorControl.undoCloseAllFiles.next();
-    });
+    // TODO: Undoing Close All has a regression in it that breaks tabs
+    // closeAllRef.onAction().subscribe(() => {
+    //   this.editorControl.undoCloseAllFiles.next();
+    // });
     this.editorControl.fetchActiveFile()
   }
 

diff --git a/webClient/src/app/shared/http/http.data.adapter.service.ts b/webClient/src/app/shared/http/http.data.adapter.service.ts
@@ -99,7 +99,7 @@ export class DataAdapterService {
 
   convertDatasetContent(responseData: any): { contents: string, etag: string } {
     return {
-      contents: JSON.parse(responseData).records.filter(function(record){return record.length > 0}).map(function(record){return record.trim()}).join("\n"),
+      contents: JSON.parse(responseData).records.filter(function(record){return record.length > 0}).map(function(record){return record.trimEnd()}).join("\n"),
       etag: JSON.parse(responseData).etag
     };
   }