CB-5578 DM: Ability to remove custom certificate

webapp/packages/core-blocks/src/ErrorDetailsDialog/ErrorDetailsDialog.tsx

@@ -26,11 +26,12 @@ import { ErrorModel, type IErrorInfo } from './ErrorModel.js';
 
 function DisplayErrorInfo({ error }: { error: IErrorInfo }) {
  const styles = useS(style);
+ const translate = useTranslate();
 
  return (
  <>
  <div className={s(styles, { property: true })}>
- {error.isHtml ? <Iframe srcDoc={error.message} /> : <div className={s(styles, { message: true })}>{error.message}</div>}
+ {error.isHtml ? <Iframe srcDoc={error.message} /> : <div className={s(styles, { message: true })}>{translate(error.message)}</div>}
  </div>
  {error.stackTrace && (
  <div className={s(styles, { property: true })}>

webapp/packages/core-blocks/src/index.ts

@@ -10,6 +10,7 @@ export * from './CommonDialog/CommonDialog/CommonDialogFooter.js';
 export * from './CommonDialog/CommonDialog/CommonDialogHeader.js';
 export * from './CommonDialog/CommonDialog/CommonDialogWrapper.js';
 export * from './CommonDialog/ConfirmationDialog.js';
+export { default as ConfirmationDialogStyles } from './CommonDialog/ConfirmationDialog.module.css';
 export * from './CommonDialog/ConfirmationDialogDelete.js';
 export * from './CommonDialog/RenameDialog.js';
 export * from './CommonDialog/DialogsPortal.js';

webapp/packages/core-utils/src/getHttpsUrl.ts

@@ -0,0 +1,15 @@
+/*
+ * 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 function getHttpsUrl(url: string): string {
+ if (url.startsWith('http://')) {
+ return url.replace('http://', 'https://');
+ }
+
+ return url;
+}

webapp/packages/core-utils/src/index.ts

@@ -56,6 +56,8 @@ export * from './TextTools.js';
 export * from './throttle.js';
 export * from './uuid_.js';
 export * from './isValidUrl.js';
+export * from './isValidServerUrl.js';
+export * from './getHttpsUrl.js';
 export * from './isImageFormat.js';
 export * from './getCookies.js';
 export * from './getUniqueName.js';

webapp/packages/core-utils/src/isValidServerUrl.ts

@@ -0,0 +1,12 @@
+/*
+ * 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.
+ */
+const SERVER_URL_REGEXP = /^(https?:\/\/)?(localhost|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(:\d+)?(\/.*)?$/i;
+
+export function isValidServerUrl(value: string): boolean {
+ return SERVER_URL_REGEXP.test(value);
+}

webapp/packages/core-website/src/WebsiteLinks.ts

@@ -6,6 +6,7 @@
  * 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';