Merge pull request #372 from OpenElements/patch25

Fix the create invironment form to capture all the details

frontend/src/pages/create-environment-page/index.tsx

@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useNavigate } from "react-router-dom";
 import { useForm, Controller } from "react-hook-form";
-import { useOSFamily } from "../../hooks";
+import { useOSFamily, useEnvironmentMetadata } from "../../hooks";
 import { createAppBarConfig } from "../../utils";
 import { z } from "zod";
 import { Select } from "../../components";
@@ -17,6 +17,8 @@ const schema = z.object({
   memory: z.string(),
   java: z.string(),
   jmh: z.string(),
+  jvm: z.string(),
+  systemArch: z.string(),
 });
 
 type EnvironmentFormData = z.infer<typeof schema>;
@@ -26,6 +28,8 @@ const inputClasses =
 
 const CreateEnvironment = () => {
   const { data: osFamilyOptions } = useOSFamily();
+  const { data: archOptions } = useEnvironmentMetadata("arch");
+  const { data: jvmNameOptions } = useEnvironmentMetadata("jvmName");
   const { handleSubmit, register, control } = useForm<EnvironmentFormData>({
     mode: "all",
     resolver: zodResolver(schema),
@@ -43,17 +47,21 @@ const CreateEnvironment = () => {
       cores,
       osName,
       osVersion,
+      jvm,
+      systemArch,
     } = data;
 
     const payload = {
       osName,
       osVersion: osVersion,
       name: infraName,
       description: infraDescription,
-      systemMemoryReadable: memory,
+      systemMemory: Number(memory),
       jmhVersion: jmh,
       jvmVersion: java,
       systemProcessors: Number(cores),
+      systemArch: systemArch,
+      jvmName: jvm, 
     };
     await saveEnvironment(payload).then(() => navigate("/environments"));
   };
@@ -151,6 +159,24 @@ const CreateEnvironment = () => {
                 />
               </div>
             </div>
+            <div className="flex justify-between items-center">
+              <div className="text-sm text-gray-800">Jvm Name</div>
+              <div className="text-sm text-gray-800">
+                <Controller
+                  name="jvm"
+                  control={control}
+                  render={({ field }) => (
+                    <Select
+                      options={jvmNameOptions}
+                      value={field.value}
+                      valueExtractor={(name) => name}
+                      labelExtractor={(label) => label }
+                      onChange={(e) => field.onChange(e)}
+                    />
+                  )}
+                />
+              </div>
+            </div>
             <div className="flex justify-between items-center">
               <div className="text-sm text-gray-800">Java</div>
               <div className="text-sm text-gray-800 flex items-center">
@@ -161,6 +187,24 @@ const CreateEnvironment = () => {
                 />
               </div>
             </div>
+            <div className="flex justify-between items-center">
+              <div className="text-sm text-gray-800">System Arch</div>
+              <div className="text-sm text-gray-800">
+                <Controller
+                  name="systemArch"
+                  control={control}
+                  render={({ field }) => (
+                    <Select
+                      options={archOptions}
+                      value={field.value}
+                      valueExtractor={(name) => name}
+                      labelExtractor={(label) => label }
+                      onChange={(e) => field.onChange(e)}
+                    />
+                  )}
+                />
+              </div>
+            </div>
             <div className="flex justify-between items-center">
               <div className="text-sm text-gray-800">JMH</div>
               <div className="text-sm text-gray-800 flex items-center">