diff --git a/frontend/src/hooks/api/secretApprovalRequest/types.ts b/frontend/src/hooks/api/secretApprovalRequest/types.ts index 588197261..caf1df320 100644 --- a/frontend/src/hooks/api/secretApprovalRequest/types.ts +++ b/frontend/src/hooks/api/secretApprovalRequest/types.ts @@ -43,6 +43,7 @@ export type TSecretApprovalRequest = { isReplicated?: boolean; slug: string; createdAt: string; + updatedAt: string; committerUserId: string; reviewers: { userId: string; diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx index 360ab6e62..46b611328 100644 --- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx +++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/SecretApprovalRequest.tsx @@ -6,16 +6,19 @@ import { faCheckCircle, faChevronDown, faCodeBranch, + faCodeMerge, faMagnifyingGlass, - faSearch + faSearch, + faXmark } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { useSearch } from "@tanstack/react-router"; -import { formatDistance } from "date-fns"; +import { format, formatDistance } from "date-fns"; import { AnimatePresence, motion } from "framer-motion"; import { twMerge } from "tailwind-merge"; import { + Badge, Button, DropdownMenu, DropdownMenuContent, @@ -25,7 +28,8 @@ import { EmptyState, Input, Pagination, - Skeleton + Skeleton, + Tooltip } from "@app/components/v2"; import { ROUTE_PATHS } from "@app/const/routes"; import { @@ -308,7 +312,9 @@ export const SecretApprovalRequest = () => { createdAt, reviewers, status, - committerUser + committerUser, + hasMerged, + updatedAt } = secretApproval; const isReviewed = reviewers.some( ({ status: reviewStatus, userId }) => @@ -317,7 +323,7 @@ export const SecretApprovalRequest = () => { return (