Merge pull request #8981 from jeffibm/fix-multiple-vm-reconfigure

Fix multiple vm reconfigure schema error
ManageIQ · Dec 5, 2023 · a0a6d5b · a0a6d5b
2 parents 6662ffb + 93a1328
commit a0a6d5b
Show file tree

Hide file tree

Showing 2 changed files with 9,444 additions and 908 deletions.
diff --git a/app/javascript/components/reconfigure-vm-form/reconfigure-form-fields.js b/app/javascript/components/reconfigure-vm-form/reconfigure-form-fields.js
@@ -149,19 +149,19 @@ const driveTable = (data, roles, setData, onCellClick) => ({
   hideField: !data.dataTable.drives || data.dataTable.drives.length === 0,
 });
 
-const renderDatatables = (recordId, data, roles, setData, onCellClick, buttonClick) => {
+const renderDatatables = (recordId, data, roles, setData, onCellClick, buttonClick) => [diskTable(data, roles, setData, onCellClick, buttonClick),
+  networkTable(data, roles, setData, onCellClick, buttonClick),
+  driveTable(data, roles, setData, onCellClick)];
+
+export const reconfigureFormFields = (recordId, roles, memory, data, setData, options, onCellClick, buttonClick) => {
+  const formFields = [
+    memoryField(roles),
+    memoryFormFields(memory),
+    processorField(roles),
+    processorFormFields(data, setData, options, memory.max_cpu),
+  ];
   if (recordId.length === 1) {
-    return [diskTable(data, roles, setData, onCellClick, buttonClick),
-      networkTable(data, roles, setData, onCellClick, buttonClick),
-      driveTable(data, roles, setData, onCellClick)];
+    formFields.push(renderDatatables(recordId, data, roles, setData, onCellClick, buttonClick));
   }
-  return '';
+  return formFields;
 };
-
-export const reconfigureFormFields = (recordId, roles, memory, data, setData, options, onCellClick, buttonClick) => ([
-  memoryField(roles),
-  memoryFormFields(memory),
-  processorField(roles),
-  processorFormFields(data, setData, options, memory.max_cpu),
-  renderDatatables(recordId, data, roles, setData, onCellClick, buttonClick),
-]);