awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 09:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3330 from Infisical/fix/snapshotsInfiniteLoading

Browse Source 
Fix infinite loading icon on snapshot button
This commit is contained in:
carlosmonastyrski
2025-03-28 16:51:29 -03:00
committed by GitHub
parent 2a7679005e a2c9c4529b
commit a1a931d3dd
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/layouts/OrganizationLayout/components/MinimizedOrgSidebar/MinimizedOrgSidebar.tsx
+3 -3
View File
@@ -329,7 +329,7 @@ export const MinimizedOrgSidebar = () => {
)} )}
</Link> </Link>
<div className="my-1 w-full bg-mineshaft-500" style={{ height: "1px" }} /> <div className="my-1 w-full bg-mineshaft-500" style={{ height: "1px" }} />
<DropdownMenu open={open} onOpenChange={setOpen}> <DropdownMenu open={open} onOpenChange={setOpen} modal={false}>
<DropdownMenuTrigger <DropdownMenuTrigger
onMouseEnter={() => setOpen(true)} onMouseEnter={() => setOpen(true)}
onMouseLeave={() => setOpen(false)} onMouseLeave={() => setOpen(false)}
@@ -396,7 +396,7 @@ export const MinimizedOrgSidebar = () => {
: "mb-4" : "mb-4"
} flex w-full cursor-default flex-col items-center px-1 text-sm text-mineshaft-400`} } flex w-full cursor-default flex-col items-center px-1 text-sm text-mineshaft-400`}
> >
<DropdownMenu open={openSupport} onOpenChange={setOpenSupport}> <DropdownMenu open={openSupport} onOpenChange={setOpenSupport} modal={false}>
<DropdownMenuTrigger <DropdownMenuTrigger
onMouseEnter={() => setOpenSupport(true)} onMouseEnter={() => setOpenSupport(true)}
onMouseLeave={() => setOpenSupport(false)} onMouseLeave={() => setOpenSupport(false)}
@@ -479,7 +479,7 @@ export const MinimizedOrgSidebar = () => {
</button> </button>
</Tooltip> </Tooltip>
)} )}
<DropdownMenu open={openUser} onOpenChange={setOpenUser}> <DropdownMenu open={openUser} onOpenChange={setOpenUser} modal={false}>
<DropdownMenuTrigger <DropdownMenuTrigger
onMouseEnter={() => setOpenUser(true)} onMouseEnter={() => setOpenUser(true)}
onMouseLeave={() => setOpenUser(false)} onMouseLeave={() => setOpenUser(false)}
frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
+6 -2
View File
@@ -250,7 +250,11 @@ const Page = () => {
limit: 10 limit: 10
}); });
const { data: snapshotCount, isPending: isSnapshotCountLoading } = useGetWsSnapshotCount({ const {
data: snapshotCount,
isPending: isSnapshotCountLoading,
isFetching: isSnapshotCountFetching
} = useGetWsSnapshotCount({
workspaceId, workspaceId,
environment, environment,
directory: secretPath, directory: secretPath,
@@ -414,7 +418,7 @@ const Page = () => {
onSearchChange={handleSearchChange} onSearchChange={handleSearchChange}
onToggleTagFilter={handleTagToggle} onToggleTagFilter={handleTagToggle}
snapshotCount={snapshotCount || 0} snapshotCount={snapshotCount || 0}
isSnapshotCountLoading={isSnapshotCountLoading} isSnapshotCountLoading={isSnapshotCountLoading && isSnapshotCountFetching}
onToggleRowType={handleToggleRowType} onToggleRowType={handleToggleRowType}
onClickRollbackMode={() => handlePopUpToggle("snapshots", true)} onClickRollbackMode={() => handlePopUpToggle("snapshots", true)}
protectedBranchPolicyName={boardPolicy?.name} protectedBranchPolicyName={boardPolicy?.name}