From 56ca96162ca7d0289a5a63a7ce0a3e3994e3952f Mon Sep 17 00:00:00 2001
From: 2427021 <s.a.vink@students.uu.nl>
Date: Thu, 7 Mar 2024 11:38:39 +0100
Subject: [PATCH] feat(databaseConnectionInfo): fixed disabled tooltips
---
libs/shared/lib/querybuilder/panel/querybuilder.tsx | 12 ++++++------
libs/shared/lib/schema/panel/schema.tsx | 2 +-
libs/shared/lib/vis/visualizationPanel.tsx | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libs/shared/lib/querybuilder/panel/querybuilder.tsx b/libs/shared/lib/querybuilder/panel/querybuilder.tsx
index 2a6aa9a9f..5a2d623a3 100644
--- a/libs/shared/lib/querybuilder/panel/querybuilder.tsx
+++ b/libs/shared/lib/querybuilder/panel/querybuilder.tsx
@@ -491,7 +491,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
<p>Layouts</p>
</TooltipContent>
</Tooltip>
- <Tooltip disabled={toggleSettings === 'settings'}>
+ <Tooltip>
<TooltipTrigger>
<Button
type="secondary"
@@ -506,7 +506,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
}}
/>
</TooltipTrigger>
- <TooltipContent side={'bottom'}>
+ <TooltipContent side={'bottom'} disabled={toggleSettings === 'settings'}>
<p>Query builder settings</p>
</TooltipContent>
</Tooltip>
@@ -527,7 +527,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
<p>Rerun query</p>
</TooltipContent>
</Tooltip>
- <Tooltip disabled={toggleSettings === 'logic'}>
+ <Tooltip>
<TooltipTrigger>
<Button
type="secondary"
@@ -541,11 +541,11 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
}}
/>
</TooltipTrigger>
- <TooltipContent side={'bottom'}>
+ <TooltipContent side={'bottom'} disabled={toggleSettings === 'logic'}>
<p>Logic settings</p>
</TooltipContent>
</Tooltip>
- <Tooltip disabled={toggleSettings === 'ml'}>
+ <Tooltip>
<TooltipTrigger>
<Button
type="secondary"
@@ -559,7 +559,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
}}
/>
</TooltipTrigger>
- <TooltipContent side={'bottom'}>
+ <TooltipContent side={'bottom'} disabled={toggleSettings === 'ml'}>
<p>Machine learning</p>
</TooltipContent>
</Tooltip>
diff --git a/libs/shared/lib/schema/panel/schema.tsx b/libs/shared/lib/schema/panel/schema.tsx
index 156c3904c..e9fcbff62 100644
--- a/libs/shared/lib/schema/panel/schema.tsx
+++ b/libs/shared/lib/schema/panel/schema.tsx
@@ -156,7 +156,7 @@ export const Schema = (props: Props) => {
}}
/>
</TooltipTrigger>
- <TooltipContent side={'bottom'}>
+ <TooltipContent side={'bottom'} disabled={toggleSchemaSettings}>
<p>Schema settings</p>
</TooltipContent>
</Tooltip>
diff --git a/libs/shared/lib/vis/visualizationPanel.tsx b/libs/shared/lib/vis/visualizationPanel.tsx
index 15c070972..d71f7191b 100644
--- a/libs/shared/lib/vis/visualizationPanel.tsx
+++ b/libs/shared/lib/vis/visualizationPanel.tsx
@@ -45,7 +45,7 @@ export const VisualizationPanel = () => {
<h1 className="text-xs font-semibold text-secondary-800">{vis.activeVisualization} visualization</h1>
<ControlContainer>
<TooltipProvider delayDuration={0}>
- <Tooltip>
+ <Tooltip disabled={showVisSettings}>
<TooltipTrigger>
<Button
type="secondary"
@@ -58,7 +58,7 @@ export const VisualizationPanel = () => {
}}
/>
</TooltipTrigger>
- <TooltipContent side={'bottom'}>
+ <TooltipContent side={'bottom'} disabled={showVisSettings}>
<p>Visualization settings</p>
</TooltipContent>
</Tooltip>
@@ -74,7 +74,7 @@ export const VisualizationPanel = () => {
}}
/>
</TooltipTrigger>
- <TooltipContent side={'bottom'}>
+ <TooltipContent side={'bottom'} disabled={visDropdownOpen}>
<p>Change visualization</p>
</TooltipContent>
</Tooltip>
--
GitLab