Renamed file api_flow_types.ts to api_types.ts

.gitignore

@@ -79,7 +79,6 @@ lifttemplate.iws
 conf/github.conf
 tmp/
 errorShots/
-flow-coverage/
 
 
 # Sublime 

frontend/javascripts/admin/admin_rest_api.ts

@@ -91,7 +91,7 @@ import {
   type VoxelyticsWorkflowListing,
   type VoxelyticsWorkflowReport,
   type ZarrPrivateLink,
-} from "types/api_flow_types";
+} from "types/api_types";
 import type { ArbitraryObject } from "types/globals";
 import { enforceValidatedDatasetViewConfiguration } from "types/schemas/dataset_view_configuration_defaults";
 import type { DatasourceConfiguration } from "types/schemas/datasource.types";

frontend/javascripts/admin/api/folders.ts

@@ -1,5 +1,5 @@
 import Request from "libs/request";
-import type { FlatFolderTreeItem, Folder, FolderUpdater } from "types/api_flow_types";
+import type { FlatFolderTreeItem, Folder, FolderUpdater } from "types/api_types";
 
 export function getFolder(folderId: string): Promise<Folder> {
   return Request.receiveJSON(`/api/folders/${folderId}`);

frontend/javascripts/admin/api/jobs.ts

@@ -10,7 +10,7 @@ import type {
   AdditionalCoordinate,
   AiModel,
   RenderAnimationOptions,
-} from "types/api_flow_types";
+} from "types/api_types";
 import { assertResponseLimit } from "./api_utils";
 
 function transformBackendJobToAPIJob(job: any): APIJob {

frontend/javascripts/admin/api/mesh.ts

@@ -1,6 +1,6 @@
 import Request from "libs/request";
 import type { Vector3, Vector4 } from "oxalis/constants";
-import type { APIDataSourceId } from "types/api_flow_types";
+import type { APIDataSourceId } from "types/api_types";
 import { doWithToken } from "./token";
 
 export type MeshChunk = {

frontend/javascripts/admin/api/tasks.ts

@@ -8,13 +8,8 @@ import type { QueryObject } from "admin/task/task_search_form";
 import type { RequestOptions } from "libs/request";
 import Request from "libs/request";
 import * as Utils from "libs/utils";
-import type {
-  APIActiveUser,
-  APIAnnotation,
-  APIAnnotationWithTask,
-  APITask,
-} from "types/api_flow_types";
-import { APIAnnotationTypeEnum } from "types/api_flow_types";
+import type { APIActiveUser, APIAnnotation, APIAnnotationWithTask, APITask } from "types/api_types";
+import { APIAnnotationTypeEnum } from "types/api_types";
 import { assertResponseLimit } from "./api_utils";
 
 export function peekNextTasks(): Promise<APITask | null | undefined> {

frontend/javascripts/admin/auth/accept_invite_view.tsx

@@ -12,7 +12,7 @@ import Toast from "libs/toast";
 import { location } from "libs/window";
 import { useState } from "react";
 import { useHistory } from "react-router-dom";
-import type { APIUser } from "types/api_flow_types";
+import type { APIUser } from "types/api_types";
 
 const { Content } = Layout;
 

frontend/javascripts/admin/auth/registration_form_generic.tsx

@@ -10,7 +10,7 @@ import { setHasOrganizationsAction } from "oxalis/model/actions/ui_actions";
 import { setActiveUserAction } from "oxalis/model/actions/user_actions";
 import Store from "oxalis/throttled_store";
 import React from "react";
-import type { APIOrganization } from "types/api_flow_types";
+import type { APIOrganization } from "types/api_types";
 import { TOSCheckFormItem } from "./tos_check_form_item";
 
 const FormItem = Form.Item;

frontend/javascripts/admin/auth/registration_view.tsx

@@ -7,7 +7,7 @@ import Toast from "libs/toast";
 import messages from "messages";
 import { useEffect, useState } from "react";
 import { Link, useHistory } from "react-router-dom";
-import type { APIOrganization } from "types/api_flow_types";
+import type { APIOrganization } from "types/api_types";
 
 function RegistrationViewGeneric() {
   const history = useHistory();

frontend/javascripts/admin/dataset/composition_wizard/04_configure_new_dataset.tsx

@@ -34,7 +34,7 @@ import { checkLandmarksForThinPlateSpline } from "oxalis/model/helpers/transform
 import type { OxalisState } from "oxalis/store";
 import React, { useState } from "react";
 import { useSelector } from "react-redux";
-import type { APIDataLayer, APIDataset, APITeam, LayerLink } from "types/api_flow_types";
+import type { APIDataLayer, APIDataset, APITeam, LayerLink } from "types/api_types";
 import { syncValidator } from "types/validation";
 import type { WizardComponentProps } from "./common";
 

frontend/javascripts/admin/dataset/composition_wizard/common.ts

@@ -3,7 +3,7 @@ import type { UploadFile } from "antd";
 import Toast from "libs/toast";
 import type { Vector3 } from "oxalis/constants";
 import { Store } from "oxalis/singletons";
-import type { APIDataStore, APIDataset } from "types/api_flow_types";
+import type { APIDataStore, APIDataset } from "types/api_types";
 
 export type FileList = UploadFile<any>[];
 

frontend/javascripts/admin/dataset/dataset_add_compose_view.tsx

@@ -1,6 +1,6 @@
 import { CardContainer } from "admin/dataset/dataset_components";
 import { useState } from "react";
-import type { APIDataStore } from "types/api_flow_types";
+import type { APIDataStore } from "types/api_types";
 import SelectImportType from "./composition_wizard/01_select_import_type";
 import UploadFiles from "./composition_wizard/02_upload_files";
 import SelectDatasets from "./composition_wizard/03_select_datasets";

frontend/javascripts/admin/dataset/dataset_add_remote_view.tsx

@@ -37,7 +37,7 @@ import { Hint } from "oxalis/view/action-bar/download_modal_view";
 import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { useHistory } from "react-router-dom";
-import type { APIDataStore, APIUser } from "types/api_flow_types";
+import type { APIDataStore, APIUser } from "types/api_types";
 import type { ArbitraryObject } from "types/globals";
 import type { DataLayer, DatasourceConfiguration } from "types/schemas/datasource.types";
 import { dataPrivacyInfo } from "./dataset_upload_view";

frontend/javascripts/admin/dataset/dataset_add_view.tsx

@@ -13,7 +13,7 @@ import React, { useState } from "react";
 import { connect, useSelector } from "react-redux";
 import type { RouteComponentProps } from "react-router-dom";
 import { withRouter } from "react-router-dom";
-import type { APIDataStore } from "types/api_flow_types";
+import type { APIDataStore } from "types/api_types";
 import DatasetAddComposeView from "./dataset_add_compose_view";
 
 const { Content, Sider } = Layout;

frontend/javascripts/admin/dataset/dataset_components.tsx

@@ -4,7 +4,7 @@ import TeamSelectionComponent from "dashboard/dataset/team_selection_component";
 import features from "features";
 import messages from "messages";
 import type * as React from "react";
-import type { APIDataStore, APITeam, APIUser } from "types/api_flow_types";
+import type { APIDataStore, APITeam, APIUser } from "types/api_types";
 import { syncValidator } from "types/validation";
 
 const FormItem = Form.Item;

frontend/javascripts/admin/dataset/dataset_upload_view.tsx

@@ -71,7 +71,7 @@ import {
   type APIOrganization,
   type APITeam,
   type APIUser,
-} from "types/api_flow_types";
+} from "types/api_types";
 import { syncValidator } from "types/validation";
 import { FormItemWithInfo, confirmAsync } from "../../dashboard/dataset/helper_components";
 

frontend/javascripts/admin/job/job_hooks.ts

@@ -3,7 +3,7 @@ import features from "features";
 import { useEffectOnlyOnce, usePolling } from "libs/react_hooks";
 import _ from "lodash";
 import { useState } from "react";
-import type { APIJob } from "types/api_flow_types";
+import type { APIJob } from "types/api_types";
 
 type JobInfo = [jobKey: string, jobId: string];
 

frontend/javascripts/admin/job/job_list_view.tsx

@@ -28,7 +28,7 @@ import type * as React from "react";
 import { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import { Link } from "react-router-dom";
-import { type APIJob, APIJobType, type APIUserBase } from "types/api_flow_types";
+import { type APIJob, APIJobType, type APIUserBase } from "types/api_types";
 
 // Unfortunately, the twoToneColor (nor the style) prop don't support
 // CSS variables.

frontend/javascripts/admin/onboarding.tsx

@@ -27,7 +27,7 @@ import Store from "oxalis/store";
 import React, { useState } from "react";
 import { connect } from "react-redux";
 import { Link, type RouteComponentProps, withRouter } from "react-router-dom";
-import type { APIDataStore, APIUser } from "types/api_flow_types";
+import type { APIDataStore, APIUser } from "types/api_types";
 
 const { Step } = Steps;
 const FormItem = Form.Item;

frontend/javascripts/admin/organization/organization_cards.tsx

@@ -12,7 +12,7 @@ import Constants from "oxalis/constants";
 import type { OxalisState } from "oxalis/store";
 import type React from "react";
 import { useSelector } from "react-redux";
-import type { APIOrganization } from "types/api_flow_types";
+import type { APIOrganization } from "types/api_types";
 import {
   PricingPlanEnum,
   hasPricingPlanExceededStorage,

frontend/javascripts/admin/organization/organization_edit_view.tsx

@@ -19,7 +19,7 @@ import { enforceActiveOrganization } from "oxalis/model/accessors/organization_a
 import type { OxalisState } from "oxalis/store";
 import { useEffect, useState } from "react";
 import { connect } from "react-redux";
-import type { APIOrganization, APIPricingPlanStatus } from "types/api_flow_types";
+import type { APIOrganization, APIPricingPlanStatus } from "types/api_types";
 import {
   PlanAboutToExceedAlert,
   PlanDashboardCard,

frontend/javascripts/admin/organization/pricing_plan_utils.ts

@@ -1,5 +1,5 @@
 import messages from "messages";
-import type { APIOrganization, APIUser } from "types/api_flow_types";
+import type { APIOrganization, APIUser } from "types/api_types";
 
 export enum PricingPlanEnum {
   Basic = "Basic",

frontend/javascripts/admin/organization/upgrade_plan_modal.tsx

@@ -21,7 +21,7 @@ import Toast from "libs/toast";
 import messages from "messages";
 import type React from "react";
 import { useEffect, useRef, useState } from "react";
-import type { APIOrganization } from "types/api_flow_types";
+import type { APIOrganization } from "types/api_types";
 import { TeamAndPowerPlanUpgradeCards } from "./organization_cards";
 import { powerPlanFeatures, teamPlanFeatures } from "./pricing_plan_utils";
 import { PricingPlanEnum } from "./pricing_plan_utils";

frontend/javascripts/admin/project/project_create_view.tsx

@@ -10,7 +10,7 @@ import { enforceActiveUser } from "oxalis/model/accessors/user_accessor";
 import { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import { useHistory } from "react-router-dom";
-import type { APITeam, APIUser } from "types/api_flow_types";
+import type { APITeam, APIUser } from "types/api_types";
 import { FormItemWithInfo } from "../../dashboard/dataset/helper_components";
 
 const FormItem = Form.Item;

frontend/javascripts/admin/project/project_list_view.tsx

@@ -44,7 +44,7 @@ import {
   type APIUser,
   type APIUserBase,
   TracingTypeEnum,
-} from "types/api_flow_types";
+} from "types/api_types";
 
 const { Column } = Table;
 const { Search } = Input;

frontend/javascripts/admin/project/transfer_all_tasks_modal.tsx

@@ -8,7 +8,7 @@ import Toast from "libs/toast";
 import _ from "lodash";
 import messages from "messages";
 import { useState } from "react";
-import type { APIActiveUser, APIProject, APIUser } from "types/api_flow_types";
+import type { APIActiveUser, APIProject, APIUser } from "types/api_types";
 
 type Props = {
   project: APIProject | null | undefined;

frontend/javascripts/admin/scripts/script_create_view.tsx

@@ -11,7 +11,7 @@ import { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import type { RouteComponentProps } from "react-router-dom";
 import { withRouter } from "react-router-dom";
-import type { APIUser } from "types/api_flow_types";
+import type { APIUser } from "types/api_types";
 
 const FormItem = Form.Item;
 type OwnProps = {

frontend/javascripts/admin/scripts/script_list_view.tsx

@@ -11,7 +11,7 @@ import messages from "messages";
 import * as React from "react";
 import { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
-import type { APIScript, APIUser } from "types/api_flow_types";
+import type { APIScript, APIUser } from "types/api_types";
 
 const { Column } = Table;
 const { Search } = Input;

frontend/javascripts/admin/statistic/available_tasks_report_view.tsx

@@ -4,7 +4,7 @@ import { Card, Spin, Table, Tag, Tooltip, Typography } from "antd";
 import { handleGenericError } from "libs/error_handling";
 import * as Utils from "libs/utils";
 import { useState } from "react";
-import type { APIAvailableTasksReport } from "types/api_flow_types";
+import type { APIAvailableTasksReport } from "types/api_types";
 import TeamSelectionForm from "./team_selection_form";
 
 const { Column } = Table;

frontend/javascripts/admin/statistic/project_progress_report_view.tsx

@@ -9,7 +9,7 @@ import * as Utils from "libs/utils";
 import messages from "messages";
 import * as React from "react";
 import { useState } from "react";
-import type { APIProjectProgressReport, APITeam } from "types/api_flow_types";
+import type { APIProjectProgressReport, APITeam } from "types/api_types";
 import TeamSelectionForm from "./team_selection_form";
 const { Column, ColumnGroup } = Table;
 const RELOAD_INTERVAL = 10 * 60 * 1000; // 10 min

frontend/javascripts/admin/statistic/team_selection_form.tsx

@@ -1,6 +1,6 @@
 import { Button, Col, Form, Row } from "antd";
 import TeamSelectionComponent from "dashboard/dataset/team_selection_component";
-import type { APITeam } from "types/api_flow_types";
+import type { APITeam } from "types/api_types";
 const FormItem = Form.Item;
 type Props = {
   value?: APITeam | null | undefined;

frontend/javascripts/admin/statistic/time_tracking_detail_view.tsx

@@ -6,7 +6,7 @@ import { useFetch } from "libs/react_helpers";
 import _ from "lodash";
 import type { AnnotationStateFilterEnum, AnnotationTypeFilterEnum } from "oxalis/constants";
 import { AnnotationStats } from "oxalis/view/right-border-tabs/dataset_info_tab_view";
-import type { APITimeTrackingPerAnnotation } from "types/api_flow_types";
+import type { APITimeTrackingPerAnnotation } from "types/api_types";
 
 type TimeTrackingDetailViewProps = {
   userId: string;

frontend/javascripts/admin/statistic/time_tracking_overview.tsx

@@ -15,7 +15,7 @@ import { AnnotationStateFilterEnum, AnnotationTypeFilterEnum } from "oxalis/cons
 import type { OxalisState } from "oxalis/store";
 import { useState } from "react";
 import { useSelector } from "react-redux";
-import type { APITimeTrackingPerUser } from "types/api_flow_types";
+import type { APITimeTrackingPerUser } from "types/api_types";
 import ProjectAndAnnotationTypeDropdown from "./project_and_annotation_type_dropdown";
 import TimeTrackingDetailView from "./time_tracking_detail_view";
 const { RangePicker } = DatePicker;

frontend/javascripts/admin/task/task_annotation_view.tsx

@@ -29,7 +29,7 @@ import { getVolumeDescriptors } from "oxalis/model/accessors/volumetracing_acces
 import type { OxalisState } from "oxalis/store";
 import { useEffect, useState } from "react";
 import { connect } from "react-redux";
-import type { APIAnnotation, APITask, APIUser } from "types/api_flow_types";
+import type { APIAnnotation, APITask, APIUser } from "types/api_types";
 
 type OwnProps = {
   task: APITask;

frontend/javascripts/admin/task/task_create_bulk_view.tsx

@@ -8,7 +8,7 @@ import Messages from "messages";
 import type { Vector3 } from "oxalis/constants";
 import type { BoundingBoxObject } from "oxalis/store";
 import { useState } from "react";
-import type { APITask } from "types/api_flow_types";
+import type { APITask } from "types/api_types";
 
 const FormItem = Form.Item;
 const { TextArea } = Input;

frontend/javascripts/admin/task/task_create_form_view.tsx

@@ -46,7 +46,7 @@ import type { BoundingBoxObject } from "oxalis/store";
 import React, { useEffect, useState } from "react";
 import type { RouteComponentProps } from "react-router-dom";
 import { withRouter } from "react-router-dom";
-import type { APIDataset, APIProject, APIScript, APITask, APITaskType } from "types/api_flow_types";
+import type { APIDataset, APIProject, APIScript, APITask, APITaskType } from "types/api_types";
 
 const FormItem = Form.Item;
 const RadioGroup = Radio.Group;

frontend/javascripts/admin/task/task_list_view.tsx

@@ -38,7 +38,7 @@ import messages from "messages";
 import type React from "react";
 import { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
-import type { APITask, APITaskType, TaskStatus } from "types/api_flow_types";
+import type { APITask, APITaskType, TaskStatus } from "types/api_types";
 
 const { Search, TextArea } = Input;
 

frontend/javascripts/admin/task/task_search_form.tsx

@@ -6,7 +6,7 @@ import Persistence from "libs/persistence";
 import { useEffectOnlyOnce } from "libs/react_hooks";
 import _ from "lodash";
 import { useEffect, useState } from "react";
-import type { APIProject, APITaskType, APIUser } from "types/api_flow_types";
+import type { APIProject, APITaskType, APIUser } from "types/api_types";
 const FormItem = Form.Item;
 
 export type QueryObject = {

frontend/javascripts/admin/tasktype/task_type_create_view.tsx

@@ -23,7 +23,7 @@ import {
   type APITeam,
   type TracingType,
   TracingTypeEnum,
-} from "types/api_flow_types";
+} from "types/api_types";
 import { syncValidator } from "types/validation";
 
 const RadioGroup = Radio.Group;

frontend/javascripts/admin/tasktype/task_type_list_view.tsx

@@ -24,7 +24,7 @@ import messages from "messages";
 import * as React from "react";
 import { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
-import type { APITaskType } from "types/api_flow_types";
+import type { APITaskType } from "types/api_types";
 
 const { Column } = Table;
 const { Search } = Input;

frontend/javascripts/admin/team/edit_team_modal_view.tsx

@@ -4,7 +4,7 @@ import { AutoComplete, Input, Modal, Spin, Tooltip } from "antd";
 import type { DefaultOptionType } from "antd/lib/select";
 import { useEffectOnlyOnce } from "libs/react_hooks";
 import { useState } from "react";
-import type { APITeam, APITeamMembership, APIUser } from "types/api_flow_types";
+import type { APITeam, APITeamMembership, APIUser } from "types/api_types";
 import { filterTeamMembersOf, renderUsersForTeam } from "./team_list_view";
 
 type Props = {

frontend/javascripts/admin/team/team_list_view.tsx

@@ -16,7 +16,7 @@ import _ from "lodash";
 import messages from "messages";
 import * as React from "react";
 import { useEffect, useState } from "react";
-import type { APITeam, APITeamMembership, APIUser } from "types/api_flow_types";
+import type { APITeam, APITeamMembership, APIUser } from "types/api_types";
 import EditTeamModalView from "./edit_team_modal_view";
 
 const { Column } = Table;

frontend/javascripts/admin/user/experience_modal_view.tsx

@@ -8,7 +8,7 @@ import Toast from "libs/toast";
 import * as Utils from "libs/utils";
 import _ from "lodash";
 import { useState } from "react";
-import type { APIUser, ExperienceDomainList } from "types/api_flow_types";
+import type { APIUser, ExperienceDomainList } from "types/api_types";
 
 const { Column } = Table;
 

frontend/javascripts/admin/user/permissions_and_teams_modal_view.tsx

@@ -6,7 +6,7 @@ import * as Utils from "libs/utils";
 import _ from "lodash";
 import messages from "messages";
 import React, { type Key, useEffect, useState } from "react";
-import type { APITeam, APITeamMembership, APIUser } from "types/api_flow_types";
+import type { APITeam, APITeamMembership, APIUser } from "types/api_types";
 const RadioButton = Radio.Button;
 const RadioGroup = Radio.Group;