Simplify schema exports

evergreen-ci · Sep 27, 2023 · 9d416fd · 9d416fd
1 parent f9d5861
commit 9d416fd
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 174 deletions.
diff --git a/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx b/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
@@ -344,6 +344,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
     elementWrapperCSS,
     emptyValue = "",
     focusOnMount,
+    rows,
   } = options;
 
   const { errors, hasError } = processErrors(rawErrors);
@@ -374,6 +375,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
           target.value === "" ? onChange(emptyValue) : onChange(target.value)
         }
         errorMessage={hasError ? errors.join(", ") : null}
+        rows={rows}
         state={hasError ? "error" : "none"}
       />
     </ElementWrapper>

diff --git a/src/components/SpruceForm/Widgets/types.ts b/src/components/SpruceForm/Widgets/types.ts
@@ -16,6 +16,7 @@ export interface SpruceWidgetProps extends WidgetProps {
     errors: string[];
     focusOnMount: boolean;
     inputType: TextInputType;
+    rows: number;
     showLabel: boolean;
     sizeVariant: string;
     tooltipDescription: string;

diff --git a/src/pages/distroSettings/tabs/HostTab/getFormSchema.tsx b/src/pages/distroSettings/tabs/HostTab/getFormSchema.tsx
@@ -1,48 +1,15 @@
 import { GetFormSchema } from "components/SpruceForm";
-import { CardFieldTemplate } from "components/SpruceForm/FieldTemplates";
 import { Arch, BootstrapMethod, Provider, SshKey } from "gql/generated/types";
+import { nonWindowsArchitectures, windowsArchitectures } from "./constants";
 import {
-  linuxArchitectures,
-  nonWindowsArchitectures,
-  windowsArchitectures,
-} from "./constants";
-import {
-  acceptableHostIdleTime,
-  arch,
-  authorizedKeysFile,
-  bootstrapMethod,
-  clientDir,
-  communicationMethod,
-  env,
-  feedbackRule,
-  futureHostFraction,
-  homeVolumeFormatCommand,
-  hostsOverallocatedRule,
+  allocation as allocationProperties,
+  bootstrap as bootstrapProperties,
+  setup,
+  sshConfig as sshConfigProperties,
   icecreamConfigPath,
   icecreamSchedulerHost,
   isVirtualWorkStation,
-  jasperBinaryDir,
-  jasperCredentialsPath,
-  lockedMemoryKb,
-  maximumHosts,
-  minimumHosts,
-  numFiles,
-  numProcesses,
-  numTasks,
-  preconditionScripts,
   rootDir,
-  roundingRule,
-  serviceUser,
-  setupAsSudo,
-  setupScript,
-  shellPath,
-  sshKey,
-  sshOptions,
-  user,
-  userSpawnAllowed,
-  version,
-  virtualMemoryKb,
-  workDir,
 } from "./schemaFields";
 
 type FormSchemaParams = {
@@ -68,15 +35,7 @@ export const getFormSchema = ({
         setup: {
           type: "object" as "object",
           title: "Host Setup",
-          properties: {
-            bootstrapMethod: bootstrapMethod.schema,
-            communicationMethod: communicationMethod.schema,
-            arch: arch.schema,
-            workDir: workDir.schema,
-            setupAsSudo: setupAsSudo.schema,
-            setupScript: setupScript.schema,
-            userSpawnAllowed: userSpawnAllowed.schema,
-          },
+          properties: setup.schema,
           dependencies: {
             userSpawnAllowed: {
               oneOf: [
@@ -166,104 +125,24 @@ export const getFormSchema = ({
       },
     },
     uiSchema: {
-      setup: {
-        "ui:ObjectFieldTemplate": CardFieldTemplate,
-        bootstrapMethod: bootstrapMethod.uiSchema,
-        communicationMethod: communicationMethod.uiSchema,
-        arch: arch.uiSchema,
-        setupAsSudo: setupAsSudo.uiSchema,
-        workDir: workDir.uiSchema,
-        setupScript: setupScript.uiSchema,
-        userSpawnAllowed: userSpawnAllowed.uiSchema(hasStaticProvider),
-        isVirtualWorkStation: isVirtualWorkStation.uiSchema(architecture),
-        icecreamSchedulerHost: icecreamSchedulerHost.uiSchema,
-        icecreamConfigPath: icecreamConfigPath.uiSchema,
-      },
-      bootstrapSettings: {
-        "ui:ObjectFieldTemplate": CardFieldTemplate,
-        serviceUser: serviceUser.uiSchema(architecture),
-        jasperBinaryDir: jasperBinaryDir.uiSchema,
-        jasperCredentialsPath: jasperCredentialsPath.uiSchema,
-        clientDir: clientDir.uiSchema,
-        shellPath: shellPath.uiSchema,
-        resourceLimits: {
-          // Only visible for Linux
-          ...(!linuxArchitectures.includes(architecture) && {
-            "ui:widget": "hidden",
-          }),
-          numFiles: numFiles.uiSchema,
-          numTasks: numTasks.uiSchema,
-          numProcesses: numProcesses.uiSchema,
-          lockedMemoryKb: lockedMemoryKb.uiSchema,
-          virtualMemoryKb: virtualMemoryKb.uiSchema,
-        },
-        env: env.uiSchema,
-        preconditionScripts: preconditionScripts.uiSchema,
-      },
-      sshConfig: {
-        "ui:ObjectFieldTemplate": CardFieldTemplate,
-        user: user.uiSchema,
-        sshKey: sshKey.uiSchema,
-        authorizedKeysFile: authorizedKeysFile.uiSchema(hasStaticProvider),
-        sshOptions: sshOptions.uiSchema,
-      },
-      allocation: {
-        "ui:ObjectFieldTemplate": CardFieldTemplate,
-        version: version.uiSchema,
-        roundingRule: roundingRule.uiSchema,
-        feedbackRule: feedbackRule.uiSchema,
-        hostsOverallocatedRule: hostsOverallocatedRule.uiSchema,
-        minimumHosts: minimumHosts.uiSchema(hasEC2Provider),
-        maximumHosts: maximumHosts.uiSchema(hasEC2Provider),
-        acceptableHostIdleTime: acceptableHostIdleTime.uiSchema(hasEC2Provider),
-        futureHostFraction: futureHostFraction.uiSchema(hasEC2Provider),
-      },
+      setup: setup.uiSchema(architecture, hasStaticProvider),
+      bootstrapSettings: bootstrapProperties.uiSchema(architecture),
+      sshConfig: sshConfigProperties.uiSchema(hasStaticProvider),
+      allocation: allocationProperties.uiSchema(hasEC2Provider),
     },
   };
 };
 
 const bootstrapSettings = {
   type: "object" as "object",
   title: "Bootstrap Settings",
-  properties: {
-    jasperBinaryDir: jasperBinaryDir.schema,
-    jasperCredentialsPath: jasperCredentialsPath.schema,
-    clientDir: clientDir.schema,
-    shellPath: shellPath.schema,
-    homeVolumeFormatCommand: homeVolumeFormatCommand.schema,
-    serviceUser: serviceUser.schema,
-    resourceLimits: {
-      type: "object" as "object",
-      title: "Resource Limits",
-      required: [
-        "numFiles",
-        "numTasks",
-        "numProcesses",
-        "lockedMemoryKb",
-        "virtualMemoryKb",
-      ],
-      properties: {
-        numFiles: numFiles.schema,
-        numTasks: numTasks.schema,
-        numProcesses: numProcesses.schema,
-        lockedMemoryKb: lockedMemoryKb.schema,
-        virtualMemoryKb: virtualMemoryKb.schema,
-      },
-    },
-    env: env.schema,
-    preconditionScripts: preconditionScripts.schema,
-  },
+  properties: bootstrapProperties.schema,
 };
 
 const sshConfig = (sshKeys: SshKey[]) => ({
   type: "object" as "object",
   title: "SSH Configuration",
-  properties: {
-    user: user.schema,
-    sshKey: sshKey.schema(sshKeys),
-    authorizedKeysFile: authorizedKeysFile.schema,
-    sshOptions: sshOptions.schema,
-  },
+  properties: sshConfigProperties.schema(sshKeys),
 });
 
 const allocation = {
@@ -275,14 +154,5 @@ const allocation = {
     "acceptableHostIdleTime",
     "futureHostFraction",
   ],
-  properties: {
-    version: version.schema,
-    roundingRule: roundingRule.schema,
-    feedbackRule: feedbackRule.schema,
-    hostsOverallocatedRule: hostsOverallocatedRule.schema,
-    minimumHosts: minimumHosts.schema,
-    maximumHosts: maximumHosts.schema,
-    acceptableHostIdleTime: acceptableHostIdleTime.schema,
-    futureHostFraction: futureHostFraction.schema,
-  },
+  properties: allocationProperties.schema,
 };