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
fix message on badge
adilsona8f8de3d2ff4
diff --git a/frontend/src/hooks/api/accessApproval/mutation.tsx b/frontend/src/hooks/api/accessApproval/mutation.tsxindex f23f8f781d..93ac3f680a 100644--- a/frontend/src/hooks/api/accessApproval/mutation.tsx+++ b/frontend/src/hooks/api/accessApproval/mutation.tsx@@ -6,6 +6,7 @@ import { apiRequest } from "@app/config/request";import { DelegatedApprovalRequestStatus } from "../delegatedApprovals/enums";import { ApiErrorTypes } from "../types";import { accessApprovalKeys } from "./queries";+import { markDelegatedDispatchRetry } from "./retrying-delegated-dispatch";import {TAccessApproval,TAccessApprovalRequest,@@ -212,6 +213,7 @@ export const useRetryDelegatedApprovalDispatch = () => {return data;},onSuccess: (_, { requestId, projectSlug }) => {+ markDelegatedDispatchRetry(requestId);queryClient.setQueriesData<TAccessApprovalRequest[]>({ queryKey: accessApprovalKeys.getAccessApprovalRequestsAllForProject(projectSlug) },(requests) =>diff --git a/frontend/src/hooks/api/accessApproval/queries.tsx b/frontend/src/hooks/api/accessApproval/queries.tsxindex ad31439247..757c50da5a 100644--- a/frontend/src/hooks/api/accessApproval/queries.tsx+++ b/frontend/src/hooks/api/accessApproval/queries.tsx@@ -6,6 +6,7 @@ import { TReactQueryOptions } from "@app/types/reactQuery";import { DelegatedApprovalRequestStatus } from "../delegatedApprovals/enums";import { TProjectPermission } from "../roles/types";+import { hasDelegatedDispatchRetries } from "./retrying-delegated-dispatch";import {TAccessApprovalPolicy,TAccessApprovalRequest,@@ -141,6 +142,7 @@ export const useGetAccessApprovalRequests = ({refetchInterval:options?.refetchInterval ??((query) =>+ hasDelegatedDispatchRetries() ||query.state.data?.some((request) =>request.delegatedApproval?.status === DelegatedApprovalRequestStatus.PendingDispatchdiff --git a/frontend/src/hooks/api/accessApproval/retrying-delegated-dispatch.ts b/frontend/src/hooks/api/accessApproval/retrying-delegated-dispatch.tsnew file mode 100644index 0000000000..8595b6f318--- /dev/null+++ b/frontend/src/hooks/api/accessApproval/retrying-delegated-dispatch.ts@@ -0,0 +1,82 @@+import { useSyncExternalStore } from "react";++import { DelegatedApprovalRequestStatus } from "../delegatedApprovals/enums";++type RetryPhase = "awaiting-dispatch" | "dispatching";++const retries = new Map<string, RetryPhase>();+const listeners = new Set<() => void>();+let version = 0;++const emit = () => {+ version += 1;+ listeners.forEach((listener) => listener());+};++const subscribe = (listener: () => void) => {+ listeners.add(listener);+ return () => {+ listeners.delete(listener);+ };+};++export const markDelegatedDispatchRetry = (requestId: string) => {+ retries.set(requestId, "awaiting-dispatch");+ emit();+};++export const isDelegatedDispatchRetrying = (requestId: string) => retries.has(requestId);++export const hasDelegatedDispatchRetries = () => retries.size > 0;++// A refetch can still return failed_dispatch until the consumer starts. That row is the+// failure the user just retried, so it must not clear the in-flight label.+export const noteDelegatedDispatchRetryStatuses = (+ requests: { id: string; status?: DelegatedApprovalRequestStatus | null }[]+) => {+ let changed = false;++ requests.forEach(({ id, status }) => {+ const phase = retries.get(id);+ if (!phase) return;++ if (!status) {+ retries.delete(id);+ changed = true;+ return;+ }++ if (phase === "awaiting-dispatch") {+ if (status === DelegatedApprovalRequestStatus.PendingDispatch) {+ retries.set(id, "dispatching");+ return;+ }+ if (status === DelegatedApprovalRequestStatus.FailedDispatch) return;++ retries.delete(id);+ changed = true;+ return;+ }++ if (status !== DelegatedApprovalRequestStatus.PendingDispatch) {+ retries.delete(id);+ changed = true;+ }+ });++ if (changed) emit();+};++export const useDelegatedDispatchRetryVersion = () =>+ useSyncExternalStore(+ subscribe,+ () => version,+ () => 0+ );++export const useIsDelegatedDispatchRetrying = (requestId: string) =>+ useSyncExternalStore(+ subscribe,+ () => retries.has(requestId),+ () => false+ );diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsxindex d4ff0aeb2c..01f3d2cc6a 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx@@ -1,6 +1,6 @@/* eslint-disable no-nested-ternary *//* eslint-disable react/jsx-no-useless-fragment */-import { useCallback, useEffect, useMemo, useState } from "react";+import { useCallback, useEffect, useMemo, useRef, useState } from "react";import { useNavigate, useSearch } from "@tanstack/react-router";import { format, formatDistance } from "date-fns";import {@@ -91,6 +91,11 @@ import {useGetAccessApprovalRequests,useGetAccessRequestsCount} from "@app/hooks/api/accessApproval/queries";+import {+ isDelegatedDispatchRetrying,+ noteDelegatedDispatchRetryStatuses,+ useDelegatedDispatchRetryVersion+} from "@app/hooks/api/accessApproval/retrying-delegated-dispatch";import { TAccessApprovalRequest } from "@app/hooks/api/accessApproval/types";import {DelegatedApprovalRequestStatus,@@ -236,12 +241,31 @@ export const AccessApprovalRequest = ({const {data: requests,refetch: refetchRequests,- isPending: areRequestsPending+ isPending: areRequestsPending,+ isFetching: areRequestsFetching} = useGetAccessApprovalRequests({projectSlug,authorUserId: validRequestedByFilter,envSlug: validEnvFilter});+ useDelegatedDispatchRetryVersion();+ const requestsCameFromFetch = useRef(false);++ useEffect(() => {+ if (areRequestsFetching) {+ requestsCameFromFetch.current = true;+ return;+ }+ if (!requestsCameFromFetch.current || !requests) return;++ requestsCameFromFetch.current = false;+ noteDelegatedDispatchRetryStatuses(+ requests.map((request) => ({+ id: request.id,+ status: request.delegatedApproval?.status+ }))+ );+ }, [areRequestsFetching, requests]);const { data: delegatedApprovalOptions } = useDelegatedApprovalOptions({enabled: Boolean(requests?.some((request) => request.delegatedApproval))@@ -477,6 +501,13 @@ export const AccessApprovalRequest = ({type: "danger",icon: ShieldBanIcon};+ else if (isDelegatedDispatchRetrying(request.id))+ displayData = {+ label: "Retrying",+ type: "info",+ icon: RefreshCwIcon,+ isIconSpinning: true+ };else if (request.delegatedApproval?.status === DelegatedApprovalRequestStatus.FailedDispatch)displayData = {label: "Not Submitted",@@ -491,7 +522,7 @@ export const AccessApprovalRequest = ({displayData =request.delegatedApproval.status === DelegatedApprovalRequestStatus.PendingDispatch? {- label: "Retrying",+ label: "Submitting",type: "info",icon: RefreshCwIcon,isIconSpinning: truediff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsxindex 197b74118e..ee4fb93f21 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx@@ -89,6 +89,7 @@ import {useReviewAccessRequest,useRevokeAccessRequest} from "@app/hooks/api";+import { useIsDelegatedDispatchRetrying } from "@app/hooks/api/accessApproval/retrying-delegated-dispatch";import {Approver,ApproverType,@@ -214,6 +215,11 @@ const DELEGATED_STATUS_PRESENTATION: Record<}};+const RETRYING_DELEGATED_STATUS = {+ variant: "warning" as const,+ getMessage: (name: string) => `Retrying the submission to ${name}.`+};+export const ReviewAccessRequestModal = ({isOpen,onOpenChange,@@ -258,9 +264,18 @@ export const ReviewAccessRequestModal = ({delegatedApprovalOptions?.find((option) => option.type === request.policy.delegatedApproval?.type)?.name ?? "the external approval system";- const delegatedStatus = request.delegatedApproval- ? DELEGATED_STATUS_PRESENTATION[request.delegatedApproval.status]- : undefined;+ const isRetryingDelegatedDispatch = useIsDelegatedDispatchRetrying(request.id);+ let delegatedStatus:+ | {+ variant: "warning" | "danger" | "success";+ getMessage: (delegatedApprovalName: string) => string;+ }+ | undefined;+ if (isRetryingDelegatedDispatch) {+ delegatedStatus = RETRYING_DELEGATED_STATUS;+ } else if (request.delegatedApproval) {+ delegatedStatus = DELEGATED_STATUS_PRESENTATION[request.delegatedApproval.status];+ }const assignPrivilegesConditions = useMemo(() => getMemberAssignPrivilegesConditions(permission),@@ -530,6 +545,7 @@ export const ReviewAccessRequestModal = ({!request.policy.deletedAt;const canRetryDispatch =+ !isRetryingDelegatedDispatch &&isDelegatedPending &&request.delegatedApproval?.status === DelegatedApprovalRequestStatus.FailedDispatch &&(request.isRequestedByCurrentUser ||@@ -1053,11 +1069,12 @@ export const ReviewAccessRequestModal = ({<span className="text-sm text-foreground">{delegatedStatus.getMessage(delegatedApprovalName)}</span>- {request.delegatedApproval?.statusReason && (- <span className="text-xs break-words text-muted">- {request.delegatedApproval.statusReason}- </span>- )}+ {!isRetryingDelegatedDispatch &&+ request.delegatedApproval?.statusReason && (+ <span className="text-xs break-words text-muted">+ {request.delegatedApproval.statusReason}+ </span>+ )}</ItemContent><ItemActions className="shrink-0 items-center gap-3"><span className="text-xs whitespace-nowrap text-muted">