Remove Hardcoded Schema References

src/actions/InstallationHandler.ts

@@ -19,7 +19,7 @@ import * as fs from 'fs';
 import { ConfigurationStore } from '../storage/ConfigurationStore';
 import { InstallationArgs } from '../types/stateInterfaces';
 import { FALLBACK_SCHEMA, deepMerge } from '../renderer/components/common/Utils';
-
+import { updateSchemaReferences } from '../services/ResolveRef';
 
 //AJV did not like the regex in our current schema
 const zoweDatasetMemberRegexFixed = {
@@ -157,14 +157,7 @@ class Installation {
             let yamlSchema = JSON.parse(readPaxYamlAndSchema.details.yamlSchema);
             const serverCommon = JSON.parse(readPaxYamlAndSchema.details.serverCommon);
             if(yamlSchema && serverCommon){
-              yamlSchema.additionalProperties = true;
-              yamlSchema.properties.zowe.properties.setup.properties.dataset.properties.parmlibMembers.properties.zis = zoweDatasetMemberRegexFixed;
-              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));
+              updateSchemaReferences(yamlSchema, serverCommon);
               ConfigurationStore.setSchema(yamlSchema);
               parsedSchema = true;
               ProgressStore.set('downloadUnpax.getSchemas', true);

src/services/ResolveRef.ts

@@ -0,0 +1,29 @@
+export const updateSchemaReferences = (schema: any, serverCommon: any): void => {
+
+  const traverseAndUpdate = (node: any) => {
+    if (node !== null && typeof node === "object") {
+      for (const key in node) {
+        if (key === "$ref" && typeof node[key] === "string") {
+          try {
+            const refValue = resolveRef(node[key]);
+            Object.assign(node, refValue); 
+            delete node['$ref'];
+          } catch(error){
+            console.error("Error resolving reference:", error.message);
+          }
+        } else {
+          traverseAndUpdate(node[key]);
+        }
+      }
+    }
+  }
+
+  const resolveRef = (ref: string) => {
+    const refPath = ref.split('#')[1];
+    let result = serverCommon.$defs;
+    const refObject = Object.values(result).find((obj:any) => obj.$anchor === refPath);
+    return refObject;
+  }
+
+  traverseAndUpdate(schema);
+}