Improve referenced secret deletion message component

This commit is contained in:
carlosmonastyrski
2025-04-10 10:24:02 -03:00
parent b121ec891f
commit 8ee2b54182
7 changed files with 174 additions and 152 deletions
@@ -581,6 +581,7 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
folders: z
.object({
folderName: z.string(),
folderImported: z.boolean(),
secrets: z.array(z.string()).optional()
})
.array()
@@ -856,6 +857,7 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {
actorAuthMethod: req.permission.authMethod,
actorOrgId: req.permission.orgId
});
if (secrets?.length || secretRotations?.length) {
const secretCount =
(secrets?.length ?? 0) +
@@ -231,6 +231,7 @@ export const secretImportDALFactory = (db: TDbClient) => {
[folderName: string]: {
secrets: string[];
folderId: string;
folderImported: boolean;
};
};
};
@@ -251,11 +252,13 @@ export const secretImportDALFactory = (db: TDbClient) => {
}
if (!updatedAcc[env].folders[folder]) {
updatedAcc[env].folders[folder] = { secrets: [], folderId: item.folderId };
updatedAcc[env].folders[folder] = { secrets: [], folderId: item.folderId, folderImported: false };
}
if ("secretId" in item && item.secretId) {
updatedAcc[env].folders[folder].secrets = [...updatedAcc[env].folders[folder].secrets, item.secretId];
} else {
updatedAcc[env].folders[folder].folderImported = true;
}
return updatedAcc;
@@ -271,6 +274,7 @@ export const secretImportDALFactory = (db: TDbClient) => {
return {
folderName,
folderId: folderData.folderId,
folderImported: folderData.folderImported,
...(hasSecrets && { secrets: folderData.secrets })
};
});
@@ -843,6 +843,7 @@ export const secretImportServiceFactory = ({
...el,
folders: el.folders.map((folderItem) => ({
folderId: folderItem.folderId,
folderImported: folderItem.folderImported,
secrets: folderItem.secrets,
folderName: deepPaths.find((p) => p.folderId === folderItem.folderId)?.path || `...${folderItem.folderName}`
}))
@@ -65,6 +65,7 @@ export type FolderInfo = {
folderName: string;
secrets?: string[];
folderId: string;
folderImported: boolean;
envSlug?: string;
};