Merge pull request #315 from zowe/encodeURL

encoding the data content in the URL
zowe · Jan 6, 2023 · 8954c67 · 8954c67
2 parents 2261a04 + 864a1cf
commit 8954c67
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Bugfix: Added a few rules for JCL syntax highlighter
 - Bugfix: Set USS path to correct directory, when opening the directory or file in new browser tab respectively
 - Added the feature to copy the line content and copy URL link to open a file at a specific line
+- Bugfix: Getting 400 BAD REQUEST in browser when opening the file or dataset in a new browser tab
 
 ## `3.0.0`
 

diff --git a/webClient/package-lock.json b/webClient/package-lock.json
diff --git a/webClient/package.json b/webClient/package.json
@@ -35,7 +35,7 @@
     "@angular/router": "~12.0.0",
     "@types/node": "~8.10.59",
     "@zlux/widgets": "git+https://github.com/zowe/zlux-widgets.git#feature/upgrade-angular",
-    "@zowe/zlux-angular-file-tree": "1.2.0-RC2",
+    "@zowe/zlux-angular-file-tree": "1.3.0",
     "angular2-template-loader": "~0.6.2",
     "codelyzer": "~5.1.0",
     "compression-webpack-plugin": "~6.1.1",

diff --git a/webClient/src/app/editor/code-editor/monaco/monaco.component.ts b/webClient/src/app/editor/code-editor/monaco/monaco.component.ts
@@ -257,10 +257,10 @@ export class MonacoComponent implements OnInit, OnChanges {
       let link = '';
       if(activeFile.model.isDataset){
         filePath = activeFile.model.path;
-        link = `${window.location.origin}${window.location.pathname}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:{"type":"openDataset","name":"${encodeURIComponent(filePath)}","lines":"${lines}","toggleTree":true}`;
+        link = `${window.location.origin}${window.location.pathname}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:${encodeURIComponent(`{"type":"openDataset","name":"${filePath}","lines":"${lines}","toggleTree":true}`)}`;
       } else {
         filePath = activeFile.model.path + "/" + activeFile.model.name;
-        link = `${window.location.origin}${window.location.pathname}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:{"type":"openFile","name":"${encodeURIComponent(filePath)}","lines":"${lines}","toggleTree":true}`;
+        link = `${window.location.origin}${window.location.pathname}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:${encodeURIComponent(`{"type":"openFile","name":"${filePath}","lines":"${lines}","toggleTree":true}`)}`;
       }
       navigator.clipboard.writeText(link).then(() => {
         this.log.debug("Permalink copied to clipboard");

diff --git a/webClient/src/app/editor/project-tree/project-tree.component.ts b/webClient/src/app/editor/project-tree/project-tree.component.ts
@@ -246,11 +246,11 @@ export class ProjectTreeComponent {
   onOpenInNewTab($event: any){
     if ($event.data === 'File'){
       const baseURI = `${window.location.origin}${window.location.pathname}`;
-      const newWindow = window.open(`${baseURI}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:{"type":"openFile","name":"${encodeURIComponent($event.path)}","toggleTree":true}`, '_blank');
+      const newWindow = window.open(`${baseURI}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:${encodeURIComponent(`{"type":"openFile","name":"${$event.path}","toggleTree":true}`)}`, '_blank');
       newWindow.focus();
     } else{
       const baseURI = `${window.location.origin}${window.location.pathname}`;
-      const newWindow = window.open(`${baseURI}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:{"type":"openDataset","name":"${encodeURIComponent($event.data.path)}","toggleTree":true}`, '_blank');
+      const newWindow = window.open(`${baseURI}?pluginId=${this.pluginDefinition.getBasePlugin().getIdentifier()}:data:${encodeURIComponent(`{"type":"openDataset","name":"${$event.data.path}","toggleTree":true}`)}`, '_blank');
       newWindow.focus();
     }
 }