Zen will now upload the user selected pax if they have selected that …

…installation type option. Add conditionals to current download and upload operations

Signed-off-by: Timothy Gerstel <[email protected]>

src/actions/InstallationHandler.ts

@@ -21,7 +21,7 @@ class Installation {
 
   public async runInstallation (
     connectionArgs: IIpcConnectionArgs, 
-    installationArgs: {installationDir: string, installationType: string},
+    installationArgs: {installationDir: string, installationType: string, userUploadedPaxPath: string},
     version: string
   ): Promise<IResponse> {
 
@@ -43,7 +43,13 @@ class Installation {
       }
 
       console.log("uploading...");
-      const upload = await this.uploadPax(connectionArgs, installationArgs.installationDir);
+      let upload;
+      if(installationArgs.installationType === "upload"){
+        //upload the PAX the user selected in the "Install Type" stage to the installation dir (from the planning stage)
+        upload = await new FileTransfer().upload(connectionArgs, installationArgs.userUploadedPaxPath, path.join(installationArgs.installationDir, "zowe.pax"), DataType.BINARY)
+      } else if (installationArgs.installationType === "download"){
+        upload = await this.uploadPax(connectionArgs, installationArgs.installationDir);
+      }
       ProgressStore.set('installation.upload', upload.status);
 
       console.log("unpaxing...");

src/renderer/components/stages/installation/installationSlice.ts

@@ -17,6 +17,7 @@ interface InstallationState {
     installationDir: string;
     installationType?: string;
     downloadDir: string;
+    userUploadedPaxPath?: string;
     smpeDir?: string;
     javaHome: string;
     nodeHome: string;
@@ -30,6 +31,7 @@ const initialState: InstallationState = {
   installationArgs: {
     installationDir: '',
     installationType: 'download',
+    userUploadedPaxPath: '',
     smpeDir: '',
     downloadDir: '',
     javaHome: '',