Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
skip imports from deleted projects, bound restored slug, hide expired deleted projects
DimitrisStaratzisc645dc7057fa
diff --git a/backend/src/services/project/project-dal.ts b/backend/src/services/project/project-dal.tsindex e0e62f8ccc..84aee06f1f 100644--- a/backend/src/services/project/project-dal.ts+++ b/backend/src/services/project/project-dal.ts@@ -1059,7 +1059,7 @@ export const projectDALFactory = (db: TDbClient) => {.leftJoin(TableName.Users, `${TableName.Project}.deletedByActorId`, `${TableName.Users}.id`).leftJoin(TableName.Identity, `${TableName.Project}.deletedByActorId`, `${TableName.Identity}.id`).where(`${TableName.Project}.orgId`, orgId)- .whereNotNull(`${TableName.Project}.deleteAfter`)+ .where(`${TableName.Project}.deleteAfter`, ">", new Date()).whereNotNull(`${TableName.Project}.softDeletedAt`).select(`${TableName.Project}.id`,diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.tsindex 71e2617448..d62ac9ce14 100644--- a/backend/src/services/project/project-service.ts+++ b/backend/src/services/project/project-service.ts@@ -973,8 +973,10 @@ export const projectServiceFactory = ({}}- // The original slug was freed on delete and may have been reused since.- return projectDAL.restoreById(project.id, slugify(`${project.name}-${alphaNumericNanoId(4)}`), tx);+ // The original slug was freed on delete and may have been reused since. Slugifying the name can+ // lengthen it, so it is cut after slugifying to stay within the 64-character slug limit.+ const slug = slugify(`${slugify(project.name).slice(0, 59)}-${alphaNumericNanoId(4)}`);+ return projectDAL.restoreById(project.id, slug, tx);});if (!restoredProject) {diff --git a/backend/src/services/secret-import/secret-import-dal.ts b/backend/src/services/secret-import/secret-import-dal.tsindex 42ae60fcc1..2cf20576ff 100644--- a/backend/src/services/secret-import/secret-import-dal.ts+++ b/backend/src/services/secret-import/secret-import-dal.ts@@ -93,6 +93,7 @@ export const secretImportDALFactory = (db: TDbClient) => {.join(TableName.Environment, `${TableName.SecretImport}.importEnv`, `${TableName.Environment}.id`).leftJoin(TableName.Project, `${TableName.Environment}.projectId`, `${TableName.Project}.id`).whereNull(`${TableName.Environment}.deleteAfter`)+ .whereNull(`${TableName.Project}.deleteAfter`).select(db.ref("*").withSchema(TableName.SecretImport) as unknown as keyof TSecretImports,db.ref("slug").withSchema(TableName.Environment),@@ -229,7 +230,9 @@ export const secretImportDALFactory = (db: TDbClient) => {.whereIn("folderId", folderIds).where("isReplication", false).join(TableName.Environment, `${TableName.SecretImport}.importEnv`, `${TableName.Environment}.id`)+ .join(TableName.Project, `${TableName.Environment}.projectId`, `${TableName.Project}.id`).whereNull(`${TableName.Environment}.deleteAfter`)+ .whereNull(`${TableName.Project}.deleteAfter`).select(db.ref("*").withSchema(TableName.SecretImport) as unknown as keyof TSecretImports,db.ref("slug").withSchema(TableName.Environment),diff --git a/frontend/src/hooks/api/auditLogs/constants.tsx b/frontend/src/hooks/api/auditLogs/constants.tsxindex 9fbd666468..3bed5eb9b7 100644--- a/frontend/src/hooks/api/auditLogs/constants.tsx+++ b/frontend/src/hooks/api/auditLogs/constants.tsx@@ -289,6 +289,7 @@ export const eventToNameMap: { [K in EventType]: string } = {[EventType.CREATE_PROJECT]: "Create Project",[EventType.UPDATE_PROJECT]: "Update Project",[EventType.DELETE_PROJECT]: "Delete Project",+ [EventType.RESTORE_PROJECT]: "Restore Project",[EventType.CREATE_SECRET_REMINDER]: "Create Secret Reminder",[EventType.GET_SECRET_REMINDER]: "Get Secret Reminder",diff --git a/frontend/src/hooks/api/auditLogs/enums.tsx b/frontend/src/hooks/api/auditLogs/enums.tsxindex 287e31e0c1..734f4e6ade 100644--- a/frontend/src/hooks/api/auditLogs/enums.tsx+++ b/frontend/src/hooks/api/auditLogs/enums.tsx@@ -284,6 +284,7 @@ export enum EventType {CREATE_PROJECT = "create-project",UPDATE_PROJECT = "update-project",DELETE_PROJECT = "delete-project",+ RESTORE_PROJECT = "restore-project",CREATE_SECRET_REMINDER = "create-secret-reminder",GET_SECRET_REMINDER = "get-secret-reminder",diff --git a/frontend/src/pages/organization/ProjectsPage/components/DeletedProjectsTable.tsx b/frontend/src/pages/organization/ProjectsPage/components/DeletedProjectsTable.tsxindex f22f9bba53..d2dc372a8a 100644--- a/frontend/src/pages/organization/ProjectsPage/components/DeletedProjectsTable.tsx+++ b/frontend/src/pages/organization/ProjectsPage/components/DeletedProjectsTable.tsx@@ -91,7 +91,7 @@ export const DeletedProjectsTable = ({ projectType }: { projectType: ProjectTypeconst remaining = formatRemainingDuration(deleteAfterDate);return (- <TableRow key={id} className="bg-warning/[0.025]">+ <TableRow key={id}><TableCell className="text-warning/80 line-through">{name}</TableCell><TableCell><div className="flex items-center justify-end gap-2">@@ -99,7 +99,7 @@ export const DeletedProjectsTable = ({ projectType }: { projectType: ProjectType<TooltipTrigger asChild><Badge variant="warning"><HourglassIcon />- Pending deletion+ Pending Deletion</Badge></TooltipTrigger><TooltipContent className="max-w-xs">@@ -136,7 +136,7 @@ export const DeletedProjectsTable = ({ projectType }: { projectType: ProjectTypeonClick={() => handlePopUpOpen("restoreProject", { id, name })}><RotateCcwIcon />- Restore project+ Restore Project</DropdownMenuItem></DropdownMenuContent></DropdownMenu>diff --git a/frontend/src/pages/project/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx b/frontend/src/pages/project/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsxindex 62e77c005a..9db7273392 100644--- a/frontend/src/pages/project/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx+++ b/frontend/src/pages/project/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx@@ -245,9 +245,9 @@ export const DeleteProjectSection = () => {open={popUp.scheduleDeleteWorkspace.isOpen}onOpenChange={(isOpen) => handlePopUpToggle("scheduleDeleteWorkspace", isOpen)}>- <AlertDialogContent className="sm:max-w-xl!">+ <AlertDialogContent><AlertDialogHeader>- <AlertDialogTitle>Schedule deletion of {currentProject?.name}?</AlertDialogTitle>+ <AlertDialogTitle>Schedule Deletion of {currentProject?.name}?</AlertDialogTitle><AlertDialogDescription>{currentProject?.name} will be inaccessible immediately, then permanently deleted on{" "}<span className="font-medium text-foreground">