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 restore buttons on the UI and reconstruct folder children on revert by default

Browse Source
This commit is contained in:
carlosmonastyrski
2025-05-27 19:42:31 -03:00
parent 5b7f445e33
commit c7ec825830
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/services/folder-commit/folder-commit-service.ts
View File

@@ -2029,7 +2029,8 @@ export const folderCommitServiceFactory = ({
}, },
folderId: commitToRevert.folderId, folderId: commitToRevert.folderId,
projectId, projectId,
reconstructNewFolders: false reconstructNewFolders: true,
reconstructUpToCommit: commitToRevert.commitId.toString()
}); });
return { return {

40
frontend/src/pages/secret-manager/CommitDetailsPage/components/CommitDetailsTab/CommitDetailsTab.tsx
View File

@@ -1,5 +1,5 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { faAngleDown } from "@fortawesome/free-solid-svg-icons"; import { faAngleDown, faCodeBranch, faRotateLeft } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { DropdownMenuItem } from "@radix-ui/react-dropdown-menu"; import { DropdownMenuItem } from "@radix-ui/react-dropdown-menu";
import { useSearch } from "@tanstack/react-router"; import { useSearch } from "@tanstack/react-router";
@@ -262,7 +262,7 @@ export const CommitDetailsTab = ({
)} )}
</b> </b>
{parsedCommitDetails.changes?.isLatest && ( {parsedCommitDetails.changes?.isLatest && (
<span className="ml-1 italic text-gray-400">(Current)</span> <span className="ml-1 italic text-gray-400">(Latest)</span>
)} )}
</p> </p>
</div> </div>
@@ -291,26 +291,48 @@ export const CommitDetailsTab = ({
<DropdownMenuContent <DropdownMenuContent
align="end" align="end"
sideOffset={2} sideOffset={2}
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-[240px] rounded-md bg-mineshaft-800 p-1 shadow-lg"
style={{ marginTop: "0" }} style={{ marginTop: "0" }}
> >
{!parsedCommitDetails.changes.isLatest && ( {!parsedCommitDetails.changes.isLatest && (
<DropdownMenuItem <DropdownMenuItem
className="h-10 w-full cursor-pointer px-3 py-2 text-sm transition-colors hover:bg-mineshaft-700" className="group cursor-pointer rounded-md px-3 py-3 transition-colors hover:bg-mineshaft-700"
onClick={() => goToRollbackPreview()} onClick={() => goToRollbackPreview()}
> >
<div className="flex w-full items-center justify-start"> <div className="flex items-center space-x-3">
<span>Restore entire folder</span> <FontAwesomeIcon
icon={faCodeBranch}
className="mt-1 text-gray-300 group-hover:text-white"
/>
<div className="flex flex-col">
<span className="text-sm font-medium text-white">
Restore to this commit
</span>
<span className="max-w-[180px] whitespace-normal break-words text-xs leading-snug text-gray-400">
Restore the folder as it was at this time
</span>
</div>
</div> </div>
</DropdownMenuItem> </DropdownMenuItem>
)} )}
<DropdownMenuItem <DropdownMenuItem
className="h-10 w-full cursor-pointer px-3 py-2 text-sm transition-colors hover:bg-mineshaft-700" className="group cursor-pointer rounded-md px-3 py-3 transition-colors hover:bg-mineshaft-700"
onClick={() => handlePopUpOpen("revertChanges")} onClick={() => handlePopUpOpen("revertChanges")}
> >
<div className="flex w-full items-center justify-start"> <div className="flex items-center space-x-3">
<span>Revert commit changes</span> <FontAwesomeIcon
icon={faRotateLeft}
className="mt-1 text-gray-300 group-hover:text-white"
/>
<div className="flex flex-col">
<span className="text-sm font-medium text-white">
Revert commit changes
</span>
<span className="max-w-[180px] whitespace-normal break-words text-xs leading-snug text-gray-400">
Create a new commit that undoes the changes in this commit
</span>
</div>
</div> </div>
</DropdownMenuItem> </DropdownMenuItem>
</DropdownMenuContent> </DropdownMenuContent>