Skip to content

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

fix: update project folder grant usage tracking and UI components

Victor Hugo dos Santoscbd5ee0fa4a8
diff --git a/frontend/src/hooks/api/projectFolderGrants/queries.tsx b/frontend/src/hooks/api/projectFolderGrants/queries.tsx
index 6f7fdc89d6..95162996f9 100644
--- a/frontend/src/hooks/api/projectFolderGrants/queries.tsx
+++ b/frontend/src/hooks/api/projectFolderGrants/queries.tsx
@@ -63,7 +63,9 @@ export const useGetProjectFolderGrantUsage = (
useQuery({
queryKey: projectFolderGrantKeys.usage(grantId, sourceProjectId),
queryFn: () => fetchProjectFolderGrantUsage(grantId, sourceProjectId),
- enabled: Boolean(grantId) && Boolean(sourceProjectId) && enabled
+ enabled: Boolean(grantId) && Boolean(sourceProjectId) && enabled,
+ staleTime: 0,
+ gcTime: 0
});
export const useGetProjectFolderGrantsUsageTotal = (
@@ -75,10 +77,12 @@ export const useGetProjectFolderGrantsUsageTotal = (
queries: grantIds.map((grantId) => ({
queryKey: projectFolderGrantKeys.usage(grantId, sourceProjectId),
queryFn: () => fetchProjectFolderGrantUsage(grantId, sourceProjectId),
- enabled: Boolean(sourceProjectId) && enabled
+ enabled: Boolean(sourceProjectId) && enabled,
+ staleTime: 0,
+ gcTime: 0
})),
combine: (results) => ({
- isPending: results.some((r) => r.isPending),
+ isChecking: results.some((r) => r.isPending || r.isFetching),
isError: results.some((r) => r.isError),
total: results.reduce(
(sum, r) => sum + (r.data?.importCount ?? 0) + (r.data?.referenceCount ?? 0),
diff --git a/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/ProductSettingsPage.tsx b/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/ProductSettingsPage.tsx
index abfd059678..c2a767fe1b 100644
--- a/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/ProductSettingsPage.tsx
+++ b/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/ProductSettingsPage.tsx
@@ -179,7 +179,7 @@ export const ProductSettingsPage = () => {
<AlertDialog open={isDisableSharingConfirmOpen} onOpenChange={setIsDisableSharingConfirmOpen}>
<AlertDialogContent>
<AlertDialogHeader>
- <AlertDialogTitle>Disable cross-project secret sharing?</AlertDialogTitle>
+ <AlertDialogTitle>Disable Cross-Project Secret Sharing?</AlertDialogTitle>
<AlertDialogDescription>
Projects in this organization will no longer be able to share secrets with each other.
</AlertDialogDescription>
diff --git a/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/CrossProjectSharingSection.tsx b/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/CrossProjectSharingSection.tsx
index 124711dcef..63cd30ed9e 100644
--- a/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/CrossProjectSharingSection.tsx
+++ b/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/CrossProjectSharingSection.tsx
@@ -201,7 +201,7 @@ const DeleteProjectGrantsDialog = ({
variant="danger"
onClick={handleConfirmDelete}
isPending={isDeleting}
- disabled={!isConfirmed || usage.isPending}
+ disabled={!isConfirmed || usage.isChecking}
>
Remove
</AlertDialogAction>
diff --git a/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/GrantRevocationImpact.tsx b/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/GrantRevocationImpact.tsx
index f0648d70dd..7b9e3a5083 100644
--- a/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/GrantRevocationImpact.tsx
+++ b/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/GrantRevocationImpact.tsx
@@ -3,7 +3,7 @@ import { TriangleAlertIcon } from "lucide-react";
import { Alert, AlertDescription } from "@app/components/v3";
type Props = {
- usage: { isPending: boolean; isError: boolean; total: number };
+ usage: { isChecking: boolean; isError: boolean; total: number };
targetProjectName?: string;
folderCount: number;
};
@@ -12,7 +12,7 @@ export const GrantRevocationImpact = ({ usage, targetProjectName, folderCount }:
const folders = folderCount === 1 ? "this folder" : "these folders";
const projectName = targetProjectName ?? "the other project";
- if (usage.isPending) {
+ if (usage.isChecking) {
return (
<p className="text-sm text-label">
Checking for secret imports and references that use {folders}...
diff --git a/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/ShareSecretsSheet.tsx b/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/ShareSecretsSheet.tsx
index 7c7d74e00b..94641903b0 100644
--- a/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/ShareSecretsSheet.tsx
+++ b/frontend/src/pages/project/SettingsPage/components/CrossProjectSharingSection/ShareSecretsSheet.tsx
@@ -531,7 +531,7 @@ export const ShareSecretsSheet = ({
<AlertDialog open={isConfirmUpdateOpen} onOpenChange={setIsConfirmUpdateOpen}>
<AlertDialogContent>
<AlertDialogHeader>
- <AlertDialogTitle>Remove access to shared folders?</AlertDialogTitle>
+ <AlertDialogTitle>Remove Access to Shared Folders?</AlertDialogTitle>
<AlertDialogDescription>
<strong>{editData?.targetProjectName}</strong> will lose access to{" "}
{revokedGrants.length} shared {revokedGrants.length === 1 ? "folder" : "folders"}.
@@ -547,7 +547,7 @@ export const ShareSecretsSheet = ({
<AlertDialogAction
variant="danger"
onClick={handleSubmit}
- isDisabled={revokedGrantUsage.isPending}
+ isDisabled={revokedGrantUsage.isChecking}
>
Save
</AlertDialogAction>