diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 07ce2d8905..b21891514d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -103,7 +103,7 @@ { "label": "Clean CE", "type": "shell", - "command": "yarn clean", + "command": "yarn clear", "options": { "cwd": "${workspaceFolder}/webapp" } diff --git a/common-react/@dbeaver/ui-kit/package.json b/common-react/@dbeaver/ui-kit/package.json index c720169a94..9745119f92 100644 --- a/common-react/@dbeaver/ui-kit/package.json +++ b/common-react/@dbeaver/ui-kit/package.json @@ -10,7 +10,7 @@ "scripts": { "build": "tsc -b", "docs": "ladle serve", - "clean": "rimraf --glob dist" + "clean": "rimraf --glob lib" }, "packageManager": "yarn@4.6.0", "devDependencies": { diff --git a/webapp/package.json b/webapp/package.json index 27ea406877..f16364a96a 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -49,7 +49,8 @@ "reflect-metadata": "^0", "rimraf": "^6", "typescript": "^5.7.3", - "typescript-plugin-css-modules": "^5" + "typescript-plugin-css-modules": "^5", + "vitest": "^3" }, "packageManager": "yarn@4.6.0" } diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json index b609f6db57..317df3306a 100644 --- a/webapp/packages/core-administration/package.json +++ b/webapp/packages/core-administration/package.json @@ -10,11 +10,11 @@ "description": "", "license": "Apache-2.0", "exports": { - ".": "./dist/index.js" + ".": "./lib/index.js" }, "scripts": { "build": "tsc -b", - "clean": "rimraf --glob dist", + "clean": "rimraf --glob lib", "lint": "eslint ./src/ --ext .ts,.tsx", "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies" diff --git a/webapp/packages/core-administration/tsconfig.json b/webapp/packages/core-administration/tsconfig.json index b8064ae67d..f41f41aaef 100644 --- a/webapp/packages/core-administration/tsconfig.json +++ b/webapp/packages/core-administration/tsconfig.json @@ -2,8 +2,8 @@ "extends": "@cloudbeaver/tsconfig/tsconfig.json", "compilerOptions": { "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", + "outDir": "lib", + "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo", "composite": true }, "references": [ @@ -53,7 +53,6 @@ ], "exclude": [ "**/node_modules", - "lib/**/*", - "dist/**/*" + "lib/**/*" ] } diff --git a/webapp/packages/core-app/package.json b/webapp/packages/core-app/package.json index 0b1aaab692..d7db7108b3 100644 --- a/webapp/packages/core-app/package.json +++ b/webapp/packages/core-app/package.json @@ -10,11 +10,11 @@ "description": "", "license": "Apache-2.0", "exports": { - ".": "./dist/index.js" + ".": "./lib/index.js" }, "scripts": { "build": "tsc -b", - "clean": "rimraf --glob dist", + "clean": "rimraf --glob lib", "lint": "eslint ./src/ --ext .ts,.tsx", "validate-dependencies": "core-cli-validate-dependencies" }, diff --git a/webapp/packages/core-app/tsconfig.json b/webapp/packages/core-app/tsconfig.json index eab47c6f42..dd3d13ad71 100644 --- a/webapp/packages/core-app/tsconfig.json +++ b/webapp/packages/core-app/tsconfig.json @@ -2,8 +2,8 @@ "extends": "@cloudbeaver/tsconfig/tsconfig.json", "compilerOptions": { "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", + "outDir": "lib", + "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo", "composite": true }, "references": [ @@ -62,7 +62,6 @@ ], "exclude": [ "**/node_modules", - "lib/**/*", - "dist/**/*" + "lib/**/*" ] } diff --git a/webapp/packages/core-authentication/package.json b/webapp/packages/core-authentication/package.json index 5d81d95bc9..81670c36e9 100644 --- a/webapp/packages/core-authentication/package.json +++ b/webapp/packages/core-authentication/package.json @@ -10,12 +10,12 @@ "description": "", "license": "Apache-2.0", "exports": { - ".": "./dist/index.js", - "./*": "./dist/*" + ".": "./lib/index.js", + "./*": "./lib/*" }, "scripts": { "build": "tsc -b", - "clean": "rimraf --glob dist", + "clean": "rimraf --glob lib", "lint": "eslint ./src/ --ext .ts,.tsx", "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies" @@ -39,8 +39,8 @@ "@cloudbeaver/core-cli": "workspace:*", "@cloudbeaver/core-sdk": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", - "@types/jest": "^29", "msw": "^2", - "typescript": "^5" + "typescript": "^5", + "vitest": "^3" } } diff --git a/webapp/packages/core-authentication/src/AuthSettingsService.test.ts b/webapp/packages/core-authentication/src/AuthSettingsService.test.ts index efd4423d8a..99f8dba020 100644 --- a/webapp/packages/core-authentication/src/AuthSettingsService.test.ts +++ b/webapp/packages/core-authentication/src/AuthSettingsService.test.ts @@ -1,11 +1,11 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ -// import { expect, test } from '@jest/globals'; +import { describe } from 'vitest'; // import { coreClientActivityManifest } from '@cloudbeaver/core-client-activity'; // import { coreLocalizationManifest } from '@cloudbeaver/core-localization'; @@ -52,3 +52,5 @@ // expect(settings.disableAnonymousAccess).toBe(true); // expectNoDeprecatedSettingMessage(); // }); + +describe.skip('AuthSettingsService', () => {}); diff --git a/webapp/packages/core-authentication/src/UserInfoResource.ts b/webapp/packages/core-authentication/src/UserInfoResource.ts index 762ee418f1..8f502ec51c 100644 --- a/webapp/packages/core-authentication/src/UserInfoResource.ts +++ b/webapp/packages/core-authentication/src/UserInfoResource.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/core-authentication/tsconfig.json b/webapp/packages/core-authentication/tsconfig.json index 141fd453ad..e8019adbc1 100644 --- a/webapp/packages/core-authentication/tsconfig.json +++ b/webapp/packages/core-authentication/tsconfig.json @@ -2,13 +2,12 @@ "extends": "@cloudbeaver/tsconfig/tsconfig.json", "exclude": [ "**/node_modules", - "lib/**/*", - "dist/**/*" + "lib/**/*" ], "compilerOptions": { "rootDir": "src", - "outDir": "dist", - "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo", + "outDir": "lib", + "tsBuildInfoFile": "lib/tsconfig.tsbuildinfo", "composite": true }, "references": [ diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json index 5e3d9aac56..bab58c7ed5 100644 --- a/webapp/packages/core-blocks/package.json +++ b/webapp/packages/core-blocks/package.json @@ -10,11 +10,11 @@ "description": "", "license": "Apache-2.0", "exports": { - ".": "./dist/index.js" + ".": "./lib/index.js" }, "scripts": { "build": "tsc -b", - "clean": "rimraf --glob dist", + "clean": "rimraf --glob lib", "lint": "eslint ./src/ --ext .ts,.tsx", "test": "core-cli-test", "validate-dependencies": "core-cli-validate-dependencies" @@ -51,15 +51,14 @@ "@cloudbeaver/core-utils": "workspace:*", "@cloudbeaver/tests-runner": "workspace:*", "@cloudbeaver/tsconfig": "workspace:*", - "@jest/globals": "^29", - "@testing-library/dom": "^10", + "@testing-library/jest-dom": "^6", "@testing-library/react": "^16", - "@types/jest": "^29", "@types/react": "^19", "mobx": "^6", "react": "^19", "react-dom": "^19", "typescript": "^5", - "typescript-plugin-css-modules": "^5" + "typescript-plugin-css-modules": "^5", + "vitest": "^3" } } diff --git a/webapp/packages/core-blocks/src/Cell.test.tsx b/webapp/packages/core-blocks/src/Cell.test.tsx index 85c3e59ade..74498c18ec 100644 --- a/webapp/packages/core-blocks/src/Cell.test.tsx +++ b/webapp/packages/core-blocks/src/Cell.test.tsx @@ -1,65 +1,70 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ -// // @ts-nocheck -// import { afterEach, describe, expect, it } from '@jest/globals'; -// import { cleanup, waitFor } from '@testing-library/react'; -// import { createApp, renderInApp } from '@cloudbeaver/tests-runner'; +import { describe, expect, it, vi } from 'vitest'; -// import { Cell } from './Cell.js'; +import '@testing-library/jest-dom/vitest'; +import { render } from '@testing-library/react'; -// const app = createApp(); +import { Cell } from './Cell.js'; -// describe('Cell', () => { -// afterEach(() => { -// cleanup(); -// }); +vi.mock('./s', () => ({ + s: (...args: any[]) => args.join(' '), +})); -// it('should render children correctly', async () => { -// const { getByText } = renderInApp(Test Children, app); -// const text = await waitFor(() => getByText('Test Children')); +vi.mock('./useS', () => ({ + useS: vi.fn(), +})); -// expect(text).toBeInTheDocument(); -// }); +vi.mock('./Containers/Container', () => ({ + Container: (props: any) =>
{props.children}
, +})); -// it('should render before element correctly', async () => { -// const { getByText } = renderInApp(Before Element}>Test Children, app); +describe('Cell', () => { + it('should render children correctly', async () => { + const { getByText } = render(Test Children); + const text = await vi.waitFor(() => getByText('Test Children')); -// const beforeText = await waitFor(() => getByText('Before Element')); -// expect(beforeText).toBeInTheDocument(); -// }); + expect(text).toBeInTheDocument(); + }); -// it('should render after element correctly', async () => { -// const { getByText } = renderInApp(After Element}>Test Children, app); + it('should render before element correctly', async () => { + const { getByText } = render(Before Element}>Test Children); -// const afterText = await waitFor(() => getByText('After Element')); -// expect(afterText).toBeInTheDocument(); -// }); + const beforeText = await vi.waitFor(() => getByText('Before Element')); + expect(beforeText).toBeInTheDocument(); + }); -// it('should render after and before elements correctly', async () => { -// const { getByText } = renderInApp( -// Before Element} after={After Element}> -// Test Children -// , -// app, -// ); + it('should render after element correctly', async () => { + const { getByText } = render(After Element}>Test Children); -// const afterText = await waitFor(() => getByText('After Element')); -// const beforeText = await waitFor(() => getByText('Before Element')); + const afterText = await vi.waitFor(() => getByText('After Element')); + expect(afterText).toBeInTheDocument(); + }); -// expect(beforeText).toBeInTheDocument(); -// expect(afterText).toBeInTheDocument(); -// }); + it('should render after and before elements correctly', async () => { + const { getByText } = render( + Before Element} after={After Element}> + Test Children + , + ); -// it('should render description element correctly', async () => { -// const { getByText } = renderInApp(Description Element}>Test Children, app); + const afterText = await vi.waitFor(() => getByText('After Element')); + const beforeText = await vi.waitFor(() => getByText('Before Element')); -// const description = await waitFor(() => getByText('Description Element')); -// expect(description).toBeInTheDocument(); -// }); -// }); + expect(beforeText).toBeInTheDocument(); + expect(afterText).toBeInTheDocument(); + }); + + it('should render description element correctly', async () => { + const { getByText } = render(Description Element}>Test Children); + + const description = await vi.waitFor(() => getByText('Description Element')); + expect(description).toBeInTheDocument(); + }); +}); diff --git a/webapp/packages/core-blocks/src/ErrorMessage.test.tsx b/webapp/packages/core-blocks/src/ErrorMessage.test.tsx index 753ab0d425..516df0b693 100644 --- a/webapp/packages/core-blocks/src/ErrorMessage.test.tsx +++ b/webapp/packages/core-blocks/src/ErrorMessage.test.tsx @@ -1,21 +1,38 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ -// import { expect, test } from '@jest/globals'; -// import { screen, waitFor } from '@testing-library/react'; +import { expect, describe, it, vi } from 'vitest'; -// import { coreLocalizationManifest } from '@cloudbeaver/core-localization'; -// import { createApp, renderInApp } from '@cloudbeaver/tests-runner'; +import { ErrorMessage } from './ErrorMessage.js'; +import { render } from '@testing-library/react'; -// import { ErrorMessage } from './ErrorMessage.js'; +vi.mock('./s', () => ({ + s: (...args: any[]) => args.join(' '), +})); -// const app = createApp(coreLocalizationManifest); +vi.mock('./useS', () => ({ + useS: vi.fn(), +})); -// test('icons.svg#name', async () => { -// renderInApp(, app); -// await waitFor(() => expect(screen.getByText('error')).not.toBeNull()); -// }); +vi.mock('./localization/useTranslate', () => ({ + useTranslate: () => (key: string) => key, +})); + +vi.mock('./Button', () => ({ + Button: (props: any) =>