From 714823514ca8ccff40e356564c616ab31bd36af6 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Wed, 21 May 2025 16:19:35 +0100 Subject: [PATCH] Refactor import paths in test and UI component files for consistency - Updated import statements in various test files to use relative paths instead of absolute paths. - Adjusted import paths in UI components to ensure they correctly reference the Types and Models directories. - Ensured all components and tests are aligned with the new directory structure for better maintainability. --- Common/Server/API/GlobalConfigAPI.ts | 1 - Common/Server/DatabaseConfig.ts | 16 ++++---- .../Services/AnalyticsDatabaseService.ts | 38 +++++++++---------- .../Types/Workflow/Components/API/Delete.ts | 18 ++++----- .../Types/Workflow/Components/API/Get.ts | 18 ++++----- .../Types/Workflow/Components/API/Patch.ts | 18 ++++----- .../Types/Workflow/Components/API/Post.ts | 18 ++++----- .../Types/Workflow/Components/API/Put.ts | 18 ++++----- .../Types/Workflow/Components/API/Utils.ts | 14 +++---- .../BaseModel/CreateManyBaseModel.ts | 14 +++---- .../BaseModel/CreateOneBaseModel.ts | 16 ++++---- .../BaseModel/DeleteManyBaseModel.ts | 18 ++++----- .../BaseModel/DeleteOneBaseModel.ts | 14 +++---- .../Components/BaseModel/FindManyBaseModel.ts | 18 ++++----- .../Components/BaseModel/FindOneBaseModel.ts | 14 +++---- .../Components/BaseModel/OnCreateBaseModel.ts | 2 +- .../Components/BaseModel/OnDeleteBaseModel.ts | 2 +- .../BaseModel/OnTriggerBaseModel.ts | 20 +++++----- .../Components/BaseModel/OnUpdateBaseModel.ts | 2 +- .../BaseModel/UpdateManyBaseModel.ts | 20 +++++----- .../BaseModel/UpdateOneBaseModel.ts | 16 ++++---- .../Workflow/Components/Conditions/IfElse.ts | 12 +++--- .../Server/Types/Workflow/Components/Email.ts | 10 ++--- .../Workflow/Components/JSON/JsonToText.ts | 12 +++--- .../Workflow/Components/JSON/MergeJson.ts | 12 +++--- .../Workflow/Components/JSON/TextToJson.ts | 12 +++--- .../MicrosoftTeams/SendMessageToChannel.ts | 20 +++++----- Common/Tests/UI/Components/404.test.tsx | 6 +-- Common/Tests/UI/Components/BasicForm.test.tsx | 4 +- .../Tests/UI/Components/Breadcrumbs.test.tsx | 4 +- Common/Tests/UI/Components/Button.test.tsx | 2 +- Common/Tests/UI/Components/Card.test.tsx | 2 +- .../Tests/UI/Components/ColorViewer.test.tsx | 4 +- .../UI/Components/ComponentsModal.test.tsx | 6 +-- .../Components/DictionaryOfStrings.test.tsx | 4 +- Common/Tests/UI/Components/Dropdown.test.tsx | 2 +- .../UI/Components/DuplicateModel.test.tsx | 12 +++--- .../Components/EmptyState/EmptyState.test.tsx | 2 +- .../Tests/UI/Components/FilePicker.test.tsx | 10 ++--- Common/Tests/UI/Components/Input.test.tsx | 2 +- Common/Tests/UI/Components/Item.test.tsx | 4 +- Common/Tests/UI/Components/Loader.test.tsx | 2 +- Common/Tests/UI/Components/Modal.test.tsx | 4 +- .../Tests/UI/Components/Pagination.test.tsx | 2 +- Common/Tests/UI/Components/Pill.test.tsx | 2 +- Common/Tests/UI/Components/Probe.test.tsx | 4 +- .../Tests/UI/Components/RadioButtons.test.tsx | 2 +- .../Tests/UI/Components/SideMenuItem.test.tsx | 6 +-- Common/Tests/UI/Components/Tabs.test.tsx | 2 +- Common/Tests/UI/Components/TextArea.test.tsx | 2 +- Common/Tests/UI/Components/Toggle.test.tsx | 2 +- Common/UI/Components/404.tsx | 6 +-- Common/UI/Components/Banner/Banner.tsx | 2 +- .../Components/BulkUpdate/BulkUpdateForm.tsx | 2 +- Common/UI/Components/Button/Button.tsx | 2 +- Common/UI/Components/Feed/FeedItem.tsx | 2 +- .../UI/Components/Forms/Fields/FormField.tsx | 2 +- Common/UI/Components/Forms/Steps/Step.tsx | 2 +- Common/UI/Components/Forms/Steps/Steps.tsx | 2 +- .../UI/Components/HeaderAlert/HeaderAlert.tsx | 2 +- Common/UI/Components/List/List.tsx | 2 +- .../Components/ModelList/StaticModelList.tsx | 2 +- .../Components/ModelTable/BaseModelTable.tsx | 2 +- Common/UI/Components/Pill/Pill.tsx | 2 +- Common/UI/Components/Table/Table.tsx | 2 +- Common/UI/Utils/API/API.ts | 22 +++++------ .../AnalyticsModelAPI/AnalyticsModelAPI.ts | 4 +- Common/UI/Utils/BaseDatabase/GroupBy.ts | 2 +- Common/UI/Utils/BaseDatabase/ListResult.ts | 2 +- .../UI/Utils/BaseDatabase/RequestOptions.ts | 4 +- Common/UI/Utils/BaseDatabase/Select.ts | 2 +- Common/UI/Utils/BaseDatabase/Sort.ts | 4 +- Common/UI/Utils/Cookie.ts | 16 ++++---- Common/UI/Utils/File.ts | 4 +- Common/UI/Utils/GlobalEvents.ts | 2 +- Common/UI/Utils/JWT.ts | 2 +- Common/UI/Utils/LocalStorage.ts | 12 +++--- Common/UI/Utils/Login.ts | 8 ++-- Common/UI/Utils/ModelAPI/ModelAPI.ts | 6 +-- Common/UI/Utils/Navigation.ts | 12 +++--- Common/UI/Utils/Permission.ts | 4 +- Common/UI/Utils/PricingPlan.ts | 4 +- Common/UI/Utils/Project.ts | 8 ++-- Common/UI/Utils/Realtime.ts | 14 +++---- Common/UI/Utils/SessionStorage.ts | 12 +++--- Common/UI/Utils/StatusPage.ts | 8 ++-- Common/UI/Utils/Timezone.ts | 4 +- Common/UI/Utils/User.ts | 18 ++++----- 88 files changed, 345 insertions(+), 346 deletions(-) diff --git a/Common/Server/API/GlobalConfigAPI.ts b/Common/Server/API/GlobalConfigAPI.ts index c5963b6823..1e79ae9b51 100644 --- a/Common/Server/API/GlobalConfigAPI.ts +++ b/Common/Server/API/GlobalConfigAPI.ts @@ -9,7 +9,6 @@ import { import Response from "../Utils/Response"; import BaseAPI from "./BaseAPI"; import GlobalConfig from "../../Models/DatabaseModels/GlobalConfig"; -import ObjectID from "../../Types/ObjectID"; export default class GlobalConfigAPI extends BaseAPI< GlobalConfig, diff --git a/Common/Server/DatabaseConfig.ts b/Common/Server/DatabaseConfig.ts index f7dddc8db6..66fce30de5 100644 --- a/Common/Server/DatabaseConfig.ts +++ b/Common/Server/DatabaseConfig.ts @@ -1,13 +1,13 @@ import GlobalConfigService from "./Services/GlobalConfigService"; -import { AccountsRoute, DashboardRoute } from "../../../ServiceRoute"; -import Hostname from "../../../Types/API/Hostname"; -import Protocol from "../../../Types/API/Protocol"; -import URL from "../../../Types/API/URL"; -import BadDataException from "../../../Types/Exception/BadDataException"; -import { JSONValue } from "../../../Types/JSON"; -import ObjectID from "../../../Types/ObjectID"; -import GlobalConfig from "../../../Models/DatabaseModels/GlobalConfig"; +import { AccountsRoute, DashboardRoute } from "../ServiceRoute"; +import Hostname from "../Types/API/Hostname"; +import Protocol from "../Types/API/Protocol"; +import URL from "../Types/API/URL"; +import BadDataException from "../Types/Exception/BadDataException"; +import { JSONValue } from "../Types/JSON"; +import GlobalConfig from "../Models/DatabaseModels/GlobalConfig"; import CaptureSpan from "./Utils/Telemetry/CaptureSpan"; +import ObjectID from "../Types/ObjectID"; export default class DatabaseConfig { @CaptureSpan() diff --git a/Common/Server/Services/AnalyticsDatabaseService.ts b/Common/Server/Services/AnalyticsDatabaseService.ts index 4bb6d28737..09798aae83 100644 --- a/Common/Server/Services/AnalyticsDatabaseService.ts +++ b/Common/Server/Services/AnalyticsDatabaseService.ts @@ -31,29 +31,29 @@ import Realtime from "../Utils/Realtime"; import StreamUtil from "../Utils/Stream"; import BaseService from "./BaseService"; import { ExecResult, ResponseJSON, ResultSet } from "@clickhouse/client"; -import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; -import { WorkflowRoute } from "../../../ServiceRoute"; -import Protocol from "../../../Types/API/Protocol"; -import Route from "../../../Types/API/Route"; -import URL from "../../../Types/API/URL"; -import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn"; -import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType"; -import SortOrder from "../../../Types/BaseDatabase/SortOrder"; -import OneUptimeDate from "../../../Types/Date"; -import BadDataException from "../../../Types/Exception/BadDataException"; -import Exception from "../../../Types/Exception/Exception"; -import { JSONObject } from "../../../Types/JSON"; -import ObjectID from "../../../Types/ObjectID"; -import PositiveNumber from "../../../Types/PositiveNumber"; -import Text from "../../../Types/Text"; -import Typeof from "../../../Types/Typeof"; +import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import { WorkflowRoute } from "../../ServiceRoute"; +import Protocol from "../../Types/API/Protocol"; +import Route from "../../Types/API/Route"; +import URL from "../../Types/API/URL"; +import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn"; +import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType"; +import SortOrder from "../../Types/BaseDatabase/SortOrder"; +import OneUptimeDate from "../../Types/Date"; +import BadDataException from "../../Types/Exception/BadDataException"; +import Exception from "../../Types/Exception/Exception"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; +import PositiveNumber from "../../Types/PositiveNumber"; +import Text from "../../Types/Text"; +import Typeof from "../../Types/Typeof"; import API from "../../../Utils/API"; import { Stream } from "node:stream"; import AggregateBy from "../Types/AnalyticsDatabase/AggregateBy"; -import AggregatedResult from "../../../Types/BaseDatabase/AggregatedResult"; +import AggregatedResult from "../../Types/BaseDatabase/AggregatedResult"; import Sort from "../Types/AnalyticsDatabase/Sort"; -import AggregatedModel from "../../../Types/BaseDatabase/AggregatedModel"; -import ModelEventType from "../../../Types/Realtime/ModelEventType"; +import AggregatedModel from "../../Types/BaseDatabase/AggregatedModel"; +import ModelEventType from "../../Types/Realtime/ModelEventType"; export default class AnalyticsDatabaseService< TBaseModel extends AnalyticsBaseModel, diff --git a/Common/Server/Types/Workflow/Components/API/Delete.ts b/Common/Server/Types/Workflow/Components/API/Delete.ts index e81aa9a54b..5fd5e17430 100644 --- a/Common/Server/Types/Workflow/Components/API/Delete.ts +++ b/Common/Server/Types/Workflow/Components/API/Delete.ts @@ -1,14 +1,14 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import Dictionary from "../../Types/Dictionary"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import APIComponents from "../../Types/Workflow/Components/API"; +import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../../Types/API/HTTPResponse"; +import URL from "../../../../../Types/API/URL"; +import Dictionary from "../../../../../Types/Dictionary"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import APIComponents from "../../../../../Types/Workflow/Components/API"; import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/API/Get.ts b/Common/Server/Types/Workflow/Components/API/Get.ts index f6f7357b6d..225b8cbe6c 100644 --- a/Common/Server/Types/Workflow/Components/API/Get.ts +++ b/Common/Server/Types/Workflow/Components/API/Get.ts @@ -1,14 +1,14 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import Dictionary from "../../Types/Dictionary"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import APIComponents from "../../Types/Workflow/Components/API"; +import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../../Types/API/HTTPResponse"; +import URL from "../../../../../Types/API/URL"; +import Dictionary from "../../../../../Types/Dictionary"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import APIComponents from "../../../../../Types/Workflow/Components/API"; import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/API/Patch.ts b/Common/Server/Types/Workflow/Components/API/Patch.ts index 0c9247a573..8035452895 100644 --- a/Common/Server/Types/Workflow/Components/API/Patch.ts +++ b/Common/Server/Types/Workflow/Components/API/Patch.ts @@ -1,14 +1,14 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import Dictionary from "../../Types/Dictionary"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import APIComponents from "../../Types/Workflow/Components/API"; +import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../../Types/API/HTTPResponse"; +import URL from "../../../../../Types/API/URL"; +import Dictionary from "../../../../../Types/Dictionary"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import APIComponents from "../../../../../Types/Workflow/Components/API"; import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/API/Post.ts b/Common/Server/Types/Workflow/Components/API/Post.ts index d1201dacc9..ffca9020e9 100644 --- a/Common/Server/Types/Workflow/Components/API/Post.ts +++ b/Common/Server/Types/Workflow/Components/API/Post.ts @@ -1,14 +1,14 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import Dictionary from "../../Types/Dictionary"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import APIComponents from "../../Types/Workflow/Components/API"; +import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../../Types/API/HTTPResponse"; +import URL from "../../../../../Types/API/URL"; +import Dictionary from "../../../../../Types/Dictionary"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import APIComponents from "../../../../../Types/Workflow/Components/API"; import API from "../../Utils/API"; import logger from "../../../../Utils/Logger"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/API/Put.ts b/Common/Server/Types/Workflow/Components/API/Put.ts index a5b18037e2..ec246a64ee 100644 --- a/Common/Server/Types/Workflow/Components/API/Put.ts +++ b/Common/Server/Types/Workflow/Components/API/Put.ts @@ -1,14 +1,14 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; import { ApiComponentUtils } from "./Utils"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import Dictionary from "../../Types/Dictionary"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import APIComponents from "../../Types/Workflow/Components/API"; +import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../../Types/API/HTTPResponse"; +import URL from "../../../../../Types/API/URL"; +import Dictionary from "../../../../../Types/Dictionary"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import APIComponents from "../../../../../Types/Workflow/Components/API"; import API from "../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/API/Utils.ts b/Common/Server/Types/Workflow/Components/API/Utils.ts index 46d1098400..a2dc1e522a 100644 --- a/Common/Server/Types/Workflow/Components/API/Utils.ts +++ b/Common/Server/Types/Workflow/Components/API/Utils.ts @@ -1,11 +1,11 @@ import { RunOptions } from "../../ComponentCode"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; +import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../../Types/API/HTTPResponse"; +import URL from "../../../../../Types/API/URL"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export class ApiComponentUtils { diff --git a/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts index ee4bf30dd7..ca61c1d060 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/CreateManyBaseModel.ts @@ -1,12 +1,12 @@ import DatabaseService from "../../../../Services/DatabaseService"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class CreateManyBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts index 6329520910..8058cf6a31 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/CreateOneBaseModel.ts @@ -1,14 +1,14 @@ import DatabaseService from "../../../../Services/DatabaseService"; import logger from "../../../../Utils/Logger"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "../../Types/Exception/BadDataException"; -import Exception from "../../Types/Exception/Exception"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import Exception from "../../../../../Types/Exception/Exception"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class CreateOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts index 3564fdd8ff..3f89e2e927 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/DeleteManyBaseModel.ts @@ -1,15 +1,15 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import PositiveNumber from "../../Types/PositiveNumber"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { LIMIT_PER_PROJECT } from "../../../../../Types/Database/LimitMax"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import PositiveNumber from "../../../../../Types/PositiveNumber"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; export default class DeleteManyBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts index 6aaf677a10..65092d32cf 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/DeleteOneBaseModel.ts @@ -1,13 +1,13 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class DeleteOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts index f62c6887e1..0cf427e10f 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/FindManyBaseModel.ts @@ -2,15 +2,15 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import Select from "../../../Database/Select"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import PositiveNumber from "../../Types/PositiveNumber"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { LIMIT_PER_PROJECT } from "../../../../../Types/Database/LimitMax"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import PositiveNumber from "../../../../../Types/PositiveNumber"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class FindManyBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts index 1f72f063f2..75500e107b 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/FindOneBaseModel.ts @@ -2,13 +2,13 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import Select from "../../../Database/Select"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class FindOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts index 5b75c8a6b1..e08c4c4337 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnCreateBaseModel.ts @@ -1,6 +1,6 @@ import DatabaseService from "../../../../Services/DatabaseService"; import OnTriggerBaseModel from "./OnTriggerBaseModel"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default class OnCreateBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts index 9a4f3a3561..2db4a8ed9a 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnDeleteBaseModel.ts @@ -1,6 +1,6 @@ import DatabaseService from "../../../../Services/DatabaseService"; import OnTriggerBaseModel from "./OnTriggerBaseModel"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default class OnDeleteBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts index 39970731db..e57f699695 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts @@ -7,16 +7,16 @@ import Response from "../../../../Utils/Response"; import Select from "../../../Database/Select"; import { RunOptions, RunReturnType } from "../../ComponentCode"; import TriggerCode, { ExecuteWorkflowType, InitProps } from "../../TriggerCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import LIMIT_MAX from "../../Types/Database/LimitMax"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import ObjectID from "../../Types/ObjectID"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; -import Workflow from "../../Models/DatabaseModels/Workflow"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import LIMIT_MAX from "../../../../../Types/Database/LimitMax"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import ObjectID from "../../../../../Types/ObjectID"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; +import Workflow from "../../../../../Models/DatabaseModels/Workflow"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class OnTriggerBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts index fc1ae6bc7c..1b8d03475f 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/OnUpdateBaseModel.ts @@ -1,6 +1,6 @@ import DatabaseService from "../../../../Services/DatabaseService"; import OnTriggerBaseModel from "./OnTriggerBaseModel"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; export default class OnUpdateBaseModel< TBaseModel extends BaseModel, diff --git a/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts index a84fcfdd6e..6fb6975716 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/UpdateManyBaseModel.ts @@ -1,16 +1,16 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; -import QueryDeepPartialEntity from "../../Types/Database/PartialEntity"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import PositiveNumber from "../../Types/PositiveNumber"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import { LIMIT_PER_PROJECT } from "../../../../../Types/Database/LimitMax"; +import QueryDeepPartialEntity from "../../../../../Types/Database/PartialEntity"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import PositiveNumber from "../../../../../Types/PositiveNumber"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class UpdateManyBaseModel< diff --git a/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts b/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts index a67affbf4f..45c1d71b72 100644 --- a/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts +++ b/Common/Server/Types/Workflow/Components/BaseModel/UpdateOneBaseModel.ts @@ -1,14 +1,14 @@ import DatabaseService from "../../../../Services/DatabaseService"; import Query from "../../../Database/Query"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import QueryDeepPartialEntity from "../../Types/Database/PartialEntity"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import Text from "../../Types/Text"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import BaseModelComponents from "../../Types/Workflow/Components/BaseModel"; +import BaseModel from "../../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import QueryDeepPartialEntity from "../../../../../Types/Database/PartialEntity"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import Text from "../../../../../Types/Text"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import BaseModelComponents from "../../../../../Types/Workflow/Components/BaseModel"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class UpdateOneBaseModel< diff --git a/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts b/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts index 0a8bfc5bed..bd7b8772cb 100644 --- a/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts +++ b/Common/Server/Types/Workflow/Components/Conditions/IfElse.ts @@ -1,13 +1,13 @@ import VMUtil from "../../../../Utils/VM/VMAPI"; import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "../../Types/Exception/BadDataException"; -import ReturnResult from "../../Types/IsolatedVM/ReturnResult"; -import { JSONObject, JSONValue } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import ReturnResult from "../../../../../Types/IsolatedVM/ReturnResult"; +import { JSONObject, JSONValue } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; import Components, { ConditionOperator, -} from "../../Types/Workflow/Components/Condition"; +} from "../../../../../Types/Workflow/Components/Condition"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class IfElse extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/Email.ts b/Common/Server/Types/Workflow/Components/Email.ts index d1615e1ad4..42239c5d52 100644 --- a/Common/Server/Types/Workflow/Components/Email.ts +++ b/Common/Server/Types/Workflow/Components/Email.ts @@ -1,9 +1,9 @@ import ComponentCode, { RunOptions, RunReturnType } from "../ComponentCode"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import Components from "../../Types/Workflow/Components/Email"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import Components from "../../../../../Types/Workflow/Components/Email"; import nodemailer, { Transporter } from "nodemailer"; import SMTPTransport from "nodemailer/lib/smtp-transport"; import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan"; diff --git a/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts b/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts index 79f548f5b1..1223de60d7 100644 --- a/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts +++ b/Common/Server/Types/Workflow/Components/JSON/JsonToText.ts @@ -1,10 +1,10 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import JSONComponents from "../../Types/Workflow/Components/JSON"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import JSONComponents from "../../../../../Types/Workflow/Components/JSON"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class JsonToText extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts b/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts index 26396a61e0..ffd8d95c8a 100644 --- a/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts +++ b/Common/Server/Types/Workflow/Components/JSON/MergeJson.ts @@ -1,10 +1,10 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import JSONComponents from "../../Types/Workflow/Components/JSON"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import JSONComponents from "../../../../../Types/Workflow/Components/JSON"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class MergeJSON extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts b/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts index 8cc8c35c92..c5d82a584d 100644 --- a/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts +++ b/Common/Server/Types/Workflow/Components/JSON/TextToJson.ts @@ -1,10 +1,10 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import JSONFunctions from "../../Types/JSONFunctions"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import JSONComponents from "../../Types/Workflow/Components/JSON"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import JSONFunctions from "../../../../../Types/JSONFunctions"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import JSONComponents from "../../../../../Types/Workflow/Components/JSON"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class TextToJSON extends ComponentCode { diff --git a/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts b/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts index 08eff7ef93..0fadd8caf3 100644 --- a/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts +++ b/Common/Server/Types/Workflow/Components/MicrosoftTeams/SendMessageToChannel.ts @@ -1,14 +1,14 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode"; -import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; -import HTTPResponse from "../../Types/API/HTTPResponse"; -import URL from "../../Types/API/URL"; -import APIException from "../../Types/Exception/ApiException"; -import BadDataException from "../../Types/Exception/BadDataException"; -import { JSONObject } from "../../Types/JSON"; -import ComponentMetadata, { Port } from "../../Types/Workflow/Component"; -import ComponentID from "../../Types/Workflow/ComponentID"; -import MicrosoftTeamComponents from "../../Types/Workflow/Components/MicrosoftTeams"; -import API from "../../Utils/API"; +import HTTPErrorResponse from "../../../../../Types/API/HTTPErrorResponse"; +import HTTPResponse from "../../../../../Types/API/HTTPResponse"; +import URL from "../../../../../Types/API/URL"; +import APIException from "../../../../../Types/Exception/ApiException"; +import BadDataException from "../../../../../Types/Exception/BadDataException"; +import { JSONObject } from "../../../../../Types/JSON"; +import ComponentMetadata, { Port } from "../../../../../Types/Workflow/Component"; +import ComponentID from "../../../../../Types/Workflow/ComponentID"; +import MicrosoftTeamComponents from "../../../../../Types/Workflow/Components/MicrosoftTeams"; +import API from "../../../../../Utils/API"; import CaptureSpan from "../../../../Utils/Telemetry/CaptureSpan"; export default class SendMessageToChannel extends ComponentCode { diff --git a/Common/Tests/UI/Components/404.test.tsx b/Common/Tests/UI/Components/404.test.tsx index 5b689238e4..8056f54348 100644 --- a/Common/Tests/UI/Components/404.test.tsx +++ b/Common/Tests/UI/Components/404.test.tsx @@ -1,9 +1,9 @@ import NotFound, { ComponentProps } from "../../../UI/Components/404"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen } from "@testing-library/react"; -import Route from "Common/Types/API/Route"; -import URL from "Common/Types/API/URL"; -import Email from "Common/Types/Email"; +import Route from "../../../Types/API/Route"; +import URL from "../../../Types/API/URL"; +import Email from "../../../Types/Email"; import * as React from "react"; import { describe, expect, jest } from "@jest/globals"; diff --git a/Common/Tests/UI/Components/BasicForm.test.tsx b/Common/Tests/UI/Components/BasicForm.test.tsx index 0af6adeffe..4644a21314 100644 --- a/Common/Tests/UI/Components/BasicForm.test.tsx +++ b/Common/Tests/UI/Components/BasicForm.test.tsx @@ -6,10 +6,10 @@ import "@testing-library/jest-dom/extend-expect"; import { render, screen, waitFor } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { UserEvent } from "@testing-library/user-event/dist/types/setup/setup"; -import Route from "Common/Types/API/Route"; +import Route from "../../../Types/API/Route"; import * as React from "react"; import { describe, expect } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("BasicForm test", () => { const fields: Fields> = [ diff --git a/Common/Tests/UI/Components/Breadcrumbs.test.tsx b/Common/Tests/UI/Components/Breadcrumbs.test.tsx index 0083f7c16c..c13d0136dc 100644 --- a/Common/Tests/UI/Components/Breadcrumbs.test.tsx +++ b/Common/Tests/UI/Components/Breadcrumbs.test.tsx @@ -1,8 +1,8 @@ import Breadcrumbs from "../../../UI/Components/Breadcrumbs/Breadcrumbs"; import Navigation from "../../../UI/Utils/Navigation"; import { describe, expect, test, jest } from "@jest/globals"; -import Route from "Common/Types/API/Route"; -import Link from "Common/Types/Link"; +import Route from "../../../Types/API/Route"; +import Link from "../../../Types/Link"; import * as React from "react"; import renderer, { ReactTestInstance, diff --git a/Common/Tests/UI/Components/Button.test.tsx b/Common/Tests/UI/Components/Button.test.tsx index aa88002e23..ed28cf23b4 100644 --- a/Common/Tests/UI/Components/Button.test.tsx +++ b/Common/Tests/UI/Components/Button.test.tsx @@ -6,7 +6,7 @@ import ButtonType from "../../../UI/Components/Button/ButtonTypes"; import ShortcutKey from "../../../UI/Components/ShortcutKey/ShortcutKey"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen } from "@testing-library/react"; -import IconProp from "Common/Types/Icon/IconProp"; +import IconProp from "../../../Types/Icon/IconProp"; import React from "react"; import { describe, expect, jest } from "@jest/globals"; diff --git a/Common/Tests/UI/Components/Card.test.tsx b/Common/Tests/UI/Components/Card.test.tsx index 4259939674..d66b322b5b 100644 --- a/Common/Tests/UI/Components/Card.test.tsx +++ b/Common/Tests/UI/Components/Card.test.tsx @@ -5,7 +5,7 @@ import Card, { } from "../../../UI/Components/Card/Card"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen } from "@testing-library/react"; -import IconProp from "Common/Types/Icon/IconProp"; +import IconProp from "../../../Types/Icon/IconProp"; import React, { ReactElement } from "react"; import { describe, expect, jest } from "@jest/globals"; diff --git a/Common/Tests/UI/Components/ColorViewer.test.tsx b/Common/Tests/UI/Components/ColorViewer.test.tsx index e72146b4cb..a7939551a5 100644 --- a/Common/Tests/UI/Components/ColorViewer.test.tsx +++ b/Common/Tests/UI/Components/ColorViewer.test.tsx @@ -1,10 +1,10 @@ import ColorViewer from "../../../UI/Components/ColorViewer/ColorViewer"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render } from "@testing-library/react"; -import Color from "Common/Types/Color"; +import Color from "../../../Types/Color"; import * as React from "react"; import { describe, expect } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("Color Viewer", () => { test("Render the component", () => { diff --git a/Common/Tests/UI/Components/ComponentsModal.test.tsx b/Common/Tests/UI/Components/ComponentsModal.test.tsx index 725b79ac54..979a02cc49 100644 --- a/Common/Tests/UI/Components/ComponentsModal.test.tsx +++ b/Common/Tests/UI/Components/ComponentsModal.test.tsx @@ -2,13 +2,13 @@ import ComponentsModal from "../../../UI/Components/Workflow/ComponentsModal"; import { describe, expect, it } from "@jest/globals"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen } from "@testing-library/react"; -import IconProp from "Common/Types/Icon/IconProp"; +import IconProp from "../../../Types/Icon/IconProp"; import ComponentMetadata, { ComponentCategory, ComponentType, -} from "Common/Types/Workflow/Component"; +} from "../../../Types/Workflow/Component"; import React from "react"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; import Faker from "../../../Utils/Faker"; /// @dev we use different UUID for (id & title), description, and category to ensure that the component is unique diff --git a/Common/Tests/UI/Components/DictionaryOfStrings.test.tsx b/Common/Tests/UI/Components/DictionaryOfStrings.test.tsx index 4add198ae0..e4a027386f 100644 --- a/Common/Tests/UI/Components/DictionaryOfStrings.test.tsx +++ b/Common/Tests/UI/Components/DictionaryOfStrings.test.tsx @@ -6,10 +6,10 @@ import DictionaryOfStrings, { import { describe, expect, it, jest } from "@jest/globals"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen } from "@testing-library/react"; -import Dictionary from "Common/Types/Dictionary"; +import Dictionary from "../../../Types/Dictionary"; import React from "react"; -jest.mock("Common/Types/Date", () => { +jest.mock("../../../Types/Date", () => { return { toDateTimeLocalString: jest.fn(), asDateForDatabaseQuery: jest.fn(), diff --git a/Common/Tests/UI/Components/Dropdown.test.tsx b/Common/Tests/UI/Components/Dropdown.test.tsx index 1d62b4a2e9..315dc06f9d 100644 --- a/Common/Tests/UI/Components/Dropdown.test.tsx +++ b/Common/Tests/UI/Components/Dropdown.test.tsx @@ -5,7 +5,7 @@ import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen } from "@testing-library/react"; import React from "react"; import { describe, expect } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("Dropdown", () => { const options: DropdownOption[] = [ { value: "1", label: "1" }, diff --git a/Common/Tests/UI/Components/DuplicateModel.test.tsx b/Common/Tests/UI/Components/DuplicateModel.test.tsx index dc52ba2256..a74fa2c854 100644 --- a/Common/Tests/UI/Components/DuplicateModel.test.tsx +++ b/Common/Tests/UI/Components/DuplicateModel.test.tsx @@ -9,12 +9,12 @@ import { waitFor, within, } from "@testing-library/react"; -import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import Route from "Common/Types/API/Route"; -import CrudApiEndpoint from "Common/Types/Database/CrudApiEndpoint"; -import TableMetaData from "Common/Types/Database/TableMetadata"; -import IconProp from "Common/Types/Icon/IconProp"; -import ObjectID from "Common/Types/ObjectID"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import Route from "../../../Types/API/Route"; +import CrudApiEndpoint from "../../../Types/Database/CrudApiEndpoint"; +import TableMetaData from "../../../Types/Database/TableMetadata"; +import IconProp from "../../../Types/Icon/IconProp"; +import ObjectID from "../../../Types/ObjectID"; import React from "react"; import { act } from "react-test-renderer"; diff --git a/Common/Tests/UI/Components/EmptyState/EmptyState.test.tsx b/Common/Tests/UI/Components/EmptyState/EmptyState.test.tsx index 82bb1976c9..56c5761a5f 100644 --- a/Common/Tests/UI/Components/EmptyState/EmptyState.test.tsx +++ b/Common/Tests/UI/Components/EmptyState/EmptyState.test.tsx @@ -1,7 +1,7 @@ import EmptyState from "../../../../UI/Components/EmptyState/EmptyState"; import "@testing-library/jest-dom"; import { render, screen } from "@testing-library/react"; -import IconProp from "Common/Types/Icon/IconProp"; +import IconProp from "../../../../Types/Icon/IconProp"; import React from "react"; describe("EmptyState", () => { diff --git a/Common/Tests/UI/Components/FilePicker.test.tsx b/Common/Tests/UI/Components/FilePicker.test.tsx index 870ccc0b4a..da475b769e 100644 --- a/Common/Tests/UI/Components/FilePicker.test.tsx +++ b/Common/Tests/UI/Components/FilePicker.test.tsx @@ -11,13 +11,13 @@ import { screen, waitFor, } from "@testing-library/react"; -import HTTPResponse from "Common/Types/API/HTTPResponse"; -import MimeType from "Common/Types/File/MimeType"; -import ObjectID from "Common/Types/ObjectID"; -import FileModel from "Common/Models/DatabaseModels/File"; +import HTTPResponse from "../../../Types/API/HTTPResponse"; +import MimeType from "../../../Types/File/MimeType"; +import ObjectID from "../../../Types/ObjectID"; +import FileModel from "../../../Models/DatabaseModels/File"; import React from "react"; import { act } from "react-test-renderer"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; import Faker from "../../../Utils/Faker"; const mockOnChange: MockFunction = getJestMockFunction(); diff --git a/Common/Tests/UI/Components/Input.test.tsx b/Common/Tests/UI/Components/Input.test.tsx index 0449bbdcdd..7c53ea3052 100644 --- a/Common/Tests/UI/Components/Input.test.tsx +++ b/Common/Tests/UI/Components/Input.test.tsx @@ -6,7 +6,7 @@ import "@testing-library/jest-dom/extend-expect"; import { cleanup, fireEvent, render, screen } from "@testing-library/react"; import React from "react"; import { describe, expect, afterEach, test } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("Input", () => { afterEach(() => { diff --git a/Common/Tests/UI/Components/Item.test.tsx b/Common/Tests/UI/Components/Item.test.tsx index c29e605c5d..9ce18db214 100644 --- a/Common/Tests/UI/Components/Item.test.tsx +++ b/Common/Tests/UI/Components/Item.test.tsx @@ -5,9 +5,9 @@ import Item, { import { describe, expect, jest } from "@jest/globals"; import "@testing-library/jest-dom"; import { render } from "@testing-library/react"; -import IconProp from "Common/Types/Icon/IconProp"; +import IconProp from "../../../Types/Icon/IconProp"; import React from "react"; -import getJestMockFunction from "Common/Tests/MockType"; +import getJestMockFunction from "../../../Tests/MockType"; describe("Item component", () => { interface ItemData { diff --git a/Common/Tests/UI/Components/Loader.test.tsx b/Common/Tests/UI/Components/Loader.test.tsx index ad0481f8a4..57f5e5b530 100644 --- a/Common/Tests/UI/Components/Loader.test.tsx +++ b/Common/Tests/UI/Components/Loader.test.tsx @@ -1,7 +1,7 @@ import Loader, { LoaderType } from "../../../UI/Components/Loader/Loader"; import "@testing-library/jest-dom/extend-expect"; import { render, screen } from "@testing-library/react"; -import Color from "Common/Types/Color"; +import Color from "../../../Types/Color"; import React from "react"; import { describe, expect, test } from "@jest/globals"; diff --git a/Common/Tests/UI/Components/Modal.test.tsx b/Common/Tests/UI/Components/Modal.test.tsx index 81f85425c4..f9e3f243e3 100644 --- a/Common/Tests/UI/Components/Modal.test.tsx +++ b/Common/Tests/UI/Components/Modal.test.tsx @@ -4,9 +4,9 @@ import Modal, { ModalWidth } from "../../../UI/Components/Modal/Modal"; import { describe, expect, it, test } from "@jest/globals"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render } from "@testing-library/react"; -import IconProp from "Common/Types/Icon/IconProp"; +import IconProp from "../../../Types/Icon/IconProp"; import React from "react"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("Modal", () => { test("renders the modal with the title and description", () => { diff --git a/Common/Tests/UI/Components/Pagination.test.tsx b/Common/Tests/UI/Components/Pagination.test.tsx index 5d41f84b22..5cbec377b3 100644 --- a/Common/Tests/UI/Components/Pagination.test.tsx +++ b/Common/Tests/UI/Components/Pagination.test.tsx @@ -5,7 +5,7 @@ import { describe, expect, jest } from "@jest/globals"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen, waitFor } from "@testing-library/react"; import React from "react"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("Pagination", () => { it("renders Component", () => { diff --git a/Common/Tests/UI/Components/Pill.test.tsx b/Common/Tests/UI/Components/Pill.test.tsx index 6ccba13f05..295a52f758 100644 --- a/Common/Tests/UI/Components/Pill.test.tsx +++ b/Common/Tests/UI/Components/Pill.test.tsx @@ -1,7 +1,7 @@ import Pill, { PillSize } from "../../../UI/Components/Pill/Pill"; import "@testing-library/jest-dom/extend-expect"; import { render, screen } from "@testing-library/react"; -import Color from "Common/Types/Color"; +import Color from "../../../Types/Color"; import * as React from "react"; import { describe, expect, test } from "@jest/globals"; diff --git a/Common/Tests/UI/Components/Probe.test.tsx b/Common/Tests/UI/Components/Probe.test.tsx index 889887b66c..2b12f24999 100644 --- a/Common/Tests/UI/Components/Probe.test.tsx +++ b/Common/Tests/UI/Components/Probe.test.tsx @@ -1,8 +1,8 @@ import ProbeElement from "../../../UI/Components/Probe/Probe"; import "@testing-library/jest-dom/extend-expect"; import { render, screen } from "@testing-library/react"; -import ObjectID from "Common/Types/ObjectID"; -import Probe from "Common/Models/DatabaseModels/Probe"; +import ObjectID from "../../../Types/ObjectID"; +import Probe from "../../../Models/DatabaseModels/Probe"; import * as React from "react"; import { describe, expect, test } from "@jest/globals"; diff --git a/Common/Tests/UI/Components/RadioButtons.test.tsx b/Common/Tests/UI/Components/RadioButtons.test.tsx index 390896c87c..edd22cd9ef 100644 --- a/Common/Tests/UI/Components/RadioButtons.test.tsx +++ b/Common/Tests/UI/Components/RadioButtons.test.tsx @@ -5,7 +5,7 @@ import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render } from "@testing-library/react"; import React from "react"; import { describe, expect, test } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("RadioButtons", () => { const options: RadioButton[] = [ diff --git a/Common/Tests/UI/Components/SideMenuItem.test.tsx b/Common/Tests/UI/Components/SideMenuItem.test.tsx index 7265b9615b..84ffde26a4 100644 --- a/Common/Tests/UI/Components/SideMenuItem.test.tsx +++ b/Common/Tests/UI/Components/SideMenuItem.test.tsx @@ -9,10 +9,10 @@ import { describe, expect, afterEach, jest } from "@jest/globals"; import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render, screen } from "@testing-library/react"; // Types -import Route from "Common/Types/API/Route"; -import IconProp from "Common/Types/Icon/IconProp"; +import Route from "../../../Types/API/Route"; +import IconProp from "../../../Types/Icon/IconProp"; import React from "react"; -import getJestMockFunction from "Common/Tests/MockType"; +import getJestMockFunction from "../../../Tests/MockType"; const highlightClassList: string = "bg-gray-100 text-indigo-600 hover:bg-white group rounded-md px-3 py-2 flex items-center text-sm font-medium"; diff --git a/Common/Tests/UI/Components/Tabs.test.tsx b/Common/Tests/UI/Components/Tabs.test.tsx index 1d9e7b7efd..339dd13b3c 100644 --- a/Common/Tests/UI/Components/Tabs.test.tsx +++ b/Common/Tests/UI/Components/Tabs.test.tsx @@ -4,7 +4,7 @@ import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render } from "@testing-library/react"; import React from "react"; import { describe, expect, test } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("Tabs", () => { const activeClass: string = "bg-gray-100 text-gray-700"; diff --git a/Common/Tests/UI/Components/TextArea.test.tsx b/Common/Tests/UI/Components/TextArea.test.tsx index b095bb5be9..d44e7421b6 100644 --- a/Common/Tests/UI/Components/TextArea.test.tsx +++ b/Common/Tests/UI/Components/TextArea.test.tsx @@ -3,7 +3,7 @@ import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render } from "@testing-library/react"; import React from "react"; import { describe, expect, test } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("TextArea", () => { test("renders textarea element with initialValue only", () => { diff --git a/Common/Tests/UI/Components/Toggle.test.tsx b/Common/Tests/UI/Components/Toggle.test.tsx index db6a3aa938..326110bed6 100644 --- a/Common/Tests/UI/Components/Toggle.test.tsx +++ b/Common/Tests/UI/Components/Toggle.test.tsx @@ -3,7 +3,7 @@ import "@testing-library/jest-dom/extend-expect"; import { fireEvent, render } from "@testing-library/react"; import React from "react"; import { describe, expect, test } from "@jest/globals"; -import getJestMockFunction, { MockFunction } from "Common/Tests/MockType"; +import getJestMockFunction, { MockFunction } from "../../../Tests/MockType"; describe("Toggle", () => { test("renders toggle element with required props only", () => { diff --git a/Common/UI/Components/404.tsx b/Common/UI/Components/404.tsx index 15c355d53b..bb95541123 100644 --- a/Common/UI/Components/404.tsx +++ b/Common/UI/Components/404.tsx @@ -1,9 +1,9 @@ // Tailwind. import Navigation from "../Utils/Navigation"; import Button, { ButtonStyleType } from "./Button/Button"; -import Route from "../../../Types/API/Route"; -import URL from "../../../Types/API/URL"; -import Email from "../../../Types/Email"; +import Route from "../../Types/API/Route"; +import URL from "../../Types/API/URL"; +import Email from "../../Types/Email"; import React, { FunctionComponent, ReactElement } from "react"; export interface ComponentProps { diff --git a/Common/UI/Components/Banner/Banner.tsx b/Common/UI/Components/Banner/Banner.tsx index 543568f485..2c4ca67d94 100644 --- a/Common/UI/Components/Banner/Banner.tsx +++ b/Common/UI/Components/Banner/Banner.tsx @@ -2,7 +2,7 @@ import Link from "../Link/Link"; import Route from "../../../Types/API/Route"; import URL from "../../../Types/API/URL"; import React, { FunctionComponent, ReactElement } from "react"; -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; export interface ComponentProps { title: string; diff --git a/Common/UI/Components/BulkUpdate/BulkUpdateForm.tsx b/Common/UI/Components/BulkUpdate/BulkUpdateForm.tsx index 692a902da5..c5bc531f5c 100644 --- a/Common/UI/Components/BulkUpdate/BulkUpdateForm.tsx +++ b/Common/UI/Components/BulkUpdate/BulkUpdateForm.tsx @@ -1,4 +1,4 @@ -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import Button, { ButtonSize, ButtonStyleType } from "../Button/Button"; import Icon, { SizeProp } from "../Icon/Icon"; import ConfirmModal, { diff --git a/Common/UI/Components/Button/Button.tsx b/Common/UI/Components/Button/Button.tsx index 8313de1628..df1d79ba70 100644 --- a/Common/UI/Components/Button/Button.tsx +++ b/Common/UI/Components/Button/Button.tsx @@ -5,7 +5,7 @@ import ButtonType from "./ButtonTypes"; import IconProp from "../../../Types/Icon/IconProp"; import React, { FunctionComponent, ReactElement, useEffect } from "react"; import Tooltip from "../Tooltip/Tooltip"; -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; export enum ButtonStyleType { PRIMARY, diff --git a/Common/UI/Components/Feed/FeedItem.tsx b/Common/UI/Components/Feed/FeedItem.tsx index cd5bae131b..c9a3642916 100644 --- a/Common/UI/Components/Feed/FeedItem.tsx +++ b/Common/UI/Components/Feed/FeedItem.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent, ReactElement, useState } from "react"; import User from "../../../Models/DatabaseModels/User"; -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import Image from "../Image/Image"; import Route from "../../../Types/API/Route"; import BlankProfilePic from "../../Images/users/blank-profile.svg"; diff --git a/Common/UI/Components/Forms/Fields/FormField.tsx b/Common/UI/Components/Forms/Fields/FormField.tsx index e7a3b951fb..05f3671cea 100644 --- a/Common/UI/Components/Forms/Fields/FormField.tsx +++ b/Common/UI/Components/Forms/Fields/FormField.tsx @@ -1,5 +1,5 @@ import Dictionary from "../../../Types/Dictionary"; -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import CategoryCheckbox from "../../CategoryCheckbox/Index"; import CheckboxElement, { CategoryCheckboxValue, diff --git a/Common/UI/Components/Forms/Steps/Step.tsx b/Common/UI/Components/Forms/Steps/Step.tsx index b0ba404ecb..2daa16cf40 100644 --- a/Common/UI/Components/Forms/Steps/Step.tsx +++ b/Common/UI/Components/Forms/Steps/Step.tsx @@ -1,5 +1,5 @@ import { FormStep, FormStepState } from "../Types/FormStep"; -import GenericObject from "../../../Types/GenericObject"; +import GenericObject from "../../../../Types/GenericObject"; import React, { ReactElement } from "react"; export interface ComponentProps { diff --git a/Common/UI/Components/Forms/Steps/Steps.tsx b/Common/UI/Components/Forms/Steps/Steps.tsx index f0840fbad4..10ff552b79 100644 --- a/Common/UI/Components/Forms/Steps/Steps.tsx +++ b/Common/UI/Components/Forms/Steps/Steps.tsx @@ -1,7 +1,7 @@ import { FormStep, FormStepState } from "../Types/FormStep"; import FormValues from "../Types/FormValues"; import Step from "./Step"; -import GenericObject from "../../../Types/GenericObject"; +import GenericObject from "../../../../Types/GenericObject"; import React, { ReactElement } from "react"; export interface ComponentProps { diff --git a/Common/UI/Components/HeaderAlert/HeaderAlert.tsx b/Common/UI/Components/HeaderAlert/HeaderAlert.tsx index ceab15e5a0..753b8b9429 100644 --- a/Common/UI/Components/HeaderAlert/HeaderAlert.tsx +++ b/Common/UI/Components/HeaderAlert/HeaderAlert.tsx @@ -2,7 +2,7 @@ import Icon, { ThickProp } from "../Icon/Icon"; import IconProp from "../../../Types/Icon/IconProp"; import React, { ReactElement } from "react"; import Tooltip from "../Tooltip/Tooltip"; -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import ColorSwatch from "../../../Types/ColorSwatch"; export enum HeaderAlertType { diff --git a/Common/UI/Components/List/List.tsx b/Common/UI/Components/List/List.tsx index 88928d6aa8..c002200d04 100644 --- a/Common/UI/Components/List/List.tsx +++ b/Common/UI/Components/List/List.tsx @@ -1,4 +1,4 @@ -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import ActionButtonSchema from "../ActionButton/ActionButtonSchema"; import ComponentLoader from "../ComponentLoader/ComponentLoader"; import Field from "../Detail/Field"; diff --git a/Common/UI/Components/ModelList/StaticModelList.tsx b/Common/UI/Components/ModelList/StaticModelList.tsx index 1a16035bb7..6280be3f1d 100644 --- a/Common/UI/Components/ModelList/StaticModelList.tsx +++ b/Common/UI/Components/ModelList/StaticModelList.tsx @@ -1,4 +1,4 @@ -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import Button, { ButtonStyleType } from "../Button/Button"; import Icon from "../Icon/Icon"; import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; diff --git a/Common/UI/Components/ModelTable/BaseModelTable.tsx b/Common/UI/Components/ModelTable/BaseModelTable.tsx index 7fb79ba8e9..8d44787a2b 100644 --- a/Common/UI/Components/ModelTable/BaseModelTable.tsx +++ b/Common/UI/Components/ModelTable/BaseModelTable.tsx @@ -1,6 +1,6 @@ import Includes from "../../../Types/BaseDatabase/Includes"; import { API_DOCS_URL, BILLING_ENABLED, getAllEnvVars } from "../../Config"; -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import SelectEntityField from "../../../Types/SelectEntityField"; import API from "../../Utils/API/API"; import GroupBy from "../../Utils/BaseDatabase/GroupBy"; diff --git a/Common/UI/Components/Pill/Pill.tsx b/Common/UI/Components/Pill/Pill.tsx index 8bbff07d6d..8717901413 100644 --- a/Common/UI/Components/Pill/Pill.tsx +++ b/Common/UI/Components/Pill/Pill.tsx @@ -2,7 +2,7 @@ import { Black } from "../../../Types/BrandColors"; import Color from "../../../Types/Color"; import React, { CSSProperties, FunctionComponent, ReactElement } from "react"; import Tooltip from "../Tooltip/Tooltip"; -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; export enum PillSize { Small = "10px", diff --git a/Common/UI/Components/Table/Table.tsx b/Common/UI/Components/Table/Table.tsx index 9c24683066..f11f61f0a1 100644 --- a/Common/UI/Components/Table/Table.tsx +++ b/Common/UI/Components/Table/Table.tsx @@ -1,4 +1,4 @@ -import { GetReactElementFunction } from "../../../Types/FunctionTypes"; +import { GetReactElementFunction } from "../../Types/FunctionTypes"; import ActionButtonSchema from "../ActionButton/ActionButtonSchema"; import BulkUpdateForm, { BulkActionButtonSchema, diff --git a/Common/UI/Utils/API/API.ts b/Common/UI/Utils/API/API.ts index 6dc2b1ec49..07280e058d 100644 --- a/Common/UI/Utils/API/API.ts +++ b/Common/UI/Utils/API/API.ts @@ -2,20 +2,20 @@ import LocalStorage from "../LocalStorage"; import Navigation from "../Navigation"; import PermissionUtil from "../Permission"; import User from "../User"; -import HTTPErrorResponse from "../../../Types/API/HTTPErrorResponse"; -import Headers from "../../../Types/API/Headers"; -import Hostname from "../../../Types/API/Hostname"; -import Protocol from "../../../Types/API/Protocol"; -import Route from "../../../Types/API/Route"; -import URL from "../../../Types/API/URL"; -import Dictionary from "../../../Types/Dictionary"; -import APIException from "../../../Types/Exception/ApiException"; -import Exception from "../../../Types/Exception/Exception"; -import JSONFunctions from "../../../Types/JSONFunctions"; +import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse"; +import Headers from "../../Types/API/Headers"; +import Hostname from "../../Types/API/Hostname"; +import Protocol from "../../Types/API/Protocol"; +import Route from "../../Types/API/Route"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import APIException from "../../Types/Exception/ApiException"; +import Exception from "../../Types/Exception/Exception"; +import JSONFunctions from "../../Types/JSONFunctions"; import { UserGlobalAccessPermission, UserTenantAccessPermission, -} from "../../../Types/Permission"; +} from "../../Types/Permission"; import API from "../../Utils/API"; import Cookies from "universal-cookie"; diff --git a/Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts b/Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts index 1d6880b05a..3e746b908f 100644 --- a/Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts +++ b/Common/UI/Utils/AnalyticsModelAPI/AnalyticsModelAPI.ts @@ -8,7 +8,7 @@ import Select from "../BaseDatabase/Select"; import Sort from "../BaseDatabase/Sort"; import Navigation from "../Navigation"; import ProjectUtil from "../Project"; -import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; +import AnalyticsBaseModel from "../../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import HTTPErrorResponse from "../../../Types/API/HTTPErrorResponse"; import HTTPMethod from "../../../Types/API/HTTPMethod"; import HTTPResponse from "../../../Types/API/HTTPResponse"; @@ -19,7 +19,7 @@ import BadDataException from "../../../Types/Exception/BadDataException"; import { JSONArray, JSONObject } from "../../../Types/JSON"; import JSONFunctions from "../../../Types/JSONFunctions"; import ObjectID from "../../../Types/ObjectID"; -import Project from "../../Models/DatabaseModels/Project"; +import Project from "../../../Models/DatabaseModels/Project"; import AggregateBy from "../../../Types/BaseDatabase/AggregateBy"; import AggregatedResult from "../../../Types/BaseDatabase/AggregatedResult"; import Query from "../../../Types/BaseDatabase/Query"; diff --git a/Common/UI/Utils/BaseDatabase/GroupBy.ts b/Common/UI/Utils/BaseDatabase/GroupBy.ts index 3df1d24020..61bf052056 100644 --- a/Common/UI/Utils/BaseDatabase/GroupBy.ts +++ b/Common/UI/Utils/BaseDatabase/GroupBy.ts @@ -1,6 +1,6 @@ import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { JSONObject } from "../../../Types/JSON"; +import { JSONObject } from "../../Types/JSON"; type GroupBy = { [P in keyof TBaseModel]?: true; diff --git a/Common/UI/Utils/BaseDatabase/ListResult.ts b/Common/UI/Utils/BaseDatabase/ListResult.ts index a2189e5f95..199ce4bdb8 100644 --- a/Common/UI/Utils/BaseDatabase/ListResult.ts +++ b/Common/UI/Utils/BaseDatabase/ListResult.ts @@ -1,6 +1,6 @@ import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { JSONObject } from "../../../Types/JSON"; +import { JSONObject } from "../../Types/JSON"; export default interface ListResult< TBaseModel extends BaseModel | AnalyticsBaseModel, diff --git a/Common/UI/Utils/BaseDatabase/RequestOptions.ts b/Common/UI/Utils/BaseDatabase/RequestOptions.ts index da9d916a85..9fe8bc2867 100644 --- a/Common/UI/Utils/BaseDatabase/RequestOptions.ts +++ b/Common/UI/Utils/BaseDatabase/RequestOptions.ts @@ -1,5 +1,5 @@ -import URL from "../../../Types/API/URL"; -import Dictionary from "../../../Types/Dictionary"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; export default interface RequestOptions { requestHeaders?: Dictionary | undefined; diff --git a/Common/UI/Utils/BaseDatabase/Select.ts b/Common/UI/Utils/BaseDatabase/Select.ts index 1c37de7e35..fc4c549cb7 100644 --- a/Common/UI/Utils/BaseDatabase/Select.ts +++ b/Common/UI/Utils/BaseDatabase/Select.ts @@ -1,6 +1,6 @@ import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import { JSONObject } from "../../../Types/JSON"; +import { JSONObject } from "../../Types/JSON"; type Select = { [P in keyof TBaseModel]?: boolean | JSONObject; diff --git a/Common/UI/Utils/BaseDatabase/Sort.ts b/Common/UI/Utils/BaseDatabase/Sort.ts index 6a3ec3a637..c07b672657 100644 --- a/Common/UI/Utils/BaseDatabase/Sort.ts +++ b/Common/UI/Utils/BaseDatabase/Sort.ts @@ -1,7 +1,7 @@ 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"; +import SortOrder from "../../Types/BaseDatabase/SortOrder"; +import { JSONObject } from "../../Types/JSON"; type Sort = { [P in keyof TBaseModel]?: SortOrder; diff --git a/Common/UI/Utils/Cookie.ts b/Common/UI/Utils/Cookie.ts index 5b9667cb91..3ea5821e02 100644 --- a/Common/UI/Utils/Cookie.ts +++ b/Common/UI/Utils/Cookie.ts @@ -1,12 +1,12 @@ -import Route from "../../../Types/API/Route"; -import URL from "../../../Types/API/URL"; -import OneUptimeDate from "../../../Types/Date"; -import Email from "../../../Types/Email"; -import { JSONObject, JSONValue } from "../../../Types/JSON"; -import JSONFunctions from "../../../Types/JSONFunctions"; -import Typeof from "../../../Types/Typeof"; +import Route from "../../Types/API/Route"; +import URL from "../../Types/API/URL"; +import OneUptimeDate from "../../Types/Date"; +import Email from "../../Types/Email"; +import { JSONObject, JSONValue } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Typeof from "../../Types/Typeof"; import UniversalCookies, { CookieSetOptions } from "universal-cookie"; -import CookieName from "../../../Types/CookieName"; +import CookieName from "../../Types/CookieName"; export default class Cookie { public static setItem( diff --git a/Common/UI/Utils/File.ts b/Common/UI/Utils/File.ts index 8b8dd6590b..aee15855ea 100644 --- a/Common/UI/Utils/File.ts +++ b/Common/UI/Utils/File.ts @@ -1,5 +1,5 @@ -import Route from "../../../Types/API/Route"; -import ObjectID from "../../../Types/ObjectID"; +import Route from "../../Types/API/Route"; +import ObjectID from "../../Types/ObjectID"; import { FileRoute } from "../../ServiceRoute"; export default class FileUtil { diff --git a/Common/UI/Utils/GlobalEvents.ts b/Common/UI/Utils/GlobalEvents.ts index 06325cfa93..0afdacff31 100644 --- a/Common/UI/Utils/GlobalEvents.ts +++ b/Common/UI/Utils/GlobalEvents.ts @@ -1,4 +1,4 @@ -import { JSONObject } from "../../../Types/JSON"; +import { JSONObject } from "../../Types/JSON"; export default class GlobalEvents { public static addEventListener( diff --git a/Common/UI/Utils/JWT.ts b/Common/UI/Utils/JWT.ts index 405ecdcfd2..004cf64700 100644 --- a/Common/UI/Utils/JWT.ts +++ b/Common/UI/Utils/JWT.ts @@ -1,4 +1,4 @@ -import { JSONObject } from "../../../Types/JSON"; +import { JSONObject } from "../../Types/JSON"; import { jwtDecode } from "jwt-decode"; export default class JWTToken { diff --git a/Common/UI/Utils/LocalStorage.ts b/Common/UI/Utils/LocalStorage.ts index 4eeae53b2f..2320185bf0 100644 --- a/Common/UI/Utils/LocalStorage.ts +++ b/Common/UI/Utils/LocalStorage.ts @@ -1,9 +1,9 @@ -import URL from "../../../Types/API/URL"; -import Dictionary from "../../../Types/Dictionary"; -import Email from "../../../Types/Email"; -import { JSONObject, JSONValue } from "../../../Types/JSON"; -import JSONFunctions from "../../../Types/JSONFunctions"; -import Typeof from "../../../Types/Typeof"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import Email from "../../Types/Email"; +import { JSONObject, JSONValue } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Typeof from "../../Types/Typeof"; export default class LocalStorage { public static setItem(key: string, value: JSONValue | Email | URL): void { diff --git a/Common/UI/Utils/Login.ts b/Common/UI/Utils/Login.ts index ea5dbe3adc..af8090dc69 100644 --- a/Common/UI/Utils/Login.ts +++ b/Common/UI/Utils/Login.ts @@ -3,10 +3,10 @@ import Analytics from "../Utils/Analytics"; import Navigation from "../Utils/Navigation"; import UserUtil from "../Utils/User"; import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; -import Email from "../../../Types/Email"; -import { JSONObject } from "../../../Types/JSON"; -import Name from "../../../Types/Name"; -import ObjectID from "../../../Types/ObjectID"; +import Email from "../../Types/Email"; +import { JSONObject } from "../../Types/JSON"; +import Name from "../../Types/Name"; +import ObjectID from "../../Types/ObjectID"; import User from "../../Models/DatabaseModels/User"; export default abstract class LoginUtil { diff --git a/Common/UI/Utils/ModelAPI/ModelAPI.ts b/Common/UI/Utils/ModelAPI/ModelAPI.ts index b137a981f9..da101ce9c7 100644 --- a/Common/UI/Utils/ModelAPI/ModelAPI.ts +++ b/Common/UI/Utils/ModelAPI/ModelAPI.ts @@ -1,6 +1,5 @@ import { FormType } from "../../Components/Forms/ModelForm"; import { APP_API_URL } from "../../Config"; -import API from "../../Utils/API/API"; import GroupBy from "../BaseDatabase/GroupBy"; import BaseListResult from "../BaseDatabase/ListResult"; import BaseRequestOptions from "../BaseDatabase/RequestOptions"; @@ -8,7 +7,7 @@ import Select from "../BaseDatabase/Select"; import Sort from "../BaseDatabase/Sort"; import Navigation from "../Navigation"; import ProjectUtil from "../Project"; -import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; +import BaseModel from "../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import HTTPErrorResponse from "../../../Types/API/HTTPErrorResponse"; import HTTPMethod from "../../../Types/API/HTTPMethod"; import HTTPResponse from "../../../Types/API/HTTPResponse"; @@ -19,8 +18,9 @@ import BadDataException from "../../../Types/Exception/BadDataException"; import { JSONArray, JSONObject } from "../../../Types/JSON"; import JSONFunctions from "../../../Types/JSONFunctions"; import ObjectID from "../../../Types/ObjectID"; -import Project from "../../Models/DatabaseModels/Project"; +import Project from "../../../Models/DatabaseModels/Project"; import Query from "../../../Types/BaseDatabase/Query"; +import API from "../../../Utils/API"; export class ModelAPIHttpResponse< TBaseModel extends BaseModel, diff --git a/Common/UI/Utils/Navigation.ts b/Common/UI/Utils/Navigation.ts index 351f368f64..9a204dccd0 100644 --- a/Common/UI/Utils/Navigation.ts +++ b/Common/UI/Utils/Navigation.ts @@ -1,10 +1,10 @@ import { AgnosticRouteMatch } from "@remix-run/router"; -import Hostname from "../../../Types/API/Hostname"; -import Route from "../../../Types/API/Route"; -import URL from "../../../Types/API/URL"; -import Dictionary from "../../../Types/Dictionary"; -import BadDataException from "../../../Types/Exception/BadDataException"; -import ObjectID from "../../../Types/ObjectID"; +import Hostname from "../../Types/API/Hostname"; +import Route from "../../Types/API/Route"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import BadDataException from "../../Types/Exception/BadDataException"; +import ObjectID from "../../Types/ObjectID"; import { Location, NavigateFunction, diff --git a/Common/UI/Utils/Permission.ts b/Common/UI/Utils/Permission.ts index 72349dd643..f155568a66 100644 --- a/Common/UI/Utils/Permission.ts +++ b/Common/UI/Utils/Permission.ts @@ -1,13 +1,13 @@ import { DropdownOption } from "../Components/Dropdown/Dropdown"; import LocalStorage from "./LocalStorage"; -import { JSONObject } from "../../../Types/JSON"; +import { JSONObject } from "../../Types/JSON"; import Permission, { PermissionHelper, PermissionProps, UserGlobalAccessPermission, UserPermission, UserTenantAccessPermission, -} from "../../../Types/Permission"; +} from "../../Types/Permission"; export default class PermissionUtil { public static getGlobalPermissions(): UserGlobalAccessPermission | null { diff --git a/Common/UI/Utils/PricingPlan.ts b/Common/UI/Utils/PricingPlan.ts index 21ab52aafa..c80a8cd918 100644 --- a/Common/UI/Utils/PricingPlan.ts +++ b/Common/UI/Utils/PricingPlan.ts @@ -1,6 +1,6 @@ import { env } from "../Config"; -import BadDataException from "../../../Types/Exception/BadDataException"; -import PricingPlanType from "../../../Types/PricingPlan"; +import BadDataException from "../../Types/Exception/BadDataException"; +import PricingPlanType from "../../Types/PricingPlan"; export default class PricingPlan { public static getPlans(): Array { diff --git a/Common/UI/Utils/Project.ts b/Common/UI/Utils/Project.ts index e52fcd3005..cc047dbb45 100644 --- a/Common/UI/Utils/Project.ts +++ b/Common/UI/Utils/Project.ts @@ -3,13 +3,13 @@ import LocalStorage from "./LocalStorage"; import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import SubscriptionPlan, { PlanType, -} from "../../../Types/Billing/SubscriptionPlan"; -import { JSONObject } from "../../../Types/JSON"; -import ObjectID from "../../../Types/ObjectID"; +} from "../../Types/Billing/SubscriptionPlan"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; import Project from "../../Models/DatabaseModels/Project"; import SubscriptionStatus, { SubscriptionStatusUtil, -} from "../../../Types/Billing/SubscriptionStatus"; +} from "../../Types/Billing/SubscriptionStatus"; import Navigation from "./Navigation"; import SessionStorage from "./SessionStorage"; diff --git a/Common/UI/Utils/Realtime.ts b/Common/UI/Utils/Realtime.ts index 5c6ea2a010..786b1e22f7 100644 --- a/Common/UI/Utils/Realtime.ts +++ b/Common/UI/Utils/Realtime.ts @@ -2,15 +2,15 @@ import { HOST, HTTP_PROTOCOL } from "../Config"; import AnalyticsBaseModel from "../../Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel"; import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel"; import { RealtimeRoute } from "../../ServiceRoute"; -import URL from "../../../Types/API/URL"; -import DatabaseType from "../../../Types/BaseDatabase/DatabaseType"; -import { JSONObject } from "../../../Types/JSON"; -import ObjectID from "../../../Types/ObjectID"; +import URL from "../../Types/API/URL"; +import DatabaseType from "../../Types/BaseDatabase/DatabaseType"; +import { JSONObject } from "../../Types/JSON"; +import ObjectID from "../../Types/ObjectID"; import RealtimeUtil from "../../Utils/Realtime"; import SocketIO, { Socket } from "socket.io-client"; -import ModelEventType from "../../../Types/Realtime/ModelEventType"; -import ListenToModelEventJSON from "../../../Types/Realtime/ListenToModelEventJSON"; -import EventName from "../../../Types/Realtime/EventName"; +import ModelEventType from "../../Types/Realtime/ModelEventType"; +import ListenToModelEventJSON from "../../Types/Realtime/ListenToModelEventJSON"; +import EventName from "../../Types/Realtime/EventName"; export interface ListenToModelEvent< Model extends AnalyticsBaseModel | BaseModel, diff --git a/Common/UI/Utils/SessionStorage.ts b/Common/UI/Utils/SessionStorage.ts index 4bdab276ce..6f1e5fb59e 100644 --- a/Common/UI/Utils/SessionStorage.ts +++ b/Common/UI/Utils/SessionStorage.ts @@ -1,9 +1,9 @@ -import URL from "../../../Types/API/URL"; -import Dictionary from "../../../Types/Dictionary"; -import Email from "../../../Types/Email"; -import { JSONObject, JSONValue } from "../../../Types/JSON"; -import JSONFunctions from "../../../Types/JSONFunctions"; -import Typeof from "../../../Types/Typeof"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import Email from "../../Types/Email"; +import { JSONObject, JSONValue } from "../../Types/JSON"; +import JSONFunctions from "../../Types/JSONFunctions"; +import Typeof from "../../Types/Typeof"; export default class SessionStorage { public static setItem(key: string, value: JSONValue | Email | URL): void { diff --git a/Common/UI/Utils/StatusPage.ts b/Common/UI/Utils/StatusPage.ts index 29e4d3abaf..847affd431 100644 --- a/Common/UI/Utils/StatusPage.ts +++ b/Common/UI/Utils/StatusPage.ts @@ -4,13 +4,13 @@ import { } from "../Components/CategoryCheckbox/CategoryCheckboxTypes"; import { CategoryCheckboxOptionsAndCategories } from "../Components/CategoryCheckbox/Index"; import ModelAPI, { ListResult } from "../Utils/ModelAPI/ModelAPI"; -import URL from "../../../Types/API/URL"; -import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax"; -import ObjectID from "../../../Types/ObjectID"; +import URL from "../../Types/API/URL"; +import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax"; +import ObjectID from "../../Types/ObjectID"; import StatusPageGroup from "../../Models/DatabaseModels/StatusPageGroup"; import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource"; import DropdownUtil from "./Dropdown"; -import StatusPageEventType from "../../../Types/StatusPage/StatusPageEventType"; +import StatusPageEventType from "../../Types/StatusPage/StatusPageEventType"; import { DropdownOption } from "../Components/Dropdown/Dropdown"; export default class StatusPageUtil { diff --git a/Common/UI/Utils/Timezone.ts b/Common/UI/Utils/Timezone.ts index 754713ee2e..4f760f8639 100644 --- a/Common/UI/Utils/Timezone.ts +++ b/Common/UI/Utils/Timezone.ts @@ -1,6 +1,6 @@ -import Timezone from "../../../Types/Timezone"; +import Timezone from "../../Types/Timezone"; import { DropdownOption } from "../Components/Dropdown/Dropdown"; -import OneUptimeDate from "../../../Types/Date"; +import OneUptimeDate from "../../Types/Date"; export default class TimezoneUtil { public static getTimezoneDropdownOptions(): DropdownOption[] { diff --git a/Common/UI/Utils/User.ts b/Common/UI/Utils/User.ts index 53e1b7a131..a5467afc86 100644 --- a/Common/UI/Utils/User.ts +++ b/Common/UI/Utils/User.ts @@ -1,16 +1,16 @@ import { IDENTITY_URL } from "../Config"; import LocalStorage from "./LocalStorage"; -import URL from "../../../Types/API/URL"; -import Dictionary from "../../../Types/Dictionary"; -import Email from "../../../Types/Email"; -import BadDataException from "../../../Types/Exception/BadDataException"; -import { JSONObject, JSONValue } from "../../../Types/JSON"; -import Name from "../../../Types/Name"; -import ObjectID from "../../../Types/ObjectID"; -import Timezone from "../../../Types/Timezone"; +import URL from "../../Types/API/URL"; +import Dictionary from "../../Types/Dictionary"; +import Email from "../../Types/Email"; +import BadDataException from "../../Types/Exception/BadDataException"; +import { JSONObject, JSONValue } from "../../Types/JSON"; +import Name from "../../Types/Name"; +import ObjectID from "../../Types/ObjectID"; +import Timezone from "../../Types/Timezone"; import API from "../../Utils/API"; import Cookie from "./Cookie"; -import CookieName from "../../../Types/CookieName"; +import CookieName from "../../Types/CookieName"; import SessionStorage from "./SessionStorage"; export default class UserUtil {