diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionInfoAction.tsx b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionInfoAction.tsx index e225f12d0a..b436b663a9 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionInfoAction.tsx +++ b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionInfoAction.tsx @@ -25,17 +25,18 @@ export const TransactionInfoAction: ICustomMenuItemComponent = observer(function const key = context ? createTransactionInfoParam(context.connectionId, context.projectId, context.id) : null; const transactionLogCountResource = useResource(TransactionInfoAction, TransactionLogCountResource, key); + const count = + transactionLogCountResource.data === 0 ? translate('plugin_datasource_transaction_manager_logs_counter_none') : transactionLogCountResource.data; + + let title: string = translate('plugin_datasource_transaction_manager_logs_tooltip'); + + if (transactionLogCountResource.data) { + title = `${title}\n${translate('plugin_datasource_transaction_manager_logs_tooltip_count', undefined, { count })}`; + } return ( - props.item.events?.onSelect?.()} - > - {transactionLogCountResource.data} + props.item.events?.onSelect?.()}> + {count} ); }); diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.module.css b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.module.css index 52479f1294..8d9fd891ea 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.module.css +++ b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.module.css @@ -7,4 +7,6 @@ */ .cell { cursor: pointer; + text-overflow: ellipsis; + overflow: hidden; } diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.tsx b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.tsx index 1800556829..7f896be359 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.tsx +++ b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryCell.tsx @@ -26,7 +26,7 @@ export const QueryCell = observer>(funct } return ( -
+
{value}
); diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryDetailsDialog.tsx b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryDetailsDialog.tsx index 19848d8bc7..4a3fa4a8bb 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryDetailsDialog.tsx +++ b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/QueryDetailsDialog.tsx @@ -32,7 +32,7 @@ export const QueryDetailsDialog: DialogComponent = observer(function Q diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/TransactionLogTable.tsx b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/TransactionLogTable.tsx index 6d86bb911d..fb11dc0430 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/TransactionLogTable.tsx +++ b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionLog/TransactionLogTable/TransactionLogTable.tsx @@ -20,6 +20,8 @@ interface Props { log: TransactionLogInfoItem[]; } +const QUERY_COLUMN_WIDTH = 300; + const COLUMNS: Column[] = [ { key: 'time', @@ -39,6 +41,7 @@ const COLUMNS: Column[] = [ key: 'text', name: 'plugin_datasource_transaction_manager_logs_table_column_text', resizable: true, + width: QUERY_COLUMN_WIDTH, renderCell: props => , renderHeaderCell: props => , }, diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/en.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/en.ts index b9ec6e443f..8feb50d73e 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/locales/en.ts +++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/en.ts @@ -17,6 +17,8 @@ export default [ ['plugin_datasource_transaction_manager_logs', 'Transaction log'], ['plugin_datasource_transaction_manager_logs_tooltip', 'Open transaction log'], + ['plugin_datasource_transaction_manager_logs_tooltip_count', 'Total statements: {arg:count}'], + ['plugin_datasource_transaction_manager_logs_counter_none', 'None'], ['plugin_datasource_transaction_manager_logs_table_column_time', 'Time'], ['plugin_datasource_transaction_manager_logs_table_column_type', 'Type'], ['plugin_datasource_transaction_manager_logs_table_column_text', 'Query'], diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/fr.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/fr.ts index 662db9253f..d96dc9cf7f 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/locales/fr.ts +++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/fr.ts @@ -17,6 +17,8 @@ export default [ ['plugin_datasource_transaction_manager_logs', 'Transaction log'], ['plugin_datasource_transaction_manager_logs_tooltip', 'Open transaction log'], + ['plugin_datasource_transaction_manager_logs_tooltip_count', 'Total statements: {arg:count}'], + ['plugin_datasource_transaction_manager_logs_counter_none', 'None'], ['plugin_datasource_transaction_manager_logs_table_column_time', 'Time'], ['plugin_datasource_transaction_manager_logs_table_column_type', 'Type'], ['plugin_datasource_transaction_manager_logs_table_column_text', 'Query'], diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/it.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/it.ts index c398f786d2..1111d67912 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/locales/it.ts +++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/it.ts @@ -17,6 +17,8 @@ export default [ ['plugin_datasource_transaction_manager_logs', 'Transaction log'], ['plugin_datasource_transaction_manager_logs_tooltip', 'Open transaction log'], + ['plugin_datasource_transaction_manager_logs_tooltip_count', 'Total statements: {arg:count}'], + ['plugin_datasource_transaction_manager_logs_counter_none', 'None'], ['plugin_datasource_transaction_manager_logs_table_column_time', 'Time'], ['plugin_datasource_transaction_manager_logs_table_column_type', 'Type'], ['plugin_datasource_transaction_manager_logs_table_column_text', 'Query'], diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/ru.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/ru.ts index cc5098fecf..591bd37bda 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/locales/ru.ts +++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/ru.ts @@ -17,6 +17,8 @@ export default [ ['plugin_datasource_transaction_manager_logs', 'Журнал транзакции'], ['plugin_datasource_transaction_manager_logs_tooltip', 'Открыть журнал транзакции'], + ['plugin_datasource_transaction_manager_logs_tooltip_count', 'Всего запросов: {arg:count}'], + ['plugin_datasource_transaction_manager_logs_counter_none', 'Нет'], ['plugin_datasource_transaction_manager_logs_table_column_time', 'Время'], ['plugin_datasource_transaction_manager_logs_table_column_type', 'Тип'], ['plugin_datasource_transaction_manager_logs_table_column_text', 'Запрос'], diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/zh.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/zh.ts index b86156f6a5..62e8ef5f32 100644 --- a/webapp/packages/plugin-datasource-transaction-manager/src/locales/zh.ts +++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/zh.ts @@ -17,6 +17,8 @@ export default [ ['plugin_datasource_transaction_manager_logs', 'Transaction log'], ['plugin_datasource_transaction_manager_logs_tooltip', 'Open transaction log'], + ['plugin_datasource_transaction_manager_logs_tooltip_count', 'Total statements: {arg:count}'], + ['plugin_datasource_transaction_manager_logs_counter_none', 'None'], ['plugin_datasource_transaction_manager_logs_table_column_time', 'Time'], ['plugin_datasource_transaction_manager_logs_table_column_type', 'Type'], ['plugin_datasource_transaction_manager_logs_table_column_text', 'Query'],