Merge pull request #104 from 1000TurquoisePogs/feature/add-b64-mode

Adding b64 mode, restructuring unixfileuri for clarity
zowe · Apr 25, 2019 · 8694ec9 · 8694ec9
2 parents 4978e7f + 069c24e
commit 8694ec9
Show file tree

Hide file tree

Showing 11 changed files with 5,475 additions and 5,330 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
@@ -25,18 +25,20 @@ export class DsmUri implements ZLUX.UriBroker {
     relativePath;//suppress warning for now
     return "";
   }
-  unixFileUri(route: string, absPath: string, sourceEncoding?: string, targetEncoding?: string,
+  unixFileUri(route: string, absPath: string,
+              sourceEncodingOrOptions?: string|ZLUX.UnixFileUriOptions, targetEncoding?: string,
                newName?: string, forceOverwrite?: boolean, sessionID?: number,
-               lastChunk?: boolean): string {
+               lastChunk?: boolean, responseType?: string): string {
     //suppress warning for now
     route;
     absPath;
-    sourceEncoding;
+    sourceEncodingOrOptions;
     targetEncoding;
     newName;
     forceOverwrite;
     sessionID;
     lastChunk;
+    responseType;
     return "";
   }
   datasetContentsUri(relativePath: string): string {

diff --git a/bootstrap/src/uri/mvd-uri.ts b/bootstrap/src/uri/mvd-uri.ts
@@ -19,21 +19,36 @@ export class MvdUri implements ZLUX.UriBroker {
   rasUri(uri: string): string {
     return `${this.serverRootUri(`ras/${uri}`)}`;
   }
-  unixFileUri(route: string, absPath: string, sourceEncoding?: string, targetEncoding?: string,
-               newName?: string, forceOverwrite?: boolean, sessionID?: number,
-               lastChunk?: boolean): string {
+  unixFileUri(route: string, absPath: string,
+              sourceEncodingOrOptions?: string|ZLUX.UnixFileUriOptions, targetEncoding?: string,
+              newName?: string, forceOverwrite?: boolean, sessionID?: number,
+              lastChunk?: boolean, responseType?: string): string {
+    let options;
+    if (typeof sourceEncodingOrOptions == 'object') {
+      options = sourceEncodingOrOptions;
+    } else {
+      options = { sourceEncoding: sourceEncodingOrOptions,
+                  targetEncoding,
+                  newName,
+                  forceOverwrite,
+                  sessionID,
+                  lastChunk,
+                  responseType };
+    }
+    if (!options.responseType) {
+      options.responseType = 'raw';
+    }
+
+    let paramArray = new Array<string>();
+    (Object as any).entries(options).forEach(([key,value]:any[])=>{
+      if (value !== undefined) {
+        paramArray.push(`${key}=${value}`);
+      }
+    });
+    let params = this.createParamURL(paramArray);
     let routeParam = route;
     let absPathParam = absPath;
 
-    let sourceEncodingParam = sourceEncoding ? 'sourceEncoding=' + sourceEncoding : '';
-    let targetEncodingParam = targetEncoding ? 'targetEncoding=' + targetEncoding : '';
-    let newNameParam = newName ? 'newName=' + newName : '';
-    let forceOverwriteParam = forceOverwrite ? 'forceOverwrite=' + forceOverwrite : '';
-    let lastChunkParam = lastChunk ? 'lastChunk=' + lastChunk : ''; 
-    let sessionIDParam = sessionID ? 'sessionID=' + sessionID : '';
-    let paramArray = [sourceEncodingParam, targetEncodingParam, newNameParam, forceOverwriteParam, lastChunkParam, sessionIDParam];
-    let params = this.createParamURL(paramArray);
-
     return `${this.serverRootUri(`unixfile/${routeParam}/${absPathParam}${params}`)}`;
   }
   datasetContentsUri(dsn: string): string {

diff --git a/system-apps/app-prop-viewer/pluginDefinition.json b/system-apps/app-prop-viewer/pluginDefinition.json
@@ -1,7 +1,7 @@
 {
   "identifier": "org.zowe.zlux.appmanager.app.propview",
   "apiVersion": "1.0.0",
-  "pluginVersion": "1.0.0",
+  "pluginVersion": "1.0.1",
   "pluginType": "application",
   "isSystemPlugin":true,
   "webContent": {
@@ -15,9 +15,7 @@
     "descriptionDefault": "Zowe Viewer",
     "defaultWindowStyle": {
       "width": 350,
-      "height": 450,
-      "x": 0,
-      "y": 0
+      "height": 450
     }
   }
 }