Major Refactor

src/actions/InstallActions.ts

@@ -64,6 +64,10 @@ export class InstallActions {
  return this.strategy.uploadLatestYaml(connectionArgs, installationArgs);
  }
 
+ smpeGetExampleYamlAndSchemas(connectionArgs: IIpcConnectionArgs, installArgs: InstallationArgs): Promise<IResponse> {
+ return this.strategy.smpeGetExampleYamlAndSchemas(connectionArgs, installArgs);
+ }
+
  initStcs(connectionArgs: IIpcConnectionArgs,
  installationArgs: InstallationArgs, zoweConfig: object): Promise<IResponse> {
  return this.strategy.initStcs(connectionArgs, installationArgs, zoweConfig);

src/actions/InstallationHandler.ts

@@ -18,6 +18,7 @@ import { ProgressStore } from "../storage/ProgressStore";
 import * as fs from 'fs';
 import { ConfigurationStore } from '../storage/ConfigurationStore';
 import { InstallationArgs } from '../types/stateInterfaces';
+import { FALLBACK_SCHEMA } from '../renderer/components/common/Constants';
 
 function removeRuntimeFromPath(path: string)
 {
@@ -50,12 +51,143 @@ class Installation {
  if(!uploadYaml.status){
  return {status: false, details: `Error uploading yaml configuration: ${uploadYaml.details}`};
  }
- return {status: true, details: "upload yaml success"};
+ return {status: true, details: "Successfully uploaded yaml config"};
  } catch (error) {
  return {status: false, details: error.message};
  }
  }
 
+ parseExampleYamlFromPax = function(catPath: string, yaml: any){
+ const jobOutputSplit = JSON.stringify(yaml).split(`cat ${catPath}\\r\\n`)
+ if(jobOutputSplit[1]){
+ const trimmedYamlSchema = jobOutputSplit[1].split(`+ echo 'Script finished.'`)[0].split(`Script finished.`);
+ // console.log("\n\n *** trimmedYamlSchema[0]: ", trimmedYamlSchema[0].replaceAll(`\\r\\n`, `\r\n`).replaceAll(`\\"`, `"`));
+ return trimmedYamlSchema[0].replaceAll(`\\r\\n`, `\r\n`).replaceAll(`\\"`, `"`);
+ }
+ return "";
+ }
+
+ parseSchemaFromPax = function(inputString: string, catPath: string){
+ const jobOutputSplit = inputString.split(`cat ${catPath}\\r\\n`)
+ if(jobOutputSplit[1]){
+ const trimmedYamlSchema = jobOutputSplit[1].split(`Script finished.`)[0].split(`Script finished.`);
+ // console.log("trimmed schema:", trimmedYamlSchema[0].replaceAll(`\\r\\n`, `\r\n`).replaceAll(`\\"`, `"`).replaceAll(`\\\\"`, `\\"`))
+ return trimmedYamlSchema[0].replaceAll(`\\r\\n`, `\r\n`).replaceAll(`\\"`, `"`).replaceAll(`\\\\"`, `\\"`);
+ }
+ return "";
+ }
+
+ mergeYamlAndInstallationArgs = function(yamlObj: any, installationArgs: InstallationArgs){
+ if (installationArgs.installationDir) {
+ yamlObj.zowe.runtimeDirectory = installationArgs.installationDir;
+ }
+ if (installationArgs.workspaceDir) {
+ yamlObj.zowe.workspaceDirectory = installationArgs.workspaceDir;
+ }
+ if (installationArgs.logDir) {
+ yamlObj.zowe.logDirectory = installationArgs.logDir;
+ }
+ if (installationArgs.extensionDir) {
+ yamlObj.zowe.extensionDirectory = installationArgs.extensionDir;
+ }
+ if (installationArgs.rbacProfile) {
+ yamlObj.zowe.rbacProfileIdentifier = installationArgs.rbacProfile;
+ }
+ if (installationArgs.jobName) {
+ yamlObj.zowe.job.name = installationArgs.jobName;
+ }
+ if (installationArgs.jobPrefix) {
+ yamlObj.zowe.job.prefix = installationArgs.jobPrefix;
+ }
+ if (installationArgs.cookieId) {
+ yamlObj.zowe.cookieIdentifier = installationArgs.cookieId;
+ }
+ if (installationArgs.javaHome) {
+ yamlObj.java.home = installationArgs.javaHome;
+ }
+ if (installationArgs.nodeHome) {
+ yamlObj.node.home = installationArgs.nodeHome;
+ }
+ if (installationArgs.zosmfHost) {
+ yamlObj.zOSMF.host = installationArgs.zosmfHost;
+ }
+ if (installationArgs.zosmfPort) {
+ yamlObj.zOSMF.port = installationArgs.zosmfPort;
+ }
+ if (installationArgs.zosmfApplId) {
+ yamlObj.zOSMF.applId = installationArgs.zosmfApplId;
+ }
+ }
+
+ public async smpeGetExampleYamlAndSchemas (
+ connectionArgs: IIpcConnectionArgs, 
+ installationArgs: InstallationArgs,
+ ): Promise<IResponse> {
+ try{
+ const currentConfig: any = ConfigurationStore.getConfig();
+ let yamlObj
+ const zoweRuntimePath = installationArgs.installationDir;
+ let readPaxYamlAndSchema = await this.readExampleYamlAndSchema(connectionArgs, zoweRuntimePath);
+ let parsedSchema = false, parsedYaml = false;
+ if(readPaxYamlAndSchema.details.yaml){
+ const yamlFromPax = this.parseExampleYamlFromPax(`${zoweRuntimePath}/example-zowe.yaml`, readPaxYamlAndSchema.details.yaml);
+ if(yamlFromPax){
+ try {
+ yamlObj = parse(yamlFromPax);
+ if (currentConfig) {
+ // console.log("currentConfig: ", JSON.stringify(currentConfig));
+ yamlObj = Object.assign({}, currentConfig, yamlObj);
+ }
+ this.mergeYamlAndInstallationArgs(yamlObj, installationArgs);
+ // console.log('Setting merged yaml:', JSON.stringify(yamlObj));
+ ConfigurationStore.setConfig(yamlObj);
+ ProgressStore.set('downloadUnpax.getExampleYaml', true);
+ parsedYaml = true;
+ } catch(e) {
+ console.log('error parsing example-zowe.yaml:', e);
+ ProgressStore.set('downloadUnpax.getExampleYaml', false);
+ return {status: false, details: {message: e.message}}
+ }
+ } else {
+ console.log("no yaml found from pax");
+ ProgressStore.set('downloadUnpax.getExampleYaml', false);
+ return {status: false, details: {message: "no yaml found from pax"}}
+ }
+
+ //No reason not to always set schema to latest if user is re-running installation
+ if(readPaxYamlAndSchema.details.yamlSchema && readPaxYamlAndSchema.details.serverCommon){
+ try {
+ let yamlSchema = JSON.parse(this.parseSchemaFromPax(JSON.stringify(readPaxYamlAndSchema.details.yamlSchema), `${zoweRuntimePath}/schemas/zowe-yaml-schema.json`));
+ const serverCommon = JSON.parse(this.parseSchemaFromPax(JSON.stringify(readPaxYamlAndSchema.details.serverCommon), `${zoweRuntimePath}/schemas/server-common.json`));
+ if(yamlSchema && serverCommon){
+ yamlSchema.additionalProperties = true;
+ yamlSchema.properties.zowe.properties.setup.properties.dataset.properties.parmlibMembers.properties.zis = serverCommon.$defs.datasetMember;
+ yamlSchema.properties.zowe.properties.setup.properties.certificate.properties.pkcs12.properties.directory = serverCommon.$defs.path;
+ if(yamlSchema.$defs?.networkSettings?.properties?.server?.properties?.listenAddresses?.items){
+ delete yamlSchema.$defs?.networkSettings?.properties?.server?.properties?.listenAddresses?.items?.ref;
+ yamlSchema.$defs.networkSettings.properties.server.properties.listenAddresses.items = serverCommon.$defs.ipv4
+ }
+ // console.log('Setting schema from runtime dir:', JSON.stringify(yamlSchema));
+ ConfigurationStore.setSchema(yamlSchema);
+ parsedSchema = true;
+ ProgressStore.set('downloadUnpax.getSchemas', true);
+ }
+ } catch (e) {
+ console.log('error setting schema from pax:', e);
+ ProgressStore.set('downloadUnpax.getSchemas', false);
+ ConfigurationStore.setSchema(FALLBACK_SCHEMA);
+ return {status: false, details: {message: e.message}}
+ }
+ }
+ return {status: parsedSchema && parsedYaml, details: {message: "Successfully retrieved example-zowe.yaml and schemas", mergedYaml: yamlObj}}
+ }
+ } catch (e) {
+ ConfigurationStore.setSchema(FALLBACK_SCHEMA);
+ return {status: false, details: e.message};
+ }
+
+ }
+
  public async downloadUnpax (
  connectionArgs: IIpcConnectionArgs, 
  installationArgs: InstallationArgs,
@@ -140,64 +272,17 @@ class Installation {
  let readPaxYamlAndSchema = await this.readExampleYamlAndSchema(connectionArgs, zoweRuntimePath);
  let parsedSchema = false, parsedYaml = false;
  if(readPaxYamlAndSchema.details.yaml){
- const parseExampleYamlFromPax = function(catPath: string){
- const jobOutputSplit = JSON.stringify(readPaxYamlAndSchema.details.yaml).split(`cat ${catPath}\\r\\n`)
- if(jobOutputSplit[1]){
- const trimmedYamlSchema = jobOutputSplit[1].split(`+ echo 'Script finished.'`)[0].split(`Script finished.`);
- // console.log("\n\n *** trimmedYamlSchema[0]: ", trimmedYamlSchema[0].replaceAll(`\\r\\n`, `\r\n`).replaceAll(`\\"`, `"`));
- return trimmedYamlSchema[0].replaceAll(`\\r\\n`, `\r\n`).replaceAll(`\\"`, `"`);
- }
- return "";
- }
- const yamlFromPax = parseExampleYamlFromPax(`${zoweRuntimePath}/example-zowe.yaml`);
+ const yamlFromPax = this.parseExampleYamlFromPax(`${zoweRuntimePath}/example-zowe.yaml`, readPaxYamlAndSchema.details.yaml);
  if(yamlFromPax){
  try {
  yamlObj = parse(yamlFromPax);
  if (currentConfig) {
  // console.log("current config:", JSON.stringify(currentConfig));
  // console.log("yamlObj: ", JSON.stringify(yamlObj));
- yamlObj = {...currentConfig, ...yamlObj}
+ yamlObj = yamlObj = Object.assign({}, yamlObj, currentConfig);
  // console.log("merged yamlObj: ", JSON.stringify(yamlObj));
  }
- if (yamlObj.zowe.runtimeDirectory === undefined && installationArgs.installationDir) {
- yamlObj.zowe.runtimeDirectory = installationArgs.installationDir;
- }
- if (yamlObj.zowe.workspaceDirectory === undefined && installationArgs.workspaceDir) {
- yamlObj.zowe.workspaceDirectory = installationArgs.workspaceDir;
- }
- if (yamlObj.zowe.logDirectory === undefined && installationArgs.logDir) {
- yamlObj.zowe.logDirectory = installationArgs.logDir;
- }
- if (yamlObj.zowe.extensionDirectory === undefined && installationArgs.extensionDir) {
- yamlObj.zowe.extensionDirectory = installationArgs.extensionDir;
- }
- if (yamlObj.zowe.rbacProfileIdentifier === undefined && installationArgs.rbacProfile) {
- yamlObj.zowe.rbacProfileIdentifier = installationArgs.rbacProfile;
- }
- if (yamlObj.zowe.job.name === undefined && installationArgs.jobName) {
- yamlObj.zowe.job.name = installationArgs.jobName;
- }
- if (yamlObj.zowe.job.prefix === undefined && installationArgs.jobPrefix) {
- yamlObj.zowe.job.prefix = installationArgs.jobPrefix;
- }
- if (yamlObj.zowe.cookieIdentifier === undefined && installationArgs.cookieId) {
- yamlObj.zowe.cookieIdentifier = installationArgs.cookieId;
- }
- if (yamlObj.java.home === undefined && installationArgs.javaHome) {
- yamlObj.java.home = installationArgs.javaHome;
- }
- if (yamlObj.node.home === undefined && installationArgs.nodeHome) {
- yamlObj.node.home = installationArgs.nodeHome;
- }
- if (yamlObj.zOSMF.host === undefined && installationArgs.zosmfHost) {
- yamlObj.zOSMF.host = installationArgs.zosmfHost;
- }
- if (yamlObj.zOSMF.port === undefined && installationArgs.zosmfPort) {
- yamlObj.zOSMF.port = installationArgs.zosmfPort;
- }
- if (yamlObj.zOSMF.applId === undefined && installationArgs.zosmfApplId) {
- yamlObj.zOSMF.applId = installationArgs.zosmfApplId;
- }
+ this.mergeYamlAndInstallationArgs(yamlObj, installationArgs);
  if (zoweConfig) {
  yamlObj = {...yamlObj, ...zoweConfig};
  }
@@ -215,17 +300,9 @@ class Installation {
 
  //No reason not to always set schema to latest if user is re-running installation
  if(readPaxYamlAndSchema.details.yamlSchema && readPaxYamlAndSchema.details.serverCommon){
- const parseSchemaFromPax = function(inputString: string, catPath: string){
- const jobOutputSplit = inputString.split(`cat ${catPath}\\r\\n`)
- if(jobOutputSplit[1]){
- const trimmedYamlSchema = jobOutputSplit[1].split(`Script finished.`)[0].split(`Script finished.`);
- return trimmedYamlSchema[0].replaceAll(`\\r\\n`, `\r\n`).replaceAll(`\\"`, `"`).replaceAll(`\\\\"`, `\\"`);
- }
- return "";
- }
  try {
- let yamlSchema = JSON.parse(parseSchemaFromPax(JSON.stringify(readPaxYamlAndSchema.details.yamlSchema), `${zoweRuntimePath}/schemas/zowe-yaml-schema.json`));
- const serverCommon = JSON.parse(parseSchemaFromPax(JSON.stringify(readPaxYamlAndSchema.details.serverCommon), `${zoweRuntimePath}/schemas/server-common.json`));
+ let yamlSchema = JSON.parse(this.parseSchemaFromPax(JSON.stringify(readPaxYamlAndSchema.details.yamlSchema), `${zoweRuntimePath}/schemas/zowe-yaml-schema.json`));
+ const serverCommon = JSON.parse(this.parseSchemaFromPax(JSON.stringify(readPaxYamlAndSchema.details.serverCommon), `${zoweRuntimePath}/schemas/server-common.json`));
  // console.log('yaml schema:', parseSchemas(JSON.stringify(readPaxYamlAndSchema.details.yamlSchema), `${zoweRuntimePath}/schemas/zowe-yaml-schema.json`));
  // console.log('server common', parseSchemas(JSON.stringify(readPaxYamlAndSchema.details.serverCommon), `${zoweRuntimePath}/schemas/server-common.json`));
  if(yamlSchema && serverCommon){

src/main/index.ts

@@ -108,7 +108,6 @@ const createWindow = (): void => {
  return res;
  });
 
-
  ipcMain.handle('get-schema', async (event, schema: any) => {
  const res: any = await ConfigurationStore.getSchema();
  return {status: true, details: res};
@@ -205,6 +204,11 @@ const createWindow = (): void => {
  return res;
  });
 
+ ipcMain.handle('get-yaml-schema', async (event, connectionArgs, installationArgs) => {
+ const res = await installActions.smpeGetExampleYamlAndSchemas(connectionArgs, installationArgs);
+ return res;
+ });
+
  ipcMain.handle('init-certificates', async (event, connectionArgs, installationArgs, zoweConfig) => {
  const res = await installActions.runInitCertificates(connectionArgs, installationArgs, zoweConfig);
  return res;

src/renderer/components/Home.tsx

@@ -16,7 +16,7 @@ import flatten, { unflatten } from 'flat';
 import { IResponse, IIpcConnectionArgs } from '../../types/interfaces';
 import { setConnectionArgs, setResumeProgress, selectInitJobStatement } from './stages/connection/connectionSlice';
 import { setJobStatement } from './stages/PlanningSlice';
-import { setZoweCLIVersion } from './configuration-wizard/wizardSlice';
+import { selectSchema, selectYaml, setSchema, setYaml, setZoweCLIVersion } from './configuration-wizard/wizardSlice';
 import { useAppDispatch, useAppSelector } from '../hooks';
 import { Tooltip } from '@mui/material';
 import installationImg from '../assets/installation.png'
@@ -28,8 +28,9 @@ import HorizontalLinearStepper from './common/Stepper';
 import Wizard from './configuration-wizard/Wizard'
 import Connection from './stages/connection/Connection';
 import { ActiveState } from '../../types/stateInterfaces';
-import { getPreviousInstallation } from './stages/progress/StageProgressStatus';
-import { DEF_NO_OUTPUT } from './common/Constants';
+import { getInstallationArguments, getPreviousInstallation } from './stages/progress/StageProgressStatus';
+import { DEF_NO_OUTPUT, FALLBACK_SCHEMA, FALLBACK_YAML } from './common/Constants';
+import { selectInstallationArgs, setInstallationArgs } from './stages/installation/installationSlice';
 
 // REVIEW: Get rid of routing
 
@@ -90,6 +91,8 @@ const Home = () => {
  const connectionStatus = useAppSelector(selectConnectionStatus);
  const [showWizard, setShowWizard] = useState(false);
  const [showLoginDialog, setShowLogin] = useState(false);
+ const [yaml] = useState(useAppSelector(selectYaml));
+ const [schema, setLocalSchema] = useState(useAppSelector(selectSchema));
 
  const { activeStepIndex, isSubStep, activeSubStepIndex, lastActiveDate } = getPreviousInstallation();
 
@@ -109,6 +112,42 @@ const Home = () => {
  eventDispatcher.on('saveAndCloseEvent', () => setShowWizard(false));
 
 
+
+ //Home is the first screen the user will always see 100% of the time. Therefore, we will call the loading of the configs, schemas, and installation args here and set them to the redux memory states
+
+ //YAML LOADING - necessary for editor state as well as form values
+ if(!yaml == undefined || (typeof yaml === "object" && Object.keys(yaml).length === 0)){
+ window.electron.ipcRenderer.getConfig().then((res: IResponse) => {
+ if (res.status) {
+ dispatch(setYaml(res.details));
+ } else {
+ dispatch(setYaml(FALLBACK_YAML));
+ }
+ })
+ }
+
+ //SCHEMA LOADING - necessary for JsonForms
+ if(schema == undefined || (typeof schema === "object" && Object.keys(yaml).length === 0)){
+ window.electron.ipcRenderer.getSchema().then((res: IResponse) => {
+ if (res.status && res.details !== undefined) {
+ dispatch(setSchema(res.details));
+ } else {
+ dispatch(setSchema(FALLBACK_SCHEMA));
+ }
+ })
+ }
+
+ //Load installation args
+ window.electron.ipcRenderer.getConfigByKey("installationArgs").then((res: IResponse) => {
+ if(res != undefined){
+ dispatch(setInstallationArgs(res));
+ } else {
+ dispatch(setInstallationArgs({...getInstallationArguments()}));
+ }
+ })
+
+
+
  window.electron.ipcRenderer.checkZoweCLI().then((res: IResponse) => {
  if (res.status) {
  dispatch(setZoweCLIVersion(res.details));