CB-5645 adds core-links and GithubLinks

dbeaver · Oct 21, 2024 · ffa267f · ffa267f
1 parent cbceee6
commit ffa267f
Show file tree

Hide file tree

Showing 28 changed files with 64 additions and 33 deletions.
diff --git 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
@@ -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
@@ -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
@@ -25,6 +25,8 @@
   },
   "peerDependencies": {},
   "devDependencies": {
+    "@jest/globals": "^29",
+    "@types/jest": "^29",
     "typescript": "^5"
   }
 }
diff --git a/webapp/packages/core-website/.gitignore → webapp/packages/core-links/.gitignore b/webapp/packages/core-website/.gitignore → webapp/packages/core-links/.gitignore
diff --git a/webapp/packages/core-website/package.json → webapp/packages/core-links/package.json b/webapp/packages/core-website/package.json → 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
@@ -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 class GithubLinks {
+  static CLOUDBEAVER_REPO = 'https://github.com/dbeaver/cloudbeaver';
+  static EE_DEPLOY_REPO = 'https://github.com/dbeaver/cloudbeaver-deploy';
+  static TE_DEPLOY_REPO = 'https://github.com/dbeaver/team-edition-deploy';
+
+  getDeployRepo(distributed: boolean) {
+    if (distributed) {
+      return GithubLinks.TE_DEPLOY_REPO;
+    }
+
+    return GithubLinks.EE_DEPLOY_REPO;
+  }
+}
diff --git a/...packages/core-website/src/WebsiteLinks.ts → ...p/packages/core-links/src/WebsiteLinks.ts b/...packages/core-website/src/WebsiteLinks.ts → ...p/packages/core-links/src/WebsiteLinks.ts
@@ -19,8 +19,6 @@ export class WebsiteLinks {
   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}`;
   }

diff --git a/webapp/packages/core-website/src/index.ts → webapp/packages/core-links/src/index.ts b/webapp/packages/core-website/src/index.ts → 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 → webapp/packages/core-links/src/manifest.ts b/webapp/packages/core-website/src/manifest.ts → 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 → webapp/packages/core-links/tsconfig.json b/webapp/packages/core-website/tsconfig.json → webapp/packages/core-links/tsconfig.json
diff --git 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
@@ -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
@@ -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 { WebsiteLinks } from '@cloudbeaver/core-links';
 import type { ServerConfigQuery } from '@cloudbeaver/core-sdk';
-import { WebsiteLinks } from '@cloudbeaver/core-website';
 
 import { defaultProductConfiguration } from './defaultProductConfiguration.js';
 

diff --git 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-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/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
@@ -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
@@ -8,8 +8,8 @@
 import { observer } from 'mobx-react-lite';
 
 import { Container, Link, s, usePermission, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { WebsiteLinks } 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';

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -20,7 +20,7 @@ import {
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import type { DialogComponent } from '@cloudbeaver/core-dialogs';
-import { WebsiteLinks } from '@cloudbeaver/core-website';
+import { WebsiteLinks } from '@cloudbeaver/core-links';
 
 import { Shortcut } from './Shortcut.js';
 import { DATA_VIEWER_SHORTCUTS, NAVIGATION_TREE_SHORTCUTS, SQL_EDITOR_SHORTCUTS } from './SHORTCUTS_DATA.js';

diff --git 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
@@ -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
@@ -25,10 +25,10 @@ import {
 } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import type { DialogComponentProps } from '@cloudbeaver/core-dialogs';
+import { GithubLinks, WebsiteLinks } 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';
 
@@ -75,7 +75,7 @@ export const ProductInfoDialog = observer<DialogComponentProps<null>>(function P
                       Site{' '}
                     </Link>
                     or
-                    <Link href={WebsiteLinks.GITHUB_REPOSITORY_PAGE} target="_blank" rel="noopener noreferrer">
+                    <Link href={GithubLinks.CLOUDBEAVER_REPO} target="_blank" rel="noopener noreferrer">
                       {' '}
                       Github
                     </Link>

diff --git 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"
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,9 @@ @@
         {
           "path": "../core-connections/tsconfig.json"
         },
+        {
+          "path": "../core-data-context/tsconfig.json"
+        },
         {
           "path": "../core-di/tsconfig.json"
         },
@@ Expand Down @@