From 824a5ba1aaee835ec92b0561e7372078af1b9229 Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Tue, 24 Oct 2023 21:11:01 +0530 Subject: [PATCH 1/6] Updating planning stage --- .../stages/installation/installationSlice.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/renderer/components/stages/installation/installationSlice.ts b/src/renderer/components/stages/installation/installationSlice.ts index bd363319..a984b193 100644 --- a/src/renderer/components/stages/installation/installationSlice.ts +++ b/src/renderer/components/stages/installation/installationSlice.ts @@ -15,6 +15,9 @@ interface InstallationState { installationStatus: boolean; installationArgs: { installationDir: string; + workspaceDir: string; + logDir: string, + extentionDir: string, installationType?: string; downloadDir: string; userUploadedPaxPath?: string; @@ -22,6 +25,13 @@ interface InstallationState { javaHome: string; nodeHome: string; setupConfig: any; + jobName: string; + jobPrefix: string; + rbacProfile: string; + cookieId: string; + zosmfHost: string, + zosmfPort: string, + zosmfApplId: string }; zoweVersion: string; } @@ -30,6 +40,9 @@ const initialState: InstallationState = { installationStatus: false, installationArgs: { installationDir: '', + workspaceDir: '', + logDir:'', + extentionDir:'', installationType: 'download', userUploadedPaxPath: '', smpeDir: '', @@ -37,6 +50,13 @@ const initialState: InstallationState = { javaHome: '', nodeHome: '', setupConfig: {}, + jobName: '', + jobPrefix: '', + rbacProfile: '', + cookieId: '', + zosmfHost: '', + zosmfPort: '', + zosmfApplId: '' }, zoweVersion: '', }; From bffe57cc87f7bbda593420f7575b80b6ffa1aaa6 Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Wed, 25 Oct 2023 14:12:28 +0530 Subject: [PATCH 2/6] add-fields --- src/renderer/components/stages/Planning.tsx | 132 +++++++++++++++++++- 1 file changed, 127 insertions(+), 5 deletions(-) diff --git a/src/renderer/components/stages/Planning.tsx b/src/renderer/components/stages/Planning.tsx index f773759c..6e0c6731 100644 --- a/src/renderer/components/stages/Planning.tsx +++ b/src/renderer/components/stages/Planning.tsx @@ -138,7 +138,8 @@ const Planning = () => { const installationArgs: any = useAppSelector(selectInstallationArgs); useEffect(() => { - dispatch(setNextStepEnabled(false)); + // dispatch(setNextStepEnabled(false)); + dispatch(setNextStepEnabled(true)); // FIXME: Add a popup warning in case failed to get config files // FIXME: Save yaml and schema on disk to not to pull it each time? // REVIEW: Replace JobStatement text area with set of text fields? @@ -183,7 +184,8 @@ const Planning = () => { }, []); useEffect(() => { - dispatch(setNextStepEnabled(jobHeaderSaved && locationsValidated)); + // dispatch(setNextStepEnabled(jobHeaderSaved && locationsValidated)); + dispatch(setNextStepEnabled(true)); }, [jobHeaderSaved, locationsValidated]); useEffect(() => { @@ -341,7 +343,7 @@ Please customize job statement below to match your system requirements. {`Now let's define general USS locations`} - - dispatch(setInstallationArgs({...installationArgs, workspaceDir: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, logDir: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, extentionDir: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, jobName: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, jobPrefix: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, rbacProfile: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, rbacProfile: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, zosmfHost: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, zosmfPort: e.target.value}))} + /> + + + dispatch(setInstallationArgs({...installationArgs, zosmfApplId: e.target.value}))} + /> + + + - Date: Mon, 30 Oct 2023 20:25:32 +0530 Subject: [PATCH 3/6] Updating the UI --- src/renderer/components/stages/Planning.tsx | 325 ++++++++++++-------- 1 file changed, 189 insertions(+), 136 deletions(-) diff --git a/src/renderer/components/stages/Planning.tsx b/src/renderer/components/stages/Planning.tsx index 6e0c6731..13ea839d 100644 --- a/src/renderer/components/stages/Planning.tsx +++ b/src/renderer/components/stages/Planning.tsx @@ -24,6 +24,7 @@ import { useAppDispatch, useAppSelector } from '../../hooks'; import { IResponse } from '../../../types/interfaces'; import Alert from "@mui/material/Alert"; import { alertEmitter } from "../Header"; +import { Checkbox, FormControlLabel } from "@mui/material"; const serverSchema = { "$schema": "https://json-schema.org/draft/2019-09/schema", @@ -133,6 +134,7 @@ const Planning = () => { const [jobStatementValidation, setJobStatementValidation] = useState(''); const [locationsValidated, setLocationsValidated] = useState(false); const [validationDetails, setValidationDetails] = useState({javaVersion: '', nodeVersion: '', spaceAvailableMb: '', error: ''}); + const [showZosmfAttributes, setShowZosmfAttributes] = useState(false); const zoweVersion = useAppSelector(selectZoweVersion); const installationArgs: any = useAppSelector(selectInstallationArgs); @@ -342,162 +344,213 @@ Please customize job statement below to match your system requirements. {`Now let's define general USS locations`} +
+
- dispatch(setInstallationArgs({...installationArgs, installationDir: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, installationDir: e.target.value}))} + /> +

Location for Zowe source files

+
- dispatch(setInstallationArgs({...installationArgs, workspaceDir: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, workspaceDir: e.target.value}))} + /> +

Location for Zowe workspace dir

+
- dispatch(setInstallationArgs({...installationArgs, logDir: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, logDir: e.target.value}))} + /> +

Location for Zowe Log dir

+
- dispatch(setInstallationArgs({...installationArgs, extentionDir: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, extentionDir: e.target.value}))} + /> +

Location for Zowe extention dir

+
- dispatch(setInstallationArgs({...installationArgs, jobName: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, rbacProfile: e.target.value}))} + /> +

An ID used for determining resource names used in RBAC authorization checks

+
+
+
- dispatch(setInstallationArgs({...installationArgs, jobPrefix: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, jobName: e.target.value}))} + /> +

Job name of Zowe primary ZWESLSTC started task.

+
- dispatch(setInstallationArgs({...installationArgs, rbacProfile: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, jobPrefix: e.target.value}))} + /> +

A short prefix to customize address spaces created by Zowe job.

+
- dispatch(setInstallationArgs({...installationArgs, rbacProfile: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, rbacProfile: e.target.value}))} + /> +

An ID that can be used by servers that distinguish their cookies from unrelated Zowe installs

+
- dispatch(setInstallationArgs({...installationArgs, zosmfHost: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, javaHome: e.target.value}))} + /> +

Location of Java in USS

+
- dispatch(setInstallationArgs({...installationArgs, zosmfPort: e.target.value}))} - /> - - - dispatch(setInstallationArgs({...installationArgs, zosmfApplId: e.target.value}))} - /> - - - dispatch(setInstallationArgs({...installationArgs, javaHome: e.target.value}))} - /> - - - dispatch(setInstallationArgs({...installationArgs, nodeHome: e.target.value}))} - /> +
+ dispatch(setInstallationArgs({...installationArgs, nodeHome: e.target.value}))} + /> +

Location for Zowe workspace dir

+
+
+
+ setShowZosmfAttributes(e.target.checked)} + /> + } + label="Set Zosmf Attributes" + /> + + {showZosmfAttributes && ( +
+
+ +
+ dispatch(setInstallationArgs({...installationArgs, zosmfHost: e.target.value}))} + /> +

Host or domain name of your z/OSMF instance.

+
+
+ +
+ dispatch(setInstallationArgs({...installationArgs, zosmfPort: e.target.value}))} + /> +

Port number of your z/OSMF instance.

+
+
+
+
+ +
+ dispatch(setInstallationArgs({...installationArgs, zosmfApplId: e.target.value}))} + /> +

Port number of your z/OSMF instance.

+ +
+
+
+
+ )} {locationsValidated ? : validationDetails.error ? null: null} From b4cd0e87e64b6636b2ad014a8f3fc8b339362e07 Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Mon, 30 Oct 2023 20:27:03 +0530 Subject: [PATCH 4/6] Resetting the code used for testing --- src/renderer/components/stages/Planning.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/renderer/components/stages/Planning.tsx b/src/renderer/components/stages/Planning.tsx index 13ea839d..3bd79575 100644 --- a/src/renderer/components/stages/Planning.tsx +++ b/src/renderer/components/stages/Planning.tsx @@ -140,8 +140,7 @@ const Planning = () => { const installationArgs: any = useAppSelector(selectInstallationArgs); useEffect(() => { - // dispatch(setNextStepEnabled(false)); - dispatch(setNextStepEnabled(true)); + dispatch(setNextStepEnabled(false)); // FIXME: Add a popup warning in case failed to get config files // FIXME: Save yaml and schema on disk to not to pull it each time? // REVIEW: Replace JobStatement text area with set of text fields? From e487fd30528a4cea703628577ebe1814415a0543 Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Mon, 30 Oct 2023 20:45:04 +0530 Subject: [PATCH 5/6] Minor UI enhancements --- src/renderer/components/stages/Planning.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/components/stages/Planning.tsx b/src/renderer/components/stages/Planning.tsx index 3bd79575..2e19c0cb 100644 --- a/src/renderer/components/stages/Planning.tsx +++ b/src/renderer/components/stages/Planning.tsx @@ -551,7 +551,7 @@ Please customize job statement below to match your system requirements. )} - + {locationsValidated ? : validationDetails.error ? null: null} From a8fd45a33dd7151ccb4df33b2b3f49f10d9497d5 Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Tue, 31 Oct 2023 14:27:12 +0530 Subject: [PATCH 6/6] Presetting some values --- src/renderer/components/stages/Planning.tsx | 2 +- .../components/stages/installation/installationSlice.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/renderer/components/stages/Planning.tsx b/src/renderer/components/stages/Planning.tsx index 2e19c0cb..de320400 100644 --- a/src/renderer/components/stages/Planning.tsx +++ b/src/renderer/components/stages/Planning.tsx @@ -351,7 +351,7 @@ Please customize job statement below to match your system requirements. id="installation-input" required style={{marginLeft: 0}} - label="Installation location" + label="Installation location (Runtime Directory)" variant="standard" value={installationArgs.installationDir} onChange={(e) => dispatch(setInstallationArgs({...installationArgs, installationDir: e.target.value}))} diff --git a/src/renderer/components/stages/installation/installationSlice.ts b/src/renderer/components/stages/installation/installationSlice.ts index a984b193..75114faf 100644 --- a/src/renderer/components/stages/installation/installationSlice.ts +++ b/src/renderer/components/stages/installation/installationSlice.ts @@ -50,10 +50,10 @@ const initialState: InstallationState = { javaHome: '', nodeHome: '', setupConfig: {}, - jobName: '', - jobPrefix: '', - rbacProfile: '', - cookieId: '', + jobName: 'ZWE1SV', + jobPrefix: 'ZWE1', + rbacProfile: '1', + cookieId: '1', zosmfHost: '', zosmfPort: '', zosmfApplId: ''