Skip to content

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

improvement(frontend): default Add Machine Identity sheet to Assign Existing (#8722)

Andrew Huang203d272e9cff
diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx
index b21bedef07..8ac09c4230 100644
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/CreateProjectIdentity/CreateProjectIdentityForm.tsx
@@ -15,6 +15,7 @@ import {
FilterableSelect,
Input,
SheetFooter,
+ Skeleton,
Tabs,
TabsList,
TabsTrigger
@@ -85,13 +86,16 @@ type Props = {
onClose: () => void;
};
-export const CreateProjectIdentityForm = ({
+type TAssignableIdentity = { id: string; name: string };
+
+const ProjectIdentityFormContent = ({
projectId,
projectType,
productLabel,
canGrantPrivileges,
- onClose
-}: Props) => {
+ onClose,
+ assignableIdentities
+}: Props & { assignableIdentities: TAssignableIdentity[] }) => {
const navigate = useNavigate();
const queryClient = useQueryClient();
const isCertManager = projectType === ProjectType.CertificateManager;
@@ -123,7 +127,10 @@ export const CreateProjectIdentityForm = ({
const form = useForm<TCreateProjectIdentityForm>({
resolver: zodResolver(createProjectIdentitySchema),
defaultValues: {
- mode: CreateProjectIdentityMode.Create,
+ mode:
+ assignableIdentities.length > 0
+ ? CreateProjectIdentityMode.Assign
+ : CreateProjectIdentityMode.Create,
name: "",
role: defaultRole,
templateIds: []
@@ -139,25 +146,6 @@ export const CreateProjectIdentityForm = ({
const mode = useWatch({ control, name: "mode" });
- const { data: availableData, isPending: isAvailableLoading } = useQuery({
- ...projectIdentityMembershipQuery.listAvailable({ projectId, projectType }),
- placeholderData: (prev) => prev,
- enabled: mode === CreateProjectIdentityMode.Assign
- });
- const { data: membershipsData } = useListProjectIdentityMemberships(
- { projectId, projectType, limit: 1000 },
- { enabled: mode === CreateProjectIdentityMode.Assign }
- );
-
- const assignableIdentities = useMemo(() => {
- const alreadyMembers = new Set(
- (membershipsData?.identityMemberships ?? []).map((m) => m.identity.id)
- );
- return (availableData ?? [])
- .filter((i) => !alreadyMembers.has(i.id))
- .map((i) => ({ id: i.id, name: i.name }));
- }, [availableData, membershipsData]);
-
const { mutateAsync: createProjectIdentity } = useCreateProjectIdentity();
const { mutateAsync: updateMembership } = useUpdateProjectIdentityMembership();
const { mutateAsync: createMembership } = useCreateProjectIdentityMembership();
@@ -311,7 +299,7 @@ export const CreateProjectIdentityForm = ({
/>
<p className="text-sm text-muted">
{mode === CreateProjectIdentityMode.Assign
- ? "Reuse an existing machine identity from your organization."
+ ? "Reuse an organization machine identity, which can be added to several projects."
: `Create a dedicated machine identity managed at the ${productLabel} level.`}
</p>
</div>
@@ -348,7 +336,6 @@ export const CreateProjectIdentityForm = ({
<FilterableSelect
value={value || null}
onChange={(newValue) => onChange(newValue || undefined)}
- isLoading={isAvailableLoading}
placeholder="Select machine identity..."
options={assignableIdentities}
getOptionValue={(option) => option.id}
@@ -413,3 +400,39 @@ export const CreateProjectIdentityForm = ({
</FormProvider>
);
};
+
+export const CreateProjectIdentityForm = (props: Props) => {
+ const { projectId, projectType } = props;
+ const isProductScoped = projectType === ProjectType.PAM || projectType === ProjectType.AgentVault;
+
+ const { data: availableData, isFetchedAfterMount: isAvailableFresh } = useQuery({
+ ...projectIdentityMembershipQuery.listAvailable({ projectId, projectType }),
+ refetchOnMount: "always"
+ });
+ const { data: membershipsData, isFetchedAfterMount: isMembershipsFresh } =
+ useListProjectIdentityMemberships(
+ { projectId, projectType, limit: 1000 },
+ { enabled: isProductScoped, refetchOnMount: "always" }
+ );
+
+ const assignableIdentities = useMemo(() => {
+ const alreadyMembers = new Set(
+ (membershipsData?.identityMemberships ?? []).map((m) => m.identity.id)
+ );
+ return (availableData ?? [])
+ .filter((i) => !alreadyMembers.has(i.id))
+ .map((i) => ({ id: i.id, name: i.name }));
+ }, [availableData, membershipsData]);
+
+ if (!isAvailableFresh || (isProductScoped && !isMembershipsFresh)) {
+ return (
+ <div className="flex flex-1 flex-col gap-4 p-4">
+ <Skeleton className="h-9 w-full" />
+ <Skeleton className="h-9 w-full" />
+ <Skeleton className="h-9 w-full" />
+ </div>
+ );
+ }
+
+ return <ProjectIdentityFormContent {...props} assignableIdentities={assignableIdentities} />;
+};