Remove ConfigService.ts, Enahance Certifcate Stage #114

timgerstel · 2024-01-30T06:41:50Z

Proposed changes

This PR combines these two PRs:

Type of change

Please delete options that are not relevant.

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Change in a documentation
Refactor the code
Chore, repository cleanup, updates the dependencies.
Breaking change (fix or feature that would cause existing functionality to not work as expected)

PR Checklist

Please delete options that are not relevant.

If the changes in this PR are meant for the next release / mainline, this PR targets a "staging" branch.
My code follows the style guidelines of this project (see: Contributing guideline)
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
New and existing unit tests pass locally with my changes
video or image is included if visual changes are made

My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works, or describe a test method below

Testing

Further comments

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…efactor and implement form change handler Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…unning zwe init certificates Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…ly and remove console logs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…recate ConfigurationStore somehow Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…ertificateStage Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…to cfgRefactorAndVerifyCerts Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

DivergentEuropeans · 2024-02-12T14:27:21Z

src/renderer/preload.ts

@@ -64,8 +64,11 @@ contextBridge.exposeInMainWorld('electron', {
    checkDirOrCreate(connectionArgs: IIpcConnectionArgs, location: string) {
      return ipcRenderer.invoke("check-dir-or-create", connectionArgs, location);
    },
-    installButtonOnClick(connectionArgs: IIpcConnectionArgs, installationArgs: {installDir: string, javaHome: string, nodeHome: string, installationType: string, userUploadedPaxPath: string, smpeDir: string}, version: string, zoweConfig: any) {
-      return ipcRenderer.invoke("install-mvs", connectionArgs, installationArgs, version, zoweConfig);
+    installButtonOnClick(connectionArgs: IIpcConnectionArgs, installationArgs: {installDir: string, javaHome: string, nodeHome: string, installationType: string, userUploadedPaxPath: string, smpeDir: string}, version: string, zoweConfig: any, skipDownload: boolean) {


what is this skipDownload stuff for? If it's for smpe, why don't we just check if smpeDir exists? Wasn't that the reason why we made that variable in the first place instead of setting installationDir = smpeDir and deleting smpeDir entirely

Also, it looks like it's never actually set any where, except 1 default
window.electron.ipcRenderer.installButtonOnClick(connectionArgs, installationArgs, version, yaml, skipDownload ?? false)

It was for QA testing, not a prod solution. It was so @struga0258 can skip the pax download process.

And its set here: https://github.com/zowe/zen/pull/114/files#diff-876487e16434db86af62a71372589b9b6ee12ec10cc731bc989c96eb78d3b17fR196

Oh I see. Yes, we need a better solution for the smpe step

DivergentEuropeans

we need a better solution for the smpe step/QA testing hack

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

DivergentEuropeans · 2024-03-06T16:39:31Z

src/actions/InstallActions.ts

@@ -35,11 +35,16 @@ export class InstallActions {
    }
  }

+  runZweInitCertificates(connectionArgs: IIpcConnectionArgs, 
+    installationArgs: {installationDir: string}, zoweConfig: any){
+      return new FTPInstallation().initCertificates(connectionArgs, installationArgs.installationDir, zoweConfig)


This doesn't seem right. It seems like

initCertificates( ) should should belong in Installation class, with initSecurity & the others +
initCertificates should be made public

change this to
return this.strategy.initCertificates(connectionArgs, installationArgs.installationDir, zoweConfig);

Also, the commands below don't include the Zwe part from method name so I guess we could remove that for organization's sake

DivergentEuropeans · 2024-03-06T16:41:55Z

src/actions/InstallationHandler.ts

+          return {status: false, details: `Error unpaxing Zowe archive: ${unpax.details}`};
+        }
+      } else {
+        download = upload = unpax = {status: true, details : ''}


Never seen that b4 for some reason, cool 👍

DivergentEuropeans · 2024-03-06T16:48:55Z

src/actions/InstallationHandler.ts

+      return ProgressStore.set('certificate.uploadYaml', false);;
+    }
+    ProgressStore.set('certificate.uploadYaml', uploadYaml.status);
+    const script = `cd ${installDir}/runtime/bin;\n./zwe init certificate --update-config -c ${installDir}/zowe.yaml`;


you no longer need "\n" as it's handled automatically however we do want to make sure we're using "&&" instead of ";"

DivergentEuropeans · 2024-03-06T16:52:03Z

src/main/index.ts

+    return res;
+  });
+
+  ipcMain.handle('zwe-init-certificates', async (event, connectionArgs, installationArgs, zoweConfig) => {


why does this have zwe-init-certificates but below is init-apf ?

…allation class Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

DivergentEuropeans

Changes addressed

timgerstel and others added 30 commits October 26, 2023 11:58

Script to submit zwe init certificates

08b8894

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

IPC handler to initiate zwe init certificates

a9c5090

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

InstallAction to run zwe init certificates

b033050

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Enhance certificates page to include zowe.verifyCertificates. TODO: r…

b19d6a5

…efactor and implement form change handler Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

ipc handler for zwe init certificaets button

e4b5cd0

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

zowe.verifyCertificates now updates properly in YAML and on UI

e875bcf

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Add function to set top level config items

54d1296

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Upload yaml after generation

2a76e94

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Use new configService to acquire latest yaml data from forms before r…

450cd0a

…unning zwe init certificates Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Refactor handleVerifyCertsChange to set form state, log errors proper…

65b378b

…ly and remove console logs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Re-add button to run 'zwe init certificates'

488c558

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

VSCode autofilled the wrong import path, sensational

6850b58

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Fix import path (thank you vs code)

9999bb9

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Add preventDefault to button click

04b82b2

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Add zoweConfig parameter to pass latest config to IPC handler

d063637

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Upload latest zowe config for command submission. Should probably dep…

34acc5e

…recate ConfigurationStore somehow Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Pass zowe config to ipc hook

b706947

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Revise console warning

1ca75d9

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge remote-tracking branch 'origin/v2.x/staging' into enhancement/c…

a0c8d4d

…ertificateStage Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Fix typo in zwe command

80be2c9

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Add certificate progress

10e659b

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Add UI for certificate init pgoress

abbc824

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Update scroll into view call

fee5b05

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Fix typo in getCertificateProgress

ec51bcb

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Rename function

c8afa2d

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Update progress store at each stage

99c0cdc

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Revert planning.tsx

0c4181d

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Remove redundant import

4f4c318

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'v2.x/staging' into enhancement/certificateStage

45cc2af

Renamed ipc main function

d23e6d6

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

timgerstel and others added 18 commits January 30, 2024 02:01

Update stage status

25f69f8

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge remote-tracking branch 'origin/refactor/removeConfigService' in…

718fd3b

…to cfgRefactorAndVerifyCerts Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Remove console log

be5d86c

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

025a756

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Remove js-yaml

d42860b

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

6cf710d

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

e9df84d

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

6682920

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

75ca81a

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

71bd3b6

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Make download skippable

b015247

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Fix yaml not setting

3a8392b

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Add skip option for QA

3408f42

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

6f6a9fe

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Use latest copy of yaml on disk for zwe init certificate

f0e0dfb

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'refactor/removeConfigService' into cfgRefactorAndVerify…

044c07e

…Certs Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Fix verifyCertificates form

5ecfa10

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'v2.x/staging' into cfgRefactorAndVerifyCerts

a492d14

DivergentEuropeans reviewed Feb 12, 2024

View reviewed changes

DivergentEuropeans requested changes Feb 23, 2024

View reviewed changes

timgerstel added 4 commits March 3, 2024 18:41

Remove network calls for yaml and schema

0b084c5

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge remote-tracking branch 'origin/v2.x/staging' into v2.x/staging

10538f8

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Merge branch 'v2.x/staging' into cfgRefactorAndVerifyCerts

939a125

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Remove skip download button from UI

73623ca

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

DivergentEuropeans requested changes Mar 6, 2024

View reviewed changes

timgerstel added 2 commits March 6, 2024 19:48

Rename zweInitCertificates -> initCertificates, move function to Inst…

7fbaec0

…allation class Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

Rename ipc function zwe-init-certificates -> init-certificates

5108be8

Signed-off-by: Timothy Gerstel <tim.gerstel@gmail.com>

DivergentEuropeans approved these changes Mar 8, 2024

View reviewed changes

DivergentEuropeans merged commit ba09467 into v2.x/staging Mar 8, 2024
4 of 5 checks passed

timgerstel mentioned this pull request Mar 8, 2024

Remove network calls for yaml and schema #128

Merged

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove ConfigService.ts, Enahance Certifcate Stage #114

Remove ConfigService.ts, Enahance Certifcate Stage #114

timgerstel commented Jan 30, 2024 •

edited

Loading

DivergentEuropeans Feb 12, 2024

timgerstel Feb 12, 2024

timgerstel Feb 12, 2024

DivergentEuropeans Feb 12, 2024

DivergentEuropeans left a comment

DivergentEuropeans Mar 6, 2024 •

edited

Loading

DivergentEuropeans Mar 6, 2024 •

edited

Loading

DivergentEuropeans Mar 6, 2024

DivergentEuropeans Mar 6, 2024

DivergentEuropeans Mar 6, 2024

DivergentEuropeans left a comment

Remove ConfigService.ts, Enahance Certifcate Stage #114

Remove ConfigService.ts, Enahance Certifcate Stage #114

Conversation

timgerstel commented Jan 30, 2024 • edited Loading

Proposed changes

Type of change

PR Checklist

Testing

Further comments

DivergentEuropeans Feb 12, 2024

Choose a reason for hiding this comment

timgerstel Feb 12, 2024

Choose a reason for hiding this comment

timgerstel Feb 12, 2024

Choose a reason for hiding this comment

DivergentEuropeans Feb 12, 2024

Choose a reason for hiding this comment

DivergentEuropeans left a comment

Choose a reason for hiding this comment

DivergentEuropeans Mar 6, 2024 • edited Loading

Choose a reason for hiding this comment

DivergentEuropeans Mar 6, 2024 • edited Loading

Choose a reason for hiding this comment

DivergentEuropeans Mar 6, 2024

Choose a reason for hiding this comment

DivergentEuropeans Mar 6, 2024

Choose a reason for hiding this comment

DivergentEuropeans Mar 6, 2024

Choose a reason for hiding this comment

DivergentEuropeans left a comment

Choose a reason for hiding this comment

timgerstel commented Jan 30, 2024 •

edited

Loading

DivergentEuropeans Mar 6, 2024 •

edited

Loading

DivergentEuropeans Mar 6, 2024 •

edited

Loading