Minor client changes (#1847)

* Minor client changes * Removed extra code
cvat-ai · Jul 8, 2020 · b4bc20f · b4bc20f
1 parent 9b0faf6
commit b4bc20f
Show file tree

Hide file tree

Showing 25 changed files with 55 additions and 704 deletions.
diff --git a/cvat-ui/src/actions/models-actions.ts b/cvat-ui/src/actions/models-actions.ts
@@ -3,26 +3,14 @@
 // SPDX-License-Identifier: MIT
 
 import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import {
-    Model,
-    ModelFiles,
-    ActiveInference,
-    CombinedState,
-} from 'reducers/interfaces';
+import { Model, ModelFiles, ActiveInference } from 'reducers/interfaces';
 import getCore from 'cvat-core-wrapper';
 
-export enum PreinstalledModels {
-    RCNN = 'RCNN Object Detector',
-    MaskRCNN = 'Mask RCNN Object Detector',
-}
-
 export enum ModelsActionTypes {
     GET_MODELS = 'GET_MODELS',
     GET_MODELS_SUCCESS = 'GET_MODELS_SUCCESS',
     GET_MODELS_FAILED = 'GET_MODELS_FAILED',
     DELETE_MODEL = 'DELETE_MODEL',
-    DELETE_MODEL_SUCCESS = 'DELETE_MODEL_SUCCESS',
-    DELETE_MODEL_FAILED = 'DELETE_MODEL_FAILED',
     CREATE_MODEL = 'CREATE_MODEL',
     CREATE_MODEL_SUCCESS = 'CREATE_MODEL_SUCCESS',
     CREATE_MODEL_FAILED = 'CREATE_MODEL_FAILED',
@@ -49,16 +37,6 @@ export const modelsActions = {
             error,
         },
     ),
-    deleteModelSuccess: (id: number) => createAction(
-        ModelsActionTypes.DELETE_MODEL_SUCCESS, {
-            id,
-        },
-    ),
-    deleteModelFailed: (id: number, error: any) => createAction(
-        ModelsActionTypes.DELETE_MODEL_FAILED, {
-            error, id,
-        },
-    ),
     createModel: () => createAction(ModelsActionTypes.CREATE_MODEL),
     createModelSuccess: () => createAction(ModelsActionTypes.CREATE_MODEL_SUCCESS),
     createModelFailed: (error: any) => createAction(
@@ -115,7 +93,7 @@ const core = getCore();
 const baseURL = core.config.backendAPI.slice(0, -7);
 
 export function getModelsAsync(): ThunkAction {
-    return async (dispatch, getState): Promise<void> => {
+    return async (dispatch): Promise<void> => {
         dispatch(modelsActions.getModels());
         const models: Model[] = [];
 
@@ -133,7 +111,6 @@ export function getModelsAsync(): ThunkAction {
                 if (model.kind === 'detector') {
                     models.push({
                         id: model.id,
-                        primary: true,
                         name: model.name,
                         description: model.description,
                         framework: model.framework,
@@ -151,21 +128,6 @@ export function getModelsAsync(): ThunkAction {
     };
 }
 
-export function deleteModelAsync(id: number): ThunkAction {
-    return async (dispatch): Promise<void> => {
-        try {
-            await core.server.request(`${baseURL}/auto_annotation/delete/${id}`, {
-                method: 'DELETE',
-            });
-        } catch (error) {
-            dispatch(modelsActions.deleteModelFailed(id, error));
-            return;
-        }
-
-        dispatch(modelsActions.deleteModelSuccess(id));
-    };
-}
-
 export function createModelAsync(name: string, files: ModelFiles, global: boolean): ThunkAction {
     return async (dispatch): Promise<void> => {
         async function checkCallback(id: string): Promise<void> {
@@ -316,8 +278,8 @@ function subscribe(
     }
 }
 
-export function getInferenceStatusAsync(tasks: number[]): ThunkAction {
-    return async (dispatch, getState): Promise<void> => {
+export function getInferenceStatusAsync(): ThunkAction {
+    return async (dispatch): Promise<void> => {
         const dispatchCallback = (action: ModelsActions): void => {
             dispatch(action);
         };
@@ -370,7 +332,7 @@ export function startInferenceAsync(
                 },
             );
 
-            dispatch(getInferenceStatusAsync([taskInstance.id]));
+            dispatch(getInferenceStatusAsync());
         } catch (error) {
             dispatch(modelsActions.startInferenceFailed(taskInstance.id, error));
         }

diff --git a/cvat-ui/src/actions/plugins-actions.ts b/cvat-ui/src/actions/plugins-actions.ts
@@ -29,10 +29,7 @@ export function checkPluginsAsync(): ThunkAction {
         dispatch(pluginActions.checkPlugins());
         const plugins: PluginObjects = {
             ANALYTICS: false,
-            AUTO_ANNOTATION: true,
             GIT_INTEGRATION: false,
-            TF_ANNOTATION: false,
-            TF_SEGMENTATION: false,
             REID: false,
             DEXTR_SEGMENTATION: false,
         };

diff --git a/cvat-ui/src/components/actions-menu/actions-menu.tsx b/cvat-ui/src/components/actions-menu/actions-menu.tsx
@@ -15,16 +15,11 @@ interface Props {
     taskID: number;
     taskMode: string;
     bugTracker: string;
-
     loaders: any[];
     dumpers: any[];
     loadActivity: string | null;
     dumpActivities: string[] | null;
     exportActivities: string[] | null;
-
-    installedTFAnnotation: boolean;
-    installedTFSegmentation: boolean;
-    installedAutoAnnotation: boolean;
     inferenceIsActive: boolean;
 
     onClickMenu: (params: ClickParam, file?: File) => void;
@@ -44,12 +39,7 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
         taskID,
         taskMode,
         bugTracker,
-
-        installedAutoAnnotation,
-        installedTFAnnotation,
-        installedTFSegmentation,
         inferenceIsActive,
-
         dumpers,
         loaders,
         onClickMenu,
@@ -58,9 +48,6 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
         loadActivity,
     } = props;
 
-    const renderModelRunner = installedAutoAnnotation
-        || installedTFAnnotation || installedTFSegmentation;
-
     let latestParams: ClickParam | null = null;
     function onClickMenuWrapper(params: ClickParam | null, file?: File): void {
         const copyParams = params || latestParams;
@@ -137,17 +124,12 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
                 })
             }
             {!!bugTracker && <Menu.Item key={Actions.OPEN_BUG_TRACKER}>Open bug tracker</Menu.Item>}
-            {
-                renderModelRunner
-                    && (
-                        <Menu.Item
-                            disabled={inferenceIsActive}
-                            key={Actions.RUN_AUTO_ANNOTATION}
-                        >
-                            Automatic annotation
-                        </Menu.Item>
-                    )
-            }
+            <Menu.Item
+                disabled={inferenceIsActive}
+                key={Actions.RUN_AUTO_ANNOTATION}
+            >
+                Automatic annotation
+            </Menu.Item>
             <hr />
             <Menu.Item key={Actions.DELETE_TASK}>Delete</Menu.Item>
         </Menu>

diff --git a/cvat-ui/src/components/create-model-page/create-model-content.tsx b/cvat-ui/src/components/create-model-page/create-model-content.tsx