diff --git a/src/renderer/components/Home.tsx b/src/renderer/components/Home.tsx index 1499e9ca..ea7b6614 100644 --- a/src/renderer/components/Home.tsx +++ b/src/renderer/components/Home.tsx @@ -51,7 +51,7 @@ const cards: Array = [ }, { id: "dry run", - name: "Zowe Installation Dry Run", + name: "Zowe Installation Preview", description: "It will guide you through the installation steps without running the installation.", link: "/wizard", media: installationDryImg, @@ -92,9 +92,9 @@ const Home = () => { const handleClick = () => { let newInstallationArgs = installationSlice.getInitialState().installationArgs; if (id === "install") { - newInstallationArgs = {...newInstallationArgs, dryRunMode: false}; + newInstallationArgs = {...newInstallationArgs, previewMode: false}; } else if (id === "dry run") { - newInstallationArgs = {...newInstallationArgs, dryRunMode: true}; + newInstallationArgs = {...newInstallationArgs, previewMode: true}; } dispatch(setYaml(FALLBACK_YAML)); dispatch(setInstallationArgs(newInstallationArgs)); diff --git a/src/renderer/components/stages/CachingService.tsx b/src/renderer/components/stages/CachingService.tsx index 2991c55e..ff131cf6 100644 --- a/src/renderer/components/stages/CachingService.tsx +++ b/src/renderer/components/stages/CachingService.tsx @@ -217,7 +217,7 @@ const CachingService = () => { updateProgress(false); event.preventDefault(); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.initVsamButtonOnClick(connectionArgs, installationArgs).then((res: IResponse) => { updateProgress(res.status); if(res.error) { diff --git a/src/renderer/components/stages/Certificates.tsx b/src/renderer/components/stages/Certificates.tsx index 148cd9c6..cd216abc 100644 --- a/src/renderer/components/stages/Certificates.tsx +++ b/src/renderer/components/stages/Certificates.tsx @@ -176,7 +176,7 @@ const Certificates = () => { setInitClicked(true); updateProgress(false); event.preventDefault(); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.initCertsButtonOnClick(connectionArgs, installationArgs).then((res: IResponse) => { clearInterval(timer); updateProgress(res.status); diff --git a/src/renderer/components/stages/InitApfAuth.tsx b/src/renderer/components/stages/InitApfAuth.tsx index 7178714f..cbde156e 100644 --- a/src/renderer/components/stages/InitApfAuth.tsx +++ b/src/renderer/components/stages/InitApfAuth.tsx @@ -177,7 +177,7 @@ const InitApfAuth = () => { setInitClicked(true); updateProgress(false); event.preventDefault(); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.apfAuthButtonOnClick(connectionArgs, installationArgs).then((res: IResponse) => { // Some parts of Wizard pass the response as a string directly into the object if (res.status == false && typeof res.details == "string") { diff --git a/src/renderer/components/stages/LaunchConfig.tsx b/src/renderer/components/stages/LaunchConfig.tsx index 977b6f87..d4668c26 100644 --- a/src/renderer/components/stages/LaunchConfig.tsx +++ b/src/renderer/components/stages/LaunchConfig.tsx @@ -529,7 +529,7 @@ const LaunchConfig = () => { updateProgress(false); dispatch(setLaunchConfigStatus(false)); alertEmitter.emit('showAlert', 'Uploading yaml...', 'info'); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.uploadLatestYaml(connectionArgs, installationArgs).then((res: IResponse) => { if(res && res.status) { updateProgress(true); diff --git a/src/renderer/components/stages/Networking.tsx b/src/renderer/components/stages/Networking.tsx index 46200a8d..4dd70529 100644 --- a/src/renderer/components/stages/Networking.tsx +++ b/src/renderer/components/stages/Networking.tsx @@ -627,7 +627,7 @@ const Networking = () => { e.preventDefault(); updateProgress(false); alertEmitter.emit('showAlert', 'Uploading yaml...', 'info'); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.uploadLatestYaml(connectionArgs, installationArgs).then((res: IResponse) => { if(res && res.status) { updateProgress(true); diff --git a/src/renderer/components/stages/Planning.tsx b/src/renderer/components/stages/Planning.tsx index 819ab92f..f28f6b03 100644 --- a/src/renderer/components/stages/Planning.tsx +++ b/src/renderer/components/stages/Planning.tsx @@ -55,7 +55,7 @@ const Planning = () => { const requiredSpace = 1300; //in megabytes useEffect(() => { - if (!installationArgs.dryRunMode) { // REVIEW: Does dry run even makes sense in this step? What do we want to get as a result? + if (!installationArgs.previewMode) { // FIXME: getZoweFullVersion should be moved to InstallTypeSelection, makes no sense here anymore window.electron.ipcRenderer.getZoweFullVersion().then((res: IResponse) => dispatch(setZoweVersion(res.status ? res.details : '' ))); @@ -130,7 +130,7 @@ const Planning = () => { alertEmitter.emit('hideAlert'); dispatch(setLoading(true)); - if (!installationArgs.dryRunMode) { + if (!installationArgs.previewMode) { window.electron.ipcRenderer.saveJobHeader(jobStatementValue) .then(() => getENVVars()) .then((res: IResponse) => { @@ -193,7 +193,7 @@ const Planning = () => { // TODO: Possible feature for future: add to checkDir to see if existing Zowe install exists. // Then give the user ability to use existing zowe.yaml to auto-fill in fields from Wizard - if (!installationArgs.dryRunMode) { + if (!installationArgs.previewMode) { Promise.all([ window.electron.ipcRenderer.checkJava(connectionArgs, localYaml?.java?.home), diff --git a/src/renderer/components/stages/Security.tsx b/src/renderer/components/stages/Security.tsx index f2b568e0..4241e5e5 100644 --- a/src/renderer/components/stages/Security.tsx +++ b/src/renderer/components/stages/Security.tsx @@ -174,7 +174,7 @@ const Security = () => { setInitClicked(true); updateProgress(false); event.preventDefault(); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.initSecurityButtonOnClick(connectionArgs, installationArgs).then((res: IResponse) => { // Some parts of Wizard pass the response as a string directly into the object if (res.status == false && typeof res.details == "string") { diff --git a/src/renderer/components/stages/Stcs.tsx b/src/renderer/components/stages/Stcs.tsx index acc661b0..1144f351 100644 --- a/src/renderer/components/stages/Stcs.tsx +++ b/src/renderer/components/stages/Stcs.tsx @@ -194,7 +194,7 @@ const Stcs = () => { updateProgress(false); event.preventDefault(); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.initStcsButtonOnClick(connectionArgs, installationArgs).then((res: IResponse) => { updateProgress(res.status); if(res.error) { diff --git a/src/renderer/components/stages/Unpax.tsx b/src/renderer/components/stages/Unpax.tsx index 7133f02c..07eb1b0a 100644 --- a/src/renderer/components/stages/Unpax.tsx +++ b/src/renderer/components/stages/Unpax.tsx @@ -165,7 +165,7 @@ const Unpax = () => { updateProgress(false); setShowProgress(true); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.downloadButtonOnClick(connectionArgs, {...installationArgs, userUploadedPaxPath: paxPath}, version).then((res: IResponse) => { if(!res.status){ //errors during runInstallation() alertEmitter.emit('showAlert', res.details, 'error'); @@ -214,7 +214,7 @@ const Unpax = () => { setShowProgress(true); updateProgress(false); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer.fetchExampleYamlBtnOnClick(connectionArgs, installationArgs).then((res: IResponse) => { setDownloadUnpaxProgress({ ...downloadUnpaxProgress, diff --git a/src/renderer/components/stages/connection/Connection.tsx b/src/renderer/components/stages/connection/Connection.tsx index 0d6e6096..fc3b80db 100644 --- a/src/renderer/components/stages/connection/Connection.tsx +++ b/src/renderer/components/stages/connection/Connection.tsx @@ -145,7 +145,7 @@ const FTPConnectionForm = () => { alertEmitter.emit('hideAlert'); dispatch(setLoading(true)); - if(!installationArgs.dryRunMode){ + if(!installationArgs.previewMode){ window.electron.ipcRenderer .connectionButtonOnClick(connectionArgs) .then((res: IResponse) => { diff --git a/src/renderer/components/stages/installation/InstallTypeSelection.tsx b/src/renderer/components/stages/installation/InstallTypeSelection.tsx index 1facfc7a..757c5e1e 100644 --- a/src/renderer/components/stages/installation/InstallTypeSelection.tsx +++ b/src/renderer/components/stages/installation/InstallTypeSelection.tsx @@ -154,7 +154,7 @@ const InstallationType = () => {