X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/598e2bcda179324f0457f6e15cdd2f2a8785374d..3c7e3cdc547ad5468421e1c049daa94b0d4b8bc0:/src/views/run-process-panel/inputs/int-input.tsx diff --git a/src/views/run-process-panel/inputs/int-input.tsx b/src/views/run-process-panel/inputs/int-input.tsx index cac8a27c..aa4fe9bb 100644 --- a/src/views/run-process-panel/inputs/int-input.tsx +++ b/src/views/run-process-panel/inputs/int-input.tsx @@ -2,12 +2,13 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; -import { IntCommandInputParameter, isRequiredInput } from '~/models/workflow'; +import React from 'react'; +import { memoize } from 'lodash/fp'; +import { IntCommandInputParameter, isRequiredInput } from 'models/workflow'; import { Field } from 'redux-form'; -import { isInteger } from '~/validators/is-integer'; -import { GenericInputProps, GenericInput } from '~/views/run-process-panel/inputs/generic-input'; -import { IntInput as IntInputComponent } from '~/components/int-input/int-input'; +import { isInteger } from 'validators/is-integer'; +import { GenericInputProps, GenericInput } from 'views/run-process-panel/inputs/generic-input'; +import { IntInput as IntInputComponent } from 'components/int-input/int-input'; export interface IntInputProps { input: IntCommandInputParameter; @@ -19,15 +20,18 @@ export const IntInput = ({ input }: IntInputProps) => component={InputComponent} parse={parse} format={format} - validate={[ - isRequiredInput(input) - ? isInteger - : () => undefined, - ]} />; + validate={getValidation(input)} />; -const parse = (value: any) => parseInt(value, 10); +export const parse = (value: any) => value === '' ? '' : parseInt(value, 10); -const format = (value: any) => isNaN(value) ? '' : JSON.stringify(value); +export const format = (value: any) => isNaN(value) ? '' : JSON.stringify(value); + +const getValidation = memoize( + (input: IntCommandInputParameter) => ([ + isRequiredInput(input) + ? isInteger + : () => undefined, + ])); const InputComponent = (props: GenericInputProps) =>