Refactor: Move BaseDatabase utilities to Common/Types and update imports

- Moved GroupBy, ListResult, Select, and RequestOptions from Common/UI/Utils/BaseDatabase to Common/Types/BaseDatabase. - Updated all relevant imports across the codebase to reflect the new paths. - Removed obsolete BaseDatabase utility files from the UI components. - Ensured consistent usage of the new types in ModelDetail, ModelList, ModelTable, and Dashboard components.
2026-04-06 00:32:12 +02:00 · 2025-05-27 11:47:53 +01:00
parent 856cff3e85
commit 93123f6042
56 changed files with 102 additions and 106 deletions
--- a/Common/Tests/UI/Components/DuplicateModel.test.tsx
+++ b/Common/Tests/UI/Components/DuplicateModel.test.tsx
@@ -1,6 +1,5 @@
 import DuplicateModel from "../../../UI/Components/DuplicateModel/DuplicateModel";
 import { ModelField } from "../../../UI/Components/Forms/ModelForm";
-import Select from "../../../UI/Utils/BaseDatabase/Select";
 import { describe, expect, it, jest } from "@jest/globals";
 import {
  fireEvent,
@@ -17,6 +16,7 @@ import IconProp from "../../../Types/Icon/IconProp";
 import ObjectID from "../../../Types/ObjectID";
 import React from "react";
 import { act } from "react-test-renderer";
+import Select from "../../../Types/BaseDatabase/Select";

@TableMetaData({
  tableName: "Foo",
--- a/Common/Types/BaseDatabase/GroupBy.ts
+++ b/Common/Types/BaseDatabase/GroupBy.ts
@@ -0,0 +1,9 @@
+import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
+import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import { JSONObject } from "../../Types/JSON";
+
+type GroupBy<TBaseModel extends AnalyticsBaseModel | BaseModel | JSONObject> = {
+  [P in keyof TBaseModel]?: true;
+};
+
+export default GroupBy;
--- a/Common/Types/BaseDatabase/ListResult.ts
+++ b/Common/Types/BaseDatabase/ListResult.ts
@@ -0,0 +1,12 @@
+import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
+import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import { JSONObject } from "../../Types/JSON";
+
+export default interface ListResult<
+  TBaseModel extends BaseModel | AnalyticsBaseModel,
+> extends JSONObject {
+  data: Array<TBaseModel>;
+  count: number;
+  skip: number;
+  limit: number;
+}
--- a/Common/Types/BaseDatabase/Select.ts
+++ b/Common/Types/BaseDatabase/Select.ts
@@ -0,0 +1,9 @@
+import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
+import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import { JSONObject } from "../../Types/JSON";
+
+type Select<TBaseModel extends BaseModel | AnalyticsBaseModel | JSONObject> = {
+  [P in keyof TBaseModel]?: boolean | JSONObject;
+};
+
+export default Select;
--- a/Common/Types/Metrics/MetricQueryData.ts
+++ b/Common/Types/Metrics/MetricQueryData.ts
@@ -1,6 +1,6 @@
 import Metric from "../../Models/AnalyticsModels/Metric";
 import FilterData from "../../UI/Components/Filters/Types/FilterData";
-import GroupBy from "../../UI/Utils/BaseDatabase/GroupBy";
+import GroupBy from "../BaseDatabase/GroupBy";
 import MetricsQuery from "./MetricsQuery";

 export default interface MetricQueryData {
--- a/Common/UI/Components/DuplicateModel/DuplicateModel.tsx
+++ b/Common/UI/Components/DuplicateModel/DuplicateModel.tsx
@@ -1,5 +1,4 @@
 import API from "../../Utils/API/API";
-import Select from "../../Utils/BaseDatabase/Select";
 import ModelAPI from "../../Utils/ModelAPI/ModelAPI";
 import Navigation from "../../Utils/Navigation";
 import { ButtonStyleType } from "../Button/Button";
@@ -13,6 +12,7 @@ import Route from "../../../Types/API/Route";
 import IconProp from "../../../Types/Icon/IconProp";
 import ObjectID from "../../../Types/ObjectID";
 import React, { ReactElement, useState } from "react";
+import Select from "../../../Types/BaseDatabase/Select";

 export interface ComponentProps<TBaseModel extends BaseModel> {
  modelType: { new (): TBaseModel };
--- a/Common/UI/Components/Forms/ModelForm.tsx
+++ b/Common/UI/Components/Forms/ModelForm.tsx
@@ -1,6 +1,5 @@
 import SelectFormFields from "../../Types/SelectEntityField";
 import API from "../../Utils/API/API";
-import Select from "../../Utils/BaseDatabase/Select";
 import ModelAPI, {
  ListResult,
  ModelAPIHttpResponse,
@@ -46,6 +45,7 @@ import Permission, {
 import Typeof from "../../../Types/Typeof";
 import React, { MutableRefObject, ReactElement, useState } from "react";
 import useAsyncEffect from "use-async-effect";
+import Select from "../../../Types/BaseDatabase/Select";

 export enum FormType {
  Create,
--- a/Common/UI/Components/LogsViewer/LogsViewer.tsx
+++ b/Common/UI/Components/LogsViewer/LogsViewer.tsx
@@ -28,7 +28,7 @@ import { Dictionary } from "lodash";
 import TelemetryService from "../../../Models/DatabaseModels/TelemetryService";
 import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
 import SortOrder from "../../../Types/BaseDatabase/SortOrder";
-import ListResult from "../../Utils/BaseDatabase/ListResult";
+import ListResult from "../../../Types/BaseDatabase/ListResult";

 export interface ComponentProps {
  logs: Array<Log>;
--- a/Common/UI/Components/ModelDetail/Field.ts
+++ b/Common/UI/Components/ModelDetail/Field.ts
@@ -1,6 +1,6 @@
-import Select from "../../Utils/BaseDatabase/Select";
 import { FieldBase } from "../Detail/Field";
 import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import Select from "../../../Types/BaseDatabase/Select";

 export default interface Field<TBaseModel extends BaseModel>
  extends FieldBase<TBaseModel> {
--- a/Common/UI/Components/ModelDetail/ModelDetail.tsx
+++ b/Common/UI/Components/ModelDetail/ModelDetail.tsx
@@ -1,5 +1,4 @@
 import API from "../../Utils/API/API";
-import Select from "../../Utils/BaseDatabase/Select";
 import ModelAPI from "../../Utils/ModelAPI/ModelAPI";
 import PermissionUtil from "../../Utils/Permission";
 import User from "../../Utils/User";
@@ -21,6 +20,7 @@ import ObjectID from "../../../Types/ObjectID";
 import Permission, { PermissionHelper } from "../../../Types/Permission";
 import React, { ReactElement, useEffect, useState } from "react";
 import { useAsyncEffect } from "use-async-effect";
+import Select from "../../../Types/BaseDatabase/Select";

 export interface ComponentProps<TBaseModel extends BaseModel> {
  modelType: { new (): TBaseModel };
--- a/Common/UI/Components/ModelList/ModelList.tsx
+++ b/Common/UI/Components/ModelList/ModelList.tsx
@@ -1,6 +1,5 @@
 import API from "../../Utils/API/API";
 import Query from "../../../Types/BaseDatabase/Query";
-import Select from "../../Utils/BaseDatabase/Select";
 import ModelAPI, {
  ListResult,
  RequestOptions,
@@ -19,6 +18,7 @@ import { PromiseVoidFunction } from "../../../Types/FunctionTypes";
 import { JSONArray } from "../../../Types/JSON";
 import ObjectID from "../../../Types/ObjectID";
 import React, { ReactElement, useEffect, useState } from "react";
+import Select from "../../../Types/BaseDatabase/Select";

 export interface ComponentProps<TBaseModel extends BaseModel> {
  id: string;
--- a/Common/UI/Components/ModelListModal/ModelListModal.tsx
+++ b/Common/UI/Components/ModelListModal/ModelListModal.tsx
@@ -1,9 +1,9 @@
 import Query from "../../../Types/BaseDatabase/Query";
-import Select from "../../Utils/BaseDatabase/Select";
 import Modal from "../Modal/Modal";
 import ModelList from "../ModelList/ModelList";
 import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import React, { ReactElement, useState } from "react";
+import Select from "../../../Types/BaseDatabase/Select";

 export interface ComponentProps<TBaseModel extends BaseModel> {
  query?: Query<TBaseModel>;
--- a/Common/UI/Components/ModelTable/AnalyticsModelTable.tsx
+++ b/Common/UI/Components/ModelTable/AnalyticsModelTable.tsx
@@ -1,9 +1,5 @@
 import ModelAPI from "../../Utils/AnalyticsModelAPI/AnalyticsModelAPI";
-import GroupBy from "../../Utils/BaseDatabase/GroupBy";
 import Query from "../../../Types/BaseDatabase/Query";
-import RequestOptions from "../../Utils/BaseDatabase/RequestOptions";
-import Select from "../../Utils/BaseDatabase/Select";
-import Sort from "../../Utils/BaseDatabase/Sort";
 import BaseModelTable, { BaseTableProps, ModalType } from "./BaseModelTable";
 import AnalyticsBaseModel, {
  AnalyticsBaseModelType,
@@ -13,6 +9,10 @@ import NotImplementedException from "../../../Types/Exception/NotImplementedExce
 import { JSONObject } from "../../../Types/JSON";
 import ObjectID from "../../../Types/ObjectID";
 import React, { ReactElement } from "react";
+import Select from "../../../Types/BaseDatabase/Select";
+import Sort from "../../../Types/BaseDatabase/Sort";
+import GroupBy from "../../../Types/BaseDatabase/GroupBy";
+import RequestOptions from "../../Utils/API/RequestOptions";

 export interface ComponentProps<TBaseModel extends AnalyticsBaseModel>
  extends BaseTableProps<TBaseModel> {
--- a/Common/UI/Components/ModelTable/BaseModelTable.tsx
+++ b/Common/UI/Components/ModelTable/BaseModelTable.tsx
@@ -3,12 +3,13 @@ import { API_DOCS_URL, BILLING_ENABLED, getAllEnvVars } from "../../Config";
 import { GetReactElementFunction } from "../../Types/FunctionTypes";
 import SelectEntityField from "../../Types/SelectEntityField";
 import API from "../../Utils/API/API";
-import GroupBy from "../../Utils/BaseDatabase/GroupBy";
-import ListResult from "../../Utils/BaseDatabase/ListResult";
+
+
+
 import Query from "../../../Types/BaseDatabase/Query";
-import RequestOptions from "../../Utils/BaseDatabase/RequestOptions";
-import Select from "../../Utils/BaseDatabase/Select";
-import Sort from "../../Utils/BaseDatabase/Sort";
+import GroupBy from "../../../Types/BaseDatabase/GroupBy";
+import Sort from "../../../Types/BaseDatabase/Sort";
+import Select from "../../../Types/BaseDatabase/Select";
 import { Logger } from "../../Utils/Logger";
 import Navigation from "../../Utils/Navigation";
 import PermissionUtil from "../../Utils/Permission";
@@ -89,6 +90,8 @@ import TableView from "../../../Models/DatabaseModels/TableView";
 import UserPreferences, {
  UserPreferenceType,
 } from "../../../Utils/UserPreferences";
+import RequestOptions from "../../Utils/API/RequestOptions";
+import ListResult from "../../../Types/BaseDatabase/ListResult";

 export enum ShowAs {
  Table,
--- a/Common/UI/Components/ModelTable/ModelTable.tsx
+++ b/Common/UI/Components/ModelTable/ModelTable.tsx
@@ -1,7 +1,3 @@
-import GroupBy from "../../Utils/BaseDatabase/GroupBy";
-import Query from "../../../Types/BaseDatabase/Query";
-import Select from "../../Utils/BaseDatabase/Select";
-import Sort from "../../Utils/BaseDatabase/Sort";
 import ModelAPI, { RequestOptions } from "../../Utils/ModelAPI/ModelAPI";
 import { FormType, ModelField } from "../Forms/ModelForm";
 import ModelFormModal from "../ModelFormModal/ModelFormModal";
@@ -14,6 +10,10 @@ import Dictionary from "../../../Types/Dictionary";
 import { JSONObject } from "../../../Types/JSON";
 import ObjectID from "../../../Types/ObjectID";
 import React, { ReactElement } from "react";
+import Query from "../../../Types/BaseDatabase/Query";
+import GroupBy from "../../../Types/BaseDatabase/GroupBy";
+import Sort from "../../../Types/BaseDatabase/Sort";
+import Select from "../../../Types/BaseDatabase/Select";

 export interface ComponentProps<TBaseModel extends BaseModel>
  extends BaseTableProps<TBaseModel> {
--- a/Common/UI/Components/ModelTable/TableView.tsx
+++ b/Common/UI/Components/ModelTable/TableView.tsx
@@ -3,7 +3,6 @@ import TableView from "../../../Models/DatabaseModels/TableView";
 import ObjectID from "../../../Types/ObjectID";
 import MoreMenu from "../MoreMenu/MoreMenu";
 import MoreMenuItem from "../MoreMenu/MoreMenuItem";
-import ListResult from "../../Utils/BaseDatabase/ListResult";
 import ModelAPI from "../../Utils/ModelAPI/ModelAPI";
 import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
 import SortOrder from "../../../Types/BaseDatabase/SortOrder";
@@ -26,6 +25,7 @@ import Query from "../../../Types/BaseDatabase/Query";
 import DatabaseBaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
 import Sort from "../../../Types/BaseDatabase/Sort";
+import ListResult from "../../../Types/BaseDatabase/ListResult";

 export interface ComponentProps<T extends GenericObject> {
  tableId: string;
--- a/Common/UI/Utils/BaseDatabase/RequestOptions.ts
+++ b/Common/UI/Utils/BaseDatabase/RequestOptions.ts
--- a/Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts
+++ b/Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts
@@ -1,11 +1,11 @@
 import { FormType } from "../../Components/Forms/ModelForm";
 import { APP_API_URL } from "../../Config";
 import API from "../API/API";
-import GroupBy from "../BaseDatabase/GroupBy";
-import BaseListResult from "../BaseDatabase/ListResult";
-import RequestOptions from "../BaseDatabase/RequestOptions";
-import Select from "../BaseDatabase/Select";
-import Sort from "../BaseDatabase/Sort";
+import GroupBy from "../../../Types/BaseDatabase/GroupBy";
+import BaseListResult from "../../../Types/BaseDatabase/ListResult";
+import RequestOptions from "../API/RequestOptions";
+import Select from "../../../Types/BaseDatabase/Select";
+import Sort from "../../../Types/BaseDatabase/Sort";
 import Navigation from "../Navigation";
 import ProjectUtil from "../Project";
 import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
--- a/Common/UI/Utils/BaseDatabase/GroupBy.ts
+++ b/Common/UI/Utils/BaseDatabase/GroupBy.ts
@@ -1,9 +0,0 @@
-import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
-import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import { JSONObject } from "../../../Types/JSON";
-
-type GroupBy<TBaseModel extends AnalyticsBaseModel | BaseModel | JSONObject> = {
-  [P in keyof TBaseModel]?: true;
-};
-
-export default GroupBy;
--- a/Common/UI/Utils/BaseDatabase/ListResult.ts
+++ b/Common/UI/Utils/BaseDatabase/ListResult.ts
@@ -1,12 +0,0 @@
-import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
-import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import { JSONObject } from "../../../Types/JSON";
-
-export default interface ListResult<
-  TBaseModel extends BaseModel | AnalyticsBaseModel,
-> extends JSONObject {
-  data: Array<TBaseModel>;
-  count: number;
-  skip: number;
-  limit: number;
-}
--- a/Common/UI/Utils/BaseDatabase/Select.ts
+++ b/Common/UI/Utils/BaseDatabase/Select.ts
@@ -1,9 +0,0 @@
-import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
-import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import { JSONObject } from "../../../Types/JSON";
-
-type Select<TBaseModel extends BaseModel | AnalyticsBaseModel | JSONObject> = {
-  [P in keyof TBaseModel]?: boolean | JSONObject;
-};
-
-export default Select;
--- a/Common/UI/Utils/BaseDatabase/Sort.ts
+++ b/Common/UI/Utils/BaseDatabase/Sort.ts
@@ -1,10 +0,0 @@
-import AnalyticsDataModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
-import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import SortOrder from "../../../Types/BaseDatabase/SortOrder";
-import { JSONObject } from "../../../Types/JSON";
-
-type Sort<TBaseModel extends AnalyticsDataModel | BaseModel | JSONObject> = {
-  [P in keyof TBaseModel]?: SortOrder;
-};
-
-export default Sort;
--- a/Common/UI/Utils/ModelAPI/ModelAPI.ts
+++ b/Common/UI/Utils/ModelAPI/ModelAPI.ts
@@ -1,12 +1,11 @@
 import { FormType } from "../../Components/Forms/ModelForm";
 import { APP_API_URL } from "../../Config";
-import GroupBy from "../BaseDatabase/GroupBy";
-import BaseListResult from "../BaseDatabase/ListResult";
-import BaseRequestOptions from "../BaseDatabase/RequestOptions";
-import Select from "../BaseDatabase/Select";
-import Sort from "../BaseDatabase/Sort";
+import GroupBy from "../../../Types/BaseDatabase/GroupBy";
+import BaseListResult from "../../../Types/BaseDatabase/ListResult";
+import Select from "../../../Types/BaseDatabase/Select";
 import Navigation from "../Navigation";
 import ProjectUtil from "../Project";
+import BaseRequestOptions from "../API/RequestOptions";
 import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import HTTPErrorResponse from "../../../Types/API/HTTPErrorResponse";
 import HTTPMethod from "../../../Types/API/HTTPMethod";
@@ -21,6 +20,7 @@ import ObjectID from "../../../Types/ObjectID";
 import Project from "../../../Models/DatabaseModels/Project";
 import Query from "../../../Types/BaseDatabase/Query";
 import API from "../API/API";
+import Sort from "../../../Types/BaseDatabase/Sort";

 export class ModelAPIHttpResponse<
  TBaseModel extends BaseModel,
--- a/Common/Utils/ClientAPI/README.md
+++ b/Common/Utils/ClientAPI/README.md
@@ -0,0 +1,3 @@
+# Client API
+
+These are wrappers over OneUptime Server API that are used on the client side like Web App, MCP (for AI agents), etc. 
--- a/Dashboard/src/Components/Alert/AlertFeed.tsx
+++ b/Dashboard/src/Components/Alert/AlertFeed.tsx
@@ -8,7 +8,6 @@ import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import AlertFeed, {
  AlertFeedEventType,
 } from "Common/Models/DatabaseModels/AlertFeed";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
@@ -26,6 +25,7 @@ import { ModalWidth } from "Common/UI/Components/Modal/Modal";
 import UserNotificationEventType from "Common/Types/UserNotification/UserNotificationEventType";
 import OnCallDutyPolicyExecutionLog from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLog";
 import OnCallDutyPolicy from "Common/Models/DatabaseModels/OnCallDutyPolicy";
+import ListResult from "Common/Types/BaseDatabase/ListResult";

 export interface ComponentProps {
  alertId: ObjectID;
--- a/Dashboard/src/Components/Incident/IncidentFeed.tsx
+++ b/Dashboard/src/Components/Incident/IncidentFeed.tsx
@@ -8,7 +8,7 @@ import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import IncidentFeed, {
  IncidentFeedEventType,
 } from "Common/Models/DatabaseModels/IncidentFeed";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
--- a/Dashboard/src/Components/IncidentSeverity/FetchIncidentSeverity.tsx
+++ b/Dashboard/src/Components/IncidentSeverity/FetchIncidentSeverity.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import IncidentSeveritiesElement from "./IncidentSeveritiesElement";
--- a/Dashboard/src/Components/Label/FetchLabels.tsx
+++ b/Dashboard/src/Components/Label/FetchLabels.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import LabelsElement from "./Labels";
--- a/Dashboard/src/Components/Logs/LogsViewer.tsx
+++ b/Dashboard/src/Components/Logs/LogsViewer.tsx
@@ -10,12 +10,12 @@ import AnalyticsModelAPI, {
  ListResult,
 } from "Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI";
 import Query from "Common/Types/BaseDatabase/Query";
-import Select from "Common/UI/Utils/BaseDatabase/Select";
 import ProjectUtil from "Common/UI/Utils/Project";
 import Realtime from "Common/UI/Utils/Realtime";
 import Log from "Common/Models/AnalyticsModels/Log";
 import React, { FunctionComponent, ReactElement, useEffect } from "react";
 import ModelEventType from "Common/Types/Realtime/ModelEventType";
+import Select from "Common/Types/BaseDatabase/Select";

 export interface ComponentProps {
  id: string;
--- a/Dashboard/src/Components/Metrics/Utils/Metrics.ts
+++ b/Dashboard/src/Components/Metrics/Utils/Metrics.ts
@@ -3,7 +3,7 @@ import AnalyticsModelAPI from "Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelA
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
 import HTTPResponse from "Common/Types/API/HTTPResponse";
 import { JSONObject } from "Common/Types/JSON";
--- a/Dashboard/src/Components/Monitor/FetchMonitors.tsx
+++ b/Dashboard/src/Components/Monitor/FetchMonitors.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import MonitorsElement from "./Monitors";
--- a/Dashboard/src/Components/Monitor/MonitorFeed.tsx
+++ b/Dashboard/src/Components/Monitor/MonitorFeed.tsx
@@ -8,7 +8,7 @@ import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import MonitorFeed, {
  MonitorFeedEventType,
 } from "Common/Models/DatabaseModels/MonitorFeed";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { FeedItemProps } from "Common/UI/Components/Feed/FeedItem";
--- a/Dashboard/src/Components/Monitor/MonitorSteps/MonitorStep.tsx
+++ b/Dashboard/src/Components/Monitor/MonitorSteps/MonitorStep.tsx
@@ -22,7 +22,7 @@ import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
 import { JSONObject } from "Common/Types/JSON";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
--- a/Dashboard/src/Components/MonitorStatus/FetchMonitorStatuses.tsx
+++ b/Dashboard/src/Components/MonitorStatus/FetchMonitorStatuses.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import MonitorStatusesElement from "./MonitorStatusesElement";
--- a/Dashboard/src/Components/OnCallPolicy/FetchOnCallPolicies.tsx
+++ b/Dashboard/src/Components/OnCallPolicy/FetchOnCallPolicies.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import OnCallPoliciesElement from "./OnCallPolicies";
--- a/Dashboard/src/Components/OnCallPolicy/OnCallDutyPolicyFeed.tsx
+++ b/Dashboard/src/Components/OnCallPolicy/OnCallDutyPolicyFeed.tsx
@@ -8,7 +8,7 @@ import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import OnCallDutyPolicyFeed, {
  OnCallDutyPolicyFeedEventType,
 } from "Common/Models/DatabaseModels/OnCallDutyPolicyFeed";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
--- a/Dashboard/src/Components/OnCallPolicy/TimeLog/OnCallDutyTimeLogTable.tsx
+++ b/Dashboard/src/Components/OnCallPolicy/TimeLog/OnCallDutyTimeLogTable.tsx
@@ -25,7 +25,7 @@ import BaseAPI from "Common/UI/Utils/API/API";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import LessThan from "Common/Types/BaseDatabase/LessThan";
 import GreaterThanOrNull from "Common/Types/BaseDatabase/GreaterThanOrNull";

--- a/Dashboard/src/Components/ScheduledMaintenance/ScheduledMaintenanceFeed.tsx
+++ b/Dashboard/src/Components/ScheduledMaintenance/ScheduledMaintenanceFeed.tsx
@@ -8,7 +8,7 @@ import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ScheduledMaintenanceFeed, {
  ScheduledMaintenanceFeedEventType,
 } from "Common/Models/DatabaseModels/ScheduledMaintenanceFeed";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
--- a/Dashboard/src/Components/Slack/SlackIntegration.tsx
+++ b/Dashboard/src/Components/Slack/SlackIntegration.tsx
@@ -26,7 +26,7 @@ import WorkspaceProjectAuthToken, {
 } from "Common/Models/DatabaseModels/WorkspaceProjectAuthToken";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import WorkspaceUserAuthToken from "Common/Models/DatabaseModels/WorkspaceUserAuthToken";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import WorkspaceType from "Common/Types/Workspace/WorkspaceType";
--- a/Dashboard/src/Components/Span/SpanViewer.tsx
+++ b/Dashboard/src/Components/Span/SpanViewer.tsx
@@ -21,7 +21,7 @@ import API from "Common/UI/Utils/API/API";
 import AnalyticsModelAPI, {
  ListResult,
 } from "Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI";
-import Select from "Common/UI/Utils/BaseDatabase/Select";
+import Select from "Common/Types/BaseDatabase/Select";
 import ProjectUtil from "Common/UI/Utils/Project";
 import Log from "Common/Models/AnalyticsModels/Log";
 import Span, {
--- a/Dashboard/src/Components/StatusPage/FetchStatusPages.tsx
+++ b/Dashboard/src/Components/StatusPage/FetchStatusPages.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import StatusPagesElement from "./StatusPagesElement";
--- a/Dashboard/src/Components/Team/FetchTeams.tsx
+++ b/Dashboard/src/Components/Team/FetchTeams.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import TeamsElement from "./TeamsElement";
--- a/Dashboard/src/Components/Traces/TraceExplorer.tsx
+++ b/Dashboard/src/Components/Traces/TraceExplorer.tsx
@@ -26,8 +26,8 @@ import PageLoader from "Common/UI/Components/Loader/PageLoader";
 import SideOver, { SideOverSize } from "Common/UI/Components/SideOver/SideOver";
 import API from "Common/UI/Utils/API/API";
 import AnalyticsModelAPI from "Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
-import Select from "Common/UI/Utils/BaseDatabase/Select";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
+import Select from "Common/Types/BaseDatabase/Select";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Span, { SpanStatus } from "Common/Models/AnalyticsModels/Span";
 import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
--- a/Dashboard/src/Components/Traces/TraceTable.tsx
+++ b/Dashboard/src/Components/Traces/TraceTable.tsx
@@ -28,7 +28,7 @@ import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import Query from "Common/Types/BaseDatabase/Query";
 import SpanUtil from "../../Utils/SpanUtil";
 import TraceElement from "./TraceElement";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import TelemetryServiceElement from "../TelemetryService/TelemetryServiceElement";
--- a/Dashboard/src/Components/User/FetchUsers.tsx
+++ b/Dashboard/src/Components/User/FetchUsers.tsx
@@ -6,7 +6,7 @@ import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Includes from "Common/Types/BaseDatabase/Includes";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
 import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";
 import UsersElement from "./Users";
--- a/Dashboard/src/Components/User/RemoveUserFromProject.tsx
+++ b/Dashboard/src/Components/User/RemoveUserFromProject.tsx
@@ -6,7 +6,7 @@ import { ButtonStyleType } from "Common/UI/Components/Button/Button";
 import Card from "Common/UI/Components/Card/Card";
 import ConfirmModal from "Common/UI/Components/Modal/ConfirmModal";
 import API from "Common/UI/Utils/API/API";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import React, { ReactElement, useState } from "react";

--- a/Dashboard/src/Components/Workspace/WorkspaceNotificationRulesTable.tsx
+++ b/Dashboard/src/Components/Workspace/WorkspaceNotificationRulesTable.tsx
@@ -27,7 +27,7 @@ import { ErrorFunction, PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import TeamMember from "Common/Models/DatabaseModels/TeamMember";
 import NotificationRuleForm from "./NotificationRuleForm/NotificationRuleForm";
 import FormValues from "Common/UI/Components/Forms/Types/FormValues";
--- a/Dashboard/src/Pages/MonitorGroup/View/Monitors.tsx
+++ b/Dashboard/src/Pages/MonitorGroup/View/Monitors.tsx
@@ -11,7 +11,7 @@ import React, {
 import MonitorsTable from "../../../Components/Monitor/MonitorTable";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import API from "Common/UI/Utils/API/API";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
--- a/Dashboard/src/Pages/ServiceCatalog/View/Incidents.tsx
+++ b/Dashboard/src/Pages/ServiceCatalog/View/Incidents.tsx
@@ -11,7 +11,7 @@ import React, {
 import IncidentsTable from "../../../Components/Incident/IncidentsTable";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import API from "Common/UI/Utils/API/API";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
--- a/Dashboard/src/Pages/ServiceCatalog/View/Monitors.tsx
+++ b/Dashboard/src/Pages/ServiceCatalog/View/Monitors.tsx
@@ -12,7 +12,7 @@ import React, {
 import MonitorsTable from "../../../Components/Monitor/MonitorTable";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import API from "Common/UI/Utils/API/API";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
--- a/Dashboard/src/Pages/ServiceCatalog/View/TelemetryServices.tsx
+++ b/Dashboard/src/Pages/ServiceCatalog/View/TelemetryServices.tsx
@@ -12,7 +12,7 @@ import React, {
 import TelemetryServicesTable from "../../../Components/TelemetryService/TelemetryServiceTable";
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import API from "Common/UI/Utils/API/API";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
--- a/Dashboard/src/Pages/Settings/Invoices.tsx
+++ b/Dashboard/src/Pages/Settings/Invoices.tsx
@@ -37,7 +37,7 @@ import {
 } from "@stripe/stripe-js";
 import BillingPaymentMethod from "Common/Models/DatabaseModels/BillingPaymentMethod";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";

 export interface ComponentProps extends PageComponentProps {}

--- a/Dashboard/src/Utils/AlertState.ts
+++ b/Dashboard/src/Utils/AlertState.ts
@@ -1,7 +1,7 @@
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import ObjectID from "Common/Types/ObjectID";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import AlertState from "Common/Models/DatabaseModels/AlertState";

--- a/Dashboard/src/Utils/IncidentState.ts
+++ b/Dashboard/src/Utils/IncidentState.ts
@@ -1,7 +1,7 @@
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import ObjectID from "Common/Types/ObjectID";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import IncidentState from "Common/Models/DatabaseModels/IncidentState";

--- a/Dashboard/src/Utils/Probe.ts
+++ b/Dashboard/src/Utils/Probe.ts
@@ -1,7 +1,7 @@
 import URL from "Common/Types/API/URL";
 import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import { APP_API_URL } from "Common/UI/Config";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import Probe from "Common/Models/DatabaseModels/Probe";
 import ProjectUtil from "Common/UI/Utils/Project";
--- a/Dashboard/src/Utils/Workspace/Workspace.ts
+++ b/Dashboard/src/Utils/Workspace/Workspace.ts
@@ -1,7 +1,7 @@
 import WorkspaceProjectAuthToken from "Common/Models/DatabaseModels/WorkspaceProjectAuthToken";
 import SortOrder from "Common/Types/BaseDatabase/SortOrder";
 import WorkspaceType from "Common/Types/Workspace/WorkspaceType";
-import ListResult from "Common/UI/Utils/BaseDatabase/ListResult";
+import ListResult from "Common/Types/BaseDatabase/ListResult";
 import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI";
 import ProjectUtil from "Common/UI/Utils/Project";