Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/renderer/components/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const cards: Array<ICard> = [
},
{
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,
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/CachingService.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/Certificates.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/InitApfAuth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/LaunchConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/Networking.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/components/stages/Planning.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 : '' )));
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/Security.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/Stcs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/stages/Unpax.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/stages/connection/Connection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const InstallationType = () => {
</Typography>
<Button style={{ color: 'white', backgroundColor: '#1976d2', fontSize: 'small', marginTop: '16px'}} type="submit" onClick={e => {
e.preventDefault();
if(!installationArgs.dryRunMode){
if(!installationArgs.previewMode){
window.electron.ipcRenderer.uploadPax().then((res: any) => {
if(res.filePaths && res.filePaths[0] != undefined){
setPaxPath(res.filePaths[0]);
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/components/stages/installation/Installation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const Installation = () => {
if(nextPosition) nextPosition.scrollIntoView({behavior: 'smooth'});
}

if(installationArgs != undefined && !installationArgs.dryRunMode){
if(installationArgs != undefined && !installationArgs.previewMode){
window.electron.ipcRenderer.getConfig().then((res: IResponse) => {
function mergeInstallationArgsAndYaml(yaml: any){
let yamlObj = JSON.parse(JSON.stringify(yaml));
Expand Down Expand Up @@ -271,7 +271,7 @@ const Installation = () => {
event.preventDefault();
dispatch(setLoading(true));
// FIXME: runtime dir is hardcoded, fix there and in InstallActions.ts - Unpax and Install functions
if(!installationArgs.dryRunMode){
if(!installationArgs.previewMode){
Promise.all([
window.electron.ipcRenderer.setConfigByKeyAndValidate('zowe.setup.dataset', setupYaml),
]).then(async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const initialState: InstallationState = {
zosmfHost: '',
zosmfPort: '443',
zosmfApplId: 'IZUDFLT',
dryRunMode: false
previewMode: false
},
zoweVersion: '',
licenseAgreement: getInstallationTypeStatus()?.licenseAgreement || false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const installationArgsStatus: InstallationArgs = {
zosmfHost: '',
zosmfPort: '443',
zosmfApplId: 'IZUDFLT',
dryRunMode:false
previewMode:false
}

let progressStateKey = 'stage_progress';
Expand Down
2 changes: 1 addition & 1 deletion src/types/stateInterfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export interface InstallationArgs {
zosmfHost: string,
zosmfPort: string,
zosmfApplId: string,
dryRunMode: boolean,
previewMode: boolean,
}


Expand Down
Loading