Merge branch 'master' into 14129-inputs-modal-new

[arvados-workbench2.git] / src / views / run-process-panel / inputs / float-input.tsx

diff --git a/src/views/run-process-panel/inputs/float-input.tsx b/src/views/run-process-panel/inputs/float-input.tsx
index 0f5a116280793671dda3c3d86ca23f4f8c983a49..56a58012b260bc2b6492671bc760d12f0479e4eb 100644 (file)
--- a/src/views/run-process-panel/inputs/float-input.tsx
+++ b/src/views/run-process-panel/inputs/float-input.tsx
@@ -3,20 +3,35 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { getInputLabel, FloatCommandInputParameter } from '~/models/workflow';
+import { FloatCommandInputParameter, isRequiredInput } from '~/models/workflow';
 import { Field } from 'redux-form';
-import { TextField } from '~/components/text-field/text-field';
 import { isNumber } from '~/validators/is-number';
-import { toNumber } from 'lodash';
+import { GenericInputProps, GenericInput } from './generic-input';
+import { FloatInput as FloatInputComponent } from '~/components/float-input/float-input';
 export interface FloatInputProps {
     input: FloatCommandInputParameter;
 }
 export const FloatInput = ({ input }: FloatInputProps) =>
     <Field
         name={input.id}
-        label={getInputLabel(input)}
-        component={TextField}
-        parse={value => toNumber(value)}
+        commandInput={input}
+        component={Input}
+        parse={parseFloat}
         format={value => isNaN(value) ? '' : JSON.stringify(value)}
-        validate={[isNumber]} />;
+        validate={[
+            isRequiredInput(input)
+                ? isNumber
+                : () => undefined,]} />;
+
+const Input = (props: GenericInputProps) =>
+    <GenericInput
+        component={InputComponent}
+        {...props} />;
+
+const InputComponent = ({ input, meta, commandInput }: GenericInputProps) =>
+    <FloatInputComponent
+        fullWidth
+        error={meta.touched && !!meta.error}
+        disabled={commandInput.disabled}
+        {...input} />;