17782: Merge branch 'main' into 17782-react-scripts-ts-migration

[arvados-workbench2.git] / src / views-components / dialog-copy / dialog-copy.tsx

diff --git a/src/views-components/dialog-copy/dialog-copy.tsx b/src/views-components/dialog-copy/dialog-copy.tsx
index 24e91dae81bb6f6f38457e386ddedcce2bef26a9..5605e6caa866c266990caa9722ac94be96004aef 100644 (file)
--- a/src/views-components/dialog-copy/dialog-copy.tsx
+++ b/src/views-components/dialog-copy/dialog-copy.tsx
@@ -2,19 +2,20 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from "react";
+import React from "react";
 import { memoize } from 'lodash/fp';
 import { InjectedFormProps, Field } from 'redux-form';
-import { WithDialogProps } from '~/store/dialog/with-dialog';
-import { FormDialog } from '~/components/form-dialog/form-dialog';
-import { ProjectTreePickerField } from '~/views-components/project-tree-picker/project-tree-picker';
-import { COPY_NAME_VALIDATION, COPY_FILE_VALIDATION } from '~/validators/validators';
-import { TextField } from "~/components/text-field/text-field";
-import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
+import { WithDialogProps } from 'store/dialog/with-dialog';
+import { FormDialog } from 'components/form-dialog/form-dialog';
+import { ProjectTreePickerField } from 'views-components/projects-tree-picker/tree-picker-field';
+import { COPY_NAME_VALIDATION, COPY_FILE_VALIDATION } from 'validators/validators';
+import { TextField } from "components/text-field/text-field";
+import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
+import { PickerIdProp } from 'store/tree-picker/picker-id';
 
 type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CopyFormDialogData>;
 
-export const DialogCopy = (props: CopyFormDialogProps & { pickerId: string }) =>
+export const DialogCopy = (props: CopyFormDialogProps & PickerIdProp) =>
     <FormDialog
         dialogTitle='Make a copy'
         formFields={CopyDialogFields(props.pickerId)}
@@ -27,12 +28,12 @@ const CopyDialogFields = memoize((pickerId: string) =>
         <span>
             <Field
                 name='name'
-                component={TextField}
+                component={TextField as any}
                 validate={COPY_NAME_VALIDATION}
                 label="Enter a new name for the copy" />
             <Field
                 name="ownerUuid"
                 component={ProjectTreePickerField}
-                validate={COPY_FILE_VALIDATION} 
+                validate={COPY_FILE_VALIDATION}
                 pickerId={pickerId}/>
         </span>);