Merge remote-tracking branch 'origin' into bugfixes-restart

zowe · Aug 8, 2024 · 756dd98 · 756dd98
2 parents 14421c0 + 949ed90
commit 756dd98
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 33 deletions.
diff --git a/src/renderer/components/common/JsonForms.tsx b/src/renderer/components/common/JsonForms.tsx
@@ -105,47 +105,40 @@ const conditionalSchema = (schema: any, formData: any, prop: any): boolean=> {
   return false;
 }
 
+const getDefaultFormData = (schema: any, formData: any) => {
+  if (schema && schema.properties) {
+    const defaultFormData = { ...formData };
+    Object.keys(schema.properties).forEach((property) => {
+      if (schema.properties[property].type && schema.properties[property].default !== undefined || schema.properties[property].type === 'object') {
+        // If the property is an object, recursively set default values
+        if (schema.properties[property].type === 'object') {
+          defaultFormData[property] = getDefaultFormData(
+            schema.properties[property],
+            defaultFormData[property] || {}
+          );
+        } else {
+          defaultFormData[property] = schema.properties[property].default;
+        }
+      }
+    });
+    return defaultFormData;
+  }
+  return null;
+};
+
 export default function JsonForm(props: any) {
   const {schema, onChange, formData} = props;
 
-  const isFormDataEmpty = formData === null || formData === undefined;
-
-  useEffect(() => {
-    if (isFormDataEmpty) {
-      const defaultFormData = getDefaultFormData(schema, formData);
-      onChange(defaultFormData);
-    }
-  }, [isFormDataEmpty, schema, onChange]);
-
-  const getDefaultFormData = (schema: any, formData: any) => {
-    if (schema && schema.properties) {
-      const defaultFormData = { ...formData };
-      Object.keys(schema.properties).forEach((property) => {
-        if (schema.properties[property].type && schema.properties[property].default !== undefined || schema.properties[property].type === 'object') {
-          // If the property is an object, recursively set default values
-          if (schema.properties[property].type === 'object') {
-            defaultFormData[property] = getDefaultFormData(
-              schema.properties[property],
-              defaultFormData[property] || {}
-            );
-          } else {
-            defaultFormData[property] = schema.properties[property].default;
-          }
-        }
-      });
-      return defaultFormData;
-    }
-    return null;
-  };
+  const isFormDataEmpty = formData === null || formData === undefined || Object.keys(formData).length < 1;
 
-  // const [formState, setFormState] = useState(isFormDataEmpty ? getDefaultFormData(schema, {}) : formData);
+  const formDataToUse = isFormDataEmpty ? getDefaultFormData(schema, {}) : formData;
 
   return (
     <ThemeProvider theme={jsonFormTheme}>
     <JsonForms
       schema={schema}
       uischema={makeUISchema(schema, '/', formData)}
-      data={formData}
+      data={formDataToUse}
       renderers={materialRenderers}
       cells={materialCells}
       config={{showUnfocusedDescription: true}}

diff --git a/src/renderer/components/stages/Security.tsx b/src/renderer/components/stages/Security.tsx
@@ -43,7 +43,7 @@ const Security = () => {
   const [schema, setLocalSchema] = useState(useAppSelector(selectSchema));
   const [yaml, setLocalYaml] = useState(useAppSelector(selectYaml));
   const [setupSchema] = useState(schema?.properties?.zowe?.properties?.setup?.properties?.security);
-  const [setupYaml, setSetupYaml] = useState(yaml?.zowe?.setup?.security ?? {product: 'RACF'});
+  const [setupYaml, setSetupYaml] = useState(yaml?.zowe?.setup?.security);
   const [showProgress, setShowProgress] = useState(getProgress('securityStatus'));
   const [init, setInit] = useState(false);
   const [editorVisible, setEditorVisible] = useState(false);
@@ -213,7 +213,7 @@ const Security = () => {
   }
 
   const handleFormChange = (data: any) => {
-    let newData = init ? (Object.keys(setupYaml).length > 0 ? setupYaml : data?.zowe?.setup?.security) : (data?.zowe?.setup?.security ? data?.zowe?.setup?.security : data);
+    let newData = (init && setupYaml) ? (Object.keys(setupYaml).length > 0 ? setupYaml : data?.zowe?.setup?.security) : (data?.zowe?.setup?.security ? data?.zowe?.setup?.security : data);
     setInit(false);
 
     if (newData) {