Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

improvement(admin): migrate remaining server console UI to v3 (#8149)

Andrew Huang3e7cb877bb3d
diff --git a/frontend/src/components/COMPONENT_LIFECYCLE.md b/frontend/src/components/COMPONENT_LIFECYCLE.md
index 04bba7fc0c..13ffe12fcc 100644
--- a/frontend/src/components/COMPONENT_LIFECYCLE.md
+++ b/frontend/src/components/COMPONENT_LIFECYCLE.md
@@ -16,7 +16,7 @@ This ledger records lifecycle decisions that aren't obvious from component sourc
| `NoticeBannerV2` | Blocked | Verify that V3 `Alert` covers existing layout and action requirements. |
| `Lottie` | Blocked | V3 `Loader` is the replacement, but the application entry point still needs the V2 compatibility path. |
| `Popoverv2` | Blocked | Migrate the V2 `DatePicker` composition first. |
-| `FontAwesomeSymbol`, `HighlightText`, `Slider` | Retained | No supported V3 primitive replaces the distinct capability. |
+| `FontAwesomeSymbol`, `HighlightText`, `Slider` | Retained | No supported V3 primitive replaces the distinct capability. `HighlightText` re-exports the shared utility. |
| `CreatableSelect`, `Drawer`, `HeaderResizer`, `HoverCard`, `NoticeBanner`, `Popover`, `RadioGroup` | Removal candidate | Confirm indirect use, then handle removal as separate cleanup work. |
## V3
diff --git a/frontend/src/components/auth/Mfa.tsx b/frontend/src/components/auth/Mfa.tsx
index 8b518f933d..8dbfd47eb6 100644
--- a/frontend/src/components/auth/Mfa.tsx
+++ b/frontend/src/components/auth/Mfa.tsx
@@ -7,10 +7,12 @@ import Error from "@app/components/basic/Error";
import { MfaEnrollment } from "@app/components/mfa/MfaEnrollment";
import { createNotification } from "@app/components/notifications";
import SecurityClient from "@app/components/utilities/SecurityClient";
-import { Tooltip } from "@app/components/v2";
import {
Button,
CardContent,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
useClientResendDelay,
VerificationCodeForm,
VerificationCodeHeader,
@@ -344,14 +346,18 @@ export const Mfa = ({ successCallback, closeMfa, email, method, onChangeAccount
const recoveryActions = (
<div className="flex flex-wrap items-center gap-x-4 gap-y-2 text-sm">
{showRecoveryCodeInput ? (
- <Tooltip
- position="bottom"
- content={
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span className="cursor-help text-label transition-colors duration-200 hover:text-foreground">
+ Lost your recovery codes?
+ </span>
+ </TooltipTrigger>
+ <TooltipContent side="bottom">
<div className="max-w-xs text-center text-xs">
{isInfisicalCloud() ? (
<>
<div className="mb-2">Account Recovery Required</div>
- <div className="mb-2 text-gray-300">
+ <div className="mb-2 text-accent">
Contact support with valid proof of account ownership to initiate recovery
</div>
<div className="mt-1">[email protected]</div>
@@ -359,18 +365,14 @@ export const Mfa = ({ successCallback, closeMfa, email, method, onChangeAccount
) : (
<>
<div className="mb-2">Account Recovery Required</div>
- <div className="text-gray-300">
+ <div className="text-accent">
Contact your instance administrator with valid proof of account ownership to
initiate recovery
</div>
</>
)}
</div>
- }
- >
- <span className="cursor-help text-label transition-colors duration-200 hover:text-foreground">
- Lost your recovery codes?
- </span>
+ </TooltipContent>
</Tooltip>
) : (
method === MfaMethod.EMAIL && (
diff --git a/frontend/src/components/v2/HighlightText/HighlightText.tsx b/frontend/src/components/utilities/HighlightText.tsx
similarity index 97%
rename from frontend/src/components/v2/HighlightText/HighlightText.tsx
rename to frontend/src/components/utilities/HighlightText.tsx
index 92fdc1d6dc..d1a56cc5a7 100644
--- a/frontend/src/components/v2/HighlightText/HighlightText.tsx
+++ b/frontend/src/components/utilities/HighlightText.tsx
@@ -28,7 +28,7 @@ export const HighlightText = ({
}
parts.push(
- <span key={`match-${offset}`} className={highlightClassName || "bg-yellow/30"}>
+ <span key={`match-${offset}`} className={highlightClassName || "bg-warning/30"}>
{match}
</span>
);
diff --git a/frontend/src/components/v2/HighlightText/index.tsx b/frontend/src/components/v2/HighlightText/index.tsx
index a2ff1b504a..851fe96842 100644
--- a/frontend/src/components/v2/HighlightText/index.tsx
+++ b/frontend/src/components/v2/HighlightText/index.tsx
@@ -1 +1 @@
-export { HighlightText } from "./HighlightText";
+export { HighlightText } from "@app/components/utilities/HighlightText";
diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
index 11d7703932..9e44676c97 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
@@ -30,7 +30,6 @@ import { createNotification } from "@app/components/notifications";
import { NewSubOrganizationModal } from "@app/components/organization/NewSubOrganizationModal";
import { OrgPermissionCan } from "@app/components/permissions";
import SecurityClient from "@app/components/utilities/SecurityClient";
-import { Button as V2Button, Modal, ModalContent } from "@app/components/v2";
import {
Badge,
Button,
@@ -46,6 +45,7 @@ import {
DialogBody,
DialogContent,
DialogDescription,
+ DialogFooter,
DialogHeader,
DialogTitle,
DropdownMenu,
@@ -787,52 +787,36 @@ export const Navbar = () => {
</DropdownMenu>
</ButtonGroup>
- <Modal
- isOpen={showCardDeclinedModal}
- onOpenChange={() => !isModalIntrusive && setShowCardDeclinedModal(false)}
+ <Dialog
+ open={showCardDeclinedModal}
+ onOpenChange={(isOpen) => {
+ if (!isModalIntrusive) setShowCardDeclinedModal(isOpen);
+ }}
>
- <ModalContent
- title={
- <div className="flex items-center gap-2">
- <FontAwesomeIcon icon={faExclamationTriangle} className="text-lg text-primary-400" />
+ <DialogContent showCloseButton={!isModalIntrusive}>
+ <DialogHeader>
+ <DialogTitle className="flex items-center gap-2">
+ <FontAwesomeIcon icon={faExclamationTriangle} className="text-lg text-warning" />
Your payment could not be processed.
- </div>
- }
- showCloseButton={!isModalIntrusive}
- >
- <div>
- <div>
- <div className="mb-1">
- <p>
- We were unable to process your last payment
- {subscription.cardDeclinedReason ? `: ${subscription.cardDeclinedReason}` : ""}.
- Please update your payment information to continue using premium features.
- </p>
- </div>
- <div className="mt-4">
- <div className="flex space-x-3">
- <V2Button
- colorSchema="primary"
- variant="solid"
- onClick={handleNavigateToRootOrgBilling}
- >
- Update Payment Method
- </V2Button>
- {!isModalIntrusive && (
- <V2Button
- colorSchema="secondary"
- variant="outline"
- onClick={() => setShowCardDeclinedModal(false)}
- >
- Dismiss
- </V2Button>
- )}
- </div>
- </div>
- </div>
- </div>
- </ModalContent>
- </Modal>
+ </DialogTitle>
+ <DialogDescription>
+ We were unable to process your last payment
+ {subscription.cardDeclinedReason ? `: ${subscription.cardDeclinedReason}` : ""}.
+ Please update your payment information to continue using premium features.
+ </DialogDescription>
+ </DialogHeader>
+ <DialogFooter>
+ {!isModalIntrusive && (
+ <Button variant="outline" onClick={() => setShowCardDeclinedModal(false)}>
+ Dismiss
+ </Button>
+ )}
+ <Button variant="org" onClick={handleNavigateToRootOrgBilling}>
+ Update Payment Method
+ </Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
<NewSubOrganizationModal
isOpen={showSubOrgForm}
onOpenChange={setShowSubOrgForm}
diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/Notification.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/Notification.tsx
index ef7f2b65ca..40c2e177cd 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/Notification.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/Notification.tsx
@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { formatDistance } from "date-fns";
import { twMerge } from "tailwind-merge";
-import { IconButton, Tooltip } from "@app/components/v2";
+import { IconButton, Tooltip, TooltipContent, TooltipTrigger } from "@app/components/v3";
import { isCriticalNotification, TUserNotification } from "@app/hooks/api/notifications/types";
type Props = {
@@ -18,10 +18,10 @@ export const Notification = ({ notification, onDelete }: Props) => {
return (
<div
className={twMerge(
- "group relative flex cursor-pointer items-start border-b border-mineshaft-600 p-2 transition-colors",
- notification.link ? "hover:bg-mineshaft-700" : "cursor-default",
- !notification.isRead && "bg-mineshaft-800",
- isCritical && !notification.isRead && "border-l-2 border-l-red-700"
+ "group relative flex cursor-pointer items-start border-b border-border p-2 transition-colors",
+ notification.link ? "hover:bg-container-hover" : "cursor-default",
+ !notification.isRead && "bg-container",
+ isCritical && !notification.isRead && "border-l-2 border-l-danger"
)}
>
<div className="flex w-full min-w-0 flex-col p-1">
@@ -30,38 +30,35 @@ export const Notification = ({ notification, onDelete }: Props) => {
<div className="flex h-5 items-center">
<FontAwesomeIcon
icon={faCircle}
- className={twMerge(
- "size-2 shrink-0",
- isCritical ? "text-red-700" : "text-yellow-400"
- )}
+ className={twMerge("size-2 shrink-0", isCritical ? "text-danger" : "text-warning")}
/>
</div>
)}
- <Tooltip
- content={<Markdown>{notification.title}</Markdown>}
- delayDuration={300}
- className="z-1000"
- >
- <span className="overflow-hidden text-sm leading-5 font-medium text-ellipsis whitespace-nowrap text-mineshaft-100">
- <Markdown components={{ p: "span" }}>{notification.title}</Markdown>
- </span>
+ <Tooltip delayDuration={300}>
+ <TooltipTrigger asChild>
+ <span className="overflow-hidden text-sm leading-5 font-medium text-ellipsis whitespace-nowrap text-foreground">
+ <Markdown components={{ p: "span" }}>{notification.title}</Markdown>
+ </span>
+ </TooltipTrigger>
+ <TooltipContent className="z-[var(--z-index-tooltip)]">
+ <Markdown>{notification.title}</Markdown>
+ </TooltipContent>
</Tooltip>
- <span className="mt-px ml-auto text-xs whitespace-nowrap text-mineshaft-400">
+ <span className="mt-px ml-auto text-xs whitespace-nowrap text-muted">
{formatDistance(notification.createdAt, new Date())} ago
</span>
</div>
{notification.body && (
- <div className="w-full overflow-hidden text-xs break-words text-mineshaft-300">
+ <div className="w-full overflow-hidden text-xs break-words text-accent">
<Markdown>{notification.body}</Markdown>
</div>
)}
</div>
<div className="mt-0.5 flex w-0 shrink-0 justify-end opacity-0 transition-all group-hover:w-[24px] group-hover:opacity-100">
<IconButton
- ariaLabel="delete"
- variant="plain"
- colorSchema="danger"
- size="sm"
+ aria-label="Delete notification"
+ variant="danger"
+ size="xs"
onClick={(e) => {
e.stopPropagation();
onDelete(notification.id);
diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/NotificationDropdown.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/NotificationDropdown.tsx
index 837e5c18f5..e48abbee7a 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/NotificationDropdown.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/NotificationDropdown.tsx
@@ -5,12 +5,13 @@ import { useRouter } from "@tanstack/react-router";
import { Bell, BellIcon } from "lucide-react";
import {
- ContentLoader,
+ Badge,
DropdownMenu,
DropdownMenuContent,
- DropdownMenuTrigger
-} from "@app/components/v2";
-import { IconButton } from "@app/components/v3";
+ DropdownMenuTrigger,
+ IconButton,
+ Loader
+} from "@app/components/v3";
import {
useDeleteNotification,
useMarkAllNotificationsAsRead,
@@ -74,21 +75,21 @@ export const NotificationDropdown = () => {
<DropdownMenuContent
align="end"
side="bottom"
- className="z-999 mt-3 flex h-[550px] w-[400px] overflow-hidden rounded-lg"
+ className="mt-3 flex h-[550px] w-[400px] overflow-hidden p-0"
>
<div className="flex w-full flex-col">
- <div className="flex items-center justify-between border-b border-mineshaft-500 px-3 py-2">
+ <div className="flex items-center justify-between border-b border-border px-3 py-2">
<div className="flex items-center gap-2">
- <span className="font-medium text-white">Notifications</span>
+ <span className="font-medium text-foreground">Notifications</span>
{hasCritical && (
- <span className="rounded-full bg-red-700 px-1.5 py-0.5 text-[10px] font-medium text-white">
- {criticalCount > 99 ? "99+" : criticalCount} critical
- </span>
+ <Badge variant="danger">
+ {criticalCount > 99 ? "99+" : criticalCount} Critical
+ </Badge>
)}
</div>
<button
type="button"
- className="text-xs font-medium text-mineshaft-300 hover:text-primary-400 disabled:pointer-events-none disabled:opacity-50"
+ className="text-xs font-medium text-muted hover:text-foreground disabled:pointer-events-none disabled:opacity-50"
onClick={(e) => {
e.preventDefault();
markAllAsRead();
@@ -101,14 +102,14 @@ export const NotificationDropdown = () => {
<div className="flex h-full w-full overflow-auto">
{isLoading && (
<div className="flex h-full w-full items-center justify-center">
- <ContentLoader className="pointer-events-none" lottieClassName="size-10" />
+ <Loader className="pointer-events-none" size="sm" />
</div>
)}
{!isLoading && notifications?.length === 0 && (
<div className="flex h-full w-full flex-col items-center justify-center">
- <FontAwesomeIcon icon={faBell} size="3x" className="text-mineshaft-400" />
- <span className="mt-4 text-sm text-mineshaft-300">No new notifications</span>
- <span className="text-xs text-mineshaft-400">
+ <FontAwesomeIcon icon={faBell} size="3x" className="text-muted" />
+ <span className="mt-4 text-sm text-accent">No new notifications</span>
+ <span className="text-xs text-muted">
We&apos;ll let you know when something important happens.
</span>
</div>
diff --git a/frontend/src/pages/admin/AccessManagementPage/AccessManagementPage.tsx b/frontend/src/pages/admin/AccessManagementPage/AccessManagementPage.tsx
index a8e80ca4ef..7b21e72849 100644
--- a/frontend/src/pages/admin/AccessManagementPage/AccessManagementPage.tsx
+++ b/frontend/src/pages/admin/AccessManagementPage/AccessManagementPage.tsx
@@ -14,7 +14,7 @@ export const AccessManagementPage = () => {
<title>{t("common.head-title", { title: "Access Control" })}</title>
</Helmet>
<div className="mx-auto flex flex-col justify-between">
- <div className="mx-auto mb-6 w-full max-w-8xl">
+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8">
<PageHeader
scope="instance"
title="Server Admin Access Control"
diff --git a/frontend/src/pages/admin/AuthenticationPage/AuthenticationPage.tsx b/frontend/src/pages/admin/AuthenticationPage/AuthenticationPage.tsx
index 8bcc65d387..5d4e63a94f 100644
--- a/frontend/src/pages/admin/AuthenticationPage/AuthenticationPage.tsx
+++ b/frontend/src/pages/admin/AuthenticationPage/AuthenticationPage.tsx
@@ -14,7 +14,7 @@ export const AuthenticationPage = () => {
<title>{t("common.head-title", { title: "Admin" })}</title>
</Helmet>
<div className="mx-auto flex flex-col justify-between">
- <div className="mx-auto mb-6 w-full max-w-8xl">
+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8">
<PageHeader
scope="instance"
title="Authentication"
diff --git a/frontend/src/pages/admin/CachingPage/CachingPage.tsx b/frontend/src/pages/admin/CachingPage/CachingPage.tsx
index 9d2dc007a1..dd43c0a1ed 100644
--- a/frontend/src/pages/admin/CachingPage/CachingPage.tsx
+++ b/frontend/src/pages/admin/CachingPage/CachingPage.tsx
@@ -14,7 +14,7 @@ export const CachingPage = () => {
<title>{t("common.head-title", { title: "Admin" })}</title>
</Helmet>
<div className="mx-auto flex flex-col justify-between">
- <div className="mx-auto mb-6 w-full max-w-8xl">
+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8">
<PageHeader
scope="instance"
title="Caching"
diff --git a/frontend/src/pages/admin/EncryptionPage/EncryptionPage.tsx b/frontend/src/pages/admin/EncryptionPage/EncryptionPage.tsx
index 06c146312a..f058aef784 100644
--- a/frontend/src/pages/admin/EncryptionPage/EncryptionPage.tsx
+++ b/frontend/src/pages/admin/EncryptionPage/EncryptionPage.tsx
@@ -14,14 +14,16 @@ export const EncryptionPage = () => {
<title>{t("common.head-title", { title: "Admin" })}</title>
</Helmet>
<div className="mx-auto flex flex-col justify-between">
- <div className="mx-auto mb-6 w-full max-w-8xl">
+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8">
<PageHeader
scope="instance"
title="Encryption"
description="Manage encryption settings for your Infisical instance."
/>
- <EncryptionPageForm />
- <EncryptionKeyRotationSection />
+ <div>
+ <EncryptionPageForm />
+ <EncryptionKeyRotationSection />
+ </div>
</div>
</div>
</div>
diff --git a/frontend/src/pages/admin/EnvironmentPage/EnvironmentPage.tsx b/frontend/src/pages/admin/EnvironmentPage/EnvironmentPage.tsx
index cadf1132aa..b29346f51e 100644
--- a/frontend/src/pages/admin/EnvironmentPage/EnvironmentPage.tsx
+++ b/frontend/src/pages/admin/EnvironmentPage/EnvironmentPage.tsx
@@ -14,7 +14,7 @@ export const EnvironmentPage = () => {
<title>{t("common.head-title", { title: "Admin" })}</title>
</Helmet>
<div className="mx-auto flex flex-col justify-between">
- <div className="mx-auto mb-6 w-full max-w-8xl">
+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8">
<PageHeader
scope="instance"
title="Environment Variables"
diff --git a/frontend/src/pages/admin/EnvironmentPage/components/EnvironmentPageForm.tsx b/frontend/src/pages/admin/EnvironmentPage/components/EnvironmentPageForm.tsx
index 30ab359c03..1e132bcc35 100644
--- a/frontend/src/pages/admin/EnvironmentPage/components/EnvironmentPageForm.tsx
+++ b/frontend/src/pages/admin/EnvironmentPage/components/EnvironmentPageForm.tsx
@@ -5,7 +5,7 @@ import { Search, TriangleAlert } from "lucide-react";
import { z } from "zod";
import { createNotification } from "@app/components/notifications";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
Accordion,
AccordionContent,
diff --git a/frontend/src/pages/admin/GeneralPage/GeneralPage.tsx b/frontend/src/pages/admin/GeneralPage/GeneralPage.tsx
index c316f3fdba..725c4f38c2 100644
--- a/frontend/src/pages/admin/GeneralPage/GeneralPage.tsx
+++ b/frontend/src/pages/admin/GeneralPage/GeneralPage.tsx
@@ -16,7 +16,7 @@ export const GeneralPage = () => {
<title>{t("common.head-title", { title: "Admin" })}</title>
</Helmet>
<div className="mx-auto flex flex-col justify-between">
- <div className="mx-auto mb-6 w-full max-w-8xl">
+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8">
<PageHeader
scope="instance"
title="General"
diff --git a/frontend/src/pages/admin/ResourceOverviewPage/ResourceOverviewPage.tsx b/frontend/src/pages/admin/ResourceOverviewPage/ResourceOverviewPage.tsx
index 3a3e90356b..9943c23f48 100644
--- a/frontend/src/pages/admin/ResourceOverviewPage/ResourceOverviewPage.tsx
+++ b/frontend/src/pages/admin/ResourceOverviewPage/ResourceOverviewPage.tsx
@@ -25,7 +25,7 @@ export const ResourceOverviewPage = () => {
<title>{t("common.head-title", { title: "Resource Overview" })}</title>
</Helmet>
<div className="mx-auto flex flex-col justify-between">
- <div className="mx-auto mb-6 w-full max-w-8xl">
+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8">
<PageHeader
scope="instance"
title="Resource Overview"
diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/GroupsTab.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/GroupsTab.tsx
index 4371e5615a..8277629cd4 100644
--- a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/GroupsTab.tsx
+++ b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/GroupsTab.tsx
@@ -4,7 +4,7 @@ import { MoreHorizontalIcon, PencilIcon, PlusIcon, SearchIcon, Trash2Icon } from
import { ProductRoleBadge } from "@app/components/agent-vault/ProductRoleBadge";
import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
Button,
Card,
diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/IdentitiesTab.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/IdentitiesTab.tsx
index 7b0f05bcc9..cf0ab323c0 100644
--- a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/IdentitiesTab.tsx
+++ b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/IdentitiesTab.tsx
@@ -13,7 +13,7 @@ import {
import { ProductRoleBadge } from "@app/components/agent-vault/ProductRoleBadge";
import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
Badge,
Button,
diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/MembersTab.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/MembersTab.tsx
index a6c56b0387..116b2b9e94 100644
--- a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/MembersTab.tsx
+++ b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/components/MembersTab.tsx
@@ -6,7 +6,7 @@ import { PendingInvitationBadge } from "@app/components/agent-vault/PendingInvit
import { ProductRoleBadge } from "@app/components/agent-vault/ProductRoleBadge";
import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
Button,
Card,
diff --git a/frontend/src/pages/pam/PamAccessControlPage/components/GroupsTab.tsx b/frontend/src/pages/pam/PamAccessControlPage/components/GroupsTab.tsx
index 8976e1f502..b42cdb6c77 100644
--- a/frontend/src/pages/pam/PamAccessControlPage/components/GroupsTab.tsx
+++ b/frontend/src/pages/pam/PamAccessControlPage/components/GroupsTab.tsx
@@ -4,8 +4,8 @@ import { MoreHorizontalIcon, PencilIcon, Plus, SearchIcon, Trash2Icon } from "lu
import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import { DeleteActionModal } from "@app/components/v2";
-import { HighlightText } from "@app/components/v2/HighlightText";
import {
Badge,
Button,
diff --git a/frontend/src/pages/pam/PamAccessControlPage/components/IdentitiesTab.tsx b/frontend/src/pages/pam/PamAccessControlPage/components/IdentitiesTab.tsx
index 43943fe528..7b1a128682 100644
--- a/frontend/src/pages/pam/PamAccessControlPage/components/IdentitiesTab.tsx
+++ b/frontend/src/pages/pam/PamAccessControlPage/components/IdentitiesTab.tsx
@@ -6,7 +6,7 @@ import { MoreHorizontalIcon, PencilIcon, Plus, SearchIcon, Trash2Icon } from "lu
import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
AlertDialog,
AlertDialogAction,
diff --git a/frontend/src/pages/pam/PamAccessControlPage/components/MembersTab.tsx b/frontend/src/pages/pam/PamAccessControlPage/components/MembersTab.tsx
index 5459e7283f..5bf41dc914 100644
--- a/frontend/src/pages/pam/PamAccessControlPage/components/MembersTab.tsx
+++ b/frontend/src/pages/pam/PamAccessControlPage/components/MembersTab.tsx
@@ -4,8 +4,8 @@ import { MoreHorizontalIcon, PencilIcon, Plus, SearchIcon, Trash2Icon } from "lu
import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import { DeleteActionModal } from "@app/components/v2";
-import { HighlightText } from "@app/components/v2/HighlightText";
import {
Badge,
Button,
diff --git a/frontend/src/pages/pam/PamAccountsPage/components/CreateAccountSheet.tsx b/frontend/src/pages/pam/PamAccountsPage/components/CreateAccountSheet.tsx
index 008c497b8c..69bc8ace39 100644
--- a/frontend/src/pages/pam/PamAccountsPage/components/CreateAccountSheet.tsx
+++ b/frontend/src/pages/pam/PamAccountsPage/components/CreateAccountSheet.tsx
@@ -5,7 +5,7 @@ import { Link } from "@tanstack/react-router";
import { AlertTriangle, ArrowUpRight, Plus, Search } from "lucide-react";
import { createNotification } from "@app/components/notifications";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
AlertDialog,
AlertDialogAction,
diff --git a/frontend/src/pages/pam/PamDiscoveryPage/PamDiscoveryPage.tsx b/frontend/src/pages/pam/PamDiscoveryPage/PamDiscoveryPage.tsx
index 5a299a601c..971c6d5148 100644
--- a/frontend/src/pages/pam/PamDiscoveryPage/PamDiscoveryPage.tsx
+++ b/frontend/src/pages/pam/PamDiscoveryPage/PamDiscoveryPage.tsx
@@ -4,8 +4,8 @@ import { format } from "date-fns";
import { MoreHorizontal, Plus, Radar, Search, Trash2 } from "lucide-react";
import { createNotification } from "@app/components/notifications";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import { DeleteActionModal, PageHeader } from "@app/components/v2";
-import { HighlightText } from "@app/components/v2/HighlightText";
import {
Button,
Card,
diff --git a/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx b/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx
index 859701dd56..5d93114f04 100644
--- a/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx
+++ b/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx
@@ -8,7 +8,7 @@ import { Play, Radar, Search, TriangleAlert } from "lucide-react";
import { z } from "zod";
import { createNotification } from "@app/components/notifications";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
Badge,
Button,
diff --git a/frontend/src/pages/pam/PamSessionsPage/PamSessionsPage.tsx b/frontend/src/pages/pam/PamSessionsPage/PamSessionsPage.tsx
index 2eb341b469..c7bf55c1d7 100644
--- a/frontend/src/pages/pam/PamSessionsPage/PamSessionsPage.tsx
+++ b/frontend/src/pages/pam/PamSessionsPage/PamSessionsPage.tsx
@@ -6,8 +6,8 @@ import { format } from "date-fns";
import { Activity, Ban, SearchIcon, Video } from "lucide-react";
import { createNotification } from "@app/components/notifications";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import { DeleteActionModal, PageHeader } from "@app/components/v2";
-import { HighlightText } from "@app/components/v2/HighlightText";
import {
Badge,
Button,
diff --git a/frontend/src/pages/pam/PamSessionsPage/components/SessionDetailSheet.tsx b/frontend/src/pages/pam/PamSessionsPage/components/SessionDetailSheet.tsx
index d15c145832..cc79dc5d42 100644
--- a/frontend/src/pages/pam/PamSessionsPage/components/SessionDetailSheet.tsx
+++ b/frontend/src/pages/pam/PamSessionsPage/components/SessionDetailSheet.tsx
@@ -10,7 +10,7 @@ import {
SearchIcon
} from "lucide-react";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
Badge,
Card,
diff --git a/frontend/src/pages/pam/PamTemplatesPage/PamTemplatesPage.tsx b/frontend/src/pages/pam/PamTemplatesPage/PamTemplatesPage.tsx
index f53fa09482..671901aba1 100644
--- a/frontend/src/pages/pam/PamTemplatesPage/PamTemplatesPage.tsx
+++ b/frontend/src/pages/pam/PamTemplatesPage/PamTemplatesPage.tsx
@@ -4,8 +4,8 @@ import { useTranslation } from "react-i18next";
import { ClipboardList, Layers, MoreHorizontal, Plus, Search, Trash2 } from "lucide-react";
import { createNotification } from "@app/components/notifications";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import { PageHeader } from "@app/components/v2";
-import { HighlightText } from "@app/components/v2/HighlightText";
import {
Button,
Card,
diff --git a/frontend/src/pages/pam/components/PamAccountRow.tsx b/frontend/src/pages/pam/components/PamAccountRow.tsx
index 2c1c6fada7..2a668bb027 100644
--- a/frontend/src/pages/pam/components/PamAccountRow.tsx
+++ b/frontend/src/pages/pam/components/PamAccountRow.tsx
@@ -1,7 +1,7 @@
import { ReactNode, useSyncExternalStore } from "react";
import { Clock, KeyRound, Rocket } from "lucide-react";
-import { HighlightText } from "@app/components/v2/HighlightText";
+import { HighlightText } from "@app/components/utilities/HighlightText";
import {
Badge,
IconButton,