Added minor changes

5 years ago · c1ddd637b4
parent 6883ee3155
commit c1ddd637b4
9 changed files with 65 additions and 65 deletions
--- a/cvat-ui/src/components/actions-menu/actions-menu.tsx
+++ b/cvat-ui/src/components/actions-menu/actions-menu.tsx
@ -68,6 +68,7 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
                            onClickMenu(copyParams, file);
                        },
                        okButtonProps: {
+                            type: 'primary',
                            danger: true,
                        },
                        okText: 'Update',
@ -84,6 +85,7 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
                    onClickMenu(copyParams);
                },
                okButtonProps: {
+                    type: 'primary',
                    danger: true,
                },
                okText: 'Delete',
--- a/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss
+++ b/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss
@ -46,7 +46,8 @@
 .cvat-merge-control,
 .cvat-group-control,
 .cvat-split-track-control,
-.cvat-issue-control {
+.cvat-issue-control,
+.cvat-tools-control {
    border-radius: 3.3px;
    transform: scale(0.65);
    padding: 2px;
--- a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx
+++ b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx
@ -102,6 +102,7 @@ export default function AnnotationMenuComponent(props: Props): JSX.Element {
                            onClickMenu(copyParams, file);
                        },
                        okButtonProps: {
+                            type: 'primary',
                            danger: true,
                        },
                        okText: 'Update',
@ -120,6 +121,7 @@ export default function AnnotationMenuComponent(props: Props): JSX.Element {
                    onClickMenu(copyParams);
                },
                okButtonProps: {
+                    type: 'primary',
                    danger: true,
                },
                okText: 'Delete',
--- a/cvat-ui/src/components/create-task-page/project-search-field.tsx
+++ b/cvat-ui/src/components/create-task-page/project-search-field.tsx
@ -62,10 +62,13 @@ export default function ProjectSearchField(props: Props): JSX.Element {
        if (value && !projects.filter((project) => project.id === value).length) {
            core.projects.get({ id: value }).then((result: Project[]) => {
                const [project] = result;
-                setProjects([...projects, {
-                    id: project.id,
-                    name: project.name,
-                }]);
+                setProjects([
+                    ...projects,
+                    {
+                        id: project.id,
+                        name: project.name,
+                    },
+                ]);
                setSearchPhrase(project.name);
                onSelect(project.id);
            });
@ -80,12 +83,10 @@ export default function ProjectSearchField(props: Props): JSX.Element {
            onSelect={handleSelect}
            className='cvat-project-search-field'
            onDropdownVisibleChange={handleFocus}
-            dataSource={
-                projects.map((proj) => ({
-                    value: proj.id.toString(),
-                    text: proj.name,
-                }))
-            }
+            options={projects.map((proj) => ({
+                value: proj.id.toString(),
+                text: proj.name,
+            }))}
        />
    );
 }
--- a/cvat-ui/src/components/labels-editor/label-form.tsx
+++ b/cvat-ui/src/components/labels-editor/label-form.tsx
@ -279,8 +279,15 @@ export default class LabelForm extends React.Component<Props> {

        return (
            <Tooltip title='Can this attribute be changed frame to frame?' mouseLeaveDelay={0}>
-                <Form.Item name={[key, 'mutable']} fieldKey={[fieldInstance.fieldKey, 'mutable']} initialValue={value} valuePropName='checked'>
-                    <Checkbox className='cvat-attribute-mutable-checkbox' disabled={locked}>Mutable</Checkbox>
+                <Form.Item
+                    name={[key, 'mutable']}
+                    fieldKey={[fieldInstance.fieldKey, 'mutable']}
+                    initialValue={value}
+                    valuePropName='checked'
+                >
+                    <Checkbox className='cvat-attribute-mutable-checkbox' disabled={locked}>
+                        Mutable
+                    </Checkbox>
                </Form.Item>
            </Tooltip>
        );
@ -315,12 +322,8 @@ export default class LabelForm extends React.Component<Props> {
        const attr = label ? label.attributes.filter((_attr: any): boolean => _attr.id === fieldValue.id)[0] : null;

        return (
-            <Form.Item
-                noStyle
-                key={key}
-                shouldUpdate
-            >
-                {() => ((
+            <Form.Item noStyle key={key} shouldUpdate>
+                {() => (
                    <Row
                        justify='space-between'
                        align='middle'
@ -350,7 +353,7 @@ export default class LabelForm extends React.Component<Props> {
                        <Col span={5}>{this.renderMutableAttributeInput(fieldInstance, attr)}</Col>
                        <Col span={2}>{this.renderDeleteAttributeButton(fieldInstance, attr)}</Col>
                    </Row>
-                ))}
+                )}
            </Form.Item>
        );
    };
@ -365,25 +368,23 @@ export default class LabelForm extends React.Component<Props> {
                hasFeedback
                name='labelName'
                initialValue={value}
-                rules={
-                    [
-                        {
-                            required: true,
-                            message: 'Please specify a name',
-                        },
-                        {
-                            pattern: patterns.validateAttributeName.pattern,
-                            message: patterns.validateAttributeName.message,
-                        },
-                        {
-                            validator: async (_rule: any, labelName: string, callback: Function) => {
-                                if (labelNames && labelNames.includes(labelName)) {
-                                    callback('Label name must be unique for the task');
-                                }
-                            },
+                rules={[
+                    {
+                        required: true,
+                        message: 'Please specify a name',
+                    },
+                    {
+                        pattern: patterns.validateAttributeName.pattern,
+                        message: patterns.validateAttributeName.message,
+                    },
+                    {
+                        validator: async (_rule: any, labelName: string, callback: Function) => {
+                            if (labelNames && labelNames.includes(labelName)) {
+                                callback('Label name must be unique for the task');
+                            }
                        },
-                    ]
-                }
+                    },
+                ]}
            >
                <Input disabled={locked} placeholder='Label name' />
            </Form.Item>
@ -444,6 +445,7 @@ export default class LabelForm extends React.Component<Props> {
        return (
            <Tooltip title='Do not save the label and return' mouseLeaveDelay={0}>
                <Button
+                    type='primary'
                    danger
                    style={{ width: '150px' }}
                    onClick={(): void => {
@ -485,11 +487,14 @@ export default class LabelForm extends React.Component<Props> {
        const { label } = this.props;
        if (this.formRef.current) {
            this.formRef.current.setFieldsValue({
-                attributes: label ? label.attributes
-                    .map((attribute: Attribute): Store => ({
-                        ...attribute,
-                        type: attribute.input_type,
-                    })) : [],
+                attributes: label ?
+                    label.attributes.map(
+                        (attribute: Attribute): Store => ({
+                            ...attribute,
+                            type: attribute.input_type,
+                        }),
+                    ) :
+                    [],
            });
        }
    }
@ -498,35 +503,21 @@ export default class LabelForm extends React.Component<Props> {
        return (
            <Form onFinish={this.handleSubmit} layout='vertical' ref={this.formRef}>
                <Row justify='start' align='middle'>
-                    <Col span={10}>
-                        {this.renderLabelNameInput()}
-                    </Col>
+                    <Col span={10}>{this.renderLabelNameInput()}</Col>
                    <Col span={1} />
-                    <Col span={3}>
-                        {this.renderChangeColorButton()}
-                    </Col>
+                    <Col span={3}>{this.renderChangeColorButton()}</Col>
                    <Col span={1} />
-                    <Col span={6}>
-                        {this.renderNewAttributeButton()}
-                    </Col>
+                    <Col span={6}>{this.renderNewAttributeButton()}</Col>
                </Row>
                <Row justify='start' align='middle'>
                    <Col span={24}>
-                        <Form.List name='attributes'>
-                            { this.renderAttributes() }
-                        </Form.List>
+                        <Form.List name='attributes'>{this.renderAttributes()}</Form.List>
                    </Col>
                </Row>
                <Row justify='start' align='middle'>
-                    <Col>
-                        {this.renderDoneButton()}
-                    </Col>
-                    <Col offset={1}>
-                        {this.renderContinueButton()}
-                    </Col>
-                    <Col offset={1}>
-                        {this.renderCancelButton()}
-                    </Col>
+                    <Col>{this.renderDoneButton()}</Col>
+                    <Col offset={1}>{this.renderContinueButton()}</Col>
+                    <Col offset={1}>{this.renderCancelButton()}</Col>
                </Row>
            </Form>
        );
--- a/cvat-ui/src/components/labels-editor/raw-viewer.tsx
+++ b/cvat-ui/src/components/labels-editor/raw-viewer.tsx
@ -96,6 +96,7 @@ export default class RawViewer extends React.PureComponent<Props> {
                    <Col offset={1}>
                        <Tooltip title='Do not save the label and return' mouseLeaveDelay={0}>
                            <Button
+                                type='primary'
                                danger
                                style={{ width: '150px' }}
                                onClick={(): void => {
--- a/cvat-ui/src/components/projects-page/actions-menu.tsx
+++ b/cvat-ui/src/components/projects-page/actions-menu.tsx
@ -26,6 +26,7 @@ export default function ProjectActionsMenuComponent(props: Props): JSX.Element {
                dispatch(deleteProjectAsync(projectInstance));
            },
            okButtonProps: {
+                type: 'primary',
                danger: true,
            },
            okText: 'Delete',
--- a/cvat-ui/src/components/task-page/user-selector.tsx
+++ b/cvat-ui/src/components/task-page/user-selector.tsx
@ -100,7 +100,7 @@ export default function UserSelector(props: Props): JSX.Element {
            onSelect={handleSelect}
            className={combinedClassName}
            onDropdownVisibleChange={handleFocus}
-            dataSource={users.map((user) => ({
+            options={users.map((user) => ({
                value: user.id.toString(),
                text: user.username,
            }))}
--- a/cvat-ui/src/components/tasks-page/automatic-annotation-progress.tsx
+++ b/cvat-ui/src/components/tasks-page/automatic-annotation-progress.tsx
@ -48,6 +48,7 @@ export default function AutomaticAnnotationProgress(props: Props): JSX.Element |
                                    title: 'You are going to cancel automatic annotation?',
                                    content: 'Reached progress will be lost. Continue?',
                                    okButtonProps: {
+                                        type: 'primary',
                                        danger: true,
                                    },
                                    onOk() {