diff --git a/webapp/packages/core-bootstrap/package.json b/webapp/packages/core-bootstrap/package.json index fe5709d984..bef9e994e6 100644 --- a/webapp/packages/core-bootstrap/package.json +++ b/webapp/packages/core-bootstrap/package.json @@ -31,6 +31,7 @@ "@cloudbeaver/core-dialogs": "^0", "@cloudbeaver/core-events": "^0", "@cloudbeaver/core-executor": "^0", + "@cloudbeaver/core-links": "^0", "@cloudbeaver/core-localization": "^0", "@cloudbeaver/core-navigation-tree": "^0", "@cloudbeaver/core-product": "^0", @@ -52,7 +53,6 @@ "@cloudbeaver/core-version": "^0", "@cloudbeaver/core-version-update": "^0", "@cloudbeaver/core-view": "^0", - "@cloudbeaver/core-website": "^0", "mobx": "^6", "react": "^18", "react-dom": "^18" diff --git a/webapp/packages/core-bootstrap/src/manifest.ts b/webapp/packages/core-bootstrap/src/manifest.ts index 870ee5ae55..322c13a66b 100644 --- a/webapp/packages/core-bootstrap/src/manifest.ts +++ b/webapp/packages/core-bootstrap/src/manifest.ts @@ -17,6 +17,7 @@ import { coreConnectionsManifest } from '@cloudbeaver/core-connections'; import { coreDIManifest, type PluginManifest } from '@cloudbeaver/core-di'; import { coreDialogsManifest } from '@cloudbeaver/core-dialogs'; import { coreEventsManifest } from '@cloudbeaver/core-events'; +import { coreLinksManifest } from '@cloudbeaver/core-links'; import { coreLocalizationManifest } from '@cloudbeaver/core-localization'; import { coreNavigationTree } from '@cloudbeaver/core-navigation-tree'; import { coreProductManifest } from '@cloudbeaver/core-product'; @@ -38,7 +39,6 @@ import { coreUIManifest } from '@cloudbeaver/core-ui'; import { coreVersionManifest } from '@cloudbeaver/core-version'; import { coreVersionUpdateManifest } from '@cloudbeaver/core-version-update'; import { coreViewManifest } from '@cloudbeaver/core-view'; -import { coreWebsiteManifest } from '@cloudbeaver/core-website'; export const coreManifests: PluginManifest[] = [ { @@ -64,7 +64,7 @@ export const coreManifests: PluginManifest[] = [ coreResourceManifest, coreSDKManifest, coreRootManifest, - coreWebsiteManifest, + coreLinksManifest, coreBrowserSettingsManifest, coreBrowserCookiesManifest, coreProductManifest, diff --git a/webapp/packages/core-bootstrap/tsconfig.json b/webapp/packages/core-bootstrap/tsconfig.json index 77f40924e6..8542bd6ee6 100644 --- a/webapp/packages/core-bootstrap/tsconfig.json +++ b/webapp/packages/core-bootstrap/tsconfig.json @@ -45,6 +45,9 @@ { "path": "../core-executor/tsconfig.json" }, + { + "path": "../core-links/tsconfig.json" + }, { "path": "../core-localization/tsconfig.json" }, @@ -107,9 +110,6 @@ }, { "path": "../core-view/tsconfig.json" - }, - { - "path": "../core-website/tsconfig.json" } ], "include": [ diff --git a/webapp/packages/core-client-activity/package.json b/webapp/packages/core-client-activity/package.json index dc866fd87f..18e03f5bf5 100644 --- a/webapp/packages/core-client-activity/package.json +++ b/webapp/packages/core-client-activity/package.json @@ -25,6 +25,8 @@ }, "peerDependencies": {}, "devDependencies": { + "@jest/globals": "^29", + "@types/jest": "^29", "typescript": "^5" } } diff --git a/webapp/packages/core-website/.gitignore b/webapp/packages/core-links/.gitignore similarity index 100% rename from webapp/packages/core-website/.gitignore rename to webapp/packages/core-links/.gitignore diff --git a/webapp/packages/core-website/package.json b/webapp/packages/core-links/package.json similarity index 94% rename from webapp/packages/core-website/package.json rename to webapp/packages/core-links/package.json index 50e8f6c4e1..d8f649cb0f 100644 --- a/webapp/packages/core-website/package.json +++ b/webapp/packages/core-links/package.json @@ -1,5 +1,5 @@ { - "name": "@cloudbeaver/core-website", + "name": "@cloudbeaver/core-links", "type": "module", "sideEffects": [ "src/**/*.css", diff --git a/webapp/packages/core-links/src/GithubLinks.ts b/webapp/packages/core-links/src/GithubLinks.ts new file mode 100644 index 0000000000..13394514f8 --- /dev/null +++ b/webapp/packages/core-links/src/GithubLinks.ts @@ -0,0 +1,20 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ +export const GITHUB_LINKS = { + CLOUDBEAVER_REPO: 'https://github.com/dbeaver/cloudbeaver', + EE_DEPLOY_UPDATE: 'https://github.com/dbeaver/cloudbeaver-deploy?tab=readme-ov-file#updating-the-cluster', + TE_DEPLOY_UPDATE: 'https://github.com/dbeaver/team-edition-deploy?tab=readme-ov-file#server-version-update', + + getDeployUpdateLink(distributed: boolean) { + if (distributed) { + return GITHUB_LINKS.TE_DEPLOY_UPDATE; + } + + return GITHUB_LINKS.EE_DEPLOY_UPDATE; + }, +}; diff --git a/webapp/packages/core-links/src/WebsiteLinks.ts b/webapp/packages/core-links/src/WebsiteLinks.ts new file mode 100644 index 0000000000..245acb1321 --- /dev/null +++ b/webapp/packages/core-links/src/WebsiteLinks.ts @@ -0,0 +1,32 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ +export const WEBSITE_LINKS = { + ROOT_PAGE: 'https://dbeaver.com/', + DATA_EDITOR_DOCUMENTATION_PAGE: 'https://dbeaver.com/docs/cloudbeaver/Data-editor/', + SQL_EDITOR_DOCUMENTATION_PAGE: 'https://dbeaver.com/docs/cloudbeaver/SQL-Editor/', + SERVER_CONFIGURATION_RESOURCE_QUOTAS_PAGE: 'https://dbeaver.com/docs/cloudbeaver/Server-configuration/#resource-quotas', + DATABASE_NAVIGATOR_DOCUMENTATION_PAGE: 'https://dbeaver.com/docs/cloudbeaver/Database-Navigator/', + + ENTERPRISE_BUY_PRODUCT_PAGE: 'https://dbeaver.com/products/cloudbeaver-enterprise/', + TEAM_EDITION_BUY_PRODUCT_PAGE: 'https://dbeaver.com/products/team-edition/', + LATEST_COMMUNITY_VERSION_PAGE: 'https://dbeaver.com/product/cloudbeaver-ce-version.json', + TEAM_ARCHIVE: 'https://dbeaver.com/downloads-team', + CONTACT_PAGE: 'https://dbeaver.com/contact/', + + getTeamArchiveById(id: string) { + return `${WEBSITE_LINKS.TEAM_ARCHIVE}/${id}`; + }, + + getProductBuyPage(distributed: boolean) { + if (distributed) { + return WEBSITE_LINKS.TEAM_EDITION_BUY_PRODUCT_PAGE; + } + + return WEBSITE_LINKS.ENTERPRISE_BUY_PRODUCT_PAGE; + }, +}; diff --git a/webapp/packages/core-website/src/index.ts b/webapp/packages/core-links/src/index.ts similarity index 89% rename from webapp/packages/core-website/src/index.ts rename to webapp/packages/core-links/src/index.ts index 38be8ec1f1..a0246db54e 100644 --- a/webapp/packages/core-website/src/index.ts +++ b/webapp/packages/core-links/src/index.ts @@ -6,4 +6,5 @@ * you may not use this file except in compliance with the License. */ export * from './WebsiteLinks.js'; +export * from './GithubLinks.js'; export * from './manifest.js'; diff --git a/webapp/packages/core-website/src/manifest.ts b/webapp/packages/core-links/src/manifest.ts similarity index 80% rename from webapp/packages/core-website/src/manifest.ts rename to webapp/packages/core-links/src/manifest.ts index ce7585d11c..afed7515af 100644 --- a/webapp/packages/core-website/src/manifest.ts +++ b/webapp/packages/core-links/src/manifest.ts @@ -7,9 +7,9 @@ */ import type { PluginManifest } from '@cloudbeaver/core-di'; -export const coreWebsiteManifest: PluginManifest = { +export const coreLinksManifest: PluginManifest = { info: { - name: 'Core Website', + name: 'Core Links', }, providers: [], diff --git a/webapp/packages/core-website/tsconfig.json b/webapp/packages/core-links/tsconfig.json similarity index 100% rename from webapp/packages/core-website/tsconfig.json rename to webapp/packages/core-links/tsconfig.json diff --git a/webapp/packages/core-localization/package.json b/webapp/packages/core-localization/package.json index 85b27c09d1..3ee4e322fb 100644 --- a/webapp/packages/core-localization/package.json +++ b/webapp/packages/core-localization/package.json @@ -25,6 +25,8 @@ }, "peerDependencies": {}, "devDependencies": { + "@jest/globals": "^29", + "@types/jest": "^29", "typescript": "^5" } } diff --git a/webapp/packages/core-root/package.json b/webapp/packages/core-root/package.json index d4951f0386..376174e6b6 100644 --- a/webapp/packages/core-root/package.json +++ b/webapp/packages/core-root/package.json @@ -32,8 +32,8 @@ }, "peerDependencies": {}, "devDependencies": { + "@cloudbeaver/core-links": "^0", "@cloudbeaver/core-sdk": "^0", - "@cloudbeaver/core-website": "^0", "@cloudbeaver/tests-runner": "^0", "@jest/globals": "^29", "@types/jest": "^29", diff --git a/webapp/packages/core-root/src/__custom_mocks__/data/defaultServerConfig.ts b/webapp/packages/core-root/src/__custom_mocks__/data/defaultServerConfig.ts index dcdc7442e2..25622b56ef 100644 --- a/webapp/packages/core-root/src/__custom_mocks__/data/defaultServerConfig.ts +++ b/webapp/packages/core-root/src/__custom_mocks__/data/defaultServerConfig.ts @@ -5,8 +5,8 @@ * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. */ +import { WEBSITE_LINKS } from '@cloudbeaver/core-links'; import type { ServerConfigQuery } from '@cloudbeaver/core-sdk'; -import { WebsiteLinks } from '@cloudbeaver/core-website'; import { defaultProductConfiguration } from './defaultProductConfiguration.js'; @@ -113,7 +113,7 @@ export const defaultServerConfig: (productConfiguration?: Record) = productInfo: { id: 'io.cloudbeaver.product.ce.product', version: '22.1.2.202207140640', - latestVersionInfo: WebsiteLinks.LATEST_COMMUNITY_VERSION_PAGE, + latestVersionInfo: WEBSITE_LINKS.LATEST_COMMUNITY_VERSION_PAGE, name: 'CloudBeaver CE Server', description: 'Cloudbeaver Web UI Application', buildTime: 'July 14, 2022', diff --git a/webapp/packages/core-root/tsconfig.json b/webapp/packages/core-root/tsconfig.json index 72da7e9cc3..68b810a9f4 100644 --- a/webapp/packages/core-root/tsconfig.json +++ b/webapp/packages/core-root/tsconfig.json @@ -20,6 +20,9 @@ { "path": "../core-executor/tsconfig.json" }, + { + "path": "../core-links/tsconfig.json" + }, { "path": "../core-localization/tsconfig.json" }, @@ -41,9 +44,6 @@ { "path": "../core-utils/tsconfig.json" }, - { - "path": "../core-website/tsconfig.json" - }, { "path": "../tests-runner/tsconfig.json" } diff --git a/webapp/packages/core-version-update/package.json b/webapp/packages/core-version-update/package.json index 40f735b052..d0a3e3b89b 100644 --- a/webapp/packages/core-version-update/package.json +++ b/webapp/packages/core-version-update/package.json @@ -18,13 +18,17 @@ "update-ts-references": "yarn run clean && typescript-resolve-references" }, "dependencies": { + "@cloudbeaver/core-blocks": "^0", "@cloudbeaver/core-di": "^0", "@cloudbeaver/core-localization": "^0", "@cloudbeaver/core-version": "^0", - "mobx": "^6" + "@cloudbeaver/core-version-update": "^0", + "mobx": "^6", + "react": "^18" }, "peerDependencies": {}, "devDependencies": { + "@types/react": "^18", "typescript": "^5" } } diff --git a/webapp/packages/core-version-update/src/BaseUpdateInstruction.tsx b/webapp/packages/core-version-update/src/BaseUpdateInstruction.tsx new file mode 100644 index 0000000000..fbd1a954db --- /dev/null +++ b/webapp/packages/core-version-update/src/BaseUpdateInstruction.tsx @@ -0,0 +1,23 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 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 { Link, useTranslate } from '@cloudbeaver/core-blocks'; + +import type { InstructionComponent } from './VersionUpdateService.js'; + +export const BaseUpdateInstruction: InstructionComponent = function UpdateInstruction({ version, containerId, link, className }) { + const translate = useTranslate(); + + return ( +
+ {translate('version_update_instruction')}{' '} + + {translate('version_update_instruction_link')} + +
+ ); +}; diff --git a/webapp/packages/core-version-update/src/VersionUpdateService.ts b/webapp/packages/core-version-update/src/VersionUpdateService.ts index 3817cd5873..6f0835bee0 100644 --- a/webapp/packages/core-version-update/src/VersionUpdateService.ts +++ b/webapp/packages/core-version-update/src/VersionUpdateService.ts @@ -12,6 +12,7 @@ import { type IVersion, VersionResource, VersionService } from '@cloudbeaver/cor interface IInstructionProps { version: IVersion; + link: string; containerId?: string; className?: string; } diff --git a/webapp/packages/core-version-update/src/index.ts b/webapp/packages/core-version-update/src/index.ts index dbe8d8409e..7b365587dd 100644 --- a/webapp/packages/core-version-update/src/index.ts +++ b/webapp/packages/core-version-update/src/index.ts @@ -8,3 +8,4 @@ export { manifest as coreVersionUpdateManifest } from './manifest.js'; export * from './VersionUpdateService.js'; +export * from './BaseUpdateInstruction.js'; diff --git a/webapp/packages/core-version-update/src/locales/en.ts b/webapp/packages/core-version-update/src/locales/en.ts index e8fbdc8374..f40821f42e 100644 --- a/webapp/packages/core-version-update/src/locales/en.ts +++ b/webapp/packages/core-version-update/src/locales/en.ts @@ -1,3 +1,10 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ export default [ ['version_update', 'Version update'], ['version_update_version_is_up_to_date', 'Version is up to date'], @@ -7,4 +14,6 @@ export default [ ['version_update_versions_refresh_fail', 'Versions list refresh failed'], ['version_update_how_to_update', 'How to update'], ['version_update_info', 'Info'], + ['version_update_instruction', 'To update version, please follow'], + ['version_update_instruction_link', 'the instructions'], ]; diff --git a/webapp/packages/core-version-update/src/locales/fr.ts b/webapp/packages/core-version-update/src/locales/fr.ts index 082f3afdd6..9defcbf0c0 100644 --- a/webapp/packages/core-version-update/src/locales/fr.ts +++ b/webapp/packages/core-version-update/src/locales/fr.ts @@ -14,4 +14,6 @@ export default [ ['version_update_versions_refresh_fail', 'Échec du rafraîchissement de la liste des versions'], ['version_update_how_to_update', 'Comment mettre à jour'], ['version_update_info', 'Info'], + ['version_update_instruction', 'To update version, please follow'], + ['version_update_instruction_link', 'the instructions'], ]; diff --git a/webapp/packages/core-version-update/src/locales/it.ts b/webapp/packages/core-version-update/src/locales/it.ts index e8fbdc8374..f40821f42e 100644 --- a/webapp/packages/core-version-update/src/locales/it.ts +++ b/webapp/packages/core-version-update/src/locales/it.ts @@ -1,3 +1,10 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ export default [ ['version_update', 'Version update'], ['version_update_version_is_up_to_date', 'Version is up to date'], @@ -7,4 +14,6 @@ export default [ ['version_update_versions_refresh_fail', 'Versions list refresh failed'], ['version_update_how_to_update', 'How to update'], ['version_update_info', 'Info'], + ['version_update_instruction', 'To update version, please follow'], + ['version_update_instruction_link', 'the instructions'], ]; diff --git a/webapp/packages/core-version-update/src/locales/ru.ts b/webapp/packages/core-version-update/src/locales/ru.ts index 3eef410776..4d1fd361fb 100644 --- a/webapp/packages/core-version-update/src/locales/ru.ts +++ b/webapp/packages/core-version-update/src/locales/ru.ts @@ -1,3 +1,10 @@ +/* + * CloudBeaver - Cloud Database Manager + * Copyright (C) 2020-2024 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ export default [ ['version_update', 'Обновление версии'], ['version_update_version_is_up_to_date', 'Установлена актуальная версия'], @@ -7,4 +14,6 @@ export default [ ['version_update_versions_refresh_fail', 'Не удалось обновить список версий'], ['version_update_how_to_update', 'Как обновить версию'], ['version_update_info', 'Информация'], + ['version_update_instruction', 'Чтобы обновить версию, следуйте'], + ['version_update_instruction_link', 'инструкциям'], ]; diff --git a/webapp/packages/core-version-update/src/locales/zh.ts b/webapp/packages/core-version-update/src/locales/zh.ts index 2c4ec65f57..82fd807d3b 100644 --- a/webapp/packages/core-version-update/src/locales/zh.ts +++ b/webapp/packages/core-version-update/src/locales/zh.ts @@ -14,4 +14,6 @@ export default [ ['version_update_versions_refresh_fail', '版本列表刷新失败'], ['version_update_how_to_update', '如何升级'], ['version_update_info', '信息'], + ['version_update_instruction', 'To update version, please follow'], + ['version_update_instruction_link', 'the instructions'], ]; diff --git a/webapp/packages/core-version-update/tsconfig.json b/webapp/packages/core-version-update/tsconfig.json index f54ec30a10..69c2c27b9f 100644 --- a/webapp/packages/core-version-update/tsconfig.json +++ b/webapp/packages/core-version-update/tsconfig.json @@ -6,6 +6,9 @@ "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo" }, "references": [ + { + "path": "../core-blocks/tsconfig.json" + }, { "path": "../core-di/tsconfig.json" }, diff --git a/webapp/packages/core-view/package.json b/webapp/packages/core-view/package.json index 5290b1f6b5..ba234d189a 100644 --- a/webapp/packages/core-view/package.json +++ b/webapp/packages/core-view/package.json @@ -26,7 +26,8 @@ "@cloudbeaver/core-utils": "^0", "mobx": "^6", "mobx-react-lite": "^4", - "react": "^18" + "react": "^18", + "react-hotkeys-hook": "^4" }, "peerDependencies": {}, "devDependencies": { diff --git a/webapp/packages/core-website/src/WebsiteLinks.ts b/webapp/packages/core-website/src/WebsiteLinks.ts deleted file mode 100644 index 428bde739c..0000000000 --- a/webapp/packages/core-website/src/WebsiteLinks.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others - * - * Licensed under the Apache License, Version 2.0. - * you may not use this file except in compliance with the License. - */ -export class WebsiteLinks { - static ROOT_PAGE = 'https://dbeaver.com/'; - static DATA_EDITOR_DOCUMENTATION_PAGE = 'https://dbeaver.com/docs/cloudbeaver/Data-editor/'; - static SQL_EDITOR_DOCUMENTATION_PAGE = 'https://dbeaver.com/docs/cloudbeaver/SQL-Editor/'; - static SERVER_CONFIGURATION_RESOURCE_QUOTAS_PAGE = 'https://dbeaver.com/docs/cloudbeaver/Server-configuration/#resource-quotas'; - static DATABASE_NAVIGATOR_DOCUMENTATION_PAGE = 'https://dbeaver.com/docs/cloudbeaver/Database-Navigator/'; - - static ENTERPRISE_BUY_PRODUCT_PAGE = 'https://dbeaver.com/products/cloudbeaver-enterprise/'; - static TEAM_EDITION_BUY_PRODUCT_PAGE = 'https://dbeaver.com/products/team-edition/'; - static LATEST_COMMUNITY_VERSION_PAGE = 'https://dbeaver.com/product/cloudbeaver-ce-version.json'; - - static TEAM_ARCHIVE = 'https://dbeaver.com/downloads-team'; - static CONTACT_PAGE = 'https://dbeaver.com/contact/'; - - static GITHUB_REPOSITORY_PAGE = 'https://github.com/dbeaver/cloudbeaver'; - - static getTeamArchiveById(id: string) { - return `${WebsiteLinks.TEAM_ARCHIVE}/${id}`; - } - - static getProductBuyPage(distributed: boolean) { - if (distributed) { - return WebsiteLinks.TEAM_EDITION_BUY_PRODUCT_PAGE; - } - - return WebsiteLinks.ENTERPRISE_BUY_PRODUCT_PAGE; - } -} diff --git a/webapp/packages/plugin-administration/tsconfig.json b/webapp/packages/plugin-administration/tsconfig.json index 9aa1986057..2d7dde8c35 100644 --- a/webapp/packages/plugin-administration/tsconfig.json +++ b/webapp/packages/plugin-administration/tsconfig.json @@ -18,6 +18,9 @@ { "path": "../core-connections/tsconfig.json" }, + { + "path": "../core-data-context/tsconfig.json" + }, { "path": "../core-di/tsconfig.json" }, diff --git a/webapp/packages/plugin-data-viewer/package.json b/webapp/packages/plugin-data-viewer/package.json index ef1112a9c0..0f0560fd70 100644 --- a/webapp/packages/plugin-data-viewer/package.json +++ b/webapp/packages/plugin-data-viewer/package.json @@ -27,6 +27,7 @@ "@cloudbeaver/core-dialogs": "^0", "@cloudbeaver/core-events": "^0", "@cloudbeaver/core-executor": "^0", + "@cloudbeaver/core-links": "^0", "@cloudbeaver/core-localization": "^0", "@cloudbeaver/core-navigation-tree": "^0", "@cloudbeaver/core-resource": "^0", @@ -36,7 +37,6 @@ "@cloudbeaver/core-ui": "^0", "@cloudbeaver/core-utils": "^0", "@cloudbeaver/core-view": "^0", - "@cloudbeaver/core-website": "^0", "@cloudbeaver/plugin-codemirror6": "^0", "@cloudbeaver/plugin-navigation-tabs": "^0", "@cloudbeaver/plugin-object-viewer": "^0", diff --git a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx index 185d640206..fde336c73d 100644 --- a/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx +++ b/webapp/packages/plugin-data-viewer/src/ValuePanelPresentation/QuotaPlaceholder.tsx @@ -8,8 +8,8 @@ import { observer } from 'mobx-react-lite'; import { Container, Link, s, usePermission, useS, useTranslate } from '@cloudbeaver/core-blocks'; +import { WEBSITE_LINKS } from '@cloudbeaver/core-links'; import { EAdminPermission } from '@cloudbeaver/core-root'; -import { WebsiteLinks } from '@cloudbeaver/core-website'; import type { IResultSetElementKey } from '../DatabaseDataModel/Actions/ResultSet/IResultSetDataKey.js'; import { ResultSetDataContentAction } from '../DatabaseDataModel/Actions/ResultSet/ResultSetDataContentAction.js'; @@ -46,7 +46,7 @@ export const QuotaPlaceholder: React.FC> = observ   {admin ? ( - + {translate('ui_limit')} ) : ( diff --git a/webapp/packages/plugin-data-viewer/tsconfig.json b/webapp/packages/plugin-data-viewer/tsconfig.json index 92c945207c..392f930811 100644 --- a/webapp/packages/plugin-data-viewer/tsconfig.json +++ b/webapp/packages/plugin-data-viewer/tsconfig.json @@ -54,6 +54,9 @@ { "path": "../core-executor/tsconfig.json" }, + { + "path": "../core-links/tsconfig.json" + }, { "path": "../core-localization/tsconfig.json" }, @@ -111,9 +114,6 @@ { "path": "../core-view/tsconfig.json" }, - { - "path": "../core-website/tsconfig.json" - }, { "path": "../plugin-codemirror6/tsconfig.json" }, diff --git a/webapp/packages/plugin-datasource-context-switch/package.json b/webapp/packages/plugin-datasource-context-switch/package.json index c44217b4a5..61e597962b 100644 --- a/webapp/packages/plugin-datasource-context-switch/package.json +++ b/webapp/packages/plugin-datasource-context-switch/package.json @@ -29,6 +29,7 @@ "@cloudbeaver/core-projects": "^0", "@cloudbeaver/core-resource": "^0", "@cloudbeaver/core-ui": "^0", + "@cloudbeaver/core-utils": "^0", "@cloudbeaver/core-view": "^0", "@cloudbeaver/plugin-navigation-tabs": "^0", "@cloudbeaver/plugin-top-app-bar": "^0", diff --git a/webapp/packages/plugin-datasource-context-switch/tsconfig.json b/webapp/packages/plugin-datasource-context-switch/tsconfig.json index becf517fd2..6e06566585 100644 --- a/webapp/packages/plugin-datasource-context-switch/tsconfig.json +++ b/webapp/packages/plugin-datasource-context-switch/tsconfig.json @@ -39,6 +39,9 @@ { "path": "../core-ui/tsconfig.json" }, + { + "path": "../core-utils/tsconfig.json" + }, { "path": "../core-view/tsconfig.json" }, diff --git a/webapp/packages/plugin-help/package.json b/webapp/packages/plugin-help/package.json index 31dcb5f79f..1c2e4f93c2 100644 --- a/webapp/packages/plugin-help/package.json +++ b/webapp/packages/plugin-help/package.json @@ -24,11 +24,11 @@ "@cloudbeaver/core-di": "^0", "@cloudbeaver/core-dialogs": "^0", "@cloudbeaver/core-events": "^0", + "@cloudbeaver/core-links": "^0", "@cloudbeaver/core-localization": "^0", "@cloudbeaver/core-routing": "^0", "@cloudbeaver/core-utils": "^0", "@cloudbeaver/core-view": "^0", - "@cloudbeaver/core-website": "^0", "@cloudbeaver/plugin-navigation-tree": "^0", "@cloudbeaver/plugin-sql-editor": "^0", "@cloudbeaver/plugin-top-app-bar": "^0", diff --git a/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx b/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx index 4c00077824..4f01321856 100644 --- a/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx +++ b/webapp/packages/plugin-help/src/Shortcuts/ShortcutsDialog.tsx @@ -20,7 +20,7 @@ import { useTranslate, } from '@cloudbeaver/core-blocks'; import type { DialogComponent } from '@cloudbeaver/core-dialogs'; -import { WebsiteLinks } from '@cloudbeaver/core-website'; +import { WEBSITE_LINKS } from '@cloudbeaver/core-links'; import { Shortcut } from './Shortcut.js'; import { DATA_VIEWER_SHORTCUTS, NAVIGATION_TREE_SHORTCUTS, SQL_EDITOR_SHORTCUTS } from './SHORTCUTS_DATA.js'; @@ -37,7 +37,7 @@ export const ShortcutsDialog: DialogComponent = function ShortcutsDialog({ - + Data Viewer @@ -47,7 +47,7 @@ export const ShortcutsDialog: DialogComponent = function ShortcutsDialog({ - + SQL Editor @@ -57,7 +57,7 @@ export const ShortcutsDialog: DialogComponent = function ShortcutsDialog({ - + Navigation Tree diff --git a/webapp/packages/plugin-help/tsconfig.json b/webapp/packages/plugin-help/tsconfig.json index 011e2c6ba7..dfcbdcad5d 100644 --- a/webapp/packages/plugin-help/tsconfig.json +++ b/webapp/packages/plugin-help/tsconfig.json @@ -24,6 +24,9 @@ { "path": "../core-events/tsconfig.json" }, + { + "path": "../core-links/tsconfig.json" + }, { "path": "../core-localization/tsconfig.json" }, @@ -36,9 +39,6 @@ { "path": "../core-view/tsconfig.json" }, - { - "path": "../core-website/tsconfig.json" - }, { "path": "../plugin-navigation-tree/tsconfig.json" }, diff --git a/webapp/packages/plugin-product/package.json b/webapp/packages/plugin-product/package.json index 0f37fd3048..900ae582ec 100644 --- a/webapp/packages/plugin-product/package.json +++ b/webapp/packages/plugin-product/package.json @@ -21,12 +21,12 @@ "@cloudbeaver/core-blocks": "^0", "@cloudbeaver/core-di": "^0", "@cloudbeaver/core-dialogs": "^0", + "@cloudbeaver/core-links": "^0", "@cloudbeaver/core-localization": "^0", "@cloudbeaver/core-root": "^0", "@cloudbeaver/core-theming": "^0", "@cloudbeaver/core-version": "^0", "@cloudbeaver/core-view": "^0", - "@cloudbeaver/core-website": "^0", "@cloudbeaver/plugin-settings-menu": "^0", "mobx-react-lite": "^4", "react": "^18" diff --git a/webapp/packages/plugin-product/src/ProductInfoDialog.tsx b/webapp/packages/plugin-product/src/ProductInfoDialog.tsx index 524ad1d30b..0d7fb20d43 100644 --- a/webapp/packages/plugin-product/src/ProductInfoDialog.tsx +++ b/webapp/packages/plugin-product/src/ProductInfoDialog.tsx @@ -25,10 +25,10 @@ import { } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; import type { DialogComponentProps } from '@cloudbeaver/core-dialogs'; +import { GITHUB_LINKS, WEBSITE_LINKS } from '@cloudbeaver/core-links'; import { ProductInfoResource } from '@cloudbeaver/core-root'; import { ThemeService } from '@cloudbeaver/core-theming'; import { useAppVersion } from '@cloudbeaver/core-version'; -import { WebsiteLinks } from '@cloudbeaver/core-website'; import ProductInfoDialogStyles from './ProductInfoDialog.module.css'; @@ -70,12 +70,12 @@ export const ProductInfoDialog = observer>(function P
You can contact us via our - + {' '} Site{' '} or - + {' '} Github diff --git a/webapp/packages/plugin-product/tsconfig.json b/webapp/packages/plugin-product/tsconfig.json index 5945e68ad9..466fef882d 100644 --- a/webapp/packages/plugin-product/tsconfig.json +++ b/webapp/packages/plugin-product/tsconfig.json @@ -15,6 +15,9 @@ { "path": "../core-dialogs/tsconfig.json" }, + { + "path": "../core-links/tsconfig.json" + }, { "path": "../core-localization/tsconfig.json" }, @@ -30,9 +33,6 @@ { "path": "../core-view/tsconfig.json" }, - { - "path": "../core-website/tsconfig.json" - }, { "path": "../plugin-settings-menu/tsconfig.json" } diff --git a/webapp/packages/plugin-version-update-administration/package.json b/webapp/packages/plugin-version-update-administration/package.json index 215c1559ea..860c6f84f7 100644 --- a/webapp/packages/plugin-version-update-administration/package.json +++ b/webapp/packages/plugin-version-update-administration/package.json @@ -21,6 +21,7 @@ "@cloudbeaver/core-administration": "^0", "@cloudbeaver/core-blocks": "^0", "@cloudbeaver/core-di": "^0", + "@cloudbeaver/core-links": "^0", "@cloudbeaver/core-localization": "^0", "@cloudbeaver/core-resource": "^0", "@cloudbeaver/core-root": "^0", diff --git a/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx b/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx index c56c0bfa59..93e71461e7 100644 --- a/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx +++ b/webapp/packages/plugin-version-update-administration/src/VersionSelector.tsx @@ -10,6 +10,7 @@ import { useEffect, useState } from 'react'; import { Combobox, Container, Group, GroupItem, GroupTitle, s, useS, useTranslate } from '@cloudbeaver/core-blocks'; import { useService } from '@cloudbeaver/core-di'; +import { GITHUB_LINKS } from '@cloudbeaver/core-links'; import { ServerConfigResource } from '@cloudbeaver/core-root'; import { type IVersion, VersionResource } from '@cloudbeaver/core-version'; import { VersionUpdateService } from '@cloudbeaver/core-version-update'; @@ -54,7 +55,12 @@ export const VersionSelector = observer(function VersionSelector({ versio {version && Instruction && ( - + )} {translate('plugin_version_update_administration_recommendations_label')} diff --git a/webapp/packages/plugin-version-update-administration/tsconfig.json b/webapp/packages/plugin-version-update-administration/tsconfig.json index 7e5e71b48c..bd31128dec 100644 --- a/webapp/packages/plugin-version-update-administration/tsconfig.json +++ b/webapp/packages/plugin-version-update-administration/tsconfig.json @@ -15,6 +15,9 @@ { "path": "../core-di/tsconfig.json" }, + { + "path": "../core-links/tsconfig.json" + }, { "path": "../core-localization/tsconfig.json" },