diff --git a/cvat-ui/src/components/actions-menu/actions-menu.tsx b/cvat-ui/src/components/actions-menu/actions-menu.tsx index c1ef3d39..723bf68e 100644 --- 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', diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss b/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss index 0422c569..d8695372 100644 --- 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; diff --git a/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx b/cvat-ui/src/components/annotation-page/top-bar/annotation-menu.tsx index 82c5aa82..5f0970ac 100644 --- 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', diff --git a/cvat-ui/src/components/create-task-page/project-search-field.tsx b/cvat-ui/src/components/create-task-page/project-search-field.tsx index 4b9cd303..f6a4da43 100644 --- 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, + }))} /> ); } diff --git a/cvat-ui/src/components/labels-editor/label-form.tsx b/cvat-ui/src/components/labels-editor/label-form.tsx index 9e75a584..df5683ba 100644 --- 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 { return ( - - Mutable + + + Mutable + ); @@ -315,12 +322,8 @@ export default class LabelForm extends React.Component { const attr = label ? label.attributes.filter((_attr: any): boolean => _attr.id === fieldValue.id)[0] : null; return ( - - {() => (( + + {() => ( { {this.renderMutableAttributeInput(fieldInstance, attr)} {this.renderDeleteAttributeButton(fieldInstance, attr)} - ))} + )} ); }; @@ -365,25 +368,23 @@ export default class LabelForm extends React.Component { 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'); + } }, - ] - } + }, + ]} > @@ -444,6 +445,7 @@ export default class LabelForm extends React.Component { return (