Merge staging (v1.4.0)

zowe · Jul 18, 2019 · 5302b18 · 5302b18
2 parents eb4bc57 + aaf31dc
commit 5302b18
Show file tree

Hide file tree

Showing 21 changed files with 887 additions and 1,218 deletions.
diff --git a/bootstrap/package-lock.json b/bootstrap/package-lock.json
diff --git a/bootstrap/src/uri/dsm-uri.ts b/bootstrap/src/uri/dsm-uri.ts
@@ -41,6 +41,9 @@ export class DsmUri implements ZLUX.UriBroker {
     responseType;
     return "";
   }
+  omvsSegmentUri(): string {
+    return `${this.serverRootUri('omvs')}`;
+  }
   datasetContentsUri(relativePath: string): string {
     relativePath;//suppress warning for now
     return "";

diff --git a/bootstrap/src/uri/mvd-uri.ts b/bootstrap/src/uri/mvd-uri.ts
@@ -47,12 +47,15 @@ export class MvdUri implements ZLUX.UriBroker {
     });
     let params = this.createParamURL(paramArray);
     let routeParam = route;
-    let absPathParam = absPath;
+    let absPathParam = encodeURIComponent(absPath);
 
     return `${this.serverRootUri(`unixfile/${routeParam}/${absPathParam}${params}`)}`;
   }
+  omvsSegmentUri(): string {
+    return `${this.serverRootUri('omvs')}`;
+  }
   datasetContentsUri(dsn: string): string {
-    return `${this.serverRootUri(`datasetContents/${dsn}`)}`;
+    return `${this.serverRootUri(`datasetContents/${encodeURIComponent(dsn)}`)}`;
   }
   VSAMdatasetContentsUri(dsn: string, closeAfter?: boolean): string {
     let closeAfterParam = closeAfter ? '?closeAfter=' + closeAfter : '';