Skip to content

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

app connection create selector + small dropdown tweak

Andrey4a855f7d79d5
diff --git a/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts b/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts
index 8fb01434f4..27d9988d0e 100644
--- a/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts
+++ b/backend/src/server/routes/v1/approval-policy-routers/approval-policy-endpoints.ts
@@ -364,14 +364,14 @@ export const registerApprovalPolicyEndpoints = ({
},
onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
handler: async (req) => {
- const { connections } = await server.services.approvalPolicy.getAutoApprovalCatalog(
+ const { apps, connections } = await server.services.approvalPolicy.getAutoApprovalCatalog(
policyType,
req.query.scope,
req.query.id,
req.permission
);
- return { connections };
+ return { apps, connections };
}
});
diff --git a/backend/src/services/approval-policy/auto-approval/auto-approval-schemas.ts b/backend/src/services/approval-policy/auto-approval/auto-approval-schemas.ts
index e596d0737e..e7f7cf95fd 100644
--- a/backend/src/services/approval-policy/auto-approval/auto-approval-schemas.ts
+++ b/backend/src/services/approval-policy/auto-approval/auto-approval-schemas.ts
@@ -2,6 +2,7 @@ import { z } from "zod";
import { APPROVAL_POLICY_AUTO_APPROVAL as DOCS } from "@app/lib/api-docs";
import { slugSchema } from "@app/server/lib/schemas";
+import { AppConnection } from "@app/services/app-connection/app-connection-enums";
import { AutoApprovalConstraintValue } from "./auto-approval-types";
@@ -108,6 +109,7 @@ export const AutoApprovalInputDetailsSchema = z.object({
});
export const AutoApprovalCatalogSchema = z.object({
+ apps: z.nativeEnum(AppConnection).array(),
connections: z
.object({
id: z.string().uuid(),
diff --git a/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts b/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts
index 1a1c77c63b..98756d015d 100644
--- a/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts
+++ b/backend/src/services/approval-policy/auto-approval/auto-approval-service.ts
@@ -506,6 +506,7 @@ export const autoApprovalServiceFactory = ({
const connectionsByApp = await Promise.all(AUTO_APPROVAL_APPS.map(listConnections));
return {
+ apps: AUTO_APPROVAL_APPS,
connections: connectionsByApp.flat().flatMap((connection) => {
const provider = getAutoApprovalProvider(connection.app);
if (!provider) return [];
diff --git a/frontend/src/hooks/api/approvalPolicies/index.tsx b/frontend/src/hooks/api/approvalPolicies/index.tsx
index 77e374c70f..15848e17d9 100644
--- a/frontend/src/hooks/api/approvalPolicies/index.tsx
+++ b/frontend/src/hooks/api/approvalPolicies/index.tsx
@@ -19,6 +19,7 @@ export {
type PamAccessPolicyConstraints,
type PolicyBypasser,
type TApprovalPolicy,
+ type TAutoApprovalCatalog,
type TAutoApprovalCatalogConnection,
type TAutoApprovalCatalogConstraint,
type TAutoApprovalCatalogSubject,
diff --git a/frontend/src/hooks/api/approvalPolicies/queries.tsx b/frontend/src/hooks/api/approvalPolicies/queries.tsx
index f6cc40db21..930b9cc906 100644
--- a/frontend/src/hooks/api/approvalPolicies/queries.tsx
+++ b/frontend/src/hooks/api/approvalPolicies/queries.tsx
@@ -4,7 +4,7 @@ import { apiRequest } from "@app/config/request";
import {
TApprovalPolicy,
- TAutoApprovalCatalogConnection,
+ TAutoApprovalCatalog,
TAutoApprovalOption,
TGetApprovalPolicyByIdDTO,
TGetAutoApprovalCatalogDTO,
@@ -26,11 +26,11 @@ export const approvalPolicyQuery = {
queryOptions({
queryKey: approvalPolicyQuery.autoApprovalCatalogKey(params),
queryFn: async () => {
- const { data } = await apiRequest.get<{ connections: TAutoApprovalCatalogConnection[] }>(
+ const { data } = await apiRequest.get<TAutoApprovalCatalog>(
`/api/v1/approval-policies/${params.policyType}/auto-approval/catalog`,
{ params: { scope: params.scope, id: params.scopeId } }
);
- return data.connections;
+ return data;
}
}),
autoApprovalOptions: (params: TListAutoApprovalOptionsDTO) =>
diff --git a/frontend/src/hooks/api/approvalPolicies/types.ts b/frontend/src/hooks/api/approvalPolicies/types.ts
index 1e0c46640d..55c2bc124b 100644
--- a/frontend/src/hooks/api/approvalPolicies/types.ts
+++ b/frontend/src/hooks/api/approvalPolicies/types.ts
@@ -1,3 +1,5 @@
+import { AppConnection } from "@app/hooks/api/appConnections/enums";
+
export enum ApprovalPolicyType {
PamAccess = "pam-access",
CertRequest = "cert-request",
@@ -134,6 +136,12 @@ export type TAutoApprovalOutcome = {
}[];
};
+export type TAutoApprovalCatalog = {
+ // Apps a connection can be created for to use in rules
+ apps: AppConnection[];
+ connections: TAutoApprovalCatalogConnection[];
+};
+
export type TGetAutoApprovalCatalogDTO = {
policyType: ApprovalPolicyType;
scope: ApprovalPolicyScope;
diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AddAppConnectionModal.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AddAppConnectionModal.tsx
index 88abf2fb0f..360b9926e6 100644
--- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AddAppConnectionModal.tsx
+++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AddAppConnectionModal.tsx
@@ -24,6 +24,7 @@ type Props = {
projectId?: string;
projectType?: ProjectType;
app?: AppConnection;
+ apps?: AppConnection[];
onComplete?: (appConnection: TAppConnection) => void;
};
@@ -33,6 +34,7 @@ export const AddAppConnectionModal = ({
projectId,
projectType,
app,
+ apps,
onComplete
}: Props) => {
// When `app` is preset (inline create from another flow, or an OAuth reopen) we skip the provider
@@ -137,6 +139,7 @@ export const AddAppConnectionModal = ({
setSelectedApp(nextApp);
}}
projectType={projectType}
+ apps={apps}
/>
</div>
)}
diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx
index 2cbde1fefb..1f30ee7441 100644
--- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx
+++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx
@@ -27,6 +27,8 @@ import { ProjectType } from "@app/hooks/api/projects/types";
type Props = {
onSelect: (app: AppConnection) => void;
projectType?: ProjectType;
+ // Limits the choices, for flows that only work with some apps
+ apps?: AppConnection[];
};
const ProviderCard = ({ app, onClick }: { app: AppConnection; onClick: () => void }) => {
@@ -59,13 +61,16 @@ const SectionLabel = ({ children }: { children: React.ReactNode }) => (
<p className="mb-3 text-[11px] font-medium tracking-wider text-muted uppercase">{children}</p>
);
-export const AppConnectionsSelect = ({ onSelect, projectType }: Props) => {
+export const AppConnectionsSelect = ({ onSelect, projectType, apps }: Props) => {
const { subscription } = useSubscription();
const { isPending, data: appConnectionOptions } = useAppConnectionOptions(projectType);
const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["upgradePlan"] as const);
const [search, setSearch] = useState("");
- const visibleOptions = useMemo(() => appConnectionOptions ?? [], [appConnectionOptions]);
+ const visibleOptions = useMemo(
+ () => (appConnectionOptions ?? []).filter((option) => !apps || apps.includes(option.app)),
+ [appConnectionOptions, apps]
+ );
const handleSelect = (app: AppConnection) => {
if (APP_CONNECTION_MAP[app].enterprise && !subscription.enterpriseAppConnections) {
diff --git a/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx b/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx
index 38d1cb022e..6bb5d7cbfa 100644
--- a/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx
+++ b/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx
@@ -172,9 +172,10 @@ export const FolderApprovalsTab = ({ folderId, onDirtyChange }: Props) => {
scope: ApprovalPolicyScope.PamFolder,
scopeId: folderId
};
- const { data: autoApprovalCatalog } = useQuery(
+ const { data: autoApprovalCatalogData } = useQuery(
approvalPolicyQuery.autoApprovalCatalog(autoApprovalScope)
);
+ const autoApprovalCatalog = autoApprovalCatalogData?.connections;
const savedApprovers = useMemo(() => {
if (!config?.steps?.[0]) return [];
diff --git a/frontend/src/pages/pam/components/auto-approval/AutoApprovalCard.tsx b/frontend/src/pages/pam/components/auto-approval/AutoApprovalCard.tsx
index 69e445e188..5c69413b6f 100644
--- a/frontend/src/pages/pam/components/auto-approval/AutoApprovalCard.tsx
+++ b/frontend/src/pages/pam/components/auto-approval/AutoApprovalCard.tsx
@@ -1,4 +1,4 @@
-import { Fragment } from "react";
+import { Fragment, useState } from "react";
import { useQuery } from "@tanstack/react-query";
import { Link2, Plus, TriangleAlert, X } from "lucide-react";
@@ -13,6 +13,7 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
+ DropdownMenuSeparator,
DropdownMenuTrigger,
FieldContent,
FieldDescription,
@@ -21,13 +22,17 @@ import {
ProviderIcon
} from "@app/components/v3";
import { Skeleton } from "@app/components/v3/generic/Skeleton";
+import { OrgPermissionSubjects, useOrgPermission } from "@app/context";
+import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
+import { TAppConnection } from "@app/hooks/api/appConnections";
import { AppConnection } from "@app/hooks/api/appConnections/enums";
import {
approvalPolicyQuery,
ApprovalPolicyScope,
ApprovalPolicyType
} from "@app/hooks/api/approvalPolicies";
+import { AddAppConnectionModal } from "@app/pages/organization/AppConnections/AppConnectionsPage/components";
import {
AUTO_APPROVAL_LIMITS,
@@ -65,12 +70,20 @@ export const AutoApprovalCard = ({
hasApprovers
}: Props) => {
const {
- data: catalog = [],
+ data: catalogData,
isPending,
isError,
isFetching,
refetch
} = useQuery(approvalPolicyQuery.autoApprovalCatalog({ policyType, scope, scopeId }));
+ const catalog = catalogData?.connections ?? [];
+
+ const { permission } = useOrgPermission();
+ const canCreateConnection = permission.can(
+ OrgPermissionAppConnectionActions.Create,
+ OrgPermissionSubjects.AppConnections
+ );
+ const [isCreatingConnection, setIsCreatingConnection] = useState(false);
const availableInputs = catalog.flatMap((connection) =>
connection.subjects
@@ -116,197 +129,227 @@ export const AutoApprovalCard = ({
? `A folder can have at most ${AUTO_APPROVAL_LIMITS.rules} rules.`
: undefined;
+ // A connection created from here is meant for this form, so its field is added right away
+ const addFieldForConnection = async (connection: TAppConnection) => {
+ const { data } = await refetch();
+ const created = data?.connections.find((candidate) => candidate.id === connection.id);
+ const subject = created?.subjects.find((candidate) => candidate.input);
+ if (!created || !subject || draft.inputs.length >= AUTO_APPROVAL_LIMITS.inputs) return;
+ onChange({
+ ...draft,
+ inputs: [...draft.inputs, { connectionId: created.id, subject: subject.id }]
+ });
+ };
+
let addInputBlocker: string | undefined;
- if (catalog.length === 0) {
- addInputBlocker = "Add an app connection that supports auto-approval.";
- } else if (draft.inputs.length >= AUTO_APPROVAL_LIMITS.inputs) {
+ if (draft.inputs.length >= AUTO_APPROVAL_LIMITS.inputs) {
addInputBlocker = `A folder can have at most ${AUTO_APPROVAL_LIMITS.inputs} request form fields.`;
- } else if (availableInputs.length === 0) {
- addInputBlocker = "Every available field is already added.";
+ } else if (availableInputs.length === 0 && !canCreateConnection) {
+ addInputBlocker =
+ catalog.length === 0
+ ? "Ask an admin to add an app connection that supports auto-approval."
+ : "Every available field is already added.";
}
return (
- <Card>
- <CardHeader className="border-b">
- <CardTitle className="text-base">Auto-Approval</CardTitle>
- <CardDescription>
- Requests that pass a rule are approved automatically if the account&apos;s template allows
- auto-approval. Other requests wait for the approvers below.
- </CardDescription>
- </CardHeader>
- <CardContent className="flex flex-col gap-6">
- {isPending && <Skeleton className="h-24 w-full" />}
- {isError && (
- <div className="flex flex-col items-center gap-3 rounded-md border border-border p-8 text-center text-sm text-muted">
- Couldn&apos;t load the app connections auto-approval can use.
- <Button
- type="button"
- variant="outline"
- size="sm"
- isPending={isFetching}
- onClick={() => refetch()}
- >
- Retry
- </Button>
- </div>
- )}
- {!isPending && !isError && (
- <>
- <section className="flex flex-col gap-3">
- <div className="flex items-start justify-between gap-4">
- <FieldContent>
- <FieldTitle>Request Form Fields</FieldTitle>
- <FieldDescription>
- Optional fields on the access request form, such as a Jira ticket. Rules check
- what requesters enter.
- </FieldDescription>
- </FieldContent>
- <DisabledReason reason={addInputBlocker}>
- <DropdownMenu>
- <DropdownMenuTrigger asChild disabled={Boolean(addInputBlocker)}>
- <Button type="button" variant="outline" size="sm">
- <Plus />
- Add Field
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- {availableInputs.map(({ connection, subject }) => (
- <DropdownMenuItem
- key={`${connection.id}:${subject.id}`}
- onClick={() =>
- onChange({
- ...draft,
- inputs: [
- ...draft.inputs,
- { connectionId: connection.id, subject: subject.id }
- ]
- })
- }
- >
- <ConnectionIcon app={connection.app} />
- {subject.input?.label}
- <span className="text-muted">· {connection.name}</span>
- </DropdownMenuItem>
- ))}
- </DropdownMenuContent>
- </DropdownMenu>
- </DisabledReason>
- </div>
-
- {draft.inputs.length === 0 ? (
- <div className="rounded-md border border-border p-8 text-center text-sm text-muted">
- No request form fields added. Rules have nothing to check until you add one.
- </div>
- ) : (
- <div className="flex flex-col divide-y divide-border rounded-md border border-border">
- {draft.inputs.map((input) => {
- const { connection, subject } = findSubject(
- catalog,
- input.connectionId,
- input.subject
- );
- return (
- <div
- key={`${input.connectionId}:${input.subject}`}
- className="flex items-center gap-3 px-4 py-2.5"
- >
- <span className="text-sm text-foreground">
- {subject?.input?.label ?? input.subject}
- </span>
- {connection ? (
- <Badge variant="neutral">
- <Link2 />
- {connection.name}
- </Badge>
- ) : (
- <span className="text-xs text-muted">
- Connection unavailable. You may not have access to it.
- </span>
+ <>
+ <Card>
+ <CardHeader className="border-b">
+ <CardTitle className="text-base">Auto-Approval</CardTitle>
+ <CardDescription>
+ Requests that pass a rule are approved automatically if the account&apos;s template
+ allows auto-approval. Other requests wait for the approvers below.
+ </CardDescription>
+ </CardHeader>
+ <CardContent className="flex flex-col gap-6">
+ {isPending && <Skeleton className="h-24 w-full" />}
+ {isError && (
+ <div className="flex flex-col items-center gap-3 rounded-md border border-border p-8 text-center text-sm text-muted">
+ Couldn&apos;t load the app connections auto-approval can use.
+ <Button
+ type="button"
+ variant="outline"
+ size="sm"
+ isPending={isFetching}
+ onClick={() => refetch()}
+ >
+ Retry
+ </Button>
+ </div>
+ )}
+ {!isPending && !isError && (
+ <>
+ <section className="flex flex-col gap-3">
+ <div className="flex items-start justify-between gap-4">
+ <FieldContent>
+ <FieldTitle>Request Form Fields</FieldTitle>
+ <FieldDescription>
+ Optional fields on the access request form, such as a Jira ticket. Rules check
+ what requesters enter.
+ </FieldDescription>
+ </FieldContent>
+ <DisabledReason reason={addInputBlocker}>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild disabled={Boolean(addInputBlocker)}>
+ <Button type="button" variant="outline" size="sm">
+ <Plus />
+ Add Field
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ {availableInputs.map(({ connection, subject }) => (
+ <DropdownMenuItem
+ key={`${connection.id}:${subject.id}`}
+ onClick={() =>
+ onChange({
+ ...draft,
+ inputs: [
+ ...draft.inputs,
+ { connectionId: connection.id, subject: subject.id }
+ ]
+ })
+ }
+ >
+ <ConnectionIcon app={connection.app} />
+ {subject.input?.label}
+ <span className="text-muted">· {connection.name}</span>
+ </DropdownMenuItem>
+ ))}
+ {canCreateConnection && (
+ <>
+ {availableInputs.length > 0 && <DropdownMenuSeparator />}
+ <DropdownMenuItem onClick={() => setIsCreatingConnection(true)}>
+ <Plus />
+ Create App Connection
+ </DropdownMenuItem>
+ </>
)}
- <Badge variant="outline" className="ml-auto">
- Optional
- </Badge>
- <IconButton
- variant="ghost"
- size="xs"
- aria-label="Remove field"
- className="text-muted hover:text-danger"
- onClick={() => removeInput(input.connectionId, input.subject)}
- >
- <X className="size-4" />
- </IconButton>
- </div>
- );
- })}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </DisabledReason>
</div>
- )}
- </section>
- <section className="flex flex-col gap-3">
- <div className="flex items-center justify-between gap-4">
- <FieldTitle>Rules</FieldTitle>
- <DisabledReason reason={addRuleBlocker}>
- <Button
- type="button"
- variant="outline"
- size="sm"
- isDisabled={Boolean(addRuleBlocker)}
- onClick={addRule}
- >
- <Plus />
- Add Rule
- </Button>
- </DisabledReason>
- </div>
+ {draft.inputs.length === 0 ? (
+ <div className="rounded-md border border-border p-8 text-center text-sm text-muted">
+ No request form fields added. Rules have nothing to check until you add one.
+ </div>
+ ) : (
+ <div className="flex flex-col divide-y divide-border rounded-md border border-border">
+ {draft.inputs.map((input) => {
+ const { connection, subject } = findSubject(
+ catalog,
+ input.connectionId,
+ input.subject
+ );
+ return (
+ <div
+ key={`${input.connectionId}:${input.subject}`}
+ className="flex items-center gap-3 px-4 py-2.5"
+ >
+ <span className="text-sm text-foreground">
+ {subject?.input?.label ?? input.subject}
+ </span>
+ {connection ? (
+ <Badge variant="neutral">
+ <Link2 />
+ {connection.name}
+ </Badge>
+ ) : (
+ <span className="text-xs text-muted">
+ Connection unavailable. You may not have access to it.
+ </span>
+ )}
+ <Badge variant="outline" className="ml-auto">
+ Optional
+ </Badge>
+ <IconButton
+ variant="ghost"
+ size="xs"
+ aria-label="Remove field"
+ className="text-muted hover:text-danger"
+ onClick={() => removeInput(input.connectionId, input.subject)}
+ >
+ <X className="size-4" />
+ </IconButton>
+ </div>
+ );
+ })}
+ </div>
+ )}
+ </section>
- {!hasApprovers && draft.rules.length > 0 && (
- <div className="flex items-center gap-2 rounded-md border border-warning/20 bg-warning/5 px-2.5 py-1.5 text-xs text-foreground/80">
- <TriangleAlert className="size-3.5 shrink-0 text-warning" />
- This folder has no approvers. Access requests that don&apos;t pass an
- auto-approval rule are rejected immediately.
+ <section className="flex flex-col gap-3">
+ <div className="flex items-center justify-between gap-4">
+ <FieldTitle>Rules</FieldTitle>
+ <DisabledReason reason={addRuleBlocker}>
+ <Button
+ type="button"
+ variant="outline"
+ size="sm"
+ isDisabled={Boolean(addRuleBlocker)}
+ onClick={addRule}
+ >
+ <Plus />
+ Add Rule
+ </Button>
+ </DisabledReason>
</div>
- )}
- {draft.rules.length === 0 ? (
- <div className="rounded-md border border-border p-8 text-center text-sm text-muted">
- No rules added. Every request waits for the approvers below.
- </div>
- ) : (
- <div className="flex flex-col">
- {draft.rules.map((rule, index) => (
- <Fragment key={rule.key}>
- {index > 0 && <LogicConnector label="or" />}
- <AutoApprovalRuleCard
- rule={rule}
- inputs={draft.inputs}
- catalog={catalog}
- policyType={policyType}
- scope={scope}
- scopeId={scopeId}
- showErrors={showErrors}
- onChange={(next) =>
- onChange({
- ...draft,
- rules: draft.rules.map((candidate) =>
- candidate.key === next.key ? next : candidate
- )
- })
- }
- onRemove={() =>
- onChange({
- ...draft,
- rules: draft.rules.filter((candidate) => candidate.key !== rule.key)
- })
- }
- />
- </Fragment>
- ))}
- </div>
- )}
- </section>
- </>
- )}
- </CardContent>
- </Card>
+ {!hasApprovers && draft.rules.length > 0 && (
+ <div className="flex items-center gap-2 rounded-md border border-warning/20 bg-warning/5 px-2.5 py-1.5 text-xs text-foreground/80">
+ <TriangleAlert className="size-3.5 shrink-0 text-warning" />
+ This folder has no approvers. Access requests that don&apos;t pass an
+ auto-approval rule are rejected immediately.
+ </div>
+ )}
+
+ {draft.rules.length === 0 ? (
+ <div className="rounded-md border border-border p-8 text-center text-sm text-muted">
+ No rules added. Every request waits for the approvers below.
+ </div>
+ ) : (
+ <div className="flex flex-col">
+ {draft.rules.map((rule, index) => (
+ <Fragment key={rule.key}>
+ {index > 0 && <LogicConnector label="or" />}
+ <AutoApprovalRuleCard
+ rule={rule}
+ inputs={draft.inputs}
+ catalog={catalog}
+ policyType={policyType}
+ scope={scope}
+ scopeId={scopeId}
+ showErrors={showErrors}
+ onChange={(next) =>
+ onChange({
+ ...draft,
+ rules: draft.rules.map((candidate) =>
+ candidate.key === next.key ? next : candidate
+ )
+ })
+ }
+ onRemove={() =>
+ onChange({
+ ...draft,
+ rules: draft.rules.filter((candidate) => candidate.key !== rule.key)
+ })
+ }
+ />
+ </Fragment>
+ ))}
+ </div>
+ )}
+ </section>
+ </>
+ )}
+ </CardContent>
+ </Card>
+ <AddAppConnectionModal
+ isOpen={isCreatingConnection}
+ onOpenChange={setIsCreatingConnection}
+ apps={catalogData?.apps ?? []}
+ onComplete={addFieldForConnection}
+ />
+ </>
);
};
diff --git a/frontend/src/pages/pam/components/auto-approval/AutoApprovalRuleCard.tsx b/frontend/src/pages/pam/components/auto-approval/AutoApprovalRuleCard.tsx
index cffbb8e670..7061d62b09 100644
--- a/frontend/src/pages/pam/components/auto-approval/AutoApprovalRuleCard.tsx
+++ b/frontend/src/pages/pam/components/auto-approval/AutoApprovalRuleCard.tsx
@@ -148,22 +148,6 @@ const ConditionRow = ({
{constraint?.value === AutoApprovalConstraintValue.Many && (
<span className="text-xs text-muted">one of</span>
)}
- {constraint && constraint.value !== AutoApprovalConstraintValue.None && (
- <div className="max-w-72 min-w-40 flex-1">
- <AutoApprovalValuePicker
- policyType={policyType}
- scope={scope}
- scopeId={scopeId}
- connectionId={condition.connectionId}
- subject={condition.subject}
- constraint={constraint}
- values={condition.values}
- siblings={siblings}
- onChange={(values) => onChange({ ...condition, values })}
- isError={Boolean(error)}
- />
- </div>
- )}
<IconButton
variant="ghost"
size="xs"
@@ -174,6 +158,22 @@ const ConditionRow = ({
<X className="size-4" />
</IconButton>
</div>
+ {constraint && constraint.value !== AutoApprovalConstraintValue.None && (
+ <div className="pb-1">
+ <AutoApprovalValuePicker
+ policyType={policyType}
+ scope={scope}
+ scopeId={scopeId}
+ connectionId={condition.connectionId}
+ subject={condition.subject}
+ constraint={constraint}
+ values={condition.values}
+ siblings={siblings}
+ onChange={(values) => onChange({ ...condition, values })}
+ isError={Boolean(error)}
+ />
+ </div>
+ )}
{error && <p className="px-1.5 text-xs text-danger">{error}</p>}
</div>
);
diff --git a/frontend/src/pages/pam/components/auto-approval/AutoApprovalValuePicker.tsx b/frontend/src/pages/pam/components/auto-approval/AutoApprovalValuePicker.tsx
index f9e02774fd..37779ca3c4 100644
--- a/frontend/src/pages/pam/components/auto-approval/AutoApprovalValuePicker.tsx
+++ b/frontend/src/pages/pam/components/auto-approval/AutoApprovalValuePicker.tsx
@@ -90,6 +90,7 @@ export const AutoApprovalValuePicker = ({
return (
<Combobox
multiple
+ singleLine
isClearable={false}
aria-label={constraint.label}
options={options}