Improved types corresponding to export actions (#8122)

cvat-ai · Jul 8, 2024 · e76ccf8 · e76ccf8
1 parent 170b52d
commit e76ccf8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 39 deletions.
diff --git a/cvat-ui/src/actions/export-actions.ts b/cvat-ui/src/actions/export-actions.ts
@@ -25,10 +25,10 @@ export enum ExportActionTypes {
 }
 
 export const exportActions = {
-    openExportDatasetModal: (instance: any) => (
+    openExportDatasetModal: (instance: ProjectOrTaskOrJob) => (
         createAction(ExportActionTypes.OPEN_EXPORT_DATASET_MODAL, { instance })
     ),
-    closeExportDatasetModal: (instance: any) => (
+    closeExportDatasetModal: (instance: ProjectOrTaskOrJob) => (
         createAction(ExportActionTypes.CLOSE_EXPORT_DATASET_MODAL, { instance })
     ),
     exportDatasetSuccess: (
@@ -61,10 +61,10 @@ export const exportActions = {
             error,
         })
     ),
-    openExportBackupModal: (instance: any) => (
+    openExportBackupModal: (instance: ProjectOrTaskOrJob) => (
         createAction(ExportActionTypes.OPEN_EXPORT_BACKUP_MODAL, { instance })
     ),
-    closeExportBackupModal: (instance: any) => (
+    closeExportBackupModal: (instance: ProjectOrTaskOrJob) => (
         createAction(ExportActionTypes.CLOSE_EXPORT_BACKUP_MODAL, { instance })
     ),
     exportBackupSuccess: (instance: Exclude<ProjectOrTaskOrJob, Job> | RequestInstanceType, instanceType: 'task' | 'project', target?: 'local' | 'cloudstorage') => (

diff --git a/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx b/cvat-ui/src/components/export-dataset/export-dataset-modal.tsx
@@ -93,7 +93,9 @@ function ExportDatasetModal(props: StateToProps): JSX.Element {
         setUseDefaultTargetStorage(true);
         setTargetStorage({ location: StorageLocation.LOCAL });
         form.resetFields();
-        dispatch(exportActions.closeExportDatasetModal(instance));
+        if (instance) {
+            dispatch(exportActions.closeExportDatasetModal(instance));
+        }
     };
 
     const handleExport = useCallback(

diff --git a/cvat-ui/src/reducers/index.ts b/cvat-ui/src/reducers/index.ts
@@ -6,7 +6,7 @@
 import { Canvas3d } from 'cvat-canvas3d/src/typescript/canvas3d';
 import { Canvas, RectDrawingMethod, CuboidDrawingMethod } from 'cvat-canvas-wrapper';
 import {
-    Webhook, MLModel, Organization, Job, Label, User,
+    Webhook, MLModel, Organization, Job, Task, Project, Label, User,
     QualityConflict, FramesMetaData, RQStatus, Event, Invitation, SerializedAPISchema,
     Request,
 } from 'cvat-core-wrapper';
@@ -37,8 +37,6 @@ interface Preview {
     preview: string;
 }
 
-export type Project = any;
-
 export interface ProjectsState {
     initialized: boolean;
     fetching: boolean;
@@ -69,8 +67,6 @@ export interface TasksQuery {
     projectId: number | null;
 }
 
-export type Task = any; // cvat-core instance
-
 export interface JobsQuery {
     page: number;
     sort: string | null;
@@ -116,23 +112,23 @@ export interface TasksState {
 export interface ExportState {
     projects: {
         dataset: {
-            modalInstance: any | null;
+            modalInstance: Project | null;
         };
         backup: {
-            modalInstance: any | null;
+            modalInstance: Project | null;
         };
     };
     tasks: {
         dataset: {
-            modalInstance: any | null;
+            modalInstance: Task | null;
         };
         backup: {
-            modalInstance: any | null;
+            modalInstance: Task | null;
         };
     };
     jobs: {
         dataset: {
-            modalInstance: any | null;
+            modalInstance: Job | null;
         };
     };
     instanceType: 'project' | 'task' | 'job' | null;
@@ -141,7 +137,7 @@ export interface ExportState {
 export interface ImportState {
     projects: {
         dataset: {
-            modalInstance: any | null;
+            modalInstance: Project | null;
             uploadState: {
                 id: number | null,
                 format: string;
@@ -156,7 +152,7 @@ export interface ImportState {
     };
     tasks: {
         dataset: {
-            modalInstance: any | null;
+            modalInstance: Task | null;
         };
         backup: {
             modalVisible: boolean;
@@ -165,7 +161,7 @@ export interface ImportState {
     };
     jobs: {
         dataset: {
-            modalInstance: any | null;
+            modalInstance: Job | null;
         };
     };
     instanceType: 'project' | 'task' | 'job' | null;

diff --git a/cvat-ui/src/utils/deep-copy.ts b/cvat-ui/src/utils/deep-copy.ts