Skip to content

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

fix: open policy sheet from approval empty states (#8334)

Andrew Huangac4df6b8d44d
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx
index bc65ba29e6..359b117290 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
import { Helmet } from "react-helmet";
import { useTranslation } from "react-i18next";
import { useNavigate, useSearch } from "@tanstack/react-router";
@@ -7,6 +7,7 @@ import { Badge, PageHeader, Tabs, TabsContent, TabsList, TabsTrigger } from "@ap
import { ROUTE_PATHS } from "@app/const/routes";
import { useOrganization, useProject } from "@app/context";
import { useGetAccessRequestsCount, useGetSecretApprovalRequestCount } from "@app/hooks/api";
+import { PolicyType } from "@app/hooks/api/policies/enums";
import { ProjectType } from "@app/hooks/api/projects/types";
import { AccessApprovalRequest } from "./components/AccessApprovalRequest";
@@ -20,6 +21,7 @@ enum TabSection {
}
export const SecretApprovalsPage = () => {
+ const [openAddPolicy, setOpenAddPolicy] = useState<PolicyType | null>(null);
const { t } = useTranslation();
const navigate = useNavigate();
const { currentOrg } = useOrganization();
@@ -74,6 +76,11 @@ export const SecretApprovalsPage = () => {
});
};
+ const configurePolicy = (policyType: PolicyType) => {
+ setOpenAddPolicy(policyType);
+ updateSelectedTab(TabSection.Policies);
+ };
+
return (
<div>
<Helmet>
@@ -105,14 +112,22 @@ export const SecretApprovalsPage = () => {
</TabsList>
<TabsContent value={TabSection.SecretApprovalRequests}>
<SecretApprovalRequest
- onConfigurePolicies={() => updateSelectedTab(TabSection.Policies)}
+ onConfigurePolicies={() => configurePolicy(PolicyType.ChangePolicy)}
/>
</TabsContent>
<TabsContent value={TabSection.ResourceApprovalRequests}>
- <AccessApprovalRequest projectId={projectId} projectSlug={projectSlug} />
+ <AccessApprovalRequest
+ projectId={projectId}
+ projectSlug={projectSlug}
+ onConfigurePolicies={() => configurePolicy(PolicyType.AccessPolicy)}
+ />
</TabsContent>
<TabsContent value={TabSection.Policies}>
- <ApprovalPolicyList projectId={projectId} />
+ <ApprovalPolicyList
+ projectId={projectId}
+ openAddPolicy={openAddPolicy}
+ onAddPolicyOpened={() => setOpenAddPolicy(null)}
+ />
</TabsContent>
</Tabs>
</div>
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
index 78b315d287..dcc9d93f61 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
@@ -38,6 +38,7 @@ import {
DropdownMenuLabel,
DropdownMenuTrigger,
Empty,
+ EmptyContent,
EmptyDescription,
EmptyHeader,
EmptyTitle,
@@ -64,6 +65,7 @@ import {
import { cn } from "@app/components/v3/utils";
import { ROUTE_PATHS } from "@app/const/routes";
import {
+ ProjectPermissionActions,
ProjectPermissionMemberActions,
ProjectPermissionSub,
useProject,
@@ -117,10 +119,12 @@ const CLOSED_REQUEST_FILTERS: { label: string; value: ClosedRequestFilter }[] =
export const AccessApprovalRequest = ({
projectSlug,
- projectId
+ projectId,
+ onConfigurePolicies
}: {
projectSlug: string;
projectId: string;
+ onConfigurePolicies: () => void;
}) => {
const [selectedRequest, setSelectedRequest] = useState<
| (TAccessApprovalRequest & {
@@ -210,9 +214,15 @@ export const AccessApprovalRequest = ({
projectSlug
});
- const { data: policies, isPending: policiesLoading } = useGetAccessApprovalPolicies({
- projectSlug
- });
+ const {
+ data: policies,
+ isPending: policiesLoading,
+ isSuccess: arePoliciesLoaded
+ } = useGetAccessApprovalPolicies({ projectSlug });
+ const canCreatePolicies = permission.can(
+ ProjectPermissionActions.Create,
+ ProjectPermissionSub.SecretApproval
+ );
const {
data: requests,
@@ -690,6 +700,14 @@ export const AccessApprovalRequest = ({
: "Approved, rejected, revoked, or expired access requests will appear here."}
</EmptyDescription>
</EmptyHeader>
+ {canCreatePolicies && arePoliciesLoaded && !policies?.length && (
+ <EmptyContent>
+ <Button variant="project" size="sm" onClick={onConfigurePolicies}>
+ <PlusIcon />
+ Configure Policy
+ </Button>
+ </EmptyContent>
+ )}
</Empty>
)}
{Boolean(!filteredRequests?.length && isFiltered && !areRequestsPending) && (
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx
index a4fa00e592..79f0f28b71 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
import {
ChevronDownIcon,
CircleAlertIcon,
@@ -29,6 +29,7 @@ import {
DropdownMenuRadioItem,
DropdownMenuTrigger,
Empty,
+ EmptyContent,
EmptyDescription,
EmptyHeader,
EmptyTitle,
@@ -82,6 +83,8 @@ import { RemoveApprovalPolicyModal } from "./components/RemoveApprovalPolicyModa
interface IProps {
projectId: string;
+ openAddPolicy: PolicyType | null;
+ onAddPolicyOpened: () => void;
}
enum PolicyOrderBy {
@@ -145,7 +148,8 @@ const useApprovalPolicies = (permission: TProjectPermission, currentProject?: Pr
};
};
-export const ApprovalPolicyList = ({ projectId }: IProps) => {
+export const ApprovalPolicyList = ({ projectId, openAddPolicy, onAddPolicyOpened }: IProps) => {
+ const [initialPolicyType, setInitialPolicyType] = useState<PolicyType>();
const { handlePopUpToggle, handlePopUpOpen, popUp } = usePopUp([
"policyForm",
"deletePolicy",
@@ -155,6 +159,18 @@ export const ApprovalPolicyList = ({ projectId }: IProps) => {
const { subscription } = useSubscription();
const { currentProject } = useProject();
+ useEffect(() => {
+ if (!openAddPolicy) return;
+
+ if (subscription && !subscription.secretApproval) {
+ handlePopUpOpen("upgradePlan");
+ } else {
+ setInitialPolicyType(openAddPolicy);
+ handlePopUpOpen("policyForm");
+ }
+ onAddPolicyOpened();
+ }, [openAddPolicy, subscription, handlePopUpOpen, onAddPolicyOpened]);
+
const canReadPolicies = permission.can(
ProjectPermissionActions.Read,
ProjectPermissionSub.SecretApproval
@@ -337,6 +353,7 @@ export const ApprovalPolicyList = ({ projectId }: IProps) => {
handlePopUpOpen("upgradePlan");
return;
}
+ setInitialPolicyType(undefined);
handlePopUpOpen("policyForm");
}}
variant="project"
@@ -543,6 +560,25 @@ export const ApprovalPolicyList = ({ projectId }: IProps) => {
Create a policy to require approval for secret changes and access requests.
</EmptyDescription>
</EmptyHeader>
+ {canCreatePolicies && (
+ <EmptyContent>
+ <Button
+ variant="project"
+ size="sm"
+ onClick={() => {
+ if (subscription && !subscription.secretApproval) {
+ handlePopUpOpen("upgradePlan");
+ } else {
+ setInitialPolicyType(undefined);
+ handlePopUpOpen("policyForm");
+ }
+ }}
+ >
+ <PlusIcon />
+ Configure Policy
+ </Button>
+ </EmptyContent>
+ )}
</Empty>
)}
{Boolean(
@@ -572,6 +608,8 @@ export const ApprovalPolicyList = ({ projectId }: IProps) => {
</CardContent>
</Card>
<AccessPolicyForm
+ key={initialPolicyType ?? "default"}
+ initialPolicyType={initialPolicyType}
projectId={currentProject.id}
projectSlug={currentProject.slug}
isOpen={popUp.policyForm.isOpen}
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
index c6a03f3d33..6aa3768fcb 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
@@ -123,6 +123,7 @@ const hasOptionId = (option: ApproverOptionData): option is ApproverOptionData &
type Props = {
isOpen?: boolean;
+ initialPolicyType?: PolicyType;
onToggle: (isOpen: boolean) => void;
members?: TWorkspaceUser[];
groups?: TGroupMembership[];
@@ -141,6 +142,7 @@ const Form = ({
projectId,
projectSlug,
editValues,
+ initialPolicyType,
isEditMode,
onDirtyChange,
onSubmittingChange,
@@ -210,6 +212,7 @@ const Form = ({
values: editFormValues,
defaultValues: !editValues
? {
+ policyType: initialPolicyType ?? PolicyType.ChangePolicy,
secretPath: "/",
sequenceApprovers: [{ approvals: 1 }]
}
@@ -635,7 +638,7 @@ const Form = ({
return (
<form
onSubmit={handleSubmit(handleFormSubmit)}
- className="flex flex-1 flex-col gap-4 overflow-hidden"
+ className="flex flex-1 flex-col overflow-hidden"
>
<div className="flex thin-scrollbar flex-1 flex-col gap-4 overflow-y-auto p-4">
{hasApproverOptionsError && (
@@ -661,7 +664,7 @@ const Form = ({
<Controller
control={control}
name="policyType"
- defaultValue={PolicyType.ChangePolicy}
+ defaultValue={initialPolicyType ?? PolicyType.ChangePolicy}
render={({ field: { value, onChange }, fieldState: { error } }) => (
<Field>
<FieldLabel>