From 1c133405c052dbeff1c17d7120fcb3f2d2465459 Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 10 Feb 2023 18:32:46 +0300 Subject: [PATCH] CB-3128 fix: log viewer splitter (#1466) * CB-3128 fix: log viewer splitter * CB-3128 chore: styles * CB-3128 fix: update nav tree on connection create --- .../packages/core-projects/src/NavTree/getProjectNodeId.ts | 2 +- .../src/Dialog/ProcessorSelectDialog.tsx | 7 ++++++- .../packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx | 2 +- .../plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts b/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts index 0faa0b91a4..a7ff847b2d 100644 --- a/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts +++ b/webapp/packages/core-projects/src/NavTree/getProjectNodeId.ts @@ -7,5 +7,5 @@ */ export function getProjectNodeId(projectId: string): string { - return `ext://resources/${projectId}`; + return `resource://${projectId}`; } \ No newline at end of file diff --git a/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx b/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx index eaf129bb01..5eec8a1d9a 100644 --- a/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx +++ b/webapp/packages/plugin-data-export/src/Dialog/ProcessorSelectDialog.tsx @@ -25,6 +25,7 @@ const styles = css` composes: theme-typography--body2 from global; flex-shrink: 0; padding: 16px 24px; + padding-top: 0; max-height: 50px; overflow: hidden; @@ -32,8 +33,12 @@ const styles = css` margin: 0; overflow: hidden; text-overflow: ellipsis; + white-space: initial; } } + pre { + composes: theme-typography--caption from global; + } `; interface Props { @@ -64,7 +69,7 @@ export const ProcessorSelectDialog = observer(function ProcessorSelectDia onReject={onClose} > - {context.sourceName ? translate('data_transfer_exporting_sql') : `${translate('data_transfer_exporting_table')} ${node?.name}`} + {!context.sourceName && `${translate('data_transfer_exporting_table')} ${node?.name}`}
{context.sourceName}
{isLoading && } diff --git a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx index 31db70af59..8e93aec138 100644 --- a/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx +++ b/webapp/packages/plugin-log-viewer/src/LogViewer/LogViewer.tsx @@ -47,7 +47,7 @@ export const LogViewer = observer(function LogViewer() { diff --git a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx index 1e46bd99ba..d9bd6c6697 100644 --- a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx +++ b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx @@ -23,7 +23,7 @@ const tabsStyles = css` align-items: center; } Tab { - height: 46px!important; + height: 32px!important; text-transform: uppercase; font-weight: 500 !important; }