awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-03 14:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

PIT: hide restore button for last commit

Browse Source
This commit is contained in:
carlosmonastyrski
2025-05-25 11:52:28 -03:00
parent 14362dbe6a
commit b812761bdd
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/folder-commit/folder-commit-schemas.ts
+1
View File
@@ -85,6 +85,7 @@ const commitSchema = z.object({
envId: z.string(), envId: z.string(),
createdAt: z.union([z.string(), z.date()]), createdAt: z.union([z.string(), z.date()]),
updatedAt: z.union([z.string(), z.date()]), updatedAt: z.union([z.string(), z.date()]),
isLatest: z.boolean().default(false),
changes: z.array(commitChangeSchema).optional() changes: z.array(commitChangeSchema).optional()
}); });
backend/src/services/folder-commit/folder-commit-service.ts
+2 -1
View File
@@ -1279,7 +1279,8 @@ export const folderCommitServiceFactory = ({
}); });
const changes = await folderCommitChangesDAL.findByCommitId(commitId, projectId); const changes = await folderCommitChangesDAL.findByCommitId(commitId, projectId);
const commit = await folderCommitDAL.findById(commitId, undefined, projectId); const commit = await folderCommitDAL.findById(commitId, undefined, projectId);
return { ...commit, changes }; const latestCommit = await folderCommitDAL.findLatestCommit(commit.folderId, projectId);
return { ...commit, changes, isLatest: commit.id === latestCommit?.id };
}; };
/** /**
backend/src/services/secret-v2-bridge/secret-v2-bridge-service.ts
+2 -1
View File
@@ -325,6 +325,7 @@ export const secretV2BridgeServiceFactory = ({
userId: inputSecret.type === SecretType.Personal ? actorId : null, userId: inputSecret.type === SecretType.Personal ? actorId : null,
tagIds: inputSecret.tagIds, tagIds: inputSecret.tagIds,
references: nestedReferences, references: nestedReferences,
metadata: secretMetadata ? JSON.stringify(secretMetadata) : [],
secretMetadata secretMetadata
} }
], ],
@@ -529,7 +530,7 @@ export const secretV2BridgeServiceFactory = ({
skipMultilineEncoding: inputSecret.skipMultilineEncoding, skipMultilineEncoding: inputSecret.skipMultilineEncoding,
key: inputSecret.newSecretName || secretName, key: inputSecret.newSecretName || secretName,
tags: inputSecret.tagIds, tags: inputSecret.tagIds,
metadata: JSON.stringify(secretMetadata), metadata: secretMetadata ? JSON.stringify(secretMetadata) : [],
secretMetadata, secretMetadata,
...encryptedValue ...encryptedValue
} }
frontend/src/hooks/api/folderCommits/types.ts
+1
View File
@@ -13,6 +13,7 @@ export type CommitHistoryItem = {
envId: string; envId: string;
createdAt: string; createdAt: string;
updatedAt: string; updatedAt: string;
isLatest: boolean;
}; };
export type TFolderCommitChanges = { export type TFolderCommitChanges = {
frontend/src/pages/secret-manager/CommitDetailsPage/components/CommitDetailsTab/CommitDetailsTab.tsx
+10 -8
View File
@@ -291,14 +291,16 @@ export const CommitDetailsTab = ({
className="animate-in fade-in-50 zoom-in-95 min-w-[200px] p-1" className="animate-in fade-in-50 zoom-in-95 min-w-[200px] p-1"
style={{ marginTop: "0" }} style={{ marginTop: "0" }}
> >
<DropdownMenuItem {!parsedCommitDetails.changes.isLatest && (
className="h-10 w-full cursor-pointer px-3 py-2 text-sm transition-colors hover:bg-mineshaft-700" <DropdownMenuItem
onClick={() => goToRollbackPreview()} className="h-10 w-full cursor-pointer px-3 py-2 text-sm transition-colors hover:bg-mineshaft-700"
> onClick={() => goToRollbackPreview()}
<div className="flex w-full items-center justify-start"> >
<span>Restore entire folder</span> <div className="flex w-full items-center justify-start">
</div> <span>Restore entire folder</span>
</DropdownMenuItem> </div>
</DropdownMenuItem>
)}
<DropdownMenuItem <DropdownMenuItem
className="h-10 w-full cursor-pointer px-3 py-2 text-sm transition-colors hover:bg-mineshaft-700" className="h-10 w-full cursor-pointer px-3 py-2 text-sm transition-colors hover:bg-mineshaft-700"