Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
improvement(overview): move all secret annotations to the name cell (#9002)
Andrew Huangb702536f36ea
diff --git a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsxindex e66bd8cd1c..c909062ed6 100644--- a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx@@ -299,6 +299,10 @@ import { ImportSecretsSheet } from "./components/SecretDropzone";import { SecretV2MigrationSection } from "./components/SecretV2MigrationSection";import { MoveSecretsModal } from "./components/SelectionPanel/components";import { SelectionPanel } from "./components/SelectionPanel/SelectionPanel";+import {+ TABLE_BODY_ROW_FILTER_CLASS_NAME,+ TABLE_BODY_ROW_FILTER_DIMMED_CLASS_NAME+} from "./components/tableRowActionStyles";import {getTableRowActivityId,type TableRowActivityChangeHandler,@@ -4264,7 +4268,7 @@ const OverviewPageContent = () => {visibleEnvs?.map(({ name, slug, id }, index) => {return (<TableHead- className="relative min-w-[240px] border-r p-0 text-center whitespace-nowrap last:border-r-0"+ className="relative min-w-[240px] border-r p-0 text-left whitespace-nowrap last:border-r-0"key={`secret-overview-${name}-${index + 1}`}><DropdownMenu>@@ -4277,7 +4281,7 @@ const OverviewPageContent = () => {? `. Currently sorting by ${activeSecretSort?.label ?? "recency"}`: ""}`}- className="flex h-full w-full min-w-[240px] cursor-pointer items-center justify-center gap-x-2 px-3 text-sm font-medium text-muted hover:bg-foreground/5 focus-visible:ring-1 focus-visible:ring-ring focus-visible:outline-none"+ className="flex h-full w-full min-w-[240px] cursor-pointer items-center justify-between gap-x-2 px-3 text-sm font-medium text-muted hover:bg-foreground/5 focus-visible:ring-1 focus-visible:ring-ring focus-visible:outline-none"><spanclassName={twMerge(@@ -4503,9 +4507,10 @@ const OverviewPageContent = () => {</TableHeader><TableBodyclassName={twMerge(- "transition-all duration-500 [&>tr>td>*:not([data-table-row-filter-contents])]:transition-[filter] [&>tr>td>*:not([data-table-row-filter-contents])]:duration-200 motion-reduce:[&>tr>td>*:not([data-table-row-filter-contents])]:transition-none [&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:transition-[filter] [&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:duration-200 motion-reduce:[&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:transition-none [&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:transition-[filter] [&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:duration-200 motion-reduce:[&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:transition-none [@media(hover:hover)]:[&>tr:hover>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:!filter-none",+ "transition-all duration-500",+ TABLE_BODY_ROW_FILTER_CLASS_NAME,(activeTableRows.size > 0 || hasSelectedEntriesOnPage) &&- "[&>tr>td>*:not([data-table-row-filter-contents])]:filter-[opacity(40%)] [&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:filter-[opacity(40%)] [&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:filter-[opacity(40%)]"+ TABLE_BODY_ROW_FILTER_DIMMED_CLASS_NAME)}>{tableView !== "table" && (diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/ResourceEnvironmentStatusCell/ResourceEnvironmentStatusCell.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/ResourceEnvironmentStatusCell/ResourceEnvironmentStatusCell.tsxindex fa5024cc40..cafbaa9003 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/ResourceEnvironmentStatusCell/ResourceEnvironmentStatusCell.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/ResourceEnvironmentStatusCell/ResourceEnvironmentStatusCell.tsx@@ -1,3 +1,4 @@+import { MouseEventHandler, ReactNode } from "react";import {BanIcon,CheckIcon,@@ -16,9 +17,18 @@ export type EnvironmentStatus = "present" | "missing" | "empty" | "imported" | "type Props = {status: EnvironmentStatus;hasOverride?: boolean;+ children?: ReactNode;+ className?: string;+ onClick?: MouseEventHandler<HTMLTableCellElement>;};-export const ResourceEnvironmentStatusCell = ({ status, hasOverride }: Props) => {+export const ResourceEnvironmentStatusCell = ({+ status,+ hasOverride,+ children,+ className,+ onClick+}: Props) => {let tooltipContent: string;let Icon: LucideIcon;let iconClassName: string;@@ -56,13 +66,15 @@ export const ResourceEnvironmentStatusCell = ({ status, hasOverride }: Props) =>return (<TableCellclassName={twMerge(- "relative border-r text-center last:border-r-0",+ "relative border-r last:border-r-0",status === "present" && "text-success",status === "empty" && "text-warning",status === "missing" && "text-danger",status === "no-access" && "text-accent",- status === "imported" && "text-import"+ status === "imported" && "text-import",+ className)}+ onClick={onClick}>{hasOverride && (<Tooltip>@@ -74,12 +86,15 @@ export const ResourceEnvironmentStatusCell = ({ status, hasOverride }: Props) =><TooltipContent>Has personal override</TooltipContent></Tooltip>)}- <Tooltip>- <TooltipTrigger asChild>- <Icon className={twMerge(iconClassName, "inline-block")} />- </TooltipTrigger>- <TooltipContent>{tooltipContent}</TooltipContent>- </Tooltip>+ <div className={twMerge("flex items-center justify-between gap-2", hasOverride && "pr-4")}>+ <Tooltip>+ <TooltipTrigger asChild>+ <Icon className={twMerge(iconClassName, "size-4 shrink-0")} />+ </TooltipTrigger>+ <TooltipContent>{tooltipContent}</TooltipContent>+ </Tooltip>+ {children}+ </div></TableCell>);};diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/AnnotationPopoverHeader.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/AnnotationPopoverHeader.tsxnew file mode 100644index 0000000000..709f0919a1--- /dev/null+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/AnnotationPopoverHeader.tsx@@ -0,0 +1,24 @@+import { HTMLAttributes } from "react";+import { GripHorizontalIcon } from "lucide-react";++type Props = {+ title: string;+ dragHandleProps?: HTMLAttributes<HTMLDivElement>;+};++export const AnnotationPopoverHeader = ({ title, dragHandleProps }: Props) => {+ if (!dragHandleProps) return <p className="text-sm font-medium">{title}</p>;++ return (+ <div+ {...dragHandleProps}+ role="button"+ tabIndex={0}+ aria-label={`Move ${title.toLowerCase()} (drag or use arrow keys)`}+ className="-mx-4 -mt-4 flex cursor-grab touch-none items-center justify-between rounded-t-lg px-4 pt-4 outline-none select-none focus-visible:ring-2 focus-visible:ring-ring active:cursor-grabbing"+ >+ <p className="text-sm font-medium">{title}</p>+ <GripHorizontalIcon className="size-4 text-accent" />+ </div>+ );+};diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsxindex 27c6f8b101..7e6871c8dc 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsx@@ -2,7 +2,6 @@ import { HTMLAttributes, useEffect, useRef } from "react";import { Controller, useForm } from "react-hook-form";import { subject } from "@casl/ability";import { zodResolver } from "@hookform/resolvers/zod";-import { GripHorizontalIcon } from "lucide-react";import { z } from "zod";import { createNotification } from "@app/components/notifications";@@ -12,6 +11,8 @@ import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionCoimport { useUpdateSecretV3 } from "@app/hooks/api";import { SecretType } from "@app/hooks/api/types";+import { AnnotationPopoverHeader } from "./AnnotationPopoverHeader";+const formSchema = z.object({comment: z.string()});@@ -115,18 +116,7 @@ export const SecretCommentForm = ({onClose?.();};- const header = (- <div- {...dragHandleProps}- role="button"- tabIndex={0}- aria-label="Move comment (drag or use arrow keys)"- className="-mx-4 -mt-4 flex cursor-grab touch-none items-center justify-between rounded-t-lg px-4 pt-4 outline-none select-none focus-visible:ring-2 focus-visible:ring-ring active:cursor-grabbing"- >- <p className="text-sm font-medium">Comment</p>- <GripHorizontalIcon className="size-4 text-accent" />- </div>- );+ const header = <AnnotationPopoverHeader title="Comment" dragHandleProps={dragHandleProps} />;if (!canEdit) {return (diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsxindex 2ae778a987..a98c6457f1 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsx@@ -1,5 +1,5 @@/* eslint-disable no-nested-ternary */-import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";+import { ReactNode, useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";import { Controller, useForm } from "react-hook-form";import { subject } from "@casl/ability";import {@@ -59,9 +59,6 @@ import {DropdownMenuItem,DropdownMenuLabel,DropdownMenuSeparator,- DropdownMenuSub,- DropdownMenuSubContent,- DropdownMenuSubTrigger,DropdownMenuTrigger,IconButton,InfisicalSecretInput,@@ -106,7 +103,8 @@ import { OverviewFlowHandle, useOverviewTelemetry } from "../../OverviewTelemetrimport { CreateSecretForm, TSecretEditChanges } from "../CreateSecretForm/CreateSecretForm";import {TABLE_ROW_ACTION_BAR_FORCE_VISIBLE_CLASS_NAME,- TABLE_ROW_ACTION_BAR_VISIBILITY_CLASS_NAME+ TABLE_ROW_ACTION_BAR_VISIBILITY_CLASS_NAME,+ TABLE_ROW_NAME_CELL_COLUMN_CLASS_NAME} from "../tableRowActionStyles";import { SecretAccessInsights } from "./SecretAccessInsights";import { SecretCommentForm } from "./SecretCommentForm";@@ -115,6 +113,9 @@ import { SecretMetadataForm } from "./SecretMetadataForm";import { SecretReminderForm } from "./SecretReminderForm";import { SecretTagForm } from "./SecretTagForm";import { SecretVersionHistory } from "./SecretVersionHistory";+import { useDraggablePopover } from "./useDraggablePopover";++export type EnvironmentSecretAction = "value" | "comment" | "tags" | "reminder" | "metadata";type Props = {defaultValue?: string | null;@@ -187,6 +188,9 @@ type Props = {onExpandedChange?: (isExpanded: boolean) => void;lastEdited?: Pick<SecretV3RawSanitized, "createdAt" | "updatedAt" | "version">;timestampField?: "createdAt" | "updatedAt";+ nameCellContent?: ReactNode;+ initialAction?: EnvironmentSecretAction;+ onInitialActionHandled?: () => void;};export const SecretEditTableRow = ({@@ -230,7 +234,10 @@ export const SecretEditTableRow = ({revokedProjectFolderGrant,onCopySecret,onAccessInsightsUpgrade,- onExpandedChange+ onExpandedChange,+ nameCellContent,+ initialAction,+ onInitialActionHandled}: Props) => {const telemetry = useOverviewTelemetry();const valueSheetFlow = useRef<OverviewFlowHandle>(undefined);@@ -257,10 +264,6 @@ export const SecretEditTableRow = ({const isFieldActive = isFieldFocused || isResolvedValueOpen;const [isCopied, , setIsCopied] = useTimedReset<boolean>({ initialState: false });- useEffect(() => {- onExpandedChange?.(isFieldActive);- }, [isFieldActive, onExpandedChange]);-const fetchSharedValueParams =importedSecret && !isSecretPresent? {@@ -361,15 +364,28 @@ export const SecretEditTableRow = ({const [isEditing, setIsEditing] = useToggle();const [isModalOpen, setIsModalOpen] = useState<boolean>(false);const [isCommentOpen, setIsCommentOpen] = useState(false);- const [commentDragOffset, setCommentDragOffset] = useState({ x: 0, y: 0 });- const [commentSide, setCommentSide] = useState<"top" | "right" | "bottom" | "left">();- const commentDragStart = useRef<{ pointerX: number; pointerY: number; x: number; y: number }>(- undefined- );const [isTagOpen, setIsTagOpen] = useState(false);const [isMetadataOpen, setIsMetadataOpen] = useState(false);const [isReminderOpen, setIsReminderOpen] = useState(false);const [isDropdownOpen, setIsDropdownOpen] = useState(false);+ const [isAnnotateMenuOpen, setIsAnnotateMenuOpen] = useState(false);+ const isAnnotating =+ isCommentOpen || isTagOpen || isMetadataOpen || isReminderOpen || isAnnotateMenuOpen;+ const commentPopover = useDraggablePopover(isCommentOpen);+ const tagPopover = useDraggablePopover(isTagOpen);+ const metadataPopover = useDraggablePopover(isMetadataOpen);++ // Multi-env rows pass a fresh callback every render; reading it through a ref keeps the+ // activity effect from re-firing (and re-setting parent state) on each render.+ const onExpandedChangeRef = useRef(onExpandedChange);+ useLayoutEffect(() => {+ onExpandedChangeRef.current = onExpandedChange;+ });+ const isRowActive = isFieldActive || isAnnotating;+ useEffect(() => {+ onExpandedChangeRef.current?.(isRowActive);+ }, [isRowActive]);+ useEffect(() => () => onExpandedChangeRef.current?.(false), []);const [pendingAnnotation, setPendingAnnotation] = useState<"comment" | "tags" | "reminder" | "metadata" | null>(null);@@ -441,13 +457,6 @@ export const SecretEditTableRow = ({})) ?? [];}, [comment, tags, secretMetadata, isSingleEnvView, hasPendingChange]);- useLayoutEffect(() => {- commentDragStart.current = undefined;- if (!isCommentOpen) return;- setCommentDragOffset({ x: 0, y: 0 });- setCommentSide(undefined);- }, [isCommentOpen]);-// Stable callbacks for child components to avoid resetting their debounce timers on re-renderconst handleCommentChange = useCallback((newComment: string) => setValue("comment", newComment),@@ -1061,6 +1070,16 @@ export const SecretEditTableRow = ({secretTags: ["*"]}));+ useEffect(() => {+ if (!initialAction) return;+ if (initialAction === "value") setFocus("value", { shouldSelect: true });+ else if (initialAction === "comment") setIsCommentOpen(true);+ else if (initialAction === "tags") setIsTagOpen(true);+ else if (initialAction === "reminder") setIsReminderOpen(true);+ else if (initialAction === "metadata") setIsMetadataOpen(true);+ onInitialActionHandled?.();+ }, [initialAction, onInitialActionHandled, setFocus]);+const handleEditShortcut = useSecretInputActionShortcuts({isActive: isBatchMode ? isPendingBatchChange || isDirty : isDirtyState,isDisabled: isSubmitting || isSavingPendingChange,@@ -1163,9 +1182,6 @@ export const SecretEditTableRow = ({closeValueSheet(invocation);};- const shouldStayExpanded =- isCommentOpen || isTagOpen || isMetadataOpen || isReminderOpen || isDropdownOpen;-const [actionBarWidth, setActionBarWidth] = useState(0);const actionBarResizeObserverRef = useRef<ResizeObserver | null>(null);const actionBarRef = useCallback((node: HTMLDivElement | null) => {@@ -1270,63 +1286,15 @@ export const SecretEditTableRow = ({}};- const lockCommentSide = (handle: HTMLElement) => {- if (commentSide) return;- const side = handle.closest("[data-side]")?.getAttribute("data-side");- setCommentSide(side === "top" || side === "left" || side === "right" ? side : "bottom");- };-const commentPopoverContent = (<PopoverContentonCloseAutoFocus={(e) => e.preventDefault()}className="w-80"- align="end"- side={commentSide ?? "bottom"}- avoidCollisions={!commentSide}- style={{ translate: `${commentDragOffset.x}px ${commentDragOffset.y}px` }}+ align="start"+ {...commentPopover.popoverContentProps}><SecretCommentForm- dragHandleProps={{- onPointerDown: (e) => {- if (e.button !== 0) return;- e.preventDefault();- e.currentTarget.setPointerCapture(e.pointerId);- lockCommentSide(e.currentTarget);- commentDragStart.current = {- pointerX: e.clientX,- pointerY: e.clientY,- ...commentDragOffset- };- },- onPointerMove: (e) => {- const start = commentDragStart.current;- if (!start) return;- setCommentDragOffset({- x: start.x + e.clientX - start.pointerX,- y: start.y + e.clientY - start.pointerY- });- },- onPointerUp: () => {- commentDragStart.current = undefined;- },- onLostPointerCapture: () => {- commentDragStart.current = undefined;- },- onKeyDown: (e) => {- const step = e.shiftKey ? 64 : 16;- const deltas: Record<string, { x: number; y: number } | undefined> = {- ArrowLeft: { x: -step, y: 0 },- ArrowRight: { x: step, y: 0 },- ArrowUp: { x: 0, y: -step },- ArrowDown: { x: 0, y: step }- };- const delta = deltas[e.key];- if (!delta) return;- e.preventDefault();- lockCommentSide(e.currentTarget);- setCommentDragOffset((prev) => ({ x: prev.x + delta.x, y: prev.y + delta.y }));- }- }}+ dragHandleProps={commentPopover.dragHandleProps}comment={isBatchMode ? ((watchedComment as string) ?? comment) : comment}secretKey={secretName}secretPath={secretPath}@@ -1346,6 +1314,250 @@ export const SecretEditTableRow = ({const showCommentPreview =commentPreview && !isImportedSecret && !revokedProjectFolderGrant && canDescribeSecret;+ const canAnnotate = !isPendingDelete && !isCreatable && !isImportedSecret;+ const visibleTags = canReadTags && !isImportedSecret ? (tags ?? []) : [];+ const hasReminder = Boolean(reminder) && !isImportedSecret;+ const metadataCount = isImportedSecret ? 0 : (secretMetadata?.length ?? 0);++ const annotateMenu = canAnnotate && (+ <DropdownMenu open={isAnnotateMenuOpen} onOpenChange={setIsAnnotateMenuOpen}>+ <Tooltip open={isAnnotateMenuOpen ? false : undefined}>+ <TooltipTrigger asChild>+ <DropdownMenuTrigger asChild>+ <IconButton+ aria-label="Annotate secret"+ variant={isSingleEnvView ? "ghost-muted" : "ghost"}+ size={isSingleEnvView ? "2xs" : "xs"}+ className={+ isSingleEnvView+ ? twMerge(+ "transition-opacity duration-150 focus-visible:opacity-100 motion-reduce:transition-none [@media(hover:hover)]:opacity-0 [@media(hover:hover)]:group-focus-within:opacity-100 [@media(hover:hover)]:group-hover:opacity-100",+ isAnnotating && "[@media(hover:hover)]:opacity-100"+ )+ : "size-7 border-0"+ }+ >+ <PencilLineIcon className={isSingleEnvView ? undefined : "size-3.5"} />+ </IconButton>+ </DropdownMenuTrigger>+ </TooltipTrigger>+ <TooltipContent>Annotate</TooltipContent>+ </Tooltip>+ <DropdownMenuContent+ align={isSingleEnvView ? "start" : "end"}+ className="min-w-[185px] [&_[data-variant=default]]:text-foreground [&_svg:not([class*='size-'])]:!size-3"+ onCloseAutoFocus={(e) => {+ e.preventDefault();+ if (pendingAnnotation === "comment") setIsCommentOpen(true);+ else if (pendingAnnotation === "tags") setIsTagOpen(true);+ else if (pendingAnnotation === "reminder") setIsReminderOpen(true);+ else if (pendingAnnotation === "metadata") setIsMetadataOpen(true);+ setPendingAnnotation(null);+ }}+ >+ <DropdownMenuLabel>+ {isSingleEnvView ? "Annotate" : <>Annotate in {environmentName}</>}+ </DropdownMenuLabel>+ <DropdownMenuItem className="px-2.5 py-1.5" onClick={() => setPendingAnnotation("comment")}>+ <MessageSquareIcon className={twMerge(comment && "text-project")} />+ {comment ? "Edit Comment" : "Add Comment"}+ </DropdownMenuItem>+ <Tooltip open={!canReadTags ? undefined : false}>+ <TooltipTrigger className="block w-full">+ <DropdownMenuItem+ className="px-2.5 py-1.5"+ isDisabled={!canReadTags}+ onClick={() => setPendingAnnotation("tags")}+ >+ <TagsIcon className={twMerge(visibleTags.length > 0 && "text-project")} />+ {visibleTags.length > 0 ? "Edit Tags" : "Add Tags"}+ </DropdownMenuItem>+ </TooltipTrigger>+ <TooltipContent side="right">Access Denied</TooltipContent>+ </Tooltip>+ <Tooltip open={!secretId || isPendingCreate ? undefined : false}>+ <TooltipTrigger className="block w-full">+ <DropdownMenuItem+ className="px-2.5 py-1.5"+ isDisabled={!secretId || isPendingCreate}+ onClick={() => setPendingAnnotation("reminder")}+ >+ <BellIcon className={twMerge(reminder && "text-project")} />+ {reminder ? "Edit Reminder" : "Add Reminder"}+ </DropdownMenuItem>+ </TooltipTrigger>+ <TooltipContent side="right">Create Secret to Add Reminder</TooltipContent>+ </Tooltip>+ <DropdownMenuItem+ className="px-2.5 py-1.5"+ onClick={() => setPendingAnnotation("metadata")}+ >+ <CodeXmlIcon className={twMerge(metadataCount > 0 && "text-project")} />+ {metadataCount > 0 ? "Edit Metadata" : "Add Metadata"}+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ );++ const annotationSlot = (+ <div className="relative flex shrink-0 items-center gap-0.5">+ <Popover open={isCommentOpen} onOpenChange={setIsCommentOpen}>+ <PopoverAnchor asChild>+ <span className="pointer-events-none absolute inset-0" />+ </PopoverAnchor>+ {commentPopoverContent}+ </Popover>+ <Popover modal open={isTagOpen} onOpenChange={setIsTagOpen}>+ <PopoverAnchor asChild>+ <span className="pointer-events-none absolute inset-0" />+ </PopoverAnchor>+ <PopoverContent+ onCloseAutoFocus={(e) => e.preventDefault()}+ onEscapeKeyDown={handleAnnotationEscapeKeyDown}+ className="w-80"+ align="start"+ {...tagPopover.popoverContentProps}+ >+ <SecretTagForm+ dragHandleProps={tagPopover.dragHandleProps}+ secretKey={secretName}+ secretPath={secretPath}+ environment={environment}+ tags={isBatchMode ? ((watchedTags as WsTag[]) ?? tags) : tags}+ onClose={() => setIsTagOpen(false)}+ isBatchMode={isBatchMode}+ onTagsChange={handleTagsChange}+ />+ </PopoverContent>+ </Popover>+ <Popover open={isMetadataOpen} onOpenChange={setIsMetadataOpen}>+ <PopoverAnchor asChild>+ <span className="pointer-events-none absolute inset-0" />+ </PopoverAnchor>+ <PopoverContent+ onCloseAutoFocus={(e) => e.preventDefault()}+ className="w-[500px]"+ align="start"+ {...metadataPopover.popoverContentProps}+ >+ <SecretMetadataForm+ dragHandleProps={metadataPopover.dragHandleProps}+ secretMetadata={+ isBatchMode+ ? ((watchedMetadata as {+ key: string;+ value: string;+ isEncrypted?: boolean;+ }[]) ?? secretMetadata)+ : secretMetadata+ }+ secretKey={secretName}+ secretPath={secretPath}+ environment={environment}+ onClose={() => setIsMetadataOpen(false)}+ isBatchMode={isBatchMode}+ onMetadataChange={handleMetadataChange}+ />+ </PopoverContent>+ </Popover>+ <Sheet open={isReminderOpen} onOpenChange={setIsReminderOpen}>+ <SheetContent className="flex h-full max-h-full flex-col gap-y-0">+ <SheetHeader className="border-b">+ <SheetTitle>{reminder ? "Edit Reminder" : "Add Reminder"}</SheetTitle>+ <SheetDescription>+ Notify the channels below when {secretName} in {environmentName} is due for rotation.+ </SheetDescription>+ </SheetHeader>+ {secretId && isReminderOpen && (+ <SecretReminderForm+ secretId={secretId}+ secretKey={secretName}+ secretPath={secretPath}+ environment={environment}+ reminder={reminder}+ onClose={() => setIsReminderOpen(false)}+ />+ )}+ </SheetContent>+ </Sheet>+ {showCommentPreview && (+ <Tooltip open={isCommentOpen ? false : undefined}>+ <TooltipTrigger asChild>+ <IconButton+ aria-label="View secret comment"+ variant="ghost-muted"+ size="2xs"+ onClick={() => {+ if (!isPendingDelete) setIsCommentOpen(true);+ }}+ >+ <MessageSquareIcon />+ </IconButton>+ </TooltipTrigger>+ <TooltipContent className="max-w-72">+ <p className="line-clamp-2 break-words whitespace-pre-wrap">{commentPreview}</p>+ </TooltipContent>+ </Tooltip>+ )}+ {visibleTags.length > 0 && (+ <Tooltip open={isTagOpen ? false : undefined}>+ <TooltipTrigger asChild>+ <IconButton+ aria-label="View secret tags"+ variant="ghost-muted"+ size="2xs"+ onClick={() => {+ if (!isPendingDelete) setIsTagOpen(true);+ }}+ >+ <TagsIcon />+ </IconButton>+ </TooltipTrigger>+ <TooltipContent className="max-w-72 break-words">+ {visibleTags.map(({ slug }) => slug).join(", ")}+ </TooltipContent>+ </Tooltip>+ )}+ {hasReminder && (+ <Tooltip>+ <TooltipTrigger asChild>+ <IconButton+ aria-label="View secret reminder"+ variant="ghost-muted"+ size="2xs"+ onClick={() => {+ if (!isPendingDelete) setIsReminderOpen(true);+ }}+ >+ <BellIcon />+ </IconButton>+ </TooltipTrigger>+ <TooltipContent>Rotation reminder</TooltipContent>+ </Tooltip>+ )}+ {metadataCount > 0 && (+ <Tooltip open={isMetadataOpen ? false : undefined}>+ <TooltipTrigger asChild>+ <IconButton+ aria-label="View secret metadata"+ variant="ghost-muted"+ size="2xs"+ onClick={() => {+ if (!isPendingDelete) setIsMetadataOpen(true);+ }}+ >+ <CodeXmlIcon />+ </IconButton>+ </TooltipTrigger>+ <TooltipContent>+ {metadataCount} metadata {metadataCount === 1 ? "entry" : "entries"}+ </TooltipContent>+ </Tooltip>+ )}+ {isSingleEnvView && annotateMenu}+ </div>+ );+const valueContent = (<><ConfirmationAlertDialog@@ -1426,48 +1638,6 @@ export const SecretEditTableRow = ({{!isDirtyState && !isFieldActive && (<div className="pointer-events-none flex w-fit items-start justify-end self-start pl-2 opacity-0 transition-opacity duration-300 motion-reduce:transition-none [@media(hover:hover)]:pointer-events-auto [@media(hover:hover)]:opacity-100 [@media(hover:hover)]:group-focus-within:pointer-events-none [@media(hover:hover)]:group-focus-within:opacity-0 [@media(hover:hover)]:group-hover:pointer-events-none [@media(hover:hover)]:group-hover:opacity-0"><div className="flex items-center gap-1">- {!isSingleEnvView && comment && !isImportedSecret && (- <Tooltip>- <TooltipTrigger asChild>- <span className="flex size-5 items-center justify-center text-muted">- <MessageSquareIcon className="size-3.5" />- </span>- </TooltipTrigger>- <TooltipContent>Has comment</TooltipContent>- </Tooltip>- )}- {canReadTags && tags?.length && !isImportedSecret ? (- <Tooltip>- <TooltipTrigger asChild>- <span className="flex size-5 items-center justify-center text-muted">- <TagsIcon className="size-3.5" />- </span>- </TooltipTrigger>- <TooltipContent>- {tags.length} tag{tags.length > 1 ? "s" : ""}- </TooltipContent>- </Tooltip>- ) : null}- {reminder && !isImportedSecret && (- <Tooltip>- <TooltipTrigger asChild>- <span className="flex size-5 items-center justify-center text-muted">- <BellIcon className="size-3.5" />- </span>- </TooltipTrigger>- <TooltipContent>Has reminder</TooltipContent>- </Tooltip>- )}- {secretMetadata?.length && !isImportedSecret ? (- <Tooltip>- <TooltipTrigger asChild>- <span className="flex size-5 items-center justify-center text-muted">- <CodeXmlIcon className="size-3.5" />- </span>- </TooltipTrigger>- <TooltipContent>Has metadata</TooltipContent>- </Tooltip>- ) : null}{skipMultilineEncoding && !isImportedSecret && (<Tooltip><TooltipTrigger asChild>@@ -1534,88 +1704,10 @@ export const SecretEditTableRow = ({"absolute z-20","flex items-center gap-0.5 rounded-md border border-border bg-container-hover px-0.5 py-0.5 shadow-md",TABLE_ROW_ACTION_BAR_VISIBILITY_CLASS_NAME,- shouldStayExpanded && TABLE_ROW_ACTION_BAR_FORCE_VISIBLE_CLASS_NAME,+ (isDropdownOpen || isAnnotateMenuOpen) && TABLE_ROW_ACTION_BAR_FORCE_VISIBLE_CLASS_NAME,isSingleEnvView ? "top-[3px] right-0.5" : "-top-px -right-1.5")}>- {!isSingleEnvView && (- <Popover open={isCommentOpen} onOpenChange={setIsCommentOpen}>- <PopoverAnchor asChild>- <span className="pointer-events-none absolute inset-0" />- </PopoverAnchor>- {commentPopoverContent}- </Popover>- )}- <Popover modal open={isTagOpen} onOpenChange={setIsTagOpen}>- <PopoverAnchor asChild>- <span className="pointer-events-none absolute inset-0" />- </PopoverAnchor>- <PopoverContent- onCloseAutoFocus={(e) => e.preventDefault()}- onEscapeKeyDown={handleAnnotationEscapeKeyDown}- className="w-80"- align="end"- >- <SecretTagForm- secretKey={secretName}- secretPath={secretPath}- environment={environment}- tags={isBatchMode ? ((watchedTags as WsTag[]) ?? tags) : tags}- onClose={() => setIsTagOpen(false)}- isBatchMode={isBatchMode}- onTagsChange={handleTagsChange}- />- </PopoverContent>- </Popover>- <Sheet open={isReminderOpen} onOpenChange={setIsReminderOpen}>- <SheetContent className="flex h-full max-h-full flex-col gap-y-0">- <SheetHeader className="border-b">- <SheetTitle>{reminder ? "Edit Reminder" : "Add Reminder"}</SheetTitle>- <SheetDescription>- Notify the channels below when {secretName} in {environmentName} is due for- rotation.- </SheetDescription>- </SheetHeader>- {secretId && isReminderOpen && (- <SecretReminderForm- secretId={secretId}- secretKey={secretName}- secretPath={secretPath}- environment={environment}- reminder={reminder}- onClose={() => setIsReminderOpen(false)}- />- )}- </SheetContent>- </Sheet>- <Popover open={isMetadataOpen} onOpenChange={setIsMetadataOpen}>- <PopoverAnchor asChild>- <span className="pointer-events-none absolute inset-0" />- </PopoverAnchor>- <PopoverContent- onCloseAutoFocus={(e) => e.preventDefault()}- className="w-[500px]"- align="end"- >- <SecretMetadataForm- secretMetadata={- isBatchMode- ? ((watchedMetadata as {- key: string;- value: string;- isEncrypted?: boolean;- }[]) ?? secretMetadata)- : secretMetadata- }- secretKey={secretName}- secretPath={secretPath}- environment={environment}- onClose={() => setIsMetadataOpen(false)}- isBatchMode={isBatchMode}- onMetadataChange={handleMetadataChange}- />- </PopoverContent>- </Popover>{isPendingBatchChange && onPendingSave && (<ProjectPermissionCanI={@@ -1667,83 +1759,6 @@ export const SecretEditTableRow = ({<TooltipContent>Discard pending changes</TooltipContent></Tooltip>)}- {!isImportedSecret &&- !isCreatable &&- !isPendingDelete &&- !!(- (!isSingleEnvView && comment) ||- (canReadTags && tags?.length) ||- reminder ||- secretMetadata?.length- ) && (- <>- {!isSingleEnvView && comment && (- <Tooltip>- <TooltipTrigger asChild>- <IconButton- aria-label="View secret comment"- variant="ghost"- size="xs"- className="size-7 border-0"- onClick={() => setIsCommentOpen(true)}- >- <MessageSquareIcon className="size-3.5" />- </IconButton>- </TooltipTrigger>- <TooltipContent>View Comment</TooltipContent>- </Tooltip>- )}- {canReadTags && tags?.length ? (- <Tooltip>- <TooltipTrigger asChild>- <IconButton- aria-label="View secret tags"- variant="ghost"- size="xs"- className="size-7 border-0"- onClick={() => setIsTagOpen(true)}- >- <TagsIcon className="size-3.5" />- </IconButton>- </TooltipTrigger>- <TooltipContent>View Tags</TooltipContent>- </Tooltip>- ) : null}- {reminder && (- <Tooltip>- <TooltipTrigger asChild>- <IconButton- aria-label="View secret reminder"- variant="ghost"- size="xs"- className="size-7 border-0"- onClick={() => setIsReminderOpen(true)}- >- <BellIcon className="size-3.5" />- </IconButton>- </TooltipTrigger>- <TooltipContent>View Reminder</TooltipContent>- </Tooltip>- )}- {secretMetadata?.length ? (- <Tooltip>- <TooltipTrigger asChild>- <IconButton- aria-label="View secret metadata"- variant="ghost"- size="xs"- className="size-7 border-0"- onClick={() => setIsMetadataOpen(true)}- >- <CodeXmlIcon className="size-3.5" />- </IconButton>- </TooltipTrigger>- <TooltipContent>View Metadata</TooltipContent>- </Tooltip>- ) : null}- <div className="mx-0.5 h-4 w-px bg-border" />- </>- )}<Tooltip><TooltipTrigger asChild><span@@ -1762,7 +1777,7 @@ export const SecretEditTableRow = ({className="size-7 border-0"isDisabled={isEditValueDisabled}onClick={() => {- if (isSingleEnvView && !isCreatable && !isOverride) {+ if (!isCreatable && !isOverride) {handleOpenValueSheet();return;}@@ -1818,6 +1833,7 @@ export const SecretEditTableRow = ({: "Copy Secret"}</TooltipContent></Tooltip>+ {!isSingleEnvView && annotateMenu}<DropdownMenu open={isDropdownOpen} onOpenChange={setIsDropdownOpen}><Tooltip><TooltipTrigger asChild>@@ -1837,78 +1853,8 @@ export const SecretEditTableRow = ({<DropdownMenuContentalign="end"className="min-w-[200px] [&_[data-variant=default]]:text-foreground [&_svg:not([class*='size-'])]:!size-3"- onCloseAutoFocus={(e) => {- e.preventDefault();- if (pendingAnnotation === "comment") setIsCommentOpen(true);- else if (pendingAnnotation === "tags") setIsTagOpen(true);- else if (pendingAnnotation === "reminder") setIsReminderOpen(true);- else if (pendingAnnotation === "metadata") setIsMetadataOpen(true);- setPendingAnnotation(null);- }}+ onCloseAutoFocus={(e) => e.preventDefault()}>- <DropdownMenuSub>- <DropdownMenuSubTrigger- disabled={isPendingDelete || isCreatable || isImportedSecret}- className={twMerge(- "px-2.5 py-1.5",- (comment ||- (canReadTags && tags?.length) ||- reminder ||- secretMetadata?.length) &&- !isImportedSecret &&- "[&>svg:first-child]:text-project"- )}- >- <PencilLineIcon />- Annotate- </DropdownMenuSubTrigger>- <DropdownMenuSubContent className="min-w-[185px]">- <DropdownMenuItem- className="px-2.5 py-1.5"- onClick={() => setPendingAnnotation("comment")}- >- <MessageSquareIcon className={twMerge(comment && "text-project")} />- {comment ? "View Comment" : "Add Comment"}- </DropdownMenuItem>- <Tooltip open={!canReadTags ? undefined : false}>- <TooltipTrigger className="block w-full">- <DropdownMenuItem- className="px-2.5 py-1.5"- isDisabled={!canReadTags}- onClick={() => setPendingAnnotation("tags")}- >- <TagsIcon- className={twMerge(canReadTags && tags?.length && "text-project")}- />- {tags?.length ? "View Tags" : "Add Tags"}- </DropdownMenuItem>- </TooltipTrigger>- <TooltipContent side="left">Access Denied</TooltipContent>- </Tooltip>- <Tooltip open={!secretId || isPendingCreate ? undefined : false}>- <TooltipTrigger className="block w-full">- <DropdownMenuItem- className="px-2.5 py-1.5"- isDisabled={!secretId || isPendingCreate}- onClick={() => setPendingAnnotation("reminder")}- >- <BellIcon className={twMerge(reminder && "text-project")} />- {reminder ? "View Reminder" : "Add Reminder"}- </DropdownMenuItem>- </TooltipTrigger>- <TooltipContent side="left">Create Secret to Add Reminder</TooltipContent>- </Tooltip>- <DropdownMenuItem- className="px-2.5 py-1.5"- onClick={() => setPendingAnnotation("metadata")}- >- <CodeXmlIcon className={twMerge(secretMetadata?.length && "text-project")} />- {secretMetadata?.length ? "View Metadata" : "Add Metadata"}- </DropdownMenuItem>- </DropdownMenuSubContent>- </DropdownMenuSub>-- <div className="my-1" /><DropdownMenuLabel className="px-2.5 py-0.5 text-[10px]">Insights</DropdownMenuLabel><Tooltip open={!canReadSecretValue || !secretId || isEmpty ? undefined : false}><TooltipTrigger className="block w-full">@@ -2394,43 +2340,10 @@ export const SecretEditTableRow = ({}}><div className="flex min-w-0 items-center gap-2">- <Popover open={isCommentOpen} onOpenChange={setIsCommentOpen}>- <div className="flex min-w-0 flex-1 items-center gap-1.5">- {showCommentPreview ? (- nameInput- ) : (- <PopoverAnchor asChild>- <span className="inline-flex min-w-0">{nameInput}</span>- </PopoverAnchor>- )}- {showCommentPreview && (- <PopoverAnchor asChild>- <span className="inline-flex shrink-0">- <Tooltip open={isCommentOpen ? false : undefined}>- <TooltipTrigger asChild>- <IconButton- aria-label="View secret comment"- variant="ghost-muted"- size="2xs"- onClick={() => {- if (!isPendingDelete) setIsCommentOpen(true);- }}- >- <MessageSquareIcon />- </IconButton>- </TooltipTrigger>- <TooltipContent className="max-w-72">- <p className="line-clamp-2 break-words whitespace-pre-wrap">- {commentPreview}- </p>- </TooltipContent>- </Tooltip>- </span>- </PopoverAnchor>- )}- </div>- {commentPopoverContent}- </Popover>+ <div className="flex min-w-0 flex-1 items-center gap-1.5">+ <span className="inline-flex min-w-0">{nameInput}</span>+ {annotationSlot}+ </div><SecretLastEditedTime secret={lastEdited} field={timestampField} /></div></TableCell>@@ -2446,11 +2359,27 @@ export const SecretEditTableRow = ({}return (- <div- data-table-row-filter-contents- className="relative flex w-full flex-col gap-y-2 py-1.5 !filter-none"- >- {valueContent}- </div>+ <>+ <TableCell+ isTruncatable+ className={twMerge(+ TABLE_ROW_NAME_CELL_COLUMN_CLASS_NAME,+ isOverride && "border-l border-b-border/50 border-l-override"+ )}+ >+ <div className="flex h-8 min-w-0 items-center gap-2">+ {nameCellContent}+ {annotationSlot}+ </div>+ </TableCell>+ <TableCell colSpan={2} className={twMerge("max-w-0", isOverride && "border-b-border/50")}>+ <div+ data-table-row-filter-contents+ className="relative flex w-full flex-col gap-y-2 py-1.5 !filter-none"+ >+ {valueContent}+ </div>+ </TableCell>+ </>);};diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretMetadataForm.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretMetadataForm.tsxindex 3672ba185d..8274cb4382 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretMetadataForm.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretMetadataForm.tsx@@ -1,4 +1,4 @@-import { useEffect, useRef } from "react";+import { HTMLAttributes, useEffect, useRef } from "react";import { Controller, useFieldArray, useForm } from "react-hook-form";import { subject } from "@casl/ability";import { zodResolver } from "@hookform/resolvers/zod";@@ -25,6 +25,8 @@ import {import { useUpdateSecretV3 } from "@app/hooks/api";import { SecretType } from "@app/hooks/api/types";+import { AnnotationPopoverHeader } from "./AnnotationPopoverHeader";+const formSchema = (enforceEncryption?: boolean) =>z.object({metadata: z.array(@@ -46,6 +48,7 @@ type Props = {onClose?: () => void;isBatchMode?: boolean;onMetadataChange?: (metadata: { key: string; value: string; isEncrypted?: boolean }[]) => void;+ dragHandleProps?: HTMLAttributes<HTMLDivElement>;};export const SecretMetadataForm = ({@@ -55,7 +58,8 @@ export const SecretMetadataForm = ({secretPath,onClose,isBatchMode,- onMetadataChange+ onMetadataChange,+ dragHandleProps}: Props) => {const { projectId, currentProject } = useProject();const { mutateAsync: updateSecretV3, isPending } = useUpdateSecretV3();@@ -156,7 +160,7 @@ export const SecretMetadataForm = ({const metadataFields = (<><div>- <p className="text-sm font-medium">Metadata</p>+ <AnnotationPopoverHeader title="Metadata" dragHandleProps={dragHandleProps} /><p className="mt-1 text-xs text-accent">Encrypted Metadata will not be searchable via the UI or API.</p>diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTableRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTableRow.tsxindex 7d0aa7ce2f..60d690475b 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTableRow.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTableRow.tsx@@ -1,9 +1,11 @@-import { Fragment, useEffect, useState } from "react";+import { ComponentProps, Fragment, ReactNode, useCallback, useEffect, useState } from "react";import { subject } from "@casl/ability";import {BanIcon,+ BellIcon,ChevronDownIcon,ClipboardCheckIcon,+ CodeXmlIcon,CopyIcon,EditIcon,EyeIcon,@@ -12,8 +14,10 @@ import {HexagonIcon,ImportIcon,KeyIcon,+ MessageSquareIcon,RefreshCcwIcon,- RefreshCwIcon+ RefreshCwIcon,+ TagsIcon} from "lucide-react";import { twMerge } from "tailwind-merge";@@ -39,7 +43,7 @@ import {TooltipTrigger} from "@app/components/v3";import { HIDDEN_SECRET_VALUE } from "@app/const/secrets";-import { useProject, useProjectPermission } from "@app/context";+import { ProjectPermissionActions, useProject, useProjectPermission } from "@app/context";import {ProjectPermissionSecretActions,ProjectPermissionSub@@ -49,19 +53,21 @@ import { useUpdateSecretV3 } from "@app/hooks/api";import { PendingAction } from "@app/hooks/api/secretFolders/types";import { SecretType, SecretV3RawSanitized } from "@app/hooks/api/secrets/types";import { ProjectEnv } from "@app/hooks/api/types";+import { hasSecretReadValueOrDescribePermission } from "@app/lib/fn/permission";import { useOverviewTelemetry } from "../../OverviewTelemetry";import { pendingActionBorderClass, pendingActionRowClass } from "../pendingActionStyles";import { EnvironmentStatus, ResourceEnvironmentStatusCell } from "../ResourceEnvironmentStatusCell";import {- TABLE_ROW_ACTION_BAR_CLASS_NAME,- TABLE_ROW_ACTION_BUTTON_CLASS_NAME,+ TABLE_BODY_ROW_FILTER_CLASS_NAME,+ TABLE_BODY_ROW_FILTER_DIMMED_CLASS_NAME,+ TABLE_CELL_ACTION_BAR_CLASS_NAME,+ TABLE_CELL_ACTION_BUTTON_CLASS_NAME,TABLE_ROW_ACTIVE_FILTER_CLASS_NAME,- TABLE_ROW_NAME_CELL_COLUMN_CLASS_NAME,TABLE_ROW_NAME_COLUMN_CLASS_NAME} from "../tableRowActionStyles";import type { TableRowActivityChangeHandler, TableRowActivityId } from "../tableRowActivity";-import { SecretEditTableRow } from "./SecretEditTableRow";+import { EnvironmentSecretAction, SecretEditTableRow } from "./SecretEditTableRow";import { SecretOverrideRow } from "./SecretOverrideRow";import SecretRenameForm from "./SecretRenameForm";@@ -168,6 +174,26 @@ export const SecretTableRow = ({const [isSecNameCopied, setIsSecNameCopied] = useToggle(false);const [creatingOverrideEnvs, setCreatingOverrideEnvs] = useState<Set<string>>(new Set());const [expandedTableSort, setExpandedTableSort] = useState<ExpandedTableSort | null>(null);+ const [activeEnvSlugs, setActiveEnvSlugs] = useState<Set<string>>(new Set());+ const [pendingEnvAction, setPendingEnvAction] = useState<{+ slug: string;+ action: EnvironmentSecretAction;+ } | null>(null);+ const clearPendingEnvAction = useCallback(() => setPendingEnvAction(null), []);++ const openEnvironment = (slug: string, action: EnvironmentSecretAction) => {+ setPendingEnvAction({ slug, action });+ if (!isExpanded) onToggleExpand(secretKey);+ };++ const setEnvActive = (slug: string, isActive: boolean) =>+ setActiveEnvSlugs((prev) => {+ if (prev.has(slug) === isActive) return prev;+ const next = new Set(prev);+ if (isActive) next.add(slug);+ else next.delete(slug);+ return next;+ });const isSingleEnvView = environments.length === 1;const isRowActive = isSingleEnvView@@ -295,6 +321,134 @@ export const SecretTableRow = ({const sortedEnvironments = [...environments];+ const canReadTags = permission.can(ProjectPermissionActions.Read, ProjectPermissionSub.Tags);+ const renderEnvironmentAnnotations = (slug: string) => {+ const secret = getSecretByKey(slug, secretKey);+ if (!secret) return null;+ const canDescribeSecret = hasSecretReadValueOrDescribePermission(+ permission,+ ProjectPermissionSecretActions.DescribeSecret,+ {+ environment: slug,+ secretPath,+ secretName: secretKey,+ secretTags: secret.tags?.map(({ slug: tagSlug }) => tagSlug) ?? []+ }+ );+ const comment =+ canDescribeSecret && !secret.revokedProjectFolderGrant ? secret.comment : undefined;+ const tagSlugs = canReadTags ? (secret.tags?.map(({ slug: tagSlug }) => tagSlug) ?? []) : [];+ const metadataCount = secret.secretMetadata?.length ?? 0;+ const annotations = [+ comment && {+ action: "comment" as const,+ label: "View secret comment",+ icon: <MessageSquareIcon />,+ tooltip: <p className="line-clamp-2 break-words whitespace-pre-wrap">{comment}</p>+ },+ tagSlugs.length > 0 && {+ action: "tags" as const,+ label: "View secret tags",+ icon: <TagsIcon />,+ tooltip: tagSlugs.join(", ")+ },+ secret.reminder && {+ action: "reminder" as const,+ label: "View secret reminder",+ icon: <BellIcon />,+ tooltip: "Rotation reminder"+ },+ metadataCount > 0 && {+ action: "metadata" as const,+ label: "View secret metadata",+ icon: <CodeXmlIcon />,+ tooltip: `${metadataCount} metadata ${metadataCount === 1 ? "entry" : "entries"}`+ }+ ].filter((annotation) => Boolean(annotation)) as {+ action: EnvironmentSecretAction;+ label: string;+ icon: ReactNode;+ tooltip: ReactNode;+ }[];+ if (!annotations.length) return null;++ return (+ <span className="flex shrink-0 items-center gap-0.5">+ {annotations.map(({ action, label, icon, tooltip }) => (+ <Tooltip key={action}>+ <TooltipTrigger asChild>+ <IconButton+ aria-label={label}+ variant="ghost-muted"+ size="2xs"+ onClick={() => openEnvironment(slug, action)}+ >+ {icon}+ </IconButton>+ </TooltipTrigger>+ <TooltipContent className="max-w-72 break-words">{tooltip}</TooltipContent>+ </Tooltip>+ ))}+ </span>+ );+ };++ const getEnvironmentSecretRowProps = (+ slug: string,+ name: string+ ): ComponentProps<typeof SecretEditTableRow> => {+ const secret = getSecretByKey(slug, secretKey);+ const isCreatable = !secret;+ const isImportedSecret = isImportedSecretPresentInEnv(slug, secretKey);+ const importedSecret = getImportedSecretByKey(slug, secretKey);++ return {+ secretPath,+ secretName: secretKey,+ isEmpty: secret ? secret.isEmpty : importedSecret?.secret?.isEmpty,+ secretValueHidden: secret?.secretValueHidden || false,+ defaultValue: getDefaultValue(secret, importedSecret),+ secretId: secret?.id,+ isOverride: Boolean(secret?.idOverride),+ isImportedSecret,+ importedSecret,+ isCreatable,+ onSecretDelete,+ onSecretCreate,+ onSecretUpdate,+ onAddOverride: () => {+ setCreatingOverrideEnvs((prev) => new Set([...prev, slug]));+ if (!isExpanded) onToggleExpand(secretKey);+ },+ environment: slug,+ environmentName: name,+ isRotatedSecret: secret?.isRotatedSecret,+ isHoneyTokenSecret: secret?.isHoneyTokenSecret,+ importedBy,+ isSecretPresent: Boolean(secret),+ comment: secret?.comment,+ tags: secret?.tags,+ secretMetadata: secret?.secretMetadata,+ skipMultilineEncoding: secret?.skipMultilineEncoding,+ reminder: secret?.reminder,+ revokedProjectFolderGrant: secret?.revokedProjectFolderGrant,+ onCopySecret: secret?.id+ ? () =>+ onCopySecret?.({+ source: {+ id: secret.id,+ name: secretKey,+ path: secret.path ?? secretPath,+ isValueHidden: secret.secretValueHidden+ },+ environmentSlug: slug+ })+ : undefined,+ onAccessInsightsUpgrade,+ onExpandedChange: (isActive) => setEnvActive(slug, isActive)+ };+ };+if (expandedTableSort) {sortedEnvironments.sort((a, b) => {const comparison = a.name.localeCompare(b.name);@@ -439,7 +593,7 @@ export const SecretTableRow = ({isTruncatable={!isExpanded}colSpan={isExpanded ? totalCols : undefined}className={twMerge(- "sticky left-10 z-10 border-r bg-container transition-colors duration-75 group-hover:bg-container-hover",+ "group/cell sticky left-10 z-10 border-r bg-container transition-colors duration-75 group-hover:bg-container-hover",isExpanded && "relative left-auto border-r-0 border-b-0 bg-container-hover !p-0")}>@@ -490,7 +644,7 @@ export const SecretTableRow = ({className={twMerge("absolute z-20","flex items-center rounded-md border border-border bg-container-hover px-0.5 py-0.5 shadow-md",- TABLE_ROW_ACTION_BAR_CLASS_NAME,+ TABLE_CELL_ACTION_BAR_CLASS_NAME,"top-1/2 right-[3px] -translate-y-1/2")}>@@ -505,7 +659,7 @@ export const SecretTableRow = ({e.stopPropagation();copyTokenToClipboard();}}- className={TABLE_ROW_ACTION_BUTTON_CLASS_NAME}+ className={TABLE_CELL_ACTION_BUTTON_CLASS_NAME}>{isSecNameCopied ? <ClipboardCheckIcon /> : <CopyIcon />}</IconButton>@@ -522,7 +676,7 @@ export const SecretTableRow = ({setIsEditSecretNameOpen(true);e.stopPropagation();}}- className={TABLE_ROW_ACTION_BUTTON_CLASS_NAME}+ className={TABLE_CELL_ACTION_BUTTON_CLASS_NAME}><EditIcon /></IconButton>@@ -561,7 +715,16 @@ export const SecretTableRow = ({key={`sec-overview-${slug}-${i + 1}-value`}status={status}hasOverride={Boolean(secret?.idOverride)}- />+ className="group/cell cursor-pointer"+ onClick={(event) => {+ event.stopPropagation();+ const target = event.target as HTMLElement;+ if (!event.currentTarget.contains(target) || target.closest("button")) return;+ openEnvironment(slug, "value");+ }}+ >+ {renderEnvironmentAnnotations(slug)}+ </ResourceEnvironmentStatusCell>);})}</TableRow>@@ -689,10 +852,14 @@ export const SecretTableRow = ({</TableHead></TableRow></TableHeader>- <TableBody>+ <TableBody+ className={twMerge(+ TABLE_BODY_ROW_FILTER_CLASS_NAME,+ activeEnvSlugs.size > 0 && TABLE_BODY_ROW_FILTER_DIMMED_CLASS_NAME+ )}+ >{sortedEnvironments.map(({ name, slug }) => {const secret = getSecretByKey(slug, secretKey);- const isCreatable = !secret;const isImportedSecret = isImportedSecretPresentInEnv(slug, secretKey);const importedSecret = getImportedSecretByKey(slug, secretKey);@@ -703,7 +870,12 @@ export const SecretTableRow = ({return (<Fragment key={`secret-expanded-${slug}-${secretKey}`}>- <TableRow className="group hover:z-10">+ <TableRow+ className={twMerge(+ "group hover:z-10",+ activeEnvSlugs.has(slug) && TABLE_ROW_ACTIVE_FILTER_CLASS_NAME+ )}+ ><TableCellaria-hidden="true"className={twMerge(@@ -711,102 +883,53 @@ export const SecretTableRow = ({hasOverride && "border-b-border/50")}/>- <TableCell- isTruncatable- className={twMerge(- TABLE_ROW_NAME_CELL_COLUMN_CLASS_NAME,- hasOverride && "border-l border-b-border/50 border-l-override"- )}- >- <div className="flex h-8 items-center space-x-2">- <Tooltip>- <TooltipTrigger asChild>- <span className="truncate">{name}</span>- </TooltipTrigger>- <TooltipContent side="right" className="max-w-2xl break-all">- {name}- </TooltipContent>- </Tooltip>- {isImportedSecret && (+ <SecretEditTableRow+ nameCellContent={+ <><Tooltip><TooltipTrigger asChild>- <ImportIcon className="size-4 text-import" />+ <span className="truncate">{name}</span></TooltipTrigger>- <TooltipContent>- Imported from {importedSecret?.environmentInfo?.name}{" "}- environment+ <TooltipContent side="right" className="max-w-2xl break-all">+ {name}</TooltipContent></Tooltip>- )}- {secret?.isRotatedSecret && (- <Tooltip>- <TooltipTrigger asChild>- <RefreshCcwIcon className="size-4 text-secret-rotation" />- </TooltipTrigger>- <TooltipContent>Rotated secret</TooltipContent>- </Tooltip>- )}- {secret?.isHoneyTokenSecret && (- <Tooltip>- <TooltipTrigger asChild>- <HexagonIcon className="size-4 text-warning" />- </TooltipTrigger>- <TooltipContent>Honey Token secret</TooltipContent>- </Tooltip>- )}- </div>- </TableCell>- <TableCell- colSpan={2}- className={twMerge("max-w-0", hasOverride && "border-b-border/50")}- >- <SecretEditTableRow- secretPath={secretPath}- isVisible={isSecretVisible}- secretName={secretKey}- isEmpty={secret ? secret.isEmpty : importedSecret?.secret?.isEmpty}- secretValueHidden={secret?.secretValueHidden || false}- defaultValue={getDefaultValue(secret, importedSecret)}- secretId={secret?.id}- isOverride={Boolean(secret?.idOverride)}- isImportedSecret={isImportedSecret}- importedSecret={importedSecret}- isCreatable={isCreatable}- onSecretDelete={onSecretDelete}- onSecretCreate={onSecretCreate}- onSecretUpdate={onSecretUpdate}- onAddOverride={() => {- setCreatingOverrideEnvs((prev) => new Set([...prev, slug]));- }}- environment={slug}- environmentName={name}- isRotatedSecret={secret?.isRotatedSecret}- isHoneyTokenSecret={secret?.isHoneyTokenSecret}- importedBy={importedBy}- isSecretPresent={Boolean(secret)}- comment={secret?.comment}- tags={secret?.tags}- secretMetadata={secret?.secretMetadata}- skipMultilineEncoding={secret?.skipMultilineEncoding}- reminder={secret?.reminder}- revokedProjectFolderGrant={secret?.revokedProjectFolderGrant}- onCopySecret={- secret?.id- ? () =>- onCopySecret?.({- source: {- id: secret.id,- name: secretKey,- path: secret.path ?? secretPath,- isValueHidden: secret.secretValueHidden- },- environmentSlug: slug- })- : undefined- }- onAccessInsightsUpgrade={onAccessInsightsUpgrade}- />- </TableCell>+ {isImportedSecret && (+ <Tooltip>+ <TooltipTrigger asChild>+ <ImportIcon className="size-4 text-import" />+ </TooltipTrigger>+ <TooltipContent>+ Imported from {importedSecret?.environmentInfo?.name}{" "}+ environment+ </TooltipContent>+ </Tooltip>+ )}+ {secret?.isRotatedSecret && (+ <Tooltip>+ <TooltipTrigger asChild>+ <RefreshCcwIcon className="size-4 text-secret-rotation" />+ </TooltipTrigger>+ <TooltipContent>Rotated secret</TooltipContent>+ </Tooltip>+ )}+ {secret?.isHoneyTokenSecret && (+ <Tooltip>+ <TooltipTrigger asChild>+ <HexagonIcon className="size-4 text-warning" />+ </TooltipTrigger>+ <TooltipContent>Honey Token secret</TooltipContent>+ </Tooltip>+ )}+ </>+ }+ isVisible={isSecretVisible}+ initialAction={+ pendingEnvAction?.slug === slug ? pendingEnvAction.action : undefined+ }+ onInitialActionHandled={clearPendingEnvAction}+ {...getEnvironmentSecretRowProps(slug, name)}+ /></TableRow>{showOverrideRow && (<TableRowdiff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTagForm.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTagForm.tsxindex 35ee875825..88e8fe27a1 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTagForm.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretTagForm.tsx@@ -1,4 +1,4 @@-import { useEffect, useRef } from "react";+import { HTMLAttributes, useEffect, useRef } from "react";import { Controller, useForm } from "react-hook-form";import { subject } from "@casl/ability";import { zodResolver } from "@hookform/resolvers/zod";@@ -17,6 +17,8 @@ import { useCreateWsTag, useGetWsTags, useUpdateSecretV3 } from "@app/hooks/api"import { SecretType, WsTag } from "@app/hooks/api/types";import { slugSchema } from "@app/lib/schemas";+import { AnnotationPopoverHeader } from "./AnnotationPopoverHeader";+const formSchema = z.object({tags: z.array(z.object({ label: z.string(), value: z.string() })).default([])});@@ -31,6 +33,7 @@ type Props = {onClose?: () => void;isBatchMode?: boolean;onTagsChange?: (tags: { id: string; slug: string }[]) => void;+ dragHandleProps?: HTMLAttributes<HTMLDivElement>;};export const SecretTagForm = ({@@ -40,7 +43,8 @@ export const SecretTagForm = ({secretPath,onClose,isBatchMode,- onTagsChange+ onTagsChange,+ dragHandleProps}: Props) => {const { projectId } = useProject();const { mutateAsync: updateSecretV3, isPending } = useUpdateSecretV3();@@ -137,7 +141,7 @@ export const SecretTagForm = ({if (isBatchMode) {return (<div className="space-y-3">- <p className="text-sm font-medium">Tags</p>+ <AnnotationPopoverHeader title="Tags" dragHandleProps={dragHandleProps} /><Controllername="tags"control={control}@@ -183,7 +187,7 @@ export const SecretTagForm = ({return (<form onSubmit={handleSubmit(onSubmit)} className="space-y-3">- <p className="text-sm font-medium">Tags</p>+ <AnnotationPopoverHeader title="Tags" dragHandleProps={dragHandleProps} /><Controllername="tags"control={control}diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/useDraggablePopover.ts b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/useDraggablePopover.tsnew file mode 100644index 0000000000..8dbc5f38b6--- /dev/null+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/useDraggablePopover.ts@@ -0,0 +1,74 @@+import { HTMLAttributes, useLayoutEffect, useRef, useState } from "react";++type PopoverSide = "top" | "right" | "bottom" | "left";++export const useDraggablePopover = (isOpen: boolean) => {+ const [offset, setOffset] = useState({ x: 0, y: 0 });+ const [side, setSide] = useState<PopoverSide>();+ const dragStart = useRef<{ pointerX: number; pointerY: number; x: number; y: number }>(undefined);++ useLayoutEffect(() => {+ dragStart.current = undefined;+ if (!isOpen) return;+ setOffset({ x: 0, y: 0 });+ setSide(undefined);+ }, [isOpen]);++ // Radix re-flips a popover that nears a viewport edge; pinning the side it opened on keeps a dragged popover from jumping.+ const lockSide = (handle: HTMLElement) => {+ if (side) return;+ const openedSide = handle.closest("[data-side]")?.getAttribute("data-side");+ setSide(+ openedSide === "top" || openedSide === "left" || openedSide === "right"+ ? openedSide+ : "bottom"+ );+ };++ const dragHandleProps: HTMLAttributes<HTMLDivElement> = {+ onPointerDown: (e) => {+ if (e.button !== 0) return;+ e.preventDefault();+ e.currentTarget.setPointerCapture(e.pointerId);+ lockSide(e.currentTarget);+ dragStart.current = { pointerX: e.clientX, pointerY: e.clientY, ...offset };+ },+ onPointerMove: (e) => {+ const start = dragStart.current;+ if (!start) return;+ setOffset({+ x: start.x + e.clientX - start.pointerX,+ y: start.y + e.clientY - start.pointerY+ });+ },+ onPointerUp: () => {+ dragStart.current = undefined;+ },+ onLostPointerCapture: () => {+ dragStart.current = undefined;+ },+ onKeyDown: (e) => {+ const step = e.shiftKey ? 64 : 16;+ const deltas: Record<string, { x: number; y: number } | undefined> = {+ ArrowLeft: { x: -step, y: 0 },+ ArrowRight: { x: step, y: 0 },+ ArrowUp: { x: 0, y: -step },+ ArrowDown: { x: 0, y: step }+ };+ const delta = deltas[e.key];+ if (!delta) return;+ e.preventDefault();+ lockSide(e.currentTarget);+ setOffset((prev) => ({ x: prev.x + delta.x, y: prev.y + delta.y }));+ }+ };++ return {+ popoverContentProps: {+ side: side ?? ("bottom" as const),+ avoidCollisions: !side,+ style: { translate: `${offset.x}px ${offset.y}px` }+ },+ dragHandleProps+ };+};diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/tableRowActionStyles.ts b/frontend/src/pages/secret-manager/OverviewPage/components/tableRowActionStyles.tsindex edd57722b1..cacaea894e 100644--- a/frontend/src/pages/secret-manager/OverviewPage/components/tableRowActionStyles.ts+++ b/frontend/src/pages/secret-manager/OverviewPage/components/tableRowActionStyles.ts@@ -32,3 +32,17 @@ export const TABLE_ROW_NAME_COLUMN_CLASS_NAME =export const TABLE_ROW_NAME_HEADER_COLUMN_CLASS_NAME = `${TABLE_ROW_NAME_COLUMN_CLASS_NAME} pl-1`;export const TABLE_ROW_NAME_CELL_COLUMN_CLASS_NAME = TABLE_ROW_NAME_HEADER_COLUMN_CLASS_NAME;++export const TABLE_BODY_ROW_FILTER_CLASS_NAME =+ "[&>tr>td>*:not([data-table-row-filter-contents])]:transition-[filter] [&>tr>td>*:not([data-table-row-filter-contents])]:duration-200 motion-reduce:[&>tr>td>*:not([data-table-row-filter-contents])]:transition-none [&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:transition-[filter] [&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:duration-200 motion-reduce:[&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:transition-none [&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:transition-[filter] [&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:duration-200 motion-reduce:[&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:transition-none [@media(hover:hover)]:[&>tr:hover>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:!filter-none";++export const TABLE_BODY_ROW_FILTER_DIMMED_CLASS_NAME =+ "[&>tr>td>*:not([data-table-row-filter-contents])]:filter-[opacity(40%)] [&>tr>td>[data-table-row-filter-contents]>*:not([data-table-row-filter-positioner])]:filter-[opacity(40%)] [&>tr>td>[data-table-row-filter-contents]>[data-table-row-filter-positioner]>*]:filter-[opacity(40%)]";++export const TABLE_CELL_ACTION_BAR_VISIBILITY_CLASS_NAME =+ "pointer-events-auto opacity-100 transition-all duration-300 motion-reduce:transition-none [@media(hover:hover)]:pointer-events-none [@media(hover:hover)]:opacity-0 [@media(hover:hover)]:group-hover/cell:pointer-events-auto [@media(hover:hover)]:group-hover/cell:opacity-100 [@media(hover:hover)]:group-focus-within/cell:pointer-events-auto [@media(hover:hover)]:group-focus-within/cell:opacity-100";++export const TABLE_CELL_ACTION_BAR_CLASS_NAME = `${TABLE_CELL_ACTION_BAR_VISIBILITY_CLASS_NAME} gap-1 [@media(hover:hover)]:gap-0 [@media(hover:hover)]:group-hover/cell:gap-1 [@media(hover:hover)]:group-focus-within/cell:gap-1`;++export const TABLE_CELL_ACTION_BUTTON_CLASS_NAME =+ "overflow-hidden border-0 transition-all duration-300 motion-reduce:transition-none [@media(hover:hover)]:w-0 [@media(hover:hover)]:group-hover/cell:w-7 [@media(hover:hover)]:group-focus-within/cell:w-7";