awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve slug description, regex and replace useState with watch

Browse Source
This commit is contained in:
carlosmonastyrski
2025-03-10 08:18:43 -03:00
parent 699e03c1a9
commit 20bd2ca71c
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/lib/api-docs/constants.ts
View File

@@ -460,7 +460,7 @@ export const PROJECTS = {
name: "The new name of the project.",
projectDescription: "An optional description label for the project.",
autoCapitalization: "Disable or enable auto-capitalization for the project.",
slug: "An optional slug for the project. (must be unique within the server)"
slug: "An optional slug for the project. (must be unique within the organization)"
},
GET_KEY: {
workspaceId: "The ID of the project to get the key from."

4
backend/src/server/routes/v1/project-router.ts
View File

@@ -311,6 +311,10 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
slug: z
.string()
.trim()
.regex(
/^[a-z0-9]+(?:[_-][a-z0-9]+)*$/,
"Project slug can only contain lowercase letters and numbers, with optional single hyphens (-) or underscores (_) between words. Cannot start or end with a hyphen or underscore."
)
.max(64, { message: "Slug must be 64 characters or fewer" })
.optional()
.describe(PROJECTS.UPDATE.slug)

18
frontend/src/components/project/ProjectOverviewChangeSection.tsx
View File

@@ -1,4 +1,4 @@
import { useEffect, useState } from "react";
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod";
@@ -23,7 +23,10 @@ const formSchemaWithSlug = baseFormSchema.extend({
.string()
.min(1, "Required")
.max(64, "Too long, maximum length is 64 characters")
.regex(/^[a-zA-Z0-9-]+$/, "Only letters, numbers and hyphens are allowed")
.regex(
/^[a-z0-9]+(?:[_-][a-z0-9]+)*$/,
"Project slug can only contain lowercase letters and numbers, with optional single hyphens (-) or underscores (_) between words. Cannot start or end with a hyphen or underscore."
)
});
type BaseFormData = z.infer<typeof baseFormSchema>;
@@ -35,13 +38,13 @@ type Props = {
export const ProjectOverviewChangeSection = ({ showSlugField = false }: Props) => {
const { currentWorkspace } = useWorkspace();
const [currentSlug, setCurrentSlug] = useState(currentWorkspace?.slug);
const { mutateAsync, isPending } = useUpdateProject();
const { handleSubmit, control, reset } = useForm<BaseFormData | FormDataWithSlug>({
const { handleSubmit, control, reset, watch } = useForm<BaseFormData | FormDataWithSlug>({
resolver: zodResolver(showSlugField ? formSchemaWithSlug : baseFormSchema)
});
const currentSlug = showSlugField ? watch("slug") : currentWorkspace?.slug;
useEffect(() => {
if (currentWorkspace) {
reset({
@@ -49,7 +52,6 @@ export const ProjectOverviewChangeSection = ({ showSlugField = false }: Props) =
description: currentWorkspace.description ?? "",
...(showSlugField && { slug: currentWorkspace.slug })
});
setCurrentSlug(currentWorkspace.slug);
}
}, [currentWorkspace, showSlugField]);
@@ -67,10 +69,6 @@ export const ProjectOverviewChangeSection = ({ showSlugField = false }: Props) =
})
});
if (showSlugField && "slug" in data) {
setCurrentSlug(data.slug);
}
createNotification({
text: "Successfully updated project overview",
type: "success"