Skip to content

Commit 303222b

Browse files
aqandrewaqandrew
committed
fix: add TooltipProvider to ConnectionLogHelpTooltip,
IdpOrgSyncPageView, TableColumnHelpTooltip, TemplateInsightsPage
1 parent 9e6fa0c commit 303222b

File tree

4 files changed

+66
-55
lines changed

4 files changed

+66
-55
lines changed

‎site/src/pages/ConnectionLogPage/ConnectionLogHelpTooltip.tsx

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
HelpTooltipTitle,
88
HelpTooltipTrigger,
99
} from "components/HelpTooltip/HelpTooltip";
10+
import { TooltipProvider } from "components/Tooltip/Tooltip";
1011
import type { FC } from "react";
1112
import { docs } from "utils/docs";
1213

@@ -18,18 +19,20 @@ const Language = {
1819

1920
export const ConnectionLogHelpTooltip: FC = () => {
2021
return (
21-
<HelpTooltip>
22-
<HelpTooltipTrigger />
22+
<TooltipProvider>
23+
<HelpTooltip>
24+
<HelpTooltipTrigger />
2325

24-
<HelpTooltipContent>
25-
<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
26-
<HelpTooltipText>{Language.body}</HelpTooltipText>
27-
<HelpTooltipLinksGroup>
28-
<HelpTooltipLink href={docs("/admin/monitoring/connection-logs")}>
29-
{Language.docs}
30-
</HelpTooltipLink>
31-
</HelpTooltipLinksGroup>
32-
</HelpTooltipContent>
33-
</HelpTooltip>
26+
<HelpTooltipContent>
27+
<HelpTooltipTitle>{Language.title}</HelpTooltipTitle>
28+
<HelpTooltipText>{Language.body}</HelpTooltipText>
29+
<HelpTooltipLinksGroup>
30+
<HelpTooltipLink href={docs("/admin/monitoring/connection-logs")}>
31+
{Language.docs}
32+
</HelpTooltipLink>
33+
</HelpTooltipLinksGroup>
34+
</HelpTooltipContent>
35+
</HelpTooltip>
36+
</TooltipProvider>
3437
);
3538
};

‎site/src/pages/DeploymentSettingsPage/IdpOrgSyncPage/IdpOrgSyncPageView.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -458,14 +458,16 @@ const OrganizationRow: FC<OrganizationRowProps> = ({
458458

459459
const AssignDefaultOrgHelpTooltip: FC = () => {
460460
return (
461-
<HelpTooltip>
462-
<HelpTooltipTrigger />
463-
<HelpTooltipContent>
464-
<HelpTooltipText>
465-
Disabling will remove all users from the default organization if a
466-
mapping for the default organization is not defined.
467-
</HelpTooltipText>
468-
</HelpTooltipContent>
469-
</HelpTooltip>
461+
<TooltipProvider>
462+
<HelpTooltip>
463+
<HelpTooltipTrigger />
464+
<HelpTooltipContent>
465+
<HelpTooltipText>
466+
Disabling will remove all users from the default organization if a
467+
mapping for the default organization is not defined.
468+
</HelpTooltipText>
469+
</HelpTooltipContent>
470+
</HelpTooltip>
471+
</TooltipProvider>
470472
);
471473
};

‎site/src/pages/OrganizationSettingsPage/UserTable/TableColumnHelpTooltip.tsx

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
HelpTooltipTitle,
88
HelpTooltipTrigger,
99
} from "components/HelpTooltip/HelpTooltip";
10+
import { TooltipProvider } from "components/Tooltip/Tooltip";
1011
import type { FC } from "react";
1112
import { docs } from "utils/docs";
1213

@@ -44,19 +45,21 @@ export const TableColumnHelpTooltip: FC<Props> = ({ variant }) => {
4445
const variantLang = Language[variant];
4546

4647
return (
47-
<HelpTooltip>
48-
<HelpTooltipTrigger size="small" />
49-
<HelpTooltipContent>
50-
<HelpTooltipTitle>{variantLang.title}</HelpTooltipTitle>
51-
<HelpTooltipText>{variantLang.text}</HelpTooltipText>
52-
<HelpTooltipLinksGroup>
53-
{variantLang.links.map((link) => (
54-
<HelpTooltipLink key={link.text} href={link.href}>
55-
{link.text}
56-
</HelpTooltipLink>
57-
))}
58-
</HelpTooltipLinksGroup>
59-
</HelpTooltipContent>
60-
</HelpTooltip>
48+
<TooltipProvider>
49+
<HelpTooltip>
50+
<HelpTooltipTrigger size="small" />
51+
<HelpTooltipContent>
52+
<HelpTooltipTitle>{variantLang.title}</HelpTooltipTitle>
53+
<HelpTooltipText>{variantLang.text}</HelpTooltipText>
54+
<HelpTooltipLinksGroup>
55+
{variantLang.links.map((link) => (
56+
<HelpTooltipLink key={link.text} href={link.href}>
57+
{link.text}
58+
</HelpTooltipLink>
59+
))}
60+
</HelpTooltipLinksGroup>
61+
</HelpTooltipContent>
62+
</HelpTooltip>
63+
</TooltipProvider>
6164
);
6265
};

‎site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import { DateRange as DailyPicker, type DateRangeValue } from "./DateRange";
6161
import { type InsightsInterval, IntervalMenu } from "./IntervalMenu";
6262
import { lastWeeks } from "./utils";
6363
import { numberOfWeeksOptions, WeekPicker } from "./WeekPicker";
64+
import { TooltipProvider } from "components/Tooltip/Tooltip";
6465

6566
const DEFAULT_NUMBER_OF_WEEKS = numberOfWeeksOptions[0];
6667

@@ -207,26 +208,28 @@ export const TemplateInsightsPageView: FC<TemplateInsightsPageViewProps> = ({
207208
gap: 24,
208209
}}
209210
>
210-
<ActiveUsersPanel
211-
css={{ gridColumn: "span 2" }}
212-
interval={interval}
213-
userLimit={
214-
entitlements?.features.user_limit.enabled
215-
? entitlements?.features.user_limit.limit
216-
: undefined
217-
}
218-
data={templateInsights?.interval_reports}
219-
/>
220-
<UsersLatencyPanel data={userLatency} />
221-
<TemplateUsagePanel
222-
css={{ gridColumn: "span 2" }}
223-
data={templateInsights?.report?.apps_usage}
224-
/>
225-
<UsersActivityPanel data={userActivity} />
226-
<TemplateParametersUsagePanel
227-
css={{ gridColumn: "span 3" }}
228-
data={templateInsights?.report?.parameters_usage}
229-
/>
211+
<TooltipProvider>
212+
<ActiveUsersPanel
213+
css={{ gridColumn: "span 2" }}
214+
interval={interval}
215+
userLimit={
216+
entitlements?.features.user_limit.enabled
217+
? entitlements?.features.user_limit.limit
218+
: undefined
219+
}
220+
data={templateInsights?.interval_reports}
221+
/>
222+
<UsersLatencyPanel data={userLatency} />
223+
<TemplateUsagePanel
224+
css={{ gridColumn: "span 2" }}
225+
data={templateInsights?.report?.apps_usage}
226+
/>
227+
<UsersActivityPanel data={userActivity} />
228+
<TemplateParametersUsagePanel
229+
css={{ gridColumn: "span 3" }}
230+
data={templateInsights?.report?.parameters_usage}
231+
/>
232+
</TooltipProvider>
230233
</div>
231234
</>
232235
);

0 commit comments

Comments
 (0)