Fixed additional issues

bsekachev · bsekachev · commit cf8cf3b1f45b · 2019-12-06T13:50:49.000+03:00
diff --git a/cvat-ui/.eslintrc.js b/cvat-ui/.eslintrc.js
@@ -28,6 +28,7 @@ module.exports = {
         '@typescript-eslint/indent': ['warn', 4],
         'react/jsx-indent': ['warn', 4],
         'react/jsx-indent-props': ['warn', 4],
+        'react/jsx-props-no-spreading': 0,
         'jsx-quotes': ['error', 'prefer-single'],
         'arrow-parens': ['error', 'always'],
         '@typescript-eslint/no-explicit-any': [0],
diff --git a/cvat-ui/src/components/actions-menu/actions-menu.tsx b/cvat-ui/src/components/actions-menu/actions-menu.tsx
@@ -92,7 +92,7 @@ export default function ActionsMenuComponent(props: ActionsMenuComponentProps):
         >
             <Menu.SubMenu key='dump' title='Dump annotations'>
                 {
-                    dumpers.map((dumper) => DumperItemComponent({
+                    dumpers.map((dumper): JSX.Element => DumperItemComponent({
                         dumper,
                         taskInstance: props.taskInstance,
                         dumpActivity: (props.dumpActivities || [])
@@ -103,7 +103,7 @@ export default function ActionsMenuComponent(props: ActionsMenuComponentProps):
             </Menu.SubMenu>
             <Menu.SubMenu key='load' title='Upload annotations'>
                 {
-                    loaders.map((loader) => LoaderItemComponent({
+                    loaders.map((loader): JSX.Element => LoaderItemComponent({
                         loader,
                         taskInstance: props.taskInstance,
                         loadActivity: props.loadActivity,
@@ -113,7 +113,7 @@ export default function ActionsMenuComponent(props: ActionsMenuComponentProps):
             </Menu.SubMenu>
             <Menu.SubMenu key='export' title='Export as a dataset'>
                 {
-                    exporters.map((exporter) => ExportItemComponent({
+                    exporters.map((exporter): JSX.Element => ExportItemComponent({
                         exporter,
                         taskInstance: props.taskInstance,
                         exportActivity: (props.exportActivities || [])
diff --git a/cvat-ui/src/components/create-model-page/create-model-form.tsx b/cvat-ui/src/components/create-model-page/create-model-form.tsx
@@ -18,7 +18,7 @@ export class CreateModelForm extends React.PureComponent<Props> {
     public submit(): Promise<{name: string; global: boolean}> {
         const { form } = this.props;
         return new Promise((resolve, reject) => {
-            form.validateFields((errors, values) => {
+            form.validateFields((errors, values): void => {
                 if (!errors) {
                     resolve({
                         name: values.name,
diff --git a/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx b/cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx
@@ -40,7 +40,7 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
                 onSubmit,
             } = this.props;
 
-            form.validateFields((error, values) => {
+            form.validateFields((error, values): void => {
                 if (!error) {
                     const filteredValues = { ...values };
                     delete filteredValues.frameStep;
diff --git a/cvat-ui/src/components/create-task-page/basic-configuration-form.tsx b/cvat-ui/src/components/create-task-page/basic-configuration-form.tsx
@@ -22,7 +22,7 @@ class BasicConfigurationForm extends React.PureComponent<Props> {
                 onSubmit,
             } = this.props;
 
-            form.validateFields((error, values) => {
+            form.validateFields((error, values): void => {
                 if (!error) {
                     onSubmit({
                         name: values.name,
diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx
@@ -131,13 +131,13 @@ export default class CreateTaskContent extends React.PureComponent<Props, State>
                     return this.advancedConfigurationComponent.submit();
                 }
 
-                return new Promise((resolve) => {
+                return new Promise((resolve): void => {
                     resolve();
                 });
-            }).then(() => {
+            }).then((): void => {
                 const { onCreate } = this.props;
                 onCreate(this.state);
-            }).catch(() => {
+            }).catch((): void => {
                 notification.error({
                     message: 'Could not create a task',
                     description: 'Please, check configuration you specified',
diff --git a/cvat-ui/src/components/file-manager/file-manager.tsx b/cvat-ui/src/components/file-manager/file-manager.tsx
@@ -59,7 +59,7 @@ export default class FileManager extends React.PureComponent<Props, State> {
     }
 
     private loadData = (key: string): Promise<void> => new Promise<void>(
-        (resolve, reject) => {
+        (resolve, reject): void => {
             const { onLoadData } = this.props;
 
             const success = (): void => resolve();
diff --git a/cvat-ui/src/components/labels-editor/label-form.tsx b/cvat-ui/src/components/labels-editor/label-form.tsx
@@ -52,12 +52,12 @@ class LabelForm extends React.PureComponent<Props, {}> {
             onSubmit,
         } = this.props;
 
-        form.validateFields((error, values) => {
+        form.validateFields((error, values): void => {
             if (!error) {
                 onSubmit({
                     name: values.labelName,
                     id: label ? label.id : idGenerator(),
-                    attributes: values.keys.map((key: number, index: number) => (
+                    attributes: values.keys.map((key: number, index: number): Attribute => (
                         {
                             name: values.attrName[key],
                             type: values.type[key],
@@ -223,7 +223,7 @@ class LabelForm extends React.PureComponent<Props, {}> {
         const validator = (_: any, strNumbers: string, callback: any): void => {
             const numbers = strNumbers
                 .split(';')
-                .map((number) => Number.parseFloat(number));
+                .map((number): number => Number.parseFloat(number));
             if (numbers.length !== 3) {
                 callback('Invalid input');
             }
@@ -470,7 +470,7 @@ class LabelForm extends React.PureComponent<Props, {}> {
 
         form.getFieldDecorator('keys', {
             initialValue: label
-                ? label.attributes.map((attr: Attribute) => attr.id)
+                ? label.attributes.map((attr: Attribute): number => attr.id)
                 : [],
         });
 
diff --git a/cvat-ui/src/components/labels-editor/labels-editor.tsx b/cvat-ui/src/components/labels-editor/labels-editor.tsx
@@ -179,7 +179,7 @@ export default class LabelsEditor
         } = this.state;
 
         const filteredUnsavedLabels = unsavedLabels.filter(
-            (_label: Label) => _label.id !== label.id,
+            (_label: Label): boolean => _label.id !== label.id,
         );
 
         this.setState({
diff --git a/cvat-ui/src/components/labels-editor/raw-viewer.tsx b/cvat-ui/src/components/labels-editor/raw-viewer.tsx
@@ -13,6 +13,7 @@ import { FormComponentProps } from 'antd/lib/form/Form';
 
 import {
     Label,
+    Attribute,
 } from './common';
 
 type Props = FormComponentProps & {
@@ -38,7 +39,7 @@ class RawViewer extends React.PureComponent<Props> {
         } = this.props;
 
         e.preventDefault();
-        form.validateFields((error, values) => {
+        form.validateFields((error, values): void => {
             if (!error) {
                 onSubmit(JSON.parse(values.labels));
             }
@@ -47,11 +48,11 @@ class RawViewer extends React.PureComponent<Props> {
 
     public render(): JSX.Element {
         const { labels } = this.props;
-        const convertedLabels = labels.map((label: any) => (
+        const convertedLabels = labels.map((label: any): Label => (
             {
                 ...label,
                 id: label.id < 0 ? undefined : label.id,
-                attributes: label.attributes.map((attribute: any) => (
+                attributes: label.attributes.map((attribute: any): Attribute => (
                     {
                         ...attribute,
                         id: attribute.id < 0 ? undefined : attribute.id,
diff --git a/cvat-ui/src/components/login-page/login-form.tsx b/cvat-ui/src/components/login-page/login-form.tsx
@@ -25,7 +25,7 @@ class LoginFormComponent extends React.PureComponent<LoginFormProps> {
             onSubmit,
         } = this.props;
 
-        form.validateFields((error, values) => {
+        form.validateFields((error, values): void => {
             if (!error) {
                 onSubmit(values);
             }
diff --git a/cvat-ui/src/components/login-page/login-page.tsx b/cvat-ui/src/components/login-page/login-page.tsx
@@ -45,7 +45,7 @@ function LoginPageComponent(props: LoginPageComponentProps & RouteComponentProps
                     <Col>
                         <Text strong>
                             New to CVAT? Create
-                            <Link to='/auth/register'>an account</Link>
+                            <Link to='/auth/register'> an account</Link>
                         </Text>
                     </Col>
                 </Row>
diff --git a/cvat-ui/src/components/model-runner-modal/model-runner-modal.tsx b/cvat-ui/src/components/model-runner-modal/model-runner-modal.tsx
@@ -118,13 +118,13 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
 
             if (!selectedModelInstance.primary) {
                 let taskLabels: string[] = taskInstance.labels
-                    .map((label: any) => label.name);
+                    .map((label: any): string => label.name);
                 const [defaultMapping, defaultColors]: StringObject[] = selectedModelInstance.labels
-                    .reduce((acc: StringObject[], label) => {
+                    .reduce((acc: StringObject[], label): StringObject[] => {
                         if (taskLabels.includes(label)) {
                             acc[0][label] = label;
                             acc[1][label] = nextColor();
-                            taskLabels = taskLabels.filter((_label) => _label !== label);
+                            taskLabels = taskLabels.filter((_label): boolean => _label !== label);
                         }
 
                         return acc;
@@ -153,7 +153,7 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
                             mapping: {},
                         })}
                     >
-                        {models.map((model) => (
+                        {models.map((model): JSX.Element => (
                             <Select.Option key={model.name}>
                                 {model.name}
                             </Select.Option>
@@ -250,7 +250,7 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
                     }
                 }}
             >
-                {options.map((label: string) => (
+                {options.map((label: string): JSX.Element => (
                     <Select.Option key={label}>
                         {label}
                     </Select.Option>
@@ -301,7 +301,7 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
         } = this.props;
 
         const model = selectedModel && models
-            .filter((_model) => _model.name === selectedModel)[0];
+            .filter((_model): boolean => _model.name === selectedModel)[0];
 
         const excludedLabels: {
             model: string[];
@@ -330,7 +330,7 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
         const availableTaskLabels = taskInstance.labels
             .map(
                 (label: any) => label.name,
-            ).filter((label: string) => !excludedLabels.task.includes(label));
+            ).filter((label: string): boolean => !excludedLabels.task.includes(label));
 
         const mappingISAvailable = !!availableModelLabels.length
             && !!availableTaskLabels.length;
@@ -378,7 +378,7 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
         } = this.props;
 
         const activeModel = models.filter(
-            (model) => model.name === selectedModel,
+            (model): boolean => model.name === selectedModel,
         )[0];
 
         const enabledSubmit = (!!activeModel
@@ -394,7 +394,7 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
                         runInference(
                             taskInstance,
                             models
-                                .filter((model) => model.name === selectedModel)[0],
+                                .filter((model): boolean => model.name === selectedModel)[0],
                             mapping,
                             cleanOut,
                         );
diff --git a/cvat-ui/src/components/models-page/built-model-item.tsx b/cvat-ui/src/components/models-page/built-model-item.tsx
@@ -36,7 +36,7 @@ export default function BuiltModelItemComponent(props: Props): JSX.Element {
                     value='Supported labels'
                 >
                     {model.labels.map(
-                        (label) => (
+                        (label): JSX.Element => (
                             <Select.Option key={label}>
                                 {label}
                             </Select.Option>
diff --git a/cvat-ui/src/components/models-page/built-models-list.tsx b/cvat-ui/src/components/models-page/built-models-list.tsx
@@ -16,7 +16,9 @@ interface Props {
 
 export default function IntegratedModelsListComponent(props: Props): JSX.Element {
     const { models } = props;
-    const items = models.map((model) => <BuiltModelItemComponent key={model.name} model={model} />);
+    const items = models.map((model): JSX.Element => (
+        <BuiltModelItemComponent key={model.name} model={model} />
+    ));
 
     return (
         <>
diff --git a/cvat-ui/src/components/models-page/models-page.tsx b/cvat-ui/src/components/models-page/models-page.tsx
@@ -42,8 +42,8 @@ export default function ModelsPageComponent(props: Props): JSX.Element {
         );
     }
 
-    const uploadedModels = models.filter((model) => model.id !== null);
-    const integratedModels = models.filter((model) => model.id === null);
+    const uploadedModels = models.filter((model): boolean => model.id !== null);
+    const integratedModels = models.filter((model): boolean => model.id === null);
 
     return (
         <div className='cvat-models-page'>
diff --git a/cvat-ui/src/components/models-page/uploaded-model-item.tsx b/cvat-ui/src/components/models-page/uploaded-model-item.tsx
@@ -57,7 +57,7 @@ export default function UploadedModelItem(props: Props): JSX.Element {
                     value='Supported labels'
                 >
                     {model.labels.map(
-                        (label) => (
+                        (label): JSX.Element => (
                             <Select.Option key={label}>
                                 {label}
                             </Select.Option>
diff --git a/cvat-ui/src/components/models-page/uploaded-models-list.tsx b/cvat-ui/src/components/models-page/uploaded-models-list.tsx
@@ -23,7 +23,7 @@ export default function UploadedModelsListComponent(props: Props): JSX.Element {
         deleteModel,
     } = props;
 
-    const items = models.map((model) => {
+    const items = models.map((model): JSX.Element => {
         const owner = registeredUsers.filter((user) => user.id === model.ownerID)[0];
         return (
             <UploadedModelItem
diff --git a/cvat-ui/src/components/register-page/register-form.tsx b/cvat-ui/src/components/register-page/register-form.tsx
@@ -76,7 +76,7 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
             onSubmit,
         } = this.props;
 
-        form.validateFields((error, values) => {
+        form.validateFields((error, values): void => {
             if (!error) {
                 onSubmit(values);
             }
diff --git a/cvat-ui/src/components/task-page/details.tsx b/cvat-ui/src/components/task-page/details.tsx
@@ -60,7 +60,7 @@ export default class DetailsComponent extends React.PureComponent<Props, State>
         this.mounted = true;
 
         getReposData(taskInstance.id)
-            .then((data) => {
+            .then((data): void => {
                 if (data !== null && this.mounted) {
                     if (data.status.error) {
                         notification.error({
@@ -77,7 +77,7 @@ export default class DetailsComponent extends React.PureComponent<Props, State>
                         repository: data.url,
                     });
                 }
-            }).catch((error) => {
+            }).catch((error): void => {
                 if (this.mounted) {
                     notification.error({
                         message: 'Could not receive repository status',
@@ -272,13 +272,13 @@ export default class DetailsComponent extends React.PureComponent<Props, State>
                                                 repositoryStatus: 'syncing',
                                             });
 
-                                            syncRepos(taskInstance.id).then(() => {
+                                            syncRepos(taskInstance.id).then((): void => {
                                                 if (this.mounted) {
                                                     this.setState({
                                                         repositoryStatus: 'sync',
                                                     });
                                                 }
-                                            }).catch(() => {
+                                            }).catch((): void => {
                                                 if (this.mounted) {
                                                     this.setState({
                                                         repositoryStatus: '!sync',
@@ -374,11 +374,11 @@ export default class DetailsComponent extends React.PureComponent<Props, State>
                 <Col>
                     <LabelsEditorComponent
                         labels={taskInstance.labels.map(
-                            (label: any) => label.toJSON(),
+                            (label: any): string => label.toJSON(),
                         )}
                         onSubmit={(labels: any[]): void => {
                             taskInstance.labels = labels
-                                .map((labelData) => new core.classes.Label(labelData));
+                                .map((labelData): any => new core.classes.Label(labelData));
                             onTaskUpdate(taskInstance);
                         }}
                     />
diff --git a/cvat-ui/src/components/task-page/job-list.tsx b/cvat-ui/src/components/task-page/job-list.tsx
@@ -89,10 +89,9 @@ export default function JobListComponent(props: Props): JSX.Element {
                             userInstance = null;
                         }
 
-                        onJobUpdate({
-                            ...jobInstance,
-                            assignee: userInstance,
-                        });
+                        // eslint-disable-next-line
+                        jobInstance.assignee = userInstance;
+                        onJobUpdate(jobInstance);
                     }}
                 />
             );
diff --git a/cvat-ui/src/components/task-page/user-selector.tsx b/cvat-ui/src/components/task-page/user-selector.tsx
@@ -26,7 +26,7 @@ export default function UserSelector(props: Props): JSX.Element {
             onChange={onChange}
         >
             <Select.Option key='-1' value='—'>—</Select.Option>
-            { users.map((user) => (
+            { users.map((user): JSX.Element => (
                 <Select.Option key={user.id} value={user.username}>
                     {user.username}
                 </Select.Option>
diff --git a/cvat-ui/src/components/tasks-page/task-item.tsx b/cvat-ui/src/components/tasks-page/task-item.tsx
@@ -74,7 +74,7 @@ class TaskItemComponent extends React.PureComponent<TaskItemProps & RouteCompone
         // Count number of jobs and performed jobs
         const numOfJobs = taskInstance.jobs.length;
         const numOfCompleted = taskInstance.jobs.filter(
-            (job: any) => job.status === 'completed',
+            (job: any): boolean => job.status === 'completed',
         ).length;
 
         // Progress appearence depends on number of jobs
diff --git a/cvat-ui/src/components/tasks-page/task-list.tsx b/cvat-ui/src/components/tasks-page/task-list.tsx
@@ -23,7 +23,7 @@ export default function TaskListComponent(props: ContentListProps): JSX.Element
         onSwitchPage,
     } = props;
     const taskViews = currentTasksIndexes.map(
-        (tid, id) => <TaskItem idx={id} taskID={tid} key={tid} />,
+        (tid, id): JSX.Element => <TaskItem idx={id} taskID={tid} key={tid} />,
     );
 
     return (
diff --git a/cvat-ui/src/containers/tasks-page/tasks-list.tsx b/cvat-ui/src/containers/tasks-page/tasks-list.tsx

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export default class FileManager extends React.PureComponent<Props, State> {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`private loadData = (key: string): Promise<void> => new Promise<void>(`
`62`		`- (resolve, reject) => {`
	`62`	`+ (resolve, reject): void => {`
`63`	`63`	`const { onLoadData } = this.props;`
`64`	`64`
`65`	`65`	`const success = (): void => resolve();`