Skip to content

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

improvement(frontend): consistent slug auto-fill from name across create forms (#8768)

Andrew Huangf1383419f856
diff --git a/frontend/src/components/organization/NewSubOrganizationModal/NewSubOrganizationModal.tsx b/frontend/src/components/organization/NewSubOrganizationModal/NewSubOrganizationModal.tsx
index aef618f7d7..95eec1a307 100644
--- a/frontend/src/components/organization/NewSubOrganizationModal/NewSubOrganizationModal.tsx
+++ b/frontend/src/components/organization/NewSubOrganizationModal/NewSubOrganizationModal.tsx
@@ -46,6 +46,7 @@ export const NewSubOrganizationModal = ({ isOpen, onOpenChange, onCreated }: Pro
handleSubmit,
control,
setValue,
+ getFieldState,
reset,
formState: { isSubmitting }
} = useForm({
@@ -101,6 +102,7 @@ export const NewSubOrganizationModal = ({ isOpen, onOpenChange, onCreated }: Pro
value={value}
onChange={(e) => {
onChange(e);
+ if (getFieldState("slug").isDirty) return;
setValue("slug", slugify(e.target.value, { lowercase: true }), {
shouldValidate: true
});
diff --git a/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupCreateUpdateModal.tsx b/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupCreateUpdateModal.tsx
index 1cb8c9f898..8796bcc6d7 100644
--- a/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupCreateUpdateModal.tsx
+++ b/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupCreateUpdateModal.tsx
@@ -1,6 +1,7 @@
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
+import slugify from "@sindresorhus/slugify";
import { z } from "zod";
import { createNotification } from "@app/components/notifications";
@@ -52,7 +53,7 @@ export const GroupCreateUpdateModal = ({ popUp, handlePopUpClose, handlePopUpTog
const { mutateAsync: createMutateAsync, isPending: createIsLoading } = useCreateGroup();
const { mutateAsync: updateMutateAsync, isPending: updateIsLoading } = useUpdateGroup();
- const { control, handleSubmit, reset } = useForm<TGroupFormData>({
+ const { control, handleSubmit, reset, setValue, getFieldState } = useForm<TGroupFormData>({
resolver: zodResolver(GroupFormSchema)
});
@@ -144,6 +145,14 @@ export const GroupCreateUpdateModal = ({ popUp, handlePopUpClose, handlePopUpTog
placeholder="Engineering"
isError={Boolean(error)}
{...field}
+ onChange={(e) => {
+ field.onChange(e);
+ const slugState = getFieldState("slug");
+ if (!isCreateMode || slugState.isDirty) return;
+ setValue("slug", slugify(e.target.value, { lowercase: true }), {
+ shouldValidate: Boolean(slugState.error)
+ });
+ }}
autoComplete="off"
name="org-group-name"
/>
diff --git a/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx b/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
index a58b444d4e..0b43c4408f 100644
--- a/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
+++ b/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
@@ -1,6 +1,7 @@
import { useEffect, useMemo, useState } from "react";
import { Controller, FormProvider, useForm, useWatch } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
+import slugify from "@sindresorhus/slugify";
import { ChevronLeftIcon, SaveIcon } from "lucide-react";
import { z } from "zod";
@@ -62,7 +63,9 @@ export const ProjectTemplateEditRoleForm = ({
handleSubmit,
control,
formState: { isDirty, isSubmitting },
- reset
+ reset,
+ setValue,
+ getFieldState
} = formMethods;
useEffect(() => {
@@ -165,6 +168,14 @@ export const ProjectTemplateEditRoleForm = ({
<FieldLabel>Name</FieldLabel>
<Input
{...field}
+ onChange={(e) => {
+ field.onChange(e);
+ const slugState = getFieldState("slug");
+ if (role || slugState.isDirty) return;
+ setValue("slug", slugify(e.target.value, { lowercase: true }), {
+ shouldValidate: Boolean(slugState.error)
+ });
+ }}
autoFocus
placeholder="Role name..."
autoComplete="off"
diff --git a/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx b/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
index 3099e7899b..2d8754adee 100644
--- a/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
+++ b/frontend/src/pages/organization/ProductSettingsPage/project-templates/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
@@ -1,5 +1,7 @@
+import { useRef } from "react";
import { Controller, useFieldArray, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
+import slugify from "@sindresorhus/slugify";
import { ChevronDown, ChevronUp, Plus, Save, Trash2 } from "lucide-react";
import { z } from "zod";
@@ -56,7 +58,9 @@ export const ProjectTemplateEnvironmentsForm = ({
control,
handleSubmit,
formState: { isDirty, errors },
- reset
+ reset,
+ setValue,
+ getFieldState
} = useForm<TFormSchema>({
defaultValues: {
environments: projectTemplate.environments
@@ -65,6 +69,10 @@ export const ProjectTemplateEnvironmentsForm = ({
});
const { subscription } = useSubscription();
+ const customSlugRowIds = useRef(new Set<string>());
+ const newRowIds = useRef(new Set<string>());
+ const knownRowIds = useRef(new Set<string>());
+ const isAppendingRow = useRef(false);
const {
fields: environments,
@@ -73,6 +81,13 @@ export const ProjectTemplateEnvironmentsForm = ({
append
} = useFieldArray({ control, name: "environments" });
+ environments.forEach(({ id }) => {
+ if (knownRowIds.current.has(id)) return;
+ knownRowIds.current.add(id);
+ if (isAppendingRow.current) newRowIds.current.add(id);
+ });
+ isAppendingRow.current = false;
+
const updateProjectTemplate = useUpdateProjectTemplate();
const onFormSubmit = async (form: TFormSchema) => {
@@ -128,7 +143,10 @@ export const ProjectTemplateEnvironmentsForm = ({
>
{(isAllowed) => (
<Button
- onClick={() => append({ name: "", slug: "" })}
+ onClick={() => {
+ isAppendingRow.current = true;
+ append({ name: "", slug: "" });
+ }}
variant="project"
isDisabled={!isAllowed || isEnvironmentLimitExceeded}
>
@@ -173,6 +191,24 @@ export const ProjectTemplateEnvironmentsForm = ({
<Input
disabled={!isAllowed}
{...field}
+ onChange={(e) => {
+ field.onChange(e);
+ if (
+ !newRowIds.current.has(id) ||
+ customSlugRowIds.current.has(id)
+ )
+ return;
+ setValue(
+ `environments.${pos}.slug`,
+ slugify(e.target.value, { lowercase: true }),
+ {
+ shouldDirty: true,
+ shouldValidate: Boolean(
+ getFieldState(`environments.${pos}.slug`).error
+ )
+ }
+ );
+ }}
className="h-8 px-2 text-sm"
placeholder="Name..."
/>
@@ -201,6 +237,10 @@ export const ProjectTemplateEnvironmentsForm = ({
<Input
disabled={!isAllowed}
{...field}
+ onChange={(e) => {
+ customSlugRowIds.current.add(id);
+ field.onChange(e);
+ }}
className="h-8 px-2 text-sm"
placeholder="Slug..."
/>
diff --git a/frontend/src/pages/organization/RoleByIDPage/components/DuplicateOrgRoleModal.tsx b/frontend/src/pages/organization/RoleByIDPage/components/DuplicateOrgRoleModal.tsx
index 879a689862..f0b9202f0b 100644
--- a/frontend/src/pages/organization/RoleByIDPage/components/DuplicateOrgRoleModal.tsx
+++ b/frontend/src/pages/organization/RoleByIDPage/components/DuplicateOrgRoleModal.tsx
@@ -1,5 +1,6 @@
import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
+import slugify from "@sindresorhus/slugify";
import { useNavigate } from "@tanstack/react-router";
import { z } from "zod";
@@ -54,10 +55,13 @@ const Content = ({ role, onClose }: ContentProps) => {
const {
control,
handleSubmit,
+ setValue,
+ getFieldState,
formState: { isSubmitting }
} = useForm<FormData>({
defaultValues: {
- name: `${role.name} Duplicate`
+ name: `${role.name} Duplicate`,
+ slug: slugify(`${role.name} Duplicate`, { lowercase: true })
},
resolver: zodResolver(schema)
});
@@ -116,6 +120,14 @@ const Content = ({ role, onClose }: ContentProps) => {
placeholder="Billing Team"
isError={Boolean(error)}
{...field}
+ onChange={(e) => {
+ field.onChange(e);
+ const slugState = getFieldState("slug");
+ if (slugState.isDirty) return;
+ setValue("slug", slugify(e.target.value, { lowercase: true }), {
+ shouldValidate: Boolean(slugState.error)
+ });
+ }}
autoComplete="off"
name="org-role-name"
/>
diff --git a/frontend/src/pages/organization/RoleByIDPage/components/RoleModal.tsx b/frontend/src/pages/organization/RoleByIDPage/components/RoleModal.tsx
index d90a193942..7aaafd072c 100644
--- a/frontend/src/pages/organization/RoleByIDPage/components/RoleModal.tsx
+++ b/frontend/src/pages/organization/RoleByIDPage/components/RoleModal.tsx
@@ -1,6 +1,7 @@
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
+import slugify from "@sindresorhus/slugify";
import { useNavigate } from "@tanstack/react-router";
import { z } from "zod";
@@ -66,6 +67,8 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
control,
handleSubmit,
reset,
+ setValue,
+ getFieldState,
formState: { isSubmitting }
} = useForm<FormData>({
resolver: zodResolver(schema),
@@ -167,6 +170,14 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
placeholder="Billing Team"
isError={Boolean(error)}
{...field}
+ onChange={(e) => {
+ field.onChange(e);
+ const slugState = getFieldState("slug");
+ if (role || slugState.isDirty) return;
+ setValue("slug", slugify(e.target.value, { lowercase: true }), {
+ shouldValidate: Boolean(slugState.error)
+ });
+ }}
autoComplete="off"
name="org-role-name"
/>
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx
index 03abc65c6e..4c193cafd0 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx
@@ -59,6 +59,7 @@ const Content = ({ role, onClose }: ContentProps) => {
control,
handleSubmit,
setValue,
+ getFieldState,
formState: { isSubmitting }
} = useForm<FormData>({
defaultValues: {
@@ -142,6 +143,7 @@ const Content = ({ role, onClose }: ContentProps) => {
isError={Boolean(error)}
onChange={(e) => {
onChange(e);
+ if (getFieldState("slug").isDirty) return;
setValue("slug", slugify(e.target.value, { lowercase: true }), {
shouldValidate: true
});
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx
index aae51d330d..1363527283 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx
@@ -68,6 +68,7 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
handleSubmit,
reset,
setValue,
+ getFieldState,
formState: { isSubmitting }
} = useForm<FormData>({
resolver: zodResolver(schema),
@@ -148,6 +149,7 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
isError={Boolean(error)}
onChange={(e) => {
onChange(e);
+ if (getFieldState("slug").isDirty) return;
setValue("slug", slugify(e.target.value, { lowercase: true }), {
shouldValidate: true
});
diff --git a/frontend/src/pages/secret-manager/SettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx b/frontend/src/pages/secret-manager/SettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx
index 423d6974df..aa5f15146f 100644
--- a/frontend/src/pages/secret-manager/SettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx
+++ b/frontend/src/pages/secret-manager/SettingsPage/components/SecretTagsSection/AddSecretTagModal.tsx
@@ -81,7 +81,7 @@ export const AddSecretTagModal = ({ popUp, handlePopUpClose, handlePopUpToggle }
<DialogHeader>
<DialogTitle>Add a Tag for {currentProject?.name ?? ""}</DialogTitle>
<DialogDescription>
- Specify your tag name, and the slug will be created automatically.
+ Tag slugs can only contain lowercase letters, numbers, and hyphens.
</DialogDescription>
</DialogHeader>
<form onSubmit={handleSubmit(onFormSubmit)} className="flex flex-col gap-6">