From e0a01f5c0b4e6716aff345ab3cb7e00610208ebb Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Tue, 30 Jul 2024 13:14:38 +0530 Subject: [PATCH 1/4] Creating a separate const file --- .../stages/progress/progressConstants.ts | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 src/renderer/components/stages/progress/progressConstants.ts diff --git a/src/renderer/components/stages/progress/progressConstants.ts b/src/renderer/components/stages/progress/progressConstants.ts new file mode 100644 index 00000000..5fb6e2fe --- /dev/null +++ b/src/renderer/components/stages/progress/progressConstants.ts @@ -0,0 +1,130 @@ +/* + * This program and the accompanying materials are made available under the terms of the + * Eclipse Public License v2.0 which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-v20.html + * + * SPDX-License-Identifier: EPL-2.0 + * + * Copyright Contributors to the Zowe Project. + */ + +import { ProgressState, PlanningState, InstallationType, ActiveState, DatasetInstallationState, InitSubStepsState, CertInitSubStepsState, PlanningValidationDetails, SkipState, InstallationArgs, DownloadUnpaxState } from "../../../../types/stateInterfaces"; + +export const initProgressStatus: ProgressState = { + connectionStatus: false, + planningStatus: false, + installationTypeStatus: false, + downloadUnpaxStatus: false, + initializationStatus: false, + datasetInstallationStatus: false, + networkingStatus: false, + apfAuthStatus: false, + securityStatus: false, + stcsStatus: false, + certificateStatus: false, + vsamStatus: false, + launchConfigStatus: false, + reviewStatus: false, +} + +export const initInstallationTypeStatus: InstallationType = { + installationType: 'download', + licenseAgreement: false, + userUploadedPaxPath: '', +} + +export const initDownloadUnpaxStatus: DownloadUnpaxState = { + uploadYaml: false, + download: false, + upload: false, + unpax: false, + getExampleYaml: false, + getSchemas: false, +} + +export const initActiveStatus: ActiveState = { + activeStepIndex: 0, + isSubStep: false, + activeSubStepIndex: 0, +} + +export const initPlanningStageStatus: PlanningState = { + jobStatement: '', + isJobStatementValid: false, + isLocationValid: false, +} + +export const initDatasetInstallationStatus: DatasetInstallationState = { + uploadYaml: false, + install: false, + initMVS: false +} + +export const initApfAuthStatus: InitSubStepsState = { + writeYaml: false, + uploadYaml: false, + success: false +} + +export const initSecurityInitStatus: InitSubStepsState = { + writeYaml: false, + uploadYaml: false, + success: false +} + +export const initStcsInitStatus: InitSubStepsState = { + writeYaml: false, + uploadYaml: false, + success: false +} + +export const initCertificateInitStatus: CertInitSubStepsState = { + writeYaml: false, + uploadYaml: false, + zweInitCertificate: false +} + +export const initVsamInitStatus: InitSubStepsState = { + writeYaml: false, + uploadYaml: false, + success: false +} + +export const initPlanningValidationDetailsStatus: PlanningValidationDetails = { + javaVersion: '', + nodeVersion: '', + spaceAvailableMb: '', + error: '' +} + +export const initStepSkipStatus: SkipState = { + downloadUnpax: false, + datasetInstallation: false, + networking: false, + apfAuth: false, + security: false, + certificate: false, + vsam: false, + launchConfig: false +} + +export const initInstallationArgsStatus: InstallationArgs = { + installationDir: '', + workspaceDir: '', + logDir:'', + extensionDir:'', + installationType: 'download', + userUploadedPaxPath: '', + downloadDir: '', + javaHome: '', + nodeHome: '', + setupConfig: {}, + jobName: 'ZWE1SV', + jobPrefix: 'ZWE1', + rbacProfile: '1', + cookieId: '1', + zosmfHost: '', + zosmfPort: '443', + zosmfApplId: 'IZUDFLT', + dryRunMode:false +} \ No newline at end of file From 6f611315447c08bc8ad1046ae4baad162bd5918f Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Tue, 30 Jul 2024 13:26:45 +0530 Subject: [PATCH 2/4] More code optimizations Signed-off-by: Sakshi Bobade --- .../stages/progress/progressConstants.ts | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/renderer/components/stages/progress/progressConstants.ts b/src/renderer/components/stages/progress/progressConstants.ts index 5fb6e2fe..04609c02 100644 --- a/src/renderer/components/stages/progress/progressConstants.ts +++ b/src/renderer/components/stages/progress/progressConstants.ts @@ -60,23 +60,19 @@ export const initDatasetInstallationStatus: DatasetInstallationState = { initMVS: false } -export const initApfAuthStatus: InitSubStepsState = { +const initSubStepsDefault: InitSubStepsState = { writeYaml: false, uploadYaml: false, - success: false -} + success: false, +}; -export const initSecurityInitStatus: InitSubStepsState = { - writeYaml: false, - uploadYaml: false, - success: false -} +export const initApfAuthStatus: InitSubStepsState = { ...initSubStepsDefault }; -export const initStcsInitStatus: InitSubStepsState = { - writeYaml: false, - uploadYaml: false, - success: false -} +export const initSecurityInitStatus: InitSubStepsState = { ...initSubStepsDefault }; + +export const initStcsInitStatus: InitSubStepsState = { ...initSubStepsDefault }; + +export const initVsamInitStatus: InitSubStepsState = { ...initSubStepsDefault }; export const initCertificateInitStatus: CertInitSubStepsState = { writeYaml: false, @@ -84,12 +80,6 @@ export const initCertificateInitStatus: CertInitSubStepsState = { zweInitCertificate: false } -export const initVsamInitStatus: InitSubStepsState = { - writeYaml: false, - uploadYaml: false, - success: false -} - export const initPlanningValidationDetailsStatus: PlanningValidationDetails = { javaVersion: '', nodeVersion: '', @@ -127,4 +117,4 @@ export const initInstallationArgsStatus: InstallationArgs = { zosmfPort: '443', zosmfApplId: 'IZUDFLT', dryRunMode:false -} \ No newline at end of file +} From ed4aa03624c289e2b8c8d0e5d5afc4512b901ac1 Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Tue, 30 Jul 2024 13:43:47 +0530 Subject: [PATCH 3/4] Updatig the stageProgressSttaus --- .../stages/progress/StageProgressStatus.ts | 138 +++--------------- 1 file changed, 18 insertions(+), 120 deletions(-) diff --git a/src/renderer/components/stages/progress/StageProgressStatus.ts b/src/renderer/components/stages/progress/StageProgressStatus.ts index 592460c4..85fa0c75 100644 --- a/src/renderer/components/stages/progress/StageProgressStatus.ts +++ b/src/renderer/components/stages/progress/StageProgressStatus.ts @@ -10,126 +10,24 @@ import { flatten, unflatten } from 'flat'; import { ProgressState, PlanningState, InstallationType, ActiveState, DatasetInstallationState, InitSubStepsState, CertInitSubStepsState, PlanningValidationDetails, SkipState, InstallationArgs, DownloadUnpaxState} from '../../../../types/stateInterfaces'; -import { stages } from '../../configuration-wizard/Wizard'; - -const installationTypeStatus: InstallationType = { - installationType: 'download', - licenseAgreement: false, - userUploadedPaxPath: '', -} - -export const downloadUnpaxStatus: DownloadUnpaxState = { - uploadYaml: false, - download: false, - upload: false, - unpax: false, - getExampleYaml: false, - getSchemas: false, -} - -const progressStatus: ProgressState = { - connectionStatus: false, - planningStatus: false, - installationTypeStatus: false, - downloadUnpaxStatus: false, - initializationStatus: false, - datasetInstallationStatus: false, - networkingStatus: false, - apfAuthStatus: false, - securityStatus: false, - stcsStatus: false, - certificateStatus: false, - vsamStatus: false, - launchConfigStatus: false, - reviewStatus: false, -} - -const activeStatus: ActiveState = { - activeStepIndex: 0, - isSubStep: false, - activeSubStepIndex: 0, -}; - -const planningStageStatus: PlanningState = { - jobStatement: '', - isJobStatementValid: false, - isLocationValid: false, -} - -export const datasetInstallationStatus: DatasetInstallationState = { - uploadYaml: false, - install: false, - initMVS: false -} - -const apfAuthStatus: InitSubStepsState = { - writeYaml: false, - uploadYaml: false, - success: false -} - -const securityInitStatus: InitSubStepsState = { - writeYaml: false, - uploadYaml: false, - success: false -} - -const stcsInitStatus: InitSubStepsState = { - writeYaml: false, - uploadYaml: false, - success: false -} - -const certificateInitStatus: CertInitSubStepsState = { - writeYaml: false, - uploadYaml: false, - zweInitCertificate: false -} - -const vsamInitStatus: InitSubStepsState = { - writeYaml: false, - uploadYaml: false, - success: false -} - -const planningValidationDetailsStatus: PlanningValidationDetails = { - javaVersion: '', - nodeVersion: '', - spaceAvailableMb: '', - error: '' -} - -const stepSkipStatus: SkipState = { - downloadUnpax: false, - datasetInstallation: false, - networking: false, - apfAuth: false, - security: false, - certificate: false, - vsam: false, - launchConfig: false -} - -const installationArgsStatus: InstallationArgs = { - installationDir: '', - workspaceDir: '', - logDir:'', - extensionDir:'', - installationType: 'download', - userUploadedPaxPath: '', - downloadDir: '', - javaHome: '', - nodeHome: '', - setupConfig: {}, - jobName: 'ZWE1SV', - jobPrefix: 'ZWE1', - rbacProfile: '1', - cookieId: '1', - zosmfHost: '', - zosmfPort: '443', - zosmfApplId: 'IZUDFLT', - dryRunMode:false -} +import { initProgressStatus, initInstallationTypeStatus, initDownloadUnpaxStatus, initActiveStatus, initPlanningStageStatus, initDatasetInstallationStatus, initApfAuthStatus, initSecurityInitStatus, initStcsInitStatus, initCertificateInitStatus, initVsamInitStatus, initPlanningValidationDetailsStatus, initStepSkipStatus, initInstallationArgsStatus } from './progressConstants'; + + + +let installationTypeStatus: InstallationType = { ...initInstallationTypeStatus }; +export let downloadUnpaxStatus: DownloadUnpaxState = { ...initDownloadUnpaxStatus }; +let progressStatus: ProgressState = { ...initProgressStatus }; +let activeStatus: ActiveState = { ...initActiveStatus }; +let planningStageStatus: PlanningState = { ...initPlanningStageStatus }; +export let datasetInstallationStatus: DatasetInstallationState = { ...initDatasetInstallationStatus }; +let apfAuthStatus: InitSubStepsState = { ...initApfAuthStatus }; +let securityInitStatus: InitSubStepsState = { ...initSecurityInitStatus }; +let stcsInitStatus: InitSubStepsState = { ...initStcsInitStatus }; +let certificateInitStatus: CertInitSubStepsState = { ...initCertificateInitStatus }; +let vsamInitStatus: InitSubStepsState = { ...initVsamInitStatus }; +let planningValidationDetailsStatus: PlanningValidationDetails = { ...initPlanningValidationDetailsStatus }; +let stepSkipStatus: SkipState = { ...initStepSkipStatus }; +let installationArgsStatus: InstallationArgs = { ...initInstallationArgsStatus }; let progressStateKey = 'stage_progress'; let activeStateKey = 'active_state'; From 8e0c854c5b0b85f322e4d680d6c8dc73ebdbfde1 Mon Sep 17 00:00:00 2001 From: Sakshi Bobade Date: Tue, 30 Jul 2024 20:17:25 +0530 Subject: [PATCH 4/4] White spaces Signed-off-by: Sakshi Bobade --- src/renderer/components/stages/progress/StageProgressStatus.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/renderer/components/stages/progress/StageProgressStatus.ts b/src/renderer/components/stages/progress/StageProgressStatus.ts index 85fa0c75..8f427043 100644 --- a/src/renderer/components/stages/progress/StageProgressStatus.ts +++ b/src/renderer/components/stages/progress/StageProgressStatus.ts @@ -12,8 +12,6 @@ import { flatten, unflatten } from 'flat'; import { ProgressState, PlanningState, InstallationType, ActiveState, DatasetInstallationState, InitSubStepsState, CertInitSubStepsState, PlanningValidationDetails, SkipState, InstallationArgs, DownloadUnpaxState} from '../../../../types/stateInterfaces'; import { initProgressStatus, initInstallationTypeStatus, initDownloadUnpaxStatus, initActiveStatus, initPlanningStageStatus, initDatasetInstallationStatus, initApfAuthStatus, initSecurityInitStatus, initStcsInitStatus, initCertificateInitStatus, initVsamInitStatus, initPlanningValidationDetailsStatus, initStepSkipStatus, initInstallationArgsStatus } from './progressConstants'; - - let installationTypeStatus: InstallationType = { ...initInstallationTypeStatus }; export let downloadUnpaxStatus: DownloadUnpaxState = { ...initDownloadUnpaxStatus }; let progressStatus: ProgressState = { ...initProgressStatus };