From edd08dd0bcbc97398e031706de59549a01df130d Mon Sep 17 00:00:00 2001 From: naumov Date: Wed, 2 Oct 2024 11:44:36 +0200 Subject: [PATCH] CB-5746 rename buttons --- webapp/packages/core-blocks/src/Clickable.tsx | 4 ++-- webapp/packages/core-localization/src/locales/en.ts | 1 + webapp/packages/core-localization/src/locales/fr.ts | 1 + webapp/packages/core-localization/src/locales/it.ts | 1 + webapp/packages/core-localization/src/locales/ru.ts | 1 + webapp/packages/core-localization/src/locales/zh.ts | 1 + .../src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts | 4 ++-- 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/webapp/packages/core-blocks/src/Clickable.tsx b/webapp/packages/core-blocks/src/Clickable.tsx index 81f3aba9a0..d18656fd70 100644 --- a/webapp/packages/core-blocks/src/Clickable.tsx +++ b/webapp/packages/core-blocks/src/Clickable.tsx @@ -6,13 +6,13 @@ * you may not use this file except in compliance with the License. */ import { observer } from 'mobx-react-lite'; -import { type ClickableOptions, Clickable as MantineClickable } from 'reakit'; +import { type ClickableOptions, Clickable as ReakitClickable } from 'reakit'; import type { ReakitProxyComponent, ReakitProxyComponentOptions } from './Menu/ReakitProxyComponent.js'; export const Clickable: ReakitProxyComponent<'button', ClickableOptions> = observer>( function Clickable({ children, ...rest }) { - const Component = MantineClickable; + const Component = ReakitClickable; return {children}; }, diff --git a/webapp/packages/core-localization/src/locales/en.ts b/webapp/packages/core-localization/src/locales/en.ts index c3550a12a0..4891f550f2 100644 --- a/webapp/packages/core-localization/src/locales/en.ts +++ b/webapp/packages/core-localization/src/locales/en.ts @@ -45,6 +45,7 @@ export default [ ['ui_error_message', 'Error:'], ['ui_error_close', 'Close'], ['ui_clear', 'Clear'], + ['ui_clean', 'Clean'], ['ui_remove', 'Remove'], ['ui_close', 'Close'], ['ui_open', 'Open'], diff --git a/webapp/packages/core-localization/src/locales/fr.ts b/webapp/packages/core-localization/src/locales/fr.ts index ff2b1a88cf..a3318e7ec5 100644 --- a/webapp/packages/core-localization/src/locales/fr.ts +++ b/webapp/packages/core-localization/src/locales/fr.ts @@ -43,6 +43,7 @@ export default [ ['ui_error_message', 'Erreur :'], ['ui_error_close', 'Fermer'], ['ui_clear', 'Effacer'], + ['ui_clean', 'Clean'], ['ui_remove', 'Supprimer'], ['ui_close', 'Fermer'], ['ui_open', 'Ouvrir'], diff --git a/webapp/packages/core-localization/src/locales/it.ts b/webapp/packages/core-localization/src/locales/it.ts index a878a93543..9249b97f15 100644 --- a/webapp/packages/core-localization/src/locales/it.ts +++ b/webapp/packages/core-localization/src/locales/it.ts @@ -42,6 +42,7 @@ export default [ ['ui_error_message', 'Errore:'], ['ui_error_close', 'Chiudi'], ['ui_clear', 'Clear'], + ['ui_clean', 'Clean'], ['ui_remove', 'Remove'], ['ui_close', 'Chiudi'], ['ui_open', 'Open'], diff --git a/webapp/packages/core-localization/src/locales/ru.ts b/webapp/packages/core-localization/src/locales/ru.ts index ade1239035..34a1e60cf8 100644 --- a/webapp/packages/core-localization/src/locales/ru.ts +++ b/webapp/packages/core-localization/src/locales/ru.ts @@ -41,6 +41,7 @@ export default [ ['ui_error_message', 'Ошибка:'], ['ui_error_close', 'Закрыть'], ['ui_clear', 'Очистить'], + ['ui_clean', 'Очистить'], ['ui_remove', 'Убрать'], ['ui_close', 'Закрыть'], ['ui_open', 'Открыть'], diff --git a/webapp/packages/core-localization/src/locales/zh.ts b/webapp/packages/core-localization/src/locales/zh.ts index f951ec042f..e2e5eb7b07 100644 --- a/webapp/packages/core-localization/src/locales/zh.ts +++ b/webapp/packages/core-localization/src/locales/zh.ts @@ -42,6 +42,7 @@ export default [ ['ui_error_message', '错误:'], ['ui_error_close', '关闭'], ['ui_clear', '清除'], + ['ui_clean', 'Clean'], ['ui_remove', '移除'], ['ui_close', '关闭'], ['ui_open', '打开'], diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts index ce916549a8..dc92787812 100644 --- a/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts +++ b/webapp/packages/plugin-data-viewer-result-set-grouping/src/Actions/ACTION_DATA_VIEWER_GROUPING_CLEAR.ts @@ -8,7 +8,7 @@ import { createAction } from '@cloudbeaver/core-view'; export const ACTION_DATA_VIEWER_GROUPING_CLEAR = createAction('data-viewer-grouping-clear', { - label: 'ui_clear', - tooltip: 'ui_clear', + label: 'ui_clean', + tooltip: 'ui_clean', icon: 'erase', });