Skip to content

Commit 8d47b43

Browse files
♻️ refactor(imports): fix all imports paths
1 parent 0a5be5c commit 8d47b43

File tree

683 files changed

+2373
-2356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

683 files changed

+2373
-2356
lines changed

components.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"aliases": {
1414
"components": "@/components",
15-
"utils": "@/lib/utils"
15+
"utils": "@/components/utils"
1616
}
1717
}

scripts/ci/check-file-segments.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const fs = require("fs");
22
const { listAllFilesInDir } = require("./lib");
3-
// TODO
3+
44
let files = process.argv.slice(2);
55

66
if (files.length === 0) {

src/__tests__/_/api-handlers/account.ts renamed to src/__tests__/_/api/handlers/account.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { AuthActions } from "frontend/hooks/auth/auth.actions";
21
import { rest } from "msw";
3-
import { REQUEST_ERROR_CODES } from "shared/constants/auth";
4-
import type { IAuthenticatedUserBag } from "shared/types/user";
2+
3+
import { AuthActions } from "@/frontend/hooks/auth/auth.actions";
4+
import { REQUEST_ERROR_CODES } from "@/shared/constants/auth";
5+
import type { IAuthenticatedUserBag } from "@/shared/types/user";
56

67
import { BASE_TEST_URL } from "./_utils";
78

src/__tests__/_/api-handlers/config.ts renamed to src/__tests__/_/api/handlers/config.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { rest } from "msw";
2-
import type { ITableView } from "shared/types/data";
3-
import { FilterOperators } from "shared/types/data";
2+
3+
import type { ITableView } from "@/shared/types/data";
4+
import { FilterOperators } from "@/shared/types/data";
45

56
import { BASE_TEST_URL } from "./_utils";
67

src/__tests__/_/api-handlers/dashboard.ts renamed to src/__tests__/_/api/handlers/dashboard.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { MutationHelpers } from "frontend/lib/data/useMutate/mutation-helpers";
21
import { rest } from "msw";
3-
import type { IWidgetConfig } from "shared/types/dashboard";
2+
3+
import { MutationHelpers } from "@/frontend/lib/data/useMutate/mutation-helpers";
4+
import type { IWidgetConfig } from "@/shared/types/dashboard";
45

56
import { BASE_TEST_URL } from "./_utils";
67

src/__tests__/_/api-handlers/data.ts renamed to src/__tests__/_/api/handlers/data.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { rest } from "msw";
2-
import { reduceStringToNumber } from "shared/lib/strings";
2+
3+
import { reduceStringToNumber } from "@/shared/lib/strings";
34

45
import { BASE_TEST_URL } from "./_utils";
56

src/__tests__/_/api-handlers/entities.ts renamed to src/__tests__/_/api/handlers/entities.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { rest } from "msw";
2-
import type { IEntityField } from "shared/types/db";
2+
3+
import type { IEntityField } from "@/shared/types/db";
34

45
import { BASE_TEST_URL } from "./_utils";
56

src/__tests__/_/api-handlers/integrations.ts renamed to src/__tests__/_/api/handlers/integrations.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import type {
77
RestRequest,
88
} from "msw";
99
import { rest } from "msw";
10-
import type { IKeyValue } from "shared/types/options";
10+
11+
import type { IKeyValue } from "@/shared/types/options";
1112

1213
import { BASE_TEST_URL } from "./_utils";
1314

src/__tests__/_/api-handlers/menu.ts renamed to src/__tests__/_/api/handlers/menu.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { rest } from "msw";
2-
import type { INavigationMenuItem } from "shared/types/menu";
3-
import { NavigationMenuItemType } from "shared/types/menu";
2+
3+
import type { INavigationMenuItem } from "@/shared/types/menu";
4+
import { NavigationMenuItemType } from "@/shared/types/menu";
45

56
import { BASE_TEST_URL } from "./_utils";
67

src/__tests__/api/_test-utils/_activated-integrations.ts renamed to src/__tests__/_/api/setups/_activated-integrations.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createKeyValueDomainPersistenceService } from "backend/lib/key-value";
2-
import { ActionIntegrations } from "shared/types/actions";
1+
import { createKeyValueDomainPersistenceService } from "@/backend/lib/key-value";
2+
import { ActionIntegrations } from "@/shared/types/actions";
33

44
const TEST_ACTIVATED_ACTIONS: ActionIntegrations[] = [
55
ActionIntegrations.SMTP,

src/__tests__/api/_test-utils/_all.ts renamed to src/__tests__/_/api/setups/_all.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { createCacheService } from "backend/lib/cache";
2-
import type { ConfigDomain } from "backend/lib/config-persistence/types";
3-
import type { KeyValueDomain } from "backend/lib/key-value/types";
1+
import { createCacheService } from "@/backend/lib/cache";
2+
import type { ConfigDomain } from "@/backend/lib/config-persistence/types";
3+
import type { KeyValueDomain } from "@/backend/lib/key-value/types";
44

55
import { setupActivatedIntegrationsTestData } from "./_activated-integrations";
66
import { setupAppConfigTestData } from "./_app-config";

src/__tests__/api/_test-utils/_app-config.ts renamed to src/__tests__/_/api/setups/_app-config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
2-
import { typescriptSafeObjectDotEntries } from "shared/lib/objects";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
2+
import { typescriptSafeObjectDotEntries } from "@/shared/lib/objects";
33

44
const TEST_APP_CONFIG: Partial<Record<string, unknown>> = {
55
disabled_entities: ["disabled-entity-1", "disabled-entity-2"],

src/__tests__/api/_test-utils/_credentials.ts renamed to src/__tests__/_/api/setups/_credentials.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
2-
import { typescriptSafeObjectDotEntries } from "shared/lib/objects";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
2+
import { typescriptSafeObjectDotEntries } from "@/shared/lib/objects";
33

44
const TEST_CREDENTIALS: Record<string, string> = {
55
CREDENTIAL_KEY_1:

src/__tests__/api/_test-utils/_dashboard.ts renamed to src/__tests__/_/api/setups/_dashboard.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
2-
import type { IWidgetConfig } from "shared/types/dashboard";
3-
import { HOME_DASHBOARD_KEY } from "shared/types/dashboard";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
2+
import type { IWidgetConfig } from "@/shared/types/dashboard";
3+
import { HOME_DASHBOARD_KEY } from "@/shared/types/dashboard";
44

55
const TEST_DASHBOARDS: Array<IWidgetConfig> = [
66
{

src/__tests__/api/_test-utils/_data.ts renamed to src/__tests__/_/api/setups/_data.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getDbConnection } from "backend/lib/connection/db";
1+
import { getDbConnection } from "@/backend/lib/connection/db";
22

33
interface ITestDataSchema {
44
id: number;

src/__tests__/api/_test-utils/_form-actions.ts renamed to src/__tests__/_/api/setups/_form-actions.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
2-
import type { IFormAction } from "shared/types/actions";
3-
import { ActionIntegrations } from "shared/types/actions";
4-
import { DataEventActions } from "shared/types/data";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
2+
import type { IFormAction } from "@/shared/types/actions";
3+
import { ActionIntegrations } from "@/shared/types/actions";
4+
import { DataEventActions } from "@/shared/types/data";
55

66
const TEST_FORM_ACTIONS: IFormAction[] = [
77
{

src/__tests__/api/_test-utils/_integrations-constants.ts renamed to src/__tests__/_/api/setups/_integrations-constants.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { INTEGRATION_CONFIG_GROUP_DEMILITER } from "backend/integrations-configurations/services/_base";
2-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
3-
import { typescriptSafeObjectDotEntries } from "shared/lib/objects";
1+
import { INTEGRATION_CONFIG_GROUP_DEMILITER } from "@/backend/integrations-configurations/services/_base";
2+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
3+
import { typescriptSafeObjectDotEntries } from "@/shared/lib/objects";
44

55
const TEST_CONSTANTS: Record<string, string> = {
66
CONSTANT_KEY_1: "CONSTANT_KEY_1",

src/__tests__/api/_test-utils/_integrations-env.ts renamed to src/__tests__/_/api/setups/_integrations-env.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { INTEGRATION_CONFIG_GROUP_DEMILITER } from "backend/integrations-configurations/services/_base";
2-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
3-
import { typescriptSafeObjectDotEntries } from "shared/lib/objects";
1+
import { INTEGRATION_CONFIG_GROUP_DEMILITER } from "@/backend/integrations-configurations/services/_base";
2+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
3+
import { typescriptSafeObjectDotEntries } from "@/shared/lib/objects";
44

55
const TEST_ENVS: Record<string, string> = {
66
ENV_KEY_1: "ENV_KEY_1",

src/__tests__/api/_test-utils/_roles.ts renamed to src/__tests__/_/api/setups/_roles.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
2-
import type { IRole } from "backend/roles/roles.service";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
2+
import type { IRole } from "@/backend/roles/roles.service";
33

44
const TEST_ROLES: IRole[] = [
55
{

src/__tests__/api/_test-utils/_schema.ts renamed to src/__tests__/_/api/setups/_schema.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
2-
import type { IDBSchema } from "shared/types/db";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
2+
import type { IDBSchema } from "@/shared/types/db";
33

44
const TEST_DB_SCHEMA: IDBSchema[] = [
55
{

src/__tests__/api/_test-utils/_user-preferences.ts renamed to src/__tests__/_/api/setups/_user-preferences.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
22

33
export const setupUserPreferencesTestData = async () => {
44
const configPersistenceService =

src/__tests__/api/_test-utils/_users.ts renamed to src/__tests__/_/api/setups/_users.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { createConfigDomainPersistenceService } from "backend/lib/config-persistence";
2-
import type { IAccountUser } from "shared/types/user";
1+
import { createConfigDomainPersistenceService } from "@/backend/lib/config-persistence";
2+
import type { IAccountUser } from "@/shared/types/user";
33

44
const TEST_USERS: IAccountUser[] = [
55
{
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import type { PortalConfigDomain } from "@/backend/lib/config-persistence/portal/main/types";
2+
3+
export const portalTestData: [PortalConfigDomain, () => Promise<void>][] = [];

src/__tests__/_/setupApihandlers.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { AuthActions } from "frontend/hooks/auth/auth.actions";
21
import { setupServer } from "msw/node";
32

4-
import { apiHandlers } from "./api-handlers";
3+
import { AuthActions } from "@/frontend/hooks/auth/auth.actions";
4+
5+
import { apiHandlers } from "./api/handlers";
56

67
export const server = setupServer(...apiHandlers);
78

src/__tests__/_/utils/getTableRows.ts

-13
This file was deleted.

src/__tests__/_/utils/closeAllToasts.ts renamed to src/__tests__/_/utils/index.ts

+12-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ export const closeAllToasts = async () => {
77
await userEvent.keyboard("{Escape}");
88
};
99

10-
export const expectToast = async (message: string) => {
11-
expect(
12-
await within(screen.getByRole("region")).findByRole("status")
13-
).toHaveTextContent(message);
14-
};
15-
1610
export const getToastMessage = async () => {
1711
return (await within(screen.getByRole("region")).findByRole("status"))
1812
.textContent;
@@ -28,3 +22,15 @@ export const confirmDelete = async () => {
2822
{ pointerEventsCheck: PointerEventsCheckLevel.Never }
2923
);
3024
};
25+
26+
export const getTableRows = async (widget: HTMLElement) => {
27+
const rows = await within(widget).findAllByRole("row");
28+
29+
return rows.map((row, index) => {
30+
return within(row)
31+
.getAllByRole(index === 0 ? "columnheader" : "cell")
32+
.map((cell) => cell.textContent.trim())
33+
.filter(Boolean)
34+
.join("|");
35+
});
36+
};

src/__tests__/_app.spec.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { render, screen } from "@testing-library/react";
2-
import type { CustomNextPage } from "frontend/_layouts/types";
3-
import MyApp from "pages/_app";
2+
3+
import type { CustomNextPage } from "@/frontend/_layouts/types";
4+
import MyApp from "@/pages/_app";
45

56
import { USE_ROUTER_PARAMS } from "./_/constants";
67

src/__tests__/account/logout.spec.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
2-
import { TestProviders } from "__tests__/_/Provider";
3-
import { setupApiHandlers } from "__tests__/_/setupApihandlers";
41
import { render, screen, waitFor } from "@testing-library/react";
52
import userEvent from "@testing-library/user-event";
6-
import AccountPassword from "pages/account/password";
3+
4+
import AccountPassword from "@/pages/account/password";
5+
import { USE_ROUTER_PARAMS } from "@/tests/constants";
6+
import { TestProviders } from "@/tests/Provider";
7+
import { setupApiHandlers } from "@/tests/setupApihandlers";
78

89
Object.defineProperty(window, "location", {
910
value: {

src/__tests__/account/password.spec.tsx

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
2-
import { TestProviders } from "__tests__/_/Provider";
3-
import { setupApiHandlers } from "__tests__/_/setupApihandlers";
4-
import {
5-
closeAllToasts,
6-
getToastMessage,
7-
} from "__tests__/_/utils/closeAllToasts";
81
import { render, screen } from "@testing-library/react";
92
import userEvent from "@testing-library/user-event";
10-
import AccountPassword from "pages/account/password";
3+
4+
import AccountPassword from "@/pages/account/password";
5+
import { USE_ROUTER_PARAMS } from "@/tests/constants";
6+
import { TestProviders } from "@/tests/Provider";
7+
import { setupApiHandlers } from "@/tests/setupApihandlers";
8+
import { closeAllToasts, getToastMessage } from "@/tests/utils";
119

1210
setupApiHandlers();
1311

src/__tests__/account/preferences.spec.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
2-
import { TestProviders } from "__tests__/_/Provider";
3-
import { setupApiHandlers } from "__tests__/_/setupApihandlers";
41
import { render, screen, waitFor } from "@testing-library/react";
52
import userEvent from "@testing-library/user-event";
6-
import UserPreferences from "pages/account/preferences";
73

8-
import { getToastMessage } from "../_/utils/closeAllToasts";
4+
import UserPreferences from "@/pages/account/preferences";
5+
import { USE_ROUTER_PARAMS } from "@/tests/constants";
6+
import { TestProviders } from "@/tests/Provider";
7+
import { setupApiHandlers } from "@/tests/setupApihandlers";
8+
9+
import { getToastMessage } from "../_/utils";
910

1011
setupApiHandlers();
1112

src/__tests__/account/profile.spec.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
2-
import { TestProviders } from "__tests__/_/Provider";
3-
import { setupApiHandlers } from "__tests__/_/setupApihandlers";
41
import { render, screen, waitFor } from "@testing-library/react";
52
import userEvent from "@testing-library/user-event";
6-
import AccountProfile from "pages/account/profile";
73

8-
import { getToastMessage } from "../_/utils/closeAllToasts";
4+
import AccountProfile from "@/pages/account/profile";
5+
import { USE_ROUTER_PARAMS } from "@/tests/constants";
6+
import { TestProviders } from "@/tests/Provider";
7+
import { setupApiHandlers } from "@/tests/setupApihandlers";
8+
9+
import { getToastMessage } from "../_/utils";
910

1011
setupApiHandlers();
1112

src/__tests__/admin/[entity]/[id]/index.spec.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
2-
import { TestProviders } from "__tests__/_/Provider";
3-
import { setupApiHandlers } from "__tests__/_/setupApihandlers";
41
import { render, screen } from "@testing-library/react";
5-
import EntityDetails from "pages/admin/[entity]/[id]/index";
2+
3+
import EntityDetails from "@/pages/admin/[entity]/[id]/index";
4+
import { USE_ROUTER_PARAMS } from "@/tests/constants";
5+
import { TestProviders } from "@/tests/Provider";
6+
import { setupApiHandlers } from "@/tests/setupApihandlers";
67

78
setupApiHandlers();
89

src/__tests__/admin/[entity]/[id]/update.spec.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
2-
import { TestProviders } from "__tests__/_/Provider";
3-
import { setupApiHandlers } from "__tests__/_/setupApihandlers";
41
import { render, screen, waitFor } from "@testing-library/react";
5-
import EntityUpdate from "pages/admin/[entity]/[id]/update";
2+
3+
import EntityUpdate from "@/pages/admin/[entity]/[id]/update";
4+
import { USE_ROUTER_PARAMS } from "@/tests/constants";
5+
import { TestProviders } from "@/tests/Provider";
6+
import { setupApiHandlers } from "@/tests/setupApihandlers";
67

78
setupApiHandlers();
89

src/__tests__/admin/[entity]/config/actions.spec.tsx

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import { USE_ROUTER_PARAMS } from "__tests__/_/constants";
2-
import { TestProviders } from "__tests__/_/Provider";
3-
import { setupApiHandlers } from "__tests__/_/setupApihandlers";
1+
import { render, screen, within } from "@testing-library/react";
2+
import userEvent from "@testing-library/user-event";
3+
4+
import EntityFormActionsSettings from "@/pages/admin/[entity]/config/actions";
5+
import { USE_ROUTER_PARAMS } from "@/tests/constants";
6+
import { TestProviders } from "@/tests/Provider";
7+
import { setupApiHandlers } from "@/tests/setupApihandlers";
48
import {
59
closeAllToasts,
610
confirmDelete,
11+
getTableRows,
712
getToastMessage,
8-
} from "__tests__/_/utils/closeAllToasts";
9-
import { getTableRows } from "__tests__/_/utils/getTableRows";
10-
import { render, screen, within } from "@testing-library/react";
11-
import userEvent from "@testing-library/user-event";
12-
import EntityFormActionsSettings from "pages/admin/[entity]/config/actions";
13+
} from "@/tests/utils";
1314

1415
setupApiHandlers();
1516

0 commit comments

Comments
 (0)