added retry & timeout fields

src/mainviews/create-job.tsx

@@ -20,7 +20,7 @@ import { Scheduler, SchedulerService } from '../handler';
 import { useTranslator } from '../hooks';
 import { ICreateJobModel, IJobParameter, JobsView } from '../model';
 import { Scheduler as SchedulerTokens } from '../tokens';
-import { NameError } from '../util/job-name-validation';
+import { NameError, MaxRetryAttemptsError, MaxRunTimeError, MaxWaitTimeError } from '../util/job-name-validation';
 
 import { caretDownIcon } from '@jupyterlab/ui-components';
 
@@ -191,6 +191,26 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
     }
   };
 
+  const handleNumericInputChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const target = event.target;
+
+    const parameterNameIdx = parameterNameMatch(target.name);
+    const parameterValueIdx = parameterValueMatch(target.name);
+    const newParams = props.model.parameters || [];
+
+    if (parameterNameIdx !== null) {
+      newParams[parameterNameIdx].name = target.value;
+      props.handleModelChange({ ...props.model, parameters: newParams });
+    } else if (parameterValueIdx !== null) {
+      newParams[parameterValueIdx].value = +target.value;
+      props.handleModelChange({ ...props.model, parameters: newParams });
+    } else {
+      const value = +target.value;
+      const name = target.name;
+      props.handleModelChange({ ...props.model, [name]: isNaN(value)? target.value: value });
+    }
+  };
+
   const handleSelectChange = (event: SelectChangeEvent<string>) => {
     const target = event.target;
 
@@ -495,6 +515,57 @@ export function CreateJob(props: ICreateJobProps): JSX.Element {
             environmentList={environmentList}
             value={props.model.environment}
           />
+          <TextField
+            label={trans.__('Maximum Retry Attempts')}
+            variant="outlined"
+            onChange={e => {
+              // Validate name
+              setErrors({
+                ...errors,
+                maxRetryAttempts: MaxRetryAttemptsError(e.target.value, trans)
+              });
+              handleNumericInputChange(e as ChangeEvent<HTMLInputElement>);
+            }}
+            error={!!errors['maxRetryAttempts']}
+            helperText={errors['maxRetryAttempts'] ?? ''}
+            value={props.model.maxRetryAttempts}
+            id={`${formPrefix}maxRetryAttempts`}
+            name="maxRetryAttempts"
+          />
+          <TextField
+            label={trans.__('Max Run Time (In Seconds)')}
+            variant="outlined"
+            onChange={e => {
+              // Validate name
+              setErrors({
+                ...errors,
+                maxRunTime: MaxRunTimeError(e.target.value, trans)
+              });
+              handleNumericInputChange(e as ChangeEvent<HTMLInputElement>);
+            }}
+            error={!!errors['maxRunTime']}
+            helperText={errors['maxRunTime'] ?? ''}
+            value={props.model.maxRunTime}
+            id={`${formPrefix}maxRunTime`}
+            name="maxRunTime"
+          />
+          <TextField
+            label={trans.__('Max Wait Time (In Seconds)')}
+            variant="outlined"
+            onChange={e => {
+              // Validate name
+              setErrors({
+                ...errors,
+                maxWaitTime: MaxWaitTimeError(e.target.value, trans)
+              });
+              handleNumericInputChange(e as ChangeEvent<HTMLInputElement>);
+            }}
+            error={!!errors['maxWaitTime']}
+            helperText={errors['maxWaitTime'] ?? ''}
+            value={props.model.maxWaitTime}
+            id={`${formPrefix}maxWaitTime`}
+            name="maxWaitTime"
+          />
           <OutputFormatPicker
             label={trans.__('Output formats')}
             name="outputFormat"

src/model.ts

@@ -72,6 +72,12 @@ export type ModelWithScheduleFields = {
    * Value of input field for past the hour.
    */
   scheduleMinute: string;
+
+  maxRetryAttempts: number;
+
+  maxRunTime: number;
+
+  maxWaitTime: number;
 };
 
 export interface ICreateJobModel
@@ -108,7 +114,10 @@ export const defaultScheduleFields: ModelWithScheduleFields = {
   scheduleMinute: '0',
   scheduleMonthDay: '1',
   scheduleWeekDay: '1',
-  timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+  timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+  maxRetryAttempts: 1,
+  maxRunTime: 172800,
+  maxWaitTime: 172800,
 };
 
 export function emptyCreateJobModel(): ICreateJobModel {
@@ -267,7 +276,7 @@ export class JobsModel extends VDomModel {
 
   fromJson(data: IJobsModel): void {
     this._jobsView = data.jobsView ?? JobsView.ListJobs;
-    this._createJobModel = data.createJobModel ?? emptyCreateJobModel();
+    this._createJobModel = data.createJobModel ? { ...defaultScheduleFields, ...data.createJobModel } : emptyCreateJobModel();
     this._listJobsModel = data.listJobsModel ?? emptyListJobsModel();
     this._jobDetailModel = data.jobDetailModel ?? emptyDetailViewModel();
     this._updateJobDefinitionModel =

src/util/job-name-validation.tsx

@@ -5,6 +5,7 @@ import { TranslationBundle } from '@jupyterlab/translation';
 const jobNameRegex = /^[a-zA-Z0-9._][a-zA-Z0-9._ -]{0,62}$/;
 const invalidFirstCharRegex = /^[^a-zA-Z0-9._]/;
 const invalidCharRegex = /[^a-zA-Z0-9._ -]/g;
+const validIntegerRregex = /^[+]?[1-9]\d*$/;
 const maxLength = 63;
 
 export function NameIsValid(name: string): boolean {
@@ -64,3 +65,63 @@ export function NameError(name: string, trans: TranslationBundle): string {
     'Name must contain only letters, numbers, spaces, periods, hyphens, and underscores'
   );
 }
+
+export function MaxRetryAttemptsError(maxRetryAttempts: string, trans: TranslationBundle): string {
+  // Check for blank
+  if (maxRetryAttempts === '') {
+    return trans.__('You must specify max retry attempts');
+  }
+
+  if (!validIntegerRregex.test(maxRetryAttempts)) {
+    return trans.__(
+      'Max retry attempts must be an integer'
+    );
+  }
+ const integerValue = +maxRetryAttempts
+  // Check for length.
+  if (integerValue < 1 || integerValue > 30) {
+    return trans.__('Max retry attempts must be between 1 and 30');
+  }
+
+  return '';
+}
+
+export function MaxRunTimeError(maxRunTime: string, trans: TranslationBundle): string {
+  // Check for blank
+  if (maxRunTime === '') {
+    return trans.__('You must specify max run time');
+  }
+
+  if (!validIntegerRregex.test(maxRunTime)) {
+    return trans.__(
+      'Max run time must be an integer'
+    );
+  }
+ const integerValue = +maxRunTime
+  // Check for length.
+  if (integerValue < 1) {
+    return trans.__('Max run time must be greater than 1');
+  }
+
+  return '';
+}
+
+export function MaxWaitTimeError(maxWaitTime: string, trans: TranslationBundle): string {
+  // Check for blank
+  if (maxWaitTime === '') {
+    return trans.__('You must specify max run time');
+  }
+
+  if (!validIntegerRregex.test(maxWaitTime)) {
+    return trans.__(
+      'Max wait time must be an integer'
+    );
+  }
+ const integerValue = +maxWaitTime
+  // Check for length.
+  if (integerValue < 1) {
+    return trans.__('Max wait time must be greater than 1');
+  }
+
+  return '';
+}