Added ability to match many model labels to one task labels (cvat-ai#…

…1051) * Added ability to match many model labels to one task labels * Fixed grammar
cleemesser · Mar 5, 2020 · 3e5cd67 · 3e5cd67
1 parent 30eeddb
commit 3e5cd67
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 27 deletions.
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
@@ -11,6 +11,7 @@ import {
     Select,
     Tooltip,
     Checkbox,
+    notification,
 } from 'antd';
 
 import { Model } from '../../reducers/interfaces';
@@ -118,6 +119,12 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
                 .filter((model) => model.name === selectedModel)[0];
 
             if (!selectedModelInstance.primary) {
+                if (!selectedModelInstance.labels.length) {
+                    notification.warning({
+                        message: 'The selected model does not include any lables',
+                    });
+                }
+
                 let taskLabels: string[] = taskInstance.labels
                     .map((label: any): string => label.name);
                 const [defaultMapping, defaultColors]: StringObject[] = selectedModelInstance.labels
@@ -304,45 +311,32 @@ export default class ModelRunnerModalComponent extends React.PureComponent<Props
         const model = selectedModel && models
             .filter((_model): boolean => _model.name === selectedModel)[0];
 
-        const excludedLabels: {
-            model: string[];
-            task: string[];
-        } = {
-            model: [],
-            task: [],
-        };
-
+        const excludedModelLabels: string[] = Object.keys(mapping);
         const withMapping = model && !model.primary;
-        const tags = withMapping ? Object.keys(mapping)
-            .map((modelLabel: string) => {
-                const taskLabel = mapping[modelLabel];
-                excludedLabels.model.push(modelLabel);
-                excludedLabels.task.push(taskLabel);
-                return this.renderMappingTag(
-                    modelLabel,
-                    mapping[modelLabel],
-                );
-            }) : [];
+        const tags = withMapping ? excludedModelLabels
+            .map((modelLabel: string) => this.renderMappingTag(
+                modelLabel,
+                mapping[modelLabel],
+            )) : [];
 
         const availableModelLabels = model ? model.labels
             .filter(
-                (label: string) => !excludedLabels.model.includes(label),
+                (label: string) => !excludedModelLabels.includes(label),
             ) : [];
-        const availableTaskLabels = taskInstance.labels
-            .map(
-                (label: any) => label.name,
-            ).filter((label: string): boolean => !excludedLabels.task.includes(label));
+        const taskLabels = taskInstance.labels.map(
+            (label: any) => label.name,
+        );
 
         const mappingISAvailable = !!availableModelLabels.length
-            && !!availableTaskLabels.length;
+            && !!taskLabels.length;
 
         return (
             <div className='cvat-run-model-dialog'>
                 { this.renderModelSelector() }
                 { withMapping && tags}
                 { withMapping
                     && mappingISAvailable
-                    && this.renderMappingInput(availableModelLabels, availableTaskLabels)
+                    && this.renderMappingInput(availableModelLabels, taskLabels)
                 }
                 { withMapping
                     && (

diff --git a/cvat-ui/src/containers/file-manager/file-manager.tsx b/cvat-ui/src/containers/file-manager/file-manager.tsx
@@ -26,11 +26,12 @@ interface DispatchToProps {
 function mapStateToProps(state: CombinedState): StateToProps {
     function convert(items: ShareItem[], path?: string): TreeNodeNormal[] {
         return items.map((item): TreeNodeNormal => {
-            const key = `${path}${item.name}/`;
+            const isLeaf = item.type !== 'DIR';
+            const key = `${path}${item.name}${isLeaf ? '' : '/'}`;
             return {
                 key,
+                isLeaf,
                 title: item.name || 'root',
-                isLeaf: item.type !== 'DIR',
                 children: convert(item.children, key),
             };
         });