task/TUI-316 -- bug fixes (#318)

* Fix modal open issue * Use FormText for error instead of ErrorMessage * linting
tapis-project · Jun 27, 2022 · b5b7741 · b5b7741
1 parent 775562a
commit b5b7741
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/src/tapis-ui/_common/FieldWrapperFormik/FieldWrapperFormik.tsx b/src/tapis-ui/_common/FieldWrapperFormik/FieldWrapperFormik.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormGroup, Label, FormText, Badge } from 'reactstrap';
 import styles from './FieldWrapperFormik.module.css';
-import { ErrorMessage, Field, useField } from 'formik';
+import { Field, useField } from 'formik';
 export type FieldWrapperProps = {
   name: string;
   label: string;
@@ -33,11 +33,11 @@ const FieldWrapper: React.FC<FieldWrapperProps> = ({
         ) : null}
       </Label>
       <Field name={name} as={Component} id={name} />
-      <ErrorMessage name={name} className="form-field__help">
-        {(message) => (
-          <div className={styles['form-field__help']}>{message}</div>
-        )}
-      </ErrorMessage>
+      {meta.error && (
+        <FormText className={styles['form-field__help']} color="dark">
+          {meta.error}
+        </FormText>
+      )}
       {description && !meta.error && (
         <FormText className={styles['form-field__help']} color="muted">
           {description}

diff --git a/src/tapis-ui/components/jobs/JobLauncher/steps/FileInputArrays.tsx b/src/tapis-ui/components/jobs/JobLauncher/steps/FileInputArrays.tsx
@@ -109,13 +109,7 @@ const SourceUrlsField: React.FC<FieldWrapperProps> = ({
           + Browse for Files
         </Button>
       </div>
-      {modal && (
-        <FileSelectModal
-          toggle={close}
-          selectMode={{ mode: 'multi', types: ['file', 'dir'] }}
-          onSelect={onSelect}
-        />
-      )}
+      {modal && <FileSelectModal toggle={close} onSelect={onSelect} />}
     </FormGroup>
   );
 };
@@ -175,7 +169,6 @@ const JobInputArrayField: React.FC<JobInputArrayFieldProps> = ({
             label="Source URLs"
             required={true}
             description="Input TAPIS files as pathnames, TAPIS URIs or web URLs"
-            key={uuidv4()}
           >
             <SourceUrlsField
               fileInputArrayIndex={index}
@@ -339,12 +332,12 @@ const FixedInputArray: React.FC<{ inputArray: Apps.AppFileInputArray }> = ({
         required={true}
         description="Input TAPIS files as pathnames, TAPIS URIs or web URLs"
       >
-        {inputArray.sourceUrls?.map((sourceUrl) => (
+        {inputArray.sourceUrls?.map((sourceUrl, index) => (
           <Input
             bsSize="sm"
             defaultValue={sourceUrl}
             disabled={true}
-            key={uuidv4()}
+            key={`fixed-input-array-${inputArray.name}-${index}`}
           />
         ))}
       </FieldWrapper>
@@ -429,7 +422,7 @@ const JobInputArrays: React.FC<{ arrayHelpers: FieldArrayRenderProps }> = ({
           item={jobInputArray}
           index={index}
           remove={arrayHelpers.remove}
-          key={`fileInputArrays.${index}`}
+          key={`render-fileInputArrays.${index}`}
         />
       ))}
       <Button onClick={() => arrayHelpers.push({ sourceUrls: [''] })} size="sm">