Fix errors caused by changes to the Systems OAS

src/fixtures/systems.fixtures.ts

@@ -10,10 +10,10 @@ export const singularityRuntime: Systems.JobRuntime = {
   version: '0.0.1',
 };
 
-export const jobRuntimes: Set<Systems.JobRuntime> = new Set([
+export const jobRuntimes: Array<Systems.JobRuntime> = [
   { ...dockerRuntime },
   { ...singularityRuntime },
-]);
+];
 
 export const tapisSystem: Systems.TapisSystem = {
   tenant: 'tacc',

src/tapis-api/systems/makeNewSystem.ts

@@ -2,10 +2,9 @@ import { Systems } from '@tapis/tapis-typescript';
 import { apiGenerator, errorDecoder } from 'tapis-api/utils';
 
 const makeNewSystem = (
-  reqCreateSystem: Systems.ReqCreateSystem,
+  reqCreateSystem: Systems.CreateSystemRequest,
   basePath: string,
-  jwt: string,
-  skipCredentialCheck?: boolean
+  jwt: string
 ) => {
   const api: Systems.SystemsApi = apiGenerator<Systems.SystemsApi>(
     Systems,
@@ -14,7 +13,7 @@ const makeNewSystem = (
     jwt
   );
   return errorDecoder<Systems.RespBasic>(() =>
-    api.createSystem({ reqCreateSystem, skipCredentialCheck })
+    api.createSystem(reqCreateSystem)
   );
 };
 

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/AdvancedSettings.tsx

@@ -27,13 +27,13 @@ const AdvancedSettings: React.FC<AdvancedSettingsProp> = ({ simplified }) => {
   //reading if the systemType is S3 at its current state
   const isS3 = useMemo(
     () =>
-      (values as Partial<Systems.ReqCreateSystem>).systemType ===
+      (values as Partial<Systems.ReqPostSystem>).systemType ===
       SystemTypeEnum.S3,
     [values]
   );
 
   //reading the runtimeType at its current state
-  const runtimeType = (values as Partial<Systems.ReqCreateSystem>).jobRuntimes;
+  const runtimeType = (values as Partial<Systems.ReqPostSystem>).jobRuntimes;
 
   if (simplified) {
     return (

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/Batch/BatchLogicalQueuesSettings.tsx

@@ -8,7 +8,7 @@ import { LogicalQueue } from '@tapis/tapis-typescript-systems';
 type BatchLQFieldProps = {
   item: LogicalQueue;
   index: number;
-  remove: (index: number) => Systems.ReqCreateSystem | undefined;
+  remove: (index: number) => Systems.ReqPostSystem | undefined;
 };
 
 const BatchLogicalQueuesField: React.FC<BatchLQFieldProps> = ({
@@ -131,7 +131,7 @@ const BatchLogicalQueuesInputs: React.FC<{
   const { values } = useFormikContext();
 
   const batchLogicalQueues =
-    (values as Partial<Systems.ReqCreateSystem>)?.batchLogicalQueues ?? [];
+    (values as Partial<Systems.ReqPostSystem>)?.batchLogicalQueues ?? [];
 
   return (
     <Collapse

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/Batch/BatchSettings.tsx

@@ -19,13 +19,13 @@ const BatchSettings: React.FC = () => {
 
   //reading the canRunBatch at its current state
   const canRunBatch = useMemo(
-    () => (values as Partial<Systems.ReqCreateSystem>).canRunBatch,
+    () => (values as Partial<Systems.ReqPostSystem>).canRunBatch,
     [values]
   );
   //reading if the systemType is Linux at its current state
   const isLinux = useMemo(
     () =>
-      (values as Partial<Systems.ReqCreateSystem>).systemType ===
+      (values as Partial<Systems.ReqPostSystem>).systemType ===
       SystemTypeEnum.Linux,
     [values]
   );

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/DtnSettings.tsx

@@ -11,12 +11,12 @@ const DtnSettings: React.FC = () => {
 
   //reading the isDtn at its current state
   const isDtn = useMemo(
-    () => (values as Partial<Systems.ReqCreateSystem>).isDtn,
+    () => (values as Partial<Systems.ReqPostSystem>).isDtn,
     [values]
   );
   //reading the canExec at its current state
   const canExec = useMemo(
-    () => (values as Partial<Systems.ReqCreateSystem>).canExec,
+    () => (values as Partial<Systems.ReqPostSystem>).canExec,
     [values]
   );
 

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/Job/JobCapabilitiesSettings.tsx

@@ -16,7 +16,7 @@ const datatypes = Object.values(DatatypeEnum);
 type JobCapabilitiesFieldProps = {
   item: Capability;
   index: number;
-  remove: (index: number) => Systems.ReqCreateSystem | undefined;
+  remove: (index: number) => Systems.ReqPostSystem | undefined;
 };
 
 const JobCapabilitiesField: React.FC<JobCapabilitiesFieldProps> = ({
@@ -90,7 +90,7 @@ const JobCapabilitiesInputs: React.FC<{ arrayHelpers: FieldArrayRenderProps }> =
     const { values } = useFormikContext();
 
     const jobCapabilities =
-      (values as Partial<Systems.ReqCreateSystem>)?.jobCapabilities ?? [];
+      (values as Partial<Systems.ReqPostSystem>)?.jobCapabilities ?? [];
 
     return (
       <Collapse

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/Job/JobEnvVariableSettings.tsx

@@ -8,7 +8,7 @@ import { KeyValuePair } from '@tapis/tapis-typescript-systems';
 type JobEnvVariablesFieldProps = {
   item: KeyValuePair;
   index: number;
-  remove: (index: number) => Systems.ReqCreateSystem | undefined;
+  remove: (index: number) => Systems.ReqPostSystem | undefined;
 };
 
 const JobEnvVariablesField: React.FC<JobEnvVariablesFieldProps> = ({
@@ -57,7 +57,7 @@ const JobEnvVariablesInputs: React.FC<{ arrayHelpers: FieldArrayRenderProps }> =
     const { values } = useFormikContext();
 
     const jobEnvVariables =
-      (values as Partial<Systems.ReqCreateSystem>)?.jobEnvVariables ?? [];
+      (values as Partial<Systems.ReqPostSystem>)?.jobEnvVariables ?? [];
 
     return (
       <Collapse

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/ProxySettings.tsx

@@ -11,7 +11,7 @@ const ProxySettings: React.FC = () => {
 
   //reading the useProxy at its current state
   const useProxy = useMemo(
-    () => (values as Partial<Systems.ReqCreateSystem>).useProxy,
+    () => (values as Partial<Systems.ReqPostSystem>).useProxy,
     [values]
   );
 

src/tapis-app/Systems/_components/SystemToolbar/CreateSystemModal/Settings/TagsSettings.tsx

@@ -7,7 +7,7 @@ import { FieldArray, useFormikContext, FieldArrayRenderProps } from 'formik';
 type TagsFieldProps = {
   item: string;
   index: number;
-  remove: (index: number) => Systems.ReqCreateSystem | undefined;
+  remove: (index: number) => Systems.ReqPostSystem | undefined;
 };
 const TagsField: React.FC<TagsFieldProps> = ({ item, index, remove }) => {
   return (
@@ -32,7 +32,7 @@ const TagsInputs: React.FC<{ arrayHelpers: FieldArrayRenderProps }> = ({
 }) => {
   const { values } = useFormikContext();
 
-  const tags = (values as Partial<Systems.ReqCreateSystem>)?.tags ?? [];
+  const tags = (values as Partial<Systems.ReqPostSystem>)?.tags ?? [];
 
   return (
     <Collapse

src/tapis-hooks/systems/useMakeNewSystem.ts

@@ -5,7 +5,7 @@ import { useTapisConfig } from '../context';
 import QueryKeys from './queryKeys';
 
 type MkNewSystemHookParams = {
-  reqPostSystem: Systems.ReqCreateSystem;
+  reqPostSystem: Systems.ReqPostSystem;
   skipCredentialCheck: boolean;
 };
 
@@ -21,7 +21,7 @@ const useMakeNewSystem = () => {
     useMutation<Systems.RespBasic, Error, MkNewSystemHookParams>(
       [QueryKeys.makeNewSystem, basePath, jwt],
       ({ reqPostSystem, skipCredentialCheck }) =>
-        makeNewSystem(reqPostSystem, basePath, jwt, skipCredentialCheck)
+        makeNewSystem({reqPostSystem, skipCredentialCheck}, basePath, jwt)
     );
 
   // Return hook object with loading states and login function
@@ -33,7 +33,7 @@ const useMakeNewSystem = () => {
     error,
     reset,
     makeNewSystem: (
-      reqPostSystem: Systems.ReqCreateSystem,
+      reqPostSystem: Systems.ReqPostSystem,
       skipCredentialCheck: boolean = true,
       // react-query options to allow callbacks such as onSuccess
       options?: MutateOptions<Systems.RespBasic, Error, MkNewSystemHookParams>

src/tapis-ui/components/jobs/JobLauncher/steps/SchedulerOptions.tsx

@@ -62,9 +62,8 @@ const SchedulerProfiles: React.FC = () => {
         ({
           name,
           description,
-          moduleLoadCommand,
           hiddenOptions,
-          modulesToLoad,
+          moduleLoads,
           owner,
           tenant,
         }) => (
@@ -77,8 +76,7 @@ const SchedulerProfiles: React.FC = () => {
               <div>{description}</div>
               <DescriptionList
                 data={{
-                  moduleLoadCommand,
-                  modulesToLoad,
+                  moduleLoads,
                   hiddenOptions,
                   owner,
                   tenant,