Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "CB-5578 DM: Ability to remove custom certificate (#2899)" #2974

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ 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 })}>{translate(error.message)}</div>}
{error.isHtml ? <Iframe srcDoc={error.message} /> : <div className={s(styles, { message: true })}>{error.message}</div>}
</div>
{error.stackTrace && (
<div className={s(styles, { property: true })}>
Expand Down
5 changes: 1 addition & 4 deletions webapp/packages/core-blocks/src/StatusMessage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@
.statusMessage {
overflow: hidden;
composes: theme-typography--caption from global;
height: 24px;
display: flex;
align-items: center;
gap: 8px;
}

.statusMessageExtended {
height: 24px;
}
.iconOrImage {
height: 24px;
width: 24px;
Expand Down
16 changes: 4 additions & 12 deletions webapp/packages/core-blocks/src/StatusMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,10 @@ interface Props {
type?: ENotificationType | null;
exception?: Error | null;
className?: string;
multipleRows?: boolean;
onShowDetails?: () => void;
}

export const StatusMessage = observer<Props>(function StatusMessage({
type,
multipleRows = false,
message,
exception = null,
className,
onShowDetails,
}) {
export const StatusMessage = observer<Props>(function StatusMessage({ type, message, exception = null, className, onShowDetails }) {
const styles = useS(style);
const translate = useTranslate();
const errorDetails = useErrorDetails(exception);
Expand All @@ -59,13 +51,13 @@ export const StatusMessage = observer<Props>(function StatusMessage({
}

return (
<div className={s(styles, { statusMessage: true, statusMessageExtended: !multipleRows }, className)}>
<div className={s(styles, { statusMessage: true }, className)}>
{message && (
<>
<IconOrImage className={s(styles, { iconOrImage: true })} icon={icon} />
<div className={s(styles, { message: !multipleRows })} title={message}>
<div className={s(styles, { message: true })} title={message}>
{onShowDetails ? (
<Link className={s(styles, { link: !multipleRows })} onClick={onShowDetails}>
<Link className={s(styles, { link: true })} onClick={onShowDetails}>
{message}
</Link>
) : (
Expand Down
1 change: 0 additions & 1 deletion webapp/packages/core-blocks/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ 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';
Expand Down
1 change: 0 additions & 1 deletion webapp/packages/core-localization/src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export default [
['ui_errors_details', 'Details'],
['ui_search', 'Search...'],
['ui_delete', 'Delete'],
['ui_deleting', 'Deleting...'],
['ui_add', 'Add'],
['ui_revert', 'Revert'],
['ui_undo', 'Undo'],
Expand Down
1 change: 0 additions & 1 deletion webapp/packages/core-localization/src/locales/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export default [
['ui_errors_details', 'Détails'],
['ui_search', 'Rechercher...'],
['ui_delete', 'Supprimer'],
['ui_deleting', 'Deleting...'],
['ui_add', 'Ajouter'],
['ui_refresh', 'Actualiser'],
['ui_data_saving_error', 'Erreur de sauvegarde'],
Expand Down
1 change: 0 additions & 1 deletion webapp/packages/core-localization/src/locales/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export default [
['ui_errors_details', 'Dettagli'],
['ui_search', 'Cerca...'],
['ui_delete', 'Elimina'],
['ui_deleting', 'Deleting...'],
['ui_add', 'Aggiungi'],
['ui_revert', 'Revert'],
['ui_undo', 'Undo'],
Expand Down
1 change: 0 additions & 1 deletion webapp/packages/core-localization/src/locales/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export default [
['ui_errors_details', 'Информация'],
['ui_search', 'Поиск...'],
['ui_delete', 'Удалить'],
['ui_deleting', 'Удаляется...'],
['ui_add', 'Добавить'],
['ui_revert', 'Отменить изменения'],
['ui_undo', 'Отменить'],
Expand Down
1 change: 0 additions & 1 deletion webapp/packages/core-localization/src/locales/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export default [
['ui_errors_details', '详情'],
['ui_search', '搜索...'],
['ui_delete', '删除'],
['ui_deleting', 'Deleting...'],
['ui_add', '添加'],
['ui_revert', '恢复'],
['ui_undo', '撤销'],
Expand Down
1 change: 0 additions & 1 deletion webapp/packages/core-website/src/WebsiteLinks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* 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';
Expand Down