mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-09-22 13:39:35 +00:00
PIT: hide restore button for last commit
This commit is contained in:
@@ -85,6 +85,7 @@ const commitSchema = z.object({
|
||||
envId: z.string(),
|
||||
createdAt: z.union([z.string(), z.date()]),
|
||||
updatedAt: z.union([z.string(), z.date()]),
|
||||
isLatest: z.boolean().default(false),
|
||||
changes: z.array(commitChangeSchema).optional()
|
||||
});
|
||||
|
||||
|
||||
@@ -1279,7 +1279,8 @@ export const folderCommitServiceFactory = ({
|
||||
});
|
||||
const changes = await folderCommitChangesDAL.findByCommitId(commitId, 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 };
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -325,6 +325,7 @@ export const secretV2BridgeServiceFactory = ({
|
||||
userId: inputSecret.type === SecretType.Personal ? actorId : null,
|
||||
tagIds: inputSecret.tagIds,
|
||||
references: nestedReferences,
|
||||
metadata: secretMetadata ? JSON.stringify(secretMetadata) : [],
|
||||
secretMetadata
|
||||
}
|
||||
],
|
||||
@@ -529,7 +530,7 @@ export const secretV2BridgeServiceFactory = ({
|
||||
skipMultilineEncoding: inputSecret.skipMultilineEncoding,
|
||||
key: inputSecret.newSecretName || secretName,
|
||||
tags: inputSecret.tagIds,
|
||||
metadata: JSON.stringify(secretMetadata),
|
||||
metadata: secretMetadata ? JSON.stringify(secretMetadata) : [],
|
||||
secretMetadata,
|
||||
...encryptedValue
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ export type CommitHistoryItem = {
|
||||
envId: string;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
isLatest: boolean;
|
||||
};
|
||||
|
||||
export type TFolderCommitChanges = {
|
||||
|
||||
@@ -291,14 +291,16 @@ export const CommitDetailsTab = ({
|
||||
className="animate-in fade-in-50 zoom-in-95 min-w-[200px] p-1"
|
||||
style={{ marginTop: "0" }}
|
||||
>
|
||||
<DropdownMenuItem
|
||||
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>
|
||||
</DropdownMenuItem>
|
||||
{!parsedCommitDetails.changes.isLatest && (
|
||||
<DropdownMenuItem
|
||||
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>
|
||||
</DropdownMenuItem>
|
||||
)}
|
||||
|
||||
<DropdownMenuItem
|
||||
className="h-10 w-full cursor-pointer px-3 py-2 text-sm transition-colors hover:bg-mineshaft-700"
|
||||
|
||||
Reference in New Issue
Block a user